dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1210
committer: Bharath Kumar <chbharathk@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2009-12-11 12:01:36 +0530
message:
  Fixes to Run DashBoard Module
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSetPopulator.java
  local/in/dhis-in-services/pom.xml
  local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/nr/action/GenerateNullReporterResultAction.java


--
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-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSetPopulator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSetPopulator.java	2009-11-03 14:25:59 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSetPopulator.java	2009-12-11 06:31:36 +0000
@@ -36,8 +36,8 @@
 public class OrganisationUnitGroupSetPopulator
     extends AbstractStartupRoutine
 {
-    private static final String NAME_TYPE = "Type";
-    private static final String NAME_OWNERSHIP = "Ownership";
+    public static final String NAME_TYPE = "Type";
+    public static final String NAME_OWNERSHIP = "Ownership";
 
     // -------------------------------------------------------------------------
     // Dependencies

=== modified file 'local/in/dhis-in-services/pom.xml'
--- local/in/dhis-in-services/pom.xml	2009-11-18 11:06:48 +0000
+++ local/in/dhis-in-services/pom.xml	2009-12-11 06:31:36 +0000
@@ -17,7 +17,7 @@
 	<module>dhis-in-service-configuration</module>
     <module>dhis-in-service-dbmanager</module>
 	<module>dhis-in-service-linelisting</module> 
-	<module>dhis-in-service-reports</module>
+	<!--<module>dhis-in-service-reports</module>-->
     <module>dhis-in-service-survey</module>
   </modules>
   

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/nr/action/GenerateNullReporterResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/nr/action/GenerateNullReporterResultAction.java	2009-11-18 11:06:48 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/nr/action/GenerateNullReporterResultAction.java	2009-12-11 06:31:36 +0000
@@ -457,7 +457,8 @@
                         }
                         else
                         {
-                            DataValue dataValue = dataValueService.getDataValue( curOu, de, p );
+							DataElementCategoryOptionCombo decoc = de.getCategoryCombo().getOptionCombos().iterator().next();
+                            DataValue dataValue = dataValueService.getDataValue( curOu, de, p, decoc );
 
                             if ( dataValue == null )
                             {