dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #27465
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13688: local/in tagged 2.15-SNAPSHOT
------------------------------------------------------------
revno: 13688
committer: Mithilesh Kumar Thakur <mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-01-10 07:08:30 +0000
message:
local/in tagged 2.15-SNAPSHOT
modified:
local/in/dhis-in-api/pom.xml
local/in/dhis-in-services/dhis-in-service-coldchain/pom.xml
local/in/dhis-in-services/dhis-in-service-configuration/pom.xml
local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml
local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml
local/in/dhis-in-services/dhis-in-service-ihrissyncmanager/pom.xml
local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml
local/in/dhis-in-services/dhis-in-service-lookup/pom.xml
local/in/dhis-in-services/dhis-in-service-reports/pom.xml
local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml
local/in/dhis-in-services/dhis-in-service-survey/pom.xml
local/in/dhis-in-services/dhis-service-aggregationengine/pom.xml
local/in/dhis-in-services/pom.xml
local/in/dhis-mobile/dhis-service-mobile/pom.xml
local/in/dhis-mobile/dhis-web-mobile/pom.xml
local/in/dhis-mobile/pom.xml
local/in/dhis-mobile/smsclient/pom.xml
local/in/dhis-web-alert/pom.xml
local/in/dhis-web-coldchain/pom.xml
local/in/dhis-web-dashboard/pom.xml
local/in/dhis-web-dataentry-ccem/pom.xml
local/in/dhis-web-dataentry-linelisting/pom.xml
local/in/dhis-web-excelimport/pom.xml
local/in/dhis-web-ihrissyncmanager/pom.xml
local/in/dhis-web-leprosy/pom.xml
local/in/dhis-web-linelisting-in/pom.xml
local/in/dhis-web-maintenance-ccem/pom.xml
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/AddAggregationQueryAction.java
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/transferfacilitydata/action/TraferFacilityDataResultAction.java
local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addAggregationQuery.vm
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/aggregationQueryList.vm
local/in/dhis-web-maintenance-in/pom.xml
local/in/dhis-web-maintenance-pbf/pom.xml
local/in/dhis-web-reports-in/pom.xml
local/in/dhis-web-reports-national/pom.xml
local/in/dhis-web-sandbox/pom.xml
local/in/dhis-web-sandboxbk/pom.xml
local/in/dhis-web-survey/pom.xml
local/in/dhis-web-validationrule-in/pom.xml
local/in/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 'local/in/dhis-in-api/pom.xml'
--- local/in/dhis-in-api/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-in-api/pom.xml 2014-01-10 07:08:30 +0000
@@ -4,7 +4,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-api</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/pom.xml 2013-12-30 05:54:06 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-coldchain</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-configuration/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-configuration/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-configuration/pom.xml 2014-01-10 07:08:30 +0000
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-configuration</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml 2014-01-10 07:08:30 +0000
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-dataentrystatus</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-dbmanager</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-ihrissyncmanager/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-ihrissyncmanager/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-ihrissyncmanager/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-ihrissyncmanager</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-linelisting</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-lookup/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-lookup/pom.xml 2013-12-24 12:32:37 +0000
+++ local/in/dhis-in-services/dhis-in-service-lookup/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-lookup</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-reports/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-reports/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-reports/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-reports</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-scheduler</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-survey</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-service-aggregationengine/pom.xml'
--- local/in/dhis-in-services/dhis-service-aggregationengine/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-in-services/dhis-service-aggregationengine/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-services</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-service-aggregationengine-default</artifactId>
=== modified file 'local/in/dhis-in-services/pom.xml'
--- local/in/dhis-in-services/pom.xml 2013-12-24 12:32:37 +0000
+++ local/in/dhis-in-services/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-services</artifactId>
=== modified file 'local/in/dhis-mobile/dhis-service-mobile/pom.xml'
--- local/in/dhis-mobile/dhis-service-mobile/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-services</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-mobile</artifactId>
=== modified file 'local/in/dhis-mobile/dhis-web-mobile/pom.xml'
--- local/in/dhis-mobile/dhis-web-mobile/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-web-mobile</artifactId>
=== modified file 'local/in/dhis-mobile/pom.xml'
--- local/in/dhis-mobile/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-mobile/pom.xml 2014-01-10 07:08:30 +0000
@@ -5,7 +5,7 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-sms</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.13-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Mobile SMS Modules</name>
=== modified file 'local/in/dhis-mobile/smsclient/pom.xml'
--- local/in/dhis-mobile/smsclient/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-mobile/smsclient/pom.xml 2014-01-10 07:08:30 +0000
@@ -4,7 +4,7 @@
<groupId>org.hisp.dhis.ws</groupId>
<artifactId>smsclient</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
<packaging>war</packaging>
<name>smsclient</name>
=== modified file 'local/in/dhis-web-alert/pom.xml'
--- local/in/dhis-web-alert/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-alert/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-alert</artifactId>
=== modified file 'local/in/dhis-web-coldchain/pom.xml'
--- local/in/dhis-web-coldchain/pom.xml 2013-12-30 05:54:06 +0000
+++ local/in/dhis-web-coldchain/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<repositories>
<repository>
=== modified file 'local/in/dhis-web-dashboard/pom.xml'
--- local/in/dhis-web-dashboard/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-dashboard/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-dashboard</artifactId>
=== modified file 'local/in/dhis-web-dataentry-ccem/pom.xml'
--- local/in/dhis-web-dataentry-ccem/pom.xml 2013-12-30 05:54:06 +0000
+++ local/in/dhis-web-dataentry-ccem/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-dataentry-ccem</artifactId>
=== modified file 'local/in/dhis-web-dataentry-linelisting/pom.xml'
--- local/in/dhis-web-dataentry-linelisting/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-dataentry-linelisting/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-dataentry-national</artifactId>
=== modified file 'local/in/dhis-web-excelimport/pom.xml'
--- local/in/dhis-web-excelimport/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-excelimport/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-excelimport</artifactId>
=== modified file 'local/in/dhis-web-ihrissyncmanager/pom.xml'
--- local/in/dhis-web-ihrissyncmanager/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-ihrissyncmanager/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<repositories>
=== modified file 'local/in/dhis-web-leprosy/pom.xml'
--- local/in/dhis-web-leprosy/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-leprosy/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-leprosy</artifactId>
=== modified file 'local/in/dhis-web-linelisting-in/pom.xml'
--- local/in/dhis-web-linelisting-in/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-linelisting-in/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-linelisting-in</artifactId>
=== modified file 'local/in/dhis-web-maintenance-ccem/pom.xml'
--- local/in/dhis-web-maintenance-ccem/pom.xml 2013-12-27 12:32:48 +0000
+++ local/in/dhis-web-maintenance-ccem/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<repositories>
<repository>
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/AddAggregationQueryAction.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/AddAggregationQueryAction.java 2014-01-06 06:13:15 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/AddAggregationQueryAction.java 2014-01-10 07:08:30 +0000
@@ -88,14 +88,24 @@
throws Exception
{
DataElement dataElement = dataElementService.getDataElement( dataElementId );
-
+
+ /*
+ if( name == null && name.equalsIgnoreCase( "" ))
+ {
+ name = dataElement.getName();
+ }
+
+ */
+
/**
* TODO support for category option combo
*/
if ( aggType.equals( Lookup.CCEI_AGG_TYPE_STORAGE_CAPACITY ) )
{
- CaseAggregationCondition condition = new CaseAggregationCondition( name, aggType, "NONE", dataElement, dataElementCategoryService.getDefaultDataElementCategoryOptionCombo() );
-
+ //CaseAggregationCondition condition = new CaseAggregationCondition( name, aggType, "NONE", dataElement, dataElementCategoryService.getDefaultDataElementCategoryOptionCombo() );
+
+ CaseAggregationCondition condition = new CaseAggregationCondition( dataElement.getName(), aggType, "NONE", dataElement, dataElementCategoryService.getDefaultDataElementCategoryOptionCombo() );
+
aggregationConditionService.addCaseAggregationCondition( condition );
}
else if ( aggType.equals( Lookup.CCEI_AGG_TYPE_REF_WORKING_STATUS_BY_MODEL ) )
@@ -125,7 +135,9 @@
String query = cceiAggregationService.getQueryForRefrigeratorWorkingStatus( equipmentTypeId, modelTypeAttributeId, modelName, workingStatus );
- CaseAggregationCondition condition = new CaseAggregationCondition( name, aggType, query, dataElement, dataElementCategoryService.getDefaultDataElementCategoryOptionCombo() );
+ //CaseAggregationCondition condition = new CaseAggregationCondition( name, aggType, query, dataElement, dataElementCategoryService.getDefaultDataElementCategoryOptionCombo() );
+
+ CaseAggregationCondition condition = new CaseAggregationCondition( dataElement.getName(), aggType, query, dataElement, dataElementCategoryService.getDefaultDataElementCategoryOptionCombo() );
aggregationConditionService.addCaseAggregationCondition( condition );
}
@@ -147,7 +159,9 @@
String query = cceiAggregationService.getQueryForRefrigeratorUtilization( equipmentTypeId, modelTypeAttributeId, modelName, utilization );
- CaseAggregationCondition condition = new CaseAggregationCondition( name, aggType, query, dataElement, dataElementCategoryService.getDefaultDataElementCategoryOptionCombo() );
+ //CaseAggregationCondition condition = new CaseAggregationCondition( name, aggType, query, dataElement, dataElementCategoryService.getDefaultDataElementCategoryOptionCombo() );
+
+ CaseAggregationCondition condition = new CaseAggregationCondition( dataElement.getName(), aggType, query, dataElement, dataElementCategoryService.getDefaultDataElementCategoryOptionCombo() );
aggregationConditionService.addCaseAggregationCondition( condition );
}
@@ -178,7 +192,9 @@
String query = cceiAggregationService.getQueryForRefrigeratorWorkingStatus( equipmentTypeId, modelTypeAttributeId, modelName, workingStatus );
- CaseAggregationCondition condition = new CaseAggregationCondition( name, aggType, query, dataElement, dataElementCategoryService.getDefaultDataElementCategoryOptionCombo() );
+ //CaseAggregationCondition condition = new CaseAggregationCondition( name, aggType, query, dataElement, dataElementCategoryService.getDefaultDataElementCategoryOptionCombo() );
+
+ CaseAggregationCondition condition = new CaseAggregationCondition( dataElement.getName(), aggType, query, dataElement, dataElementCategoryService.getDefaultDataElementCategoryOptionCombo() );
aggregationConditionService.addCaseAggregationCondition( condition );
}
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/transferfacilitydata/action/TraferFacilityDataResultAction.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/transferfacilitydata/action/TraferFacilityDataResultAction.java 2013-12-23 12:24:45 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/transferfacilitydata/action/TraferFacilityDataResultAction.java 2014-01-10 07:08:30 +0000
@@ -138,8 +138,6 @@
// Action implementation
// -------------------------------------------------------------------------
-
-
public String execute() throws Exception
{
@@ -169,7 +167,7 @@
//orgUnitList = new ArrayList<OrganisationUnit>( organisationUnitService.getOrganisationUnitWithChildren( organisationUnit1.getId() ) );
// Data set and sections Information
- List<DataSet> dataSets = new ArrayList<DataSet>( dataSetService.getDataSetByShortName( "FMD" ) );
+ List<DataSet> dataSets = new ArrayList<DataSet>( dataSetService.getDataSetByShortName( "FMD" ) );
dataSet = dataSets.get( 0 );
orgUnitList.retainAll( dataSet.getSources() );
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties'
--- local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties 2013-11-25 07:09:17 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties 2014-01-10 07:08:30 +0000
@@ -164,3 +164,9 @@
option_set = Option Set
import_export_data = Import / Export Data
import_data = Import Data
+
+aggregation_builder = Aggregation Builder
+aggregation_query_list = Aggregation Query List
+manual_aggregation = Manual Aggregation
+aggregation_query_builder_detail = Aggregation Query Builder Detail
+ccei_aggregation_query_builder_management = CCEI Aggregation Query Builder Management
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addAggregationQuery.vm'
--- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addAggregationQuery.vm 2014-01-06 06:13:15 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addAggregationQuery.vm 2014-01-10 07:08:30 +0000
@@ -4,11 +4,11 @@
if($("#aggType").val() != '-1')
{
$("#loadParameters").load("loadAggregationParam.action",
- {
- aggTypeId : $('#aggType').val()
- }
- , function( ){
- });
+ {
+ aggTypeId : $('#aggType').val()
+ }
+ , function( ){
+ });
}
}
</script>
@@ -22,14 +22,14 @@
</thead>
<tbody>
- <tr>
+ <tr style="display:none">
<td style="width:40%"><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td style="width:60%"><input type="text" id="name" name="name" class="{validate:{required:true,minlength:2}}" style='width:100%; margin-bottom:-5px;'></td>
</tr>
<tr>
<td style="width:40%"><label for="dataElement">$i18n.getString( "dataelement" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td style="width:60%">
- <select style='width:100%; margin-bottom:-5px;' id="dataElementId" name="dataElementId" >
+ <select style='width:130%; margin-bottom:-5px;' id="dataElementId" name="dataElementId" >
#foreach( $dataElement in $dataElementList )
<option value="$dataElement.id">$dataElement.name</option>
#end
@@ -39,7 +39,7 @@
<tr>
<td style="width:40%"><label for="operator">$i18n.getString( "type" )</label></td>
<td style="width:60%">
- <select style='width:100%; margin-bottom:-5px;' id="aggType" name="aggType" onchange="getParameters()">
+ <select style='width:130%; margin-bottom:-5px;' id="aggType" name="aggType" onchange="getParameters()">
<option value="-1" >Please Select</option>
#foreach( $lookup in $lookups )
<option value="$lookup.name">$lookup.value</option>
@@ -58,7 +58,7 @@
<p>
<input type="submit" value="$i18n.getString( 'add' )" />
- <input type="button" value="$i18n.getString( 'cancel' )" onClick="cancelOnClick();" />
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='aggregationQueryList.action'" />
</p>
</form>
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/aggregationQueryList.vm'
--- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/aggregationQueryList.vm 2013-12-24 12:32:37 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/aggregationQueryList.vm 2014-01-10 07:08:30 +0000
@@ -8,7 +8,7 @@
});
</script>
-<h3>$i18n.getString( 'patient_aggregation_query_builder_management' ) #openHelp( "patient_aggregation_query_builder" )</h3>
+<h3>$i18n.getString( 'ccei_aggregation_query_builder_management' ) #openHelp( "patient_aggregation_query_builder" )</h3>
<div id="contextMenu" class="contextMenu">
<ul id="contextMenuItems" class="contextMenuItems">
=== modified file 'local/in/dhis-web-maintenance-in/pom.xml'
--- local/in/dhis-web-maintenance-in/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-maintenance-in/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-maintenance-in</artifactId>
=== modified file 'local/in/dhis-web-maintenance-pbf/pom.xml'
--- local/in/dhis-web-maintenance-pbf/pom.xml 2013-12-07 09:10:04 +0000
+++ local/in/dhis-web-maintenance-pbf/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<repositories>
<repository>
=== modified file 'local/in/dhis-web-reports-in/pom.xml'
--- local/in/dhis-web-reports-in/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-reports-in/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-reports-in</artifactId>
=== modified file 'local/in/dhis-web-reports-national/pom.xml'
--- local/in/dhis-web-reports-national/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-reports-national/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-reports-national</artifactId>
=== modified file 'local/in/dhis-web-sandbox/pom.xml'
--- local/in/dhis-web-sandbox/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-sandbox/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-sandbox</artifactId>
=== modified file 'local/in/dhis-web-sandboxbk/pom.xml'
--- local/in/dhis-web-sandboxbk/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-sandboxbk/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-sandbox-bk</artifactId>
=== modified file 'local/in/dhis-web-survey/pom.xml'
--- local/in/dhis-web-survey/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-survey/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-survey</artifactId>
=== modified file 'local/in/dhis-web-validationrule-in/pom.xml'
--- local/in/dhis-web-validationrule-in/pom.xml 2013-10-18 05:57:53 +0000
+++ local/in/dhis-web-validationrule-in/pom.xml 2014-01-10 07:08:30 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-validationrule-in</artifactId>
=== modified file 'local/in/pom.xml'
--- local/in/pom.xml 2013-12-10 10:44:10 +0000
+++ local/in/pom.xml 2014-01-10 07:08:30 +0000
@@ -5,7 +5,7 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-local</artifactId>
- <version>2.14-SNAPSHOT</version>
+ <version>2.15-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Local India Modules</name>
