dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1348
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-01-26 16:34:33 +0100
message:
  Applied progress indicator to dataset completeness
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataCompleteness.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.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-reporting/src/main/webapp/dhis-web-reporting/javascript/dataCompleteness.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataCompleteness.js	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataCompleteness.js	2010-01-26 15:34:33 +0000
@@ -32,7 +32,9 @@
     {
         clearTable( "resultTable" );
         
-        setMessage( i18n_processing + "..." );
+        showLoader();
+        
+        //setMessage( i18n_processing + "..." );
         
         var request = new Request();
         
@@ -94,7 +96,9 @@
 
 function displayCompletenessTable( xmlObject, headerText )
 {
-    hideMessage();
+    //hideMessage();
+    
+    hideLoader();
     
     var table = document.getElementById( "resultTable" );
     

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2009-09-05 07:00:46 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2010-01-26 15:34:33 +0000
@@ -45,9 +45,13 @@
     </tr>
 </table>
 
+#parse( "dhis-web-commons/loader/loader.vm" )
+
+<div id="contentDiv">
+
 <table id="resultTable" name="resultTable" style="width:95%"></table>
 
-<span id="message"></span>
+</div>
 
 <script type="text/javascript">
 	var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ) , "'")';