dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16432
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-08-18 10:54:32 +0200
message:
  Validation analysis, better user feedback
modified:
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/dataAnalysisForm.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/dataAnalysis.js
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.js
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/runValidationForm.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/dataAnalysisForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/dataAnalysisForm.vm	2013-10-08 19:10:40 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/dataAnalysisForm.vm	2014-08-18 08:54:32 +0000
@@ -135,7 +135,6 @@
 	</tr>
 </table>
 
-<span id="message"></span>
 </div>
 
 <div id="analysisResult"></div>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/dataAnalysis.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/dataAnalysis.js	2014-06-20 10:57:40 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/dataAnalysis.js	2014-08-18 08:54:32 +0000
@@ -58,7 +58,7 @@
 
 function analyseData()
 {
-    setWaitMessage( i18n_analysing_please_wait );
+    setHeaderWaitMessage( i18n_analysing_please_wait );
 
     var url = "getAnalysis.action" + "?key=" + $( "#key" ).val() + "&toDate=" + $( "#toDate" ).val() + "&fromDate="
             + $( "#fromDate" ).val() + "&" + getParamString( "dataSets", "dataSets" );
@@ -70,7 +70,7 @@
 
     $.get( url, function( data )
     {
-    	hideMessage();
+    	hideHeaderMessage();
         $( "div#analysisInput" ).hide();
         $( "div#analysisResult" ).show();
         $( "div#analysisResult" ).html( data );
@@ -81,13 +81,13 @@
 
 function getFollowUpAnalysis()
 {
-    setWaitMessage( i18n_analysing_please_wait );
+    setHeaderWaitMessage( i18n_analysing_please_wait );
 
     var url = "getAnalysis.action?key=followup";
 
     $.get( url, function( data )
     {
-        hideMessage();
+        hideHeaderMessage();
         $( "div#analysisResult" ).show();
         $( "div#analysisResult" ).html( data );
     } );

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.js	2013-11-08 23:17:37 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.js	2014-08-18 08:54:32 +0000
@@ -27,7 +27,7 @@
 	    {
 		    $( '#validateButton' ).attr( 'disabled', true )
 
-	        setWaitMessage( i18n_analysing_please_wait );
+	        setHeaderWaitMessage( i18n_analysing_please_wait );
 
 	        $.get( 'runValidationAction.action', 
 	        { 
@@ -38,7 +38,7 @@
 	        }, 
 	        function( data )
 	        {
-	            hideMessage();
+	            hideHeaderMessage();
 	            $( 'div#analysisInput' ).hide();
 	            $( 'div#analysisResult' ).show();
 	            $( 'div#analysisResult' ).html( data );

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/runValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/runValidationForm.vm	2013-11-08 23:17:37 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/runValidationForm.vm	2014-08-18 08:54:32 +0000
@@ -74,8 +74,6 @@
     	<td></td>
     </tr>
 </table>
-	
-<span id="message"></span>
 
 </div>