dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1346
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-01-26 16:20:42 +0100
message:
  Applied progress indicator to pivot table
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/loader/loader.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/pivot.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.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-commons-resources/src/main/webapp/dhis-web-commons/loader/loader.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/loader/loader.vm	2010-01-26 14:30:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/loader/loader.vm	2010-01-26 15:20:42 +0000
@@ -13,7 +13,7 @@
 
 </style>
 
-<div id="loaderDiv">
+<div id="loaderDiv" style="display:none">
     
     <br><br><br>
     

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-01-26 14:30:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-01-26 15:20:42 +0000
@@ -571,6 +571,15 @@
 }
 
 /**
+ * Shows loader div and hides content div.
+ */
+function showLoader()
+{
+    $( "#loaderDiv" ).css({ display: "block" });
+    $( "#contentDiv" ).css({ display: "none" });
+}
+
+/**
  * Hides loader div and shows content div.
  */
 function hideLoader()

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2010-01-22 03:15:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2010-01-26 15:20:42 +0000
@@ -259,3 +259,5 @@
 save = Save
 password_not_match  = Password not match
 update_user_success	= Update Informations Success
+
+please_wait_while_the_system_is_processing = Please wait while the system is processing

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-01-26 14:30:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-01-26 15:20:42 +0000
@@ -163,5 +163,4 @@
 intro_duplicate_data_elimination									= Eliminate data registered for duplicate data elements.
 select_different_org_units											= Please select two different organisation units
 select_different_data_elements										= Please select two different data elements
-filter																= Filter
-please_wait_while_the_system_is_processing							= Please wait while the system is processing
\ No newline at end of file
+filter																= Filter
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.js	2010-01-26 14:30:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.js	2010-01-26 15:20:42 +0000
@@ -1,6 +1,8 @@
 
 $( document ).ready( function()
 {
+	showLoader();
+	
     $.getJSON( "getDataIntegrity.action", {}, populateIntegrityItems );
 } );
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/pivot.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/pivot.js	2010-01-21 23:27:33 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/pivot.js	2010-01-26 15:20:42 +0000
@@ -50,6 +50,10 @@
   
   var url = "getPivotTable.action";
   
+  hideDivs();
+  
+  showLoader();
+  
   $.getJSON(
     url,
     {
@@ -73,6 +77,8 @@
       
       data = pivot.indicatorValues[0];
       
+      hideLoader();
+      
       generateTable();
     }
   );
@@ -87,6 +93,8 @@
   pivotPeriod = document.getElementById( "periodBox" ).checked;
   pivotOrgunit = document.getElementById( "orgunitBox" ).checked;
   
+  hideDivs();
+  
   generateTable();
 }
 
@@ -204,9 +212,7 @@
  * This method is responsible for generating the pivot table.
  */
 function generateTable()
-{
-  hideDivs();
-   
+{   
   var columnIndicators = pivotIndicator ? indicators : [null];
   var columnPeriods = pivotPeriod ? periods : [null];
   var columnOrgunits = pivotOrgunit ? orgunits : [null];

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2010-01-26 15:20:42 +0000
@@ -15,7 +15,7 @@
   position: relative;
   left: 2px;
   width: 230px;
-  height: 280px;
+  height: 300px;
   border: 1px solid #b0b0b0;
   background-color: #d9ece1;
   padding-left: 20px;
@@ -154,7 +154,9 @@
 
 <!-- Pivot table -->
 
-<div>
+#parse( "dhis-web-commons/loader/loader.vm" )
+
+<div id="contentDiv">
     
 <table id="pivotTable" class="pivot"></table>
 
@@ -179,6 +181,8 @@
   loadListeners();
 </script>
 
+<!-- Calendar setup -->
+
 <script type="text/javascript">
     Calendar.setup({
         inputField     :    "startDate",      // id of the input field