dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10424
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-03-26 22:19:15 +0700
message:
  Hide orgunit level columns in anonymous entry form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java
  local/in/dhis-web-dashboard/pom.xml


--
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-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java	2013-03-14 13:30:46 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java	2013-03-26 15:19:15 +0000
@@ -375,14 +375,6 @@
         if ( level == 0 )
         {
             level = organisationUnitService.getMaxOfOrganisationUnitLevels();
-            for ( Integer orgunitId : orgunitIds )
-            {
-                int orgLevel = organisationUnitService.getLevelOfOrganisationUnit( orgunitId );
-                if ( level > orgLevel )
-                {
-                    level = orgLevel;
-                }
-            }
         }
 
         // ---------------------------------------------------------------------

=== modified file 'local/in/dhis-web-dashboard/pom.xml'
--- local/in/dhis-web-dashboard/pom.xml	2013-03-25 05:08:43 +0000
+++ local/in/dhis-web-dashboard/pom.xml	2013-03-26 15:19:15 +0000
@@ -10,7 +10,7 @@
 	</parent>
 	
 	<artifactId>dhis-web-dashboard</artifactId>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
 	<name>DHIS DashBoard</name>
 	
 	<build>
@@ -24,26 +24,28 @@
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-api</artifactId>
+			<version>2.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-service-core</artifactId>
+			<version>2.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-service-patient</artifactId>
-			<version>${project.version}</version>
+			<version>2.12-SNAPSHOT</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-in-service-linelisting</artifactId>
-			<version>${project.version}</version>
+			<version>2.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-in-service-dbmanager</artifactId>
-			<version>${project.version}</version>
+			<version>2.12-SNAPSHOT</version>
 		</dependency>
 		
 		<dependency>
@@ -63,35 +65,37 @@
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-support-external</artifactId>
+			<version>2.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-support-system</artifactId>
+			<version>2.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-in-api</artifactId>
-			<version>${project.version}</version>
+			<version>2.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-in-service-survey</artifactId>
-			<version>${project.version}</version>
+			<version>2.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-in-service-configuration</artifactId>
-			<version>${project.version}</version>
+			<version>2.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-in-service-reports</artifactId>
-			<version>${project.version}</version>
+			<version>2.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-in-service-dataentrystatus</artifactId>
-			<version>${project.version}</version>
+			<version>2.12-SNAPSHOT</version>
 		</dependency>
         <!--<dependency>
             <groupId>org.hisp.dhis</groupId>