dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7129
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-06-01 11:12:47 +0100
message:
  Minor Fixes
modified:
  local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/DashBoardHomePageAction.java
  local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm
  local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ds.js


--
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 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/DashBoardHomePageAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/DashBoardHomePageAction.java	2012-02-13 12:37:04 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/DashBoardHomePageAction.java	2012-06-01 10:12:47 +0000
@@ -273,7 +273,8 @@
             while( progIterator.hasNext() )
             {
                 Program prg = progIterator.next();
-                if( prg.getOrganisationUnits() == null || prg.getOrganisationUnits().size() <= 0 || prg.getAnonymous() )
+                
+                if( prg.getOrganisationUnits() == null || prg.getOrganisationUnits().size() <= 0 || prg.getType() == Program.SINGLE_EVENT_WITHOUT_REGISTRATION )
                 {
                     progIterator.remove();
                 }

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm	2012-03-19 06:07:21 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusFront.vm	2012-06-01 10:12:47 +0000
@@ -68,6 +68,9 @@
     <input type="hidden" name="selectedButton" id="selectedButton"/>
 </form>
 <div id="contentDiv"></div>
+
+#parse( "/dhis-web-commons/loader/loader.vm" )
+
 <script>
     getdSetPeriods();
 </script>
\ No newline at end of file

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ds.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ds.js	2012-03-19 06:07:21 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ds.js	2012-06-01 10:12:47 +0000
@@ -242,7 +242,9 @@
 	url += getParamsStringBySelected( 'periodLB', 'periodLB' )+ "&"
 	*/	
 	//alert(url);
-	jQuery( "#contentDiv" ).load( url,
+	jQuery('#loaderDiv').show();
+	jQuery('#contentDiv').dialog('destroy').remove();
+	jQuery( '<div id="contentDiv">' ).load( url,
 	{
 		selectedDataSets : getFieldValue( 'selectedDataSets' ),
 		facilityLB : getFieldValue( 'facilityLB' ),
@@ -259,7 +261,8 @@
 		overlay:{ background:'#000000', opacity:0.1 },
 		width: 1000,
 		height: 800
-	} );	
+	} );
+	jQuery('#loaderDiv').hide();
 }
 
 function getParamsStringBySelected( elementId, param )