From 16c17224812f25eaadcdfa61ee4fab040df1edcb Mon Sep 17 00:00:00 2001
From: Mujuzi Moses <mujuzimoses@gmail.com>
Date: Tue, 8 Sep 2020 17:22:59 +0300
Subject: [PATCH 1/2] REPORT-495: Added an onkeyup event to the Widgets and
 Text input elements which disables and enables the smallButtons when the
 input elements have or don't have input respectively

---
 omod/src/main/webapp/run/runReportForm.jsp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/omod/src/main/webapp/run/runReportForm.jsp b/omod/src/main/webapp/run/runReportForm.jsp
index 83e31fce8d..fe05155936 100644
--- a/omod/src/main/webapp/run/runReportForm.jsp
+++ b/omod/src/main/webapp/run/runReportForm.jsp
@@ -20,6 +20,23 @@ jQuery(document).ready(
 function toggleInputElements( idPrefix ){
 	jQuery( '.'+idPrefix ).toggle();
 }
+    
+/**
+ * TODO make disableButtons(idPrefix) an external function so that when widgets are
+ * used elsewhere but not in the Reporting module, they can access it.
+ */
+var disableButtons = function(idPrefix) {
+        var checkFixedValue;
+        checkFixedValue = jQuery('.' + idPrefix).val().length;
+        var checkExpression;
+         checkExpression = jQuery('#inputExpression.' + idPrefix).val().length;
+        
+        if (checkFixedValue > 0 || checkExpression > 0) {
+            jQuery('.' + idPrefix + '.smallButton').attr("disabled", "disabled");
+        } else if (checkFixedValue == 0 || checkExpression == 0) {
+            jQuery('.' + idPrefix + '.smallButton').removeAttr("disabled");
+        }
+    }
 </script>
 
 <style>
@@ -64,7 +81,8 @@ function toggleInputElements( idPrefix ){
 																<wgt:widget id="userEnteredParam${parameter.name}" name="${status.expression}" type="${parameter.type.name}" defaultValue="${status.value}" attributes="${parameter.widgetConfigurationAsString}"/>	
 																<c:if test="${fn:contains(expSupportedTypes, parameter.type.name)}">
 																<spring:bind path="expressions[${parameter.name}]">
-																<input class="userEnteredParam${parameter.name}" type="text" name="${status.expression}" value="${status.value}" style="display: none" /> 
+                                                                <!-- TODO create a unique id attribute for input in the place of #inputExpression -->
+                                                                <input id="inputExpression" class="userEnteredParam${parameter.name}" type="text" name="${status.expression}" value="${status.value}" style="display: none" /> 
 																<span onclick="toggleInputElements('userEnteredParam${parameter.name}')">
 																	<input class="userEnteredParam${parameter.name} smallButton" type="button" value='<spring:message code="reporting.Report.run.enterExpression"/>' style="width:100px;"/>
 																	<input class="userEnteredParam${parameter.name} smallButton" type="button" value='<spring:message code="reporting.Report.run.enterFixedValue"/>' style="display:none; width:100px;" />

From 904912c187c26f01baa252236cfe1ef41add9e60 Mon Sep 17 00:00:00 2001
From: Mujuzi Moses <mujuzimoses@gmail.com>
Date: Tue, 8 Sep 2020 21:57:52 +0300
Subject: [PATCH 2/2] REPORT-495: Just updated the input method with the
 onkeyup

---
 omod/src/main/webapp/run/runReportForm.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omod/src/main/webapp/run/runReportForm.jsp b/omod/src/main/webapp/run/runReportForm.jsp
index fe05155936..9259b9e18f 100644
--- a/omod/src/main/webapp/run/runReportForm.jsp
+++ b/omod/src/main/webapp/run/runReportForm.jsp
@@ -82,7 +82,7 @@ var disableButtons = function(idPrefix) {
 																<c:if test="${fn:contains(expSupportedTypes, parameter.type.name)}">
 																<spring:bind path="expressions[${parameter.name}]">
                                                                 <!-- TODO create a unique id attribute for input in the place of #inputExpression -->
-                                                                <input id="inputExpression" class="userEnteredParam${parameter.name}" type="text" name="${status.expression}" value="${status.value}" style="display: none" /> 
+                                                                <input id="inputExpression" class="userEnteredParam${parameter.name}" type="text" name="${status.expression}" value="${status.value}" style="display: none" onkeyup="disableButtons('userEnteredParam${parameter.name}')"/> 
 																<span onclick="toggleInputElements('userEnteredParam${parameter.name}')">
 																	<input class="userEnteredParam${parameter.name} smallButton" type="button" value='<spring:message code="reporting.Report.run.enterExpression"/>' style="width:100px;"/>
 																	<input class="userEnteredParam${parameter.name} smallButton" type="button" value='<spring:message code="reporting.Report.run.enterFixedValue"/>' style="display:none; width:100px;" />