dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25641
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12770: tagged 2.14-SNAPSHOT and add CCEM Data Entry Module
------------------------------------------------------------
revno: 12770
committer: Mithilesh Kumar Thakur <mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-10-18 06:57:53 +0100
message:
tagged 2.14-SNAPSHOT and add CCEM Data Entry Module
added:
local/in/dhis-web-dataentry-ccem/
local/in/dhis-web-dataentry-ccem/pom.xml
local/in/dhis-web-dataentry-ccem/src/
local/in/dhis-web-dataentry-ccem/src/main/
local/in/dhis-web-dataentry-ccem/src/main/java/
local/in/dhis-web-dataentry-ccem/src/main/java/org/
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/GetEquipmentAndDataSetListAction.java
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/GetOrganisationUnitAction.java
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadDataEntryFormAction.java
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadNextPrePeriodsAction.java
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadPeriodsAction.java
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/PageInitAction.java
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/SaveEquipmentDataValueAction.java
local/in/dhis-web-dataentry-ccem/src/main/resources/
local/in/dhis-web-dataentry-ccem/src/main/resources/META-INF/
local/in/dhis-web-dataentry-ccem/src/main/resources/META-INF/dhis/
local/in/dhis-web-dataentry-ccem/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-dataentry-ccem/src/main/resources/org/
local/in/dhis-web-dataentry-ccem/src/main/resources/org/hisp/
local/in/dhis-web-dataentry-ccem/src/main/resources/org/hisp/dhis/
local/in/dhis-web-dataentry-ccem/src/main/resources/org/hisp/dhis/dataentry/
local/in/dhis-web-dataentry-ccem/src/main/resources/org/hisp/dhis/dataentry/i18n_module.properties
local/in/dhis-web-dataentry-ccem/src/main/resources/struts.xml
local/in/dhis-web-dataentry-ccem/src/main/webapp/
local/in/dhis-web-dataentry-ccem/src/main/webapp/WEB-INF/
local/in/dhis-web-dataentry-ccem/src/main/webapp/WEB-INF/web.xml
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/dataEntrySelection.vm
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/images/
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/images/ajax-loader.gif
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/javascript/
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/javascript/ccemDataEntry.js
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/jsonPeriods.vm
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/loadDataEntryForm.vm
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/menu.vm
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/responseEquipmentAndDataSets.vm
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/style/
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/style/dhis-web-dataentry-ccem.css
modified:
local/in/dhis-in-api/pom.xml
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentService.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentStatus.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentStore.java
local/in/dhis-in-services/dhis-in-service-coldchain/pom.xml
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/DefaultEquipmentService.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/hibernate/HibernateEquipmentStore.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/hibernate/HibernateModelStore.java
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-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-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/AddEquipmentAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentDataAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/LoadDataEntryFormAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/LoadPeriodsAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/SaveEquipmentDataValueAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowAddEquipmentFormAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentStatusFormAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentStatusHistoryFormAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/UpdateEquipmentAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/UpdateEquipmentStatusAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/GetFullOrganisationUnitDetailsAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/LoadFacilityDataEntryFormAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/SaveFacilityDataValueAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/AddModelAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/GetModelDetailsAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ShowAddModelFormAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UpdateModelAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UpdateModelFormAction.java
local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-coldchain/src/main/resources/struts.xml
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentForm.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentDataEntry.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentList.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentStatusForm.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipmentDataEntry.js
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonPeriods.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/loadEquipmentIcePacksDataForm.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddModelForm.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateEquipmentForm.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateModelForm.vm
local/in/dhis-web-dashboard/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/equipment/action/LoadDataEntryFormAction.java
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/SaveEquipmentDataValueAction.java
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/AddEquipmentTypeAttributeAction.java
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/ShowEquipmentTypeDataSetFormAction.java
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/UpdateEquipmentTypeAttributeAction.java
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddColdChainModelTypeAttributeForm.java
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelTypeAttributeAction.java
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ShowUpdateModelTypeAttributeFormAction.java
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UpdateModelTypeAttributeAction.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/addEquipmentTypeAttributeForm.vm
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/equipmentTypeAttribute.js
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/modelTypeAttribute.js
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/transferFacilityDataForm.vm
local/in/dhis-web-maintenance-in/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-08-13 12:39:25 +0000
+++ local/in/dhis-in-api/pom.xml 2013-10-18 05:57:53 +0000
@@ -4,7 +4,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis</artifactId>
- <version>2.13-SNAPSHOT</version>
+ <version>2.14-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-api</artifactId>
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentService.java 2013-09-30 12:03:10 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentService.java 2013-10-18 05:57:53 +0000
@@ -52,4 +52,6 @@
// for orgUnit list according to orGUnit Attribute values for paging purpose
int countOrgUnitByAttributeValue( Collection<Integer> orgunitIds, Attribute attribute, String searchText );
Collection<OrganisationUnit> searchOrgUnitByAttributeValue( Collection<Integer> orgunitIds, Attribute attribute, String searchText, Integer min, Integer max );
+
+ Collection<Equipment> getEquipmentList( OrganisationUnit organisationUnit, EquipmentType equipmentType );
}
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentStatus.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentStatus.java 2013-09-25 09:45:36 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentStatus.java 2013-10-18 05:57:53 +0000
@@ -19,12 +19,22 @@
public static final String WORKING_STATUS = "WORKING_STATUS";
+ /*
public static final String STATUS_NOT_WORKING = "Not working";
public static final String STATUS_WORKING_WELL = "Working well";
public static final String STATUS_WORKING_NEEDS_MAINTENANCE = "Working but needs maintenance";
-
+ */
+
+ public static final String STATUS_NOT_WORKING = "Unservicable";
+
+ public static final String STATUS_WORKING_WELL = "Functioning";
+
+ public static final String STATUS_WORKING_NEEDS_MAINTENANCE = "AwaitingRepair";
+
+
+
public static final String STATUS_IN_USE = "In Use";
public static final String STATUS_NOT_IN_USE = "Not in use";
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentStore.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentStore.java 2013-09-30 12:03:10 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentStore.java 2013-10-18 05:57:53 +0000
@@ -49,4 +49,7 @@
int countOrgUnitByAttributeValue( Collection<Integer> orgunitIds, Attribute attribute, String searchText );
Collection<OrganisationUnit> searchOrgUnitByAttributeValue( Collection<Integer> orgunitIds, Attribute attribute, String searchText, Integer min, Integer max );
+
+ Collection<Equipment> getEquipmentList( OrganisationUnit organisationUnit, EquipmentType equipmentType );
+
}
=== 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-08-13 12:39:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.13-SNAPSHOT</version>
+ <version>2.14-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-coldchain</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/DefaultEquipmentService.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/DefaultEquipmentService.java 2013-09-30 12:03:10 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/DefaultEquipmentService.java 2013-10-18 05:57:53 +0000
@@ -163,6 +163,13 @@
return equipmentStore.getEquipments( orgUnitIdsByComma, equipmentType, equipmentTypeAttribute, searchText, searchBy, min, max );
}
+
+ public Collection<Equipment> getEquipmentList( OrganisationUnit organisationUnit, EquipmentType equipmentType )
+ {
+ return equipmentStore.getEquipmentList( organisationUnit, equipmentType );
+ }
+
+
public Collection<OrganisationUnit> searchOrgUnitListByName( String searchText )
{
return equipmentStore.searchOrgUnitListByName( searchText );
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/hibernate/HibernateEquipmentStore.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/hibernate/HibernateEquipmentStore.java 2013-09-30 12:03:10 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/hibernate/HibernateEquipmentStore.java 2013-10-18 05:57:53 +0000
@@ -159,6 +159,24 @@
//return getCriteria( Restrictions.in( "organisationUnit", orgUnitList ) ).add( Restrictions.eq( "equipmentType", equipmentType ) ).setFirstResult( min ).setMaxResults( max ).list();
}
+ @SuppressWarnings( "unchecked" )
+ public Collection<Equipment> getEquipmentList( OrganisationUnit organisationUnit, EquipmentType equipmentType )
+ {
+ List<Equipment> equipmentList = new ArrayList<Equipment>();
+
+ if ( organisationUnit != null )
+ {
+ return getCriteria( Restrictions.eq( "organisationUnit", organisationUnit ) ).add( Restrictions.eq( "equipmentType", equipmentType ) ).list();
+ }
+
+ else
+ {
+ return equipmentList;
+ }
+
+ }
+
+
//public int getCountEquipment( OrganisationUnit orgUnit, EquipmentType equipmentType, EquipmentTypeAttribute equipmentTypeAttribute, String searchText )
public int getCountEquipment( String orgUnitIdsByComma, EquipmentType equipmentType, EquipmentTypeAttribute equipmentTypeAttribute, String searchText, String searchBy )
{
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/hibernate/HibernateModelStore.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/hibernate/HibernateModelStore.java 2013-09-25 09:45:36 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/hibernate/HibernateModelStore.java 2013-10-18 05:57:53 +0000
@@ -132,6 +132,14 @@
}
/*
+ postGress Hibernate query
+
+ SELECT DISTINCT cat FROM Model AS cat " +
+ " WHERE cat IN ( SELECT catdata.model FROM ModelAttributeValue catdata WHERE catdata.modelTypeAttribute.id = "+ modelTypeAttribute.getId()+" AND lower(catdata.value) LIKE '%" + searchText + "%' ) " +
+ " AND cat.modelType.id = " + modelType.getId();
+ */
+
+ /*
String hql = "SELECT DISTINCT cat FROM Model AS cat " +
" WHERE cat.name LIKE '%" + searchText + "%' ) " +
" AND cat.modelType.id = " + modelType.getId();
=== 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-08-13 12:39:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-configuration/pom.xml 2013-10-18 05:57:53 +0000
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.13-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml 2013-10-18 05:57:53 +0000
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-in-services/dhis-in-service-ihrissyncmanager/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-linelisting</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-03-25 05:08:43 +0000
+++ local/in/dhis-in-services/dhis-in-service-reports/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-05-31 08:27:38 +0000
+++ local/in/dhis-in-services/dhis-service-aggregationengine/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-services</artifactId>
- <version>2.13-SNAPSHOT</version>
+ <version>2.14-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-08-13 12:39:25 +0000
+++ local/in/dhis-in-services/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis</artifactId>
- <version>2.13-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-services</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-web-mobile</artifactId>
=== modified file 'local/in/dhis-mobile/pom.xml'
--- local/in/dhis-mobile/pom.xml 2013-03-25 05:08:43 +0000
+++ local/in/dhis-mobile/pom.xml 2013-10-18 05:57:53 +0000
@@ -5,7 +5,7 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-sms</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-mobile/smsclient/pom.xml 2013-10-18 05:57:53 +0000
@@ -4,7 +4,7 @@
<groupId>org.hisp.dhis.ws</groupId>
<artifactId>smsclient</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-web-alert/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-08-13 12:39:25 +0000
+++ local/in/dhis-web-coldchain/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.13-SNAPSHOT</version>
+ <version>2.14-SNAPSHOT</version>
</parent>
<repositories>
<repository>
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/AddEquipmentAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/AddEquipmentAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/AddEquipmentAction.java 2013-10-18 05:57:53 +0000
@@ -8,18 +8,17 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.struts2.ServletActionContext;
-import org.hisp.dhis.coldchain.model.Model;
-import org.hisp.dhis.coldchain.model.ModelService;
+import org.hisp.dhis.coldchain.equipment.Equipment;
import org.hisp.dhis.coldchain.equipment.EquipmentAttributeValue;
-import org.hisp.dhis.coldchain.equipment.Equipment;
import org.hisp.dhis.coldchain.equipment.EquipmentService;
-import org.hisp.dhis.coldchain.equipment.EquipmentStatus;
import org.hisp.dhis.coldchain.equipment.EquipmentType;
import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttribute;
-import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttributeOption;
import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttributeOptionService;
import org.hisp.dhis.coldchain.equipment.EquipmentTypeService;
import org.hisp.dhis.coldchain.equipment.EquipmentType_Attribute;
+import org.hisp.dhis.coldchain.model.Model;
+import org.hisp.dhis.coldchain.model.ModelService;
+import org.hisp.dhis.option.OptionSet;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
@@ -142,7 +141,16 @@
if ( EquipmentTypeAttribute.TYPE_COMBO.equalsIgnoreCase( attribute.getValueType() ) )
{
- EquipmentTypeAttributeOption option = equipmentTypeAttributeOptionService.getEquipmentTypeAttributeOption( NumberUtils.toInt( value, 0 ) );
+ //EquipmentTypeAttributeOption option = equipmentTypeAttributeOptionService.getEquipmentTypeAttributeOption( NumberUtils.toInt( value, 0 ) );
+
+ OptionSet equipmentTypeAttributeOption = attribute.getOptionSet();
+
+ if ( equipmentTypeAttributeOption != null )
+ {
+ equipmentAttributeValueDetails.setValue( value );
+ }
+
+ /*
if ( option != null )
{
equipmentAttributeValueDetails.setEquipmentTypeAttributeOption( option );
@@ -163,6 +171,8 @@
}
}
+ */
+
else
{
// Someone deleted this option ...
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentDataAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentDataAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentDataAction.java 2013-10-18 05:57:53 +0000
@@ -114,13 +114,22 @@
{
return equipmentModelId;
}
-
+ /*
private Map<Integer, List<EquipmentTypeAttributeOption>> equipmentTypeAttributeOptionsMap = new HashMap<Integer, List<EquipmentTypeAttributeOption>>();
public Map<Integer, List<EquipmentTypeAttributeOption>> getEquipmentTypeAttributeOptionsMap()
{
return equipmentTypeAttributeOptionsMap;
}
+ */
+ private Map<Integer, List<String>> equipmentTypeAttributeOptionsMap = new HashMap<Integer, List<String>>();
+
+ public Map<Integer, List<String>> getEquipmentTypeAttributeOptionsMap()
+ {
+ return equipmentTypeAttributeOptionsMap;
+ }
+
+
public List<EquipmentType_Attribute> equipmentTypeAttributeList;
@@ -240,15 +249,25 @@
*/
for( EquipmentTypeAttribute equipmentTypeAttribute : equipmentTypeAttributes )
{
+ /*
List<EquipmentTypeAttributeOption> equipmentTypeAttributeOptions = new ArrayList<EquipmentTypeAttributeOption>();
if( EquipmentTypeAttribute.TYPE_COMBO.equalsIgnoreCase( equipmentTypeAttribute.getValueType() ) )
{
- //System.out.println(" inside equipmentTypeAttribute.TYPE_COMBO ");
equipmentTypeAttributeOptions = new ArrayList<EquipmentTypeAttributeOption>( equipmentTypeAttribute.getAttributeOptions() );
Collections.sort( equipmentTypeAttributeOptions, new EquipmentTypeAttributeOptionComparator() );
equipmentTypeAttributeOptionsMap.put( equipmentTypeAttribute.getId(), equipmentTypeAttributeOptions );
}
-
+ */
+
+ List<String> equipmentTypeAttributeOptions = new ArrayList<String>();
+
+ if( EquipmentTypeAttribute.TYPE_COMBO.equalsIgnoreCase( equipmentTypeAttribute.getValueType() ) )
+ {
+
+ equipmentTypeAttributeOptions = new ArrayList<String>( equipmentTypeAttribute.getOptionSet().getOptions() );
+ equipmentTypeAttributeOptionsMap.put( equipmentTypeAttribute.getId(), equipmentTypeAttributeOptions );
+ }
+
}
ModelType tempModelType = equipment.getEquipmentType().getModelType();
@@ -280,8 +299,10 @@
{
if ( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( modelAttributeValue.getModelTypeAttribute().getValueType() ) )
{
- modelTypeAttributeValueMap.put( modelAttributeValue.getModelTypeAttribute().getId(), modelAttributeValue.getModelTypeAttributeOption().getName() );
+ modelTypeAttributeValueMap.put( modelAttributeValue.getModelTypeAttribute().getId(), modelAttributeValue.getValue() );
}
+
+
/*
else if ( ModelTypeAttribute.TYPE_BOOL.equalsIgnoreCase( modelAttributeValue.getModelTypeAttribute().getValueType() ) )
{
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/LoadDataEntryFormAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/LoadDataEntryFormAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/LoadDataEntryFormAction.java 2013-10-18 05:57:53 +0000
@@ -126,7 +126,8 @@
//OrganisationUnit organisationUnit = equipment.getOrganisationUnit();
//EquipmentType equipmentType = equipment.getEquipmentType();
- Period period = PeriodType.createPeriodExternalId( selectedPeriodId );
+ //Period period = PeriodType.createPeriodExternalId( selectedPeriodId );
+ Period period = PeriodType.getPeriodFromIsoString( selectedPeriodId );
dataSet = dataSetService.getDataSet( dataSetId );
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/LoadPeriodsAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/LoadPeriodsAction.java 2013-08-13 12:39:25 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/LoadPeriodsAction.java 2013-10-18 05:57:53 +0000
@@ -93,6 +93,8 @@
//Collections.sort( periods );
for ( Period period : periods )
{
+ //System.out.println("ISO Date : " + period.getIsoDate() );
+
period.setName( format.formatPeriod( period ) );
}
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/SaveEquipmentDataValueAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/SaveEquipmentDataValueAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/SaveEquipmentDataValueAction.java 2013-10-18 05:57:53 +0000
@@ -105,7 +105,8 @@
public String execute()
{
- Period period = PeriodType.createPeriodExternalId( selectedPeriodId );
+ //Period period = PeriodType.createPeriodExternalId( selectedPeriodId );
+ Period period = PeriodType.getPeriodFromIsoString( selectedPeriodId );
if ( period == null )
{
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowAddEquipmentFormAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowAddEquipmentFormAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowAddEquipmentFormAction.java 2013-10-18 05:57:53 +0000
@@ -9,6 +9,7 @@
import org.hisp.dhis.coldchain.model.Model;
import org.hisp.dhis.coldchain.model.ModelService;
import org.hisp.dhis.coldchain.model.ModelType;
+import org.hisp.dhis.coldchain.model.ModelTypeAttribute;
import org.hisp.dhis.coldchain.equipment.EquipmentAttributeValue;
import org.hisp.dhis.coldchain.equipment.EquipmentType;
import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttribute;
@@ -103,13 +104,22 @@
{
return models;
}
-
+ /*
private Map<Integer, List<EquipmentTypeAttributeOption>> equipmentTypeAttributeOptionsMap = new HashMap<Integer, List<EquipmentTypeAttributeOption>>();
public Map<Integer, List<EquipmentTypeAttributeOption>> getEquipmentTypeAttributeOptionsMap()
{
return equipmentTypeAttributeOptionsMap;
}
+ */
+
+ private Map<Integer, List<String>> equipmentTypeAttributeOptionsMap = new HashMap<Integer, List<String>>();
+
+ public Map<Integer, List<String>> getEquipmentTypeAttributeOptionsMap()
+ {
+ return equipmentTypeAttributeOptionsMap;
+ }
+
private List<OrganisationUnit> orgUnitList;
@@ -153,6 +163,7 @@
for( EquipmentTypeAttribute equipmentTypeAttribute : equipmentTypeAttributes )
{
+ /*
List<EquipmentTypeAttributeOption> equipmentTypeAttributeOptions = new ArrayList<EquipmentTypeAttributeOption>();
if( EquipmentTypeAttribute.TYPE_COMBO.equalsIgnoreCase( equipmentTypeAttribute.getValueType() ) )
{
@@ -161,7 +172,16 @@
Collections.sort( equipmentTypeAttributeOptions, new EquipmentTypeAttributeOptionComparator() );
equipmentTypeAttributeOptionsMap.put( equipmentTypeAttribute.getId(), equipmentTypeAttributeOptions );
}
-
+ */
+
+ List<String> equipmentTypeAttributeOptions = new ArrayList<String>();
+
+ if( EquipmentTypeAttribute.TYPE_COMBO.equalsIgnoreCase( equipmentTypeAttribute.getValueType() ) )
+ {
+ equipmentTypeAttributeOptions = new ArrayList<String>( equipmentTypeAttribute.getOptionSet().getOptions() );
+ equipmentTypeAttributeOptionsMap.put( equipmentTypeAttribute.getId(), equipmentTypeAttributeOptions );
+ }
+
/*
System.out.println( "Name :" + modelTypeAttribute.getName() );
System.out.println( "valueType :" + modelTypeAttribute.getValueType() );
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentStatusFormAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentStatusFormAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentStatusFormAction.java 2013-10-18 05:57:53 +0000
@@ -2,11 +2,17 @@
import org.hisp.dhis.coldchain.equipment.Equipment;
import org.hisp.dhis.coldchain.equipment.EquipmentService;
+import org.hisp.dhis.constant.Constant;
+import org.hisp.dhis.constant.ConstantService;
+import org.hisp.dhis.option.OptionService;
+import org.hisp.dhis.option.OptionSet;
import com.opensymphony.xwork2.Action;
public class ShowEquipmentStatusFormAction implements Action
{
+ public static final String WORKING_STATUS_OPTION_SET = "Working Status";//43.0
+
// -------------------------------------------------------------------------
// Dependency
// -------------------------------------------------------------------------
@@ -18,6 +24,20 @@
this.equipmentService = equipmentService;
}
+ private ConstantService constantService;
+
+ public void setConstantService( ConstantService constantService )
+ {
+ this.constantService = constantService;
+ }
+
+ private OptionService optionService;
+
+ public void setOptionService( OptionService optionService )
+ {
+ this.optionService = optionService;
+ }
+
// -------------------------------------------------------------------------
// Input & Output
// -------------------------------------------------------------------------
@@ -40,7 +60,13 @@
return equipment;
}
+ private OptionSet optionSet;
+ public OptionSet getOptionSet()
+ {
+ return optionSet;
+ }
+
// -------------------------------------------------------------------------
// Action Implementation
// -------------------------------------------------------------------------
@@ -51,6 +77,12 @@
equipment = equipmentService.getEquipment( equipmentId );
}
+ Constant optionSetConstant = constantService.getConstantByName( WORKING_STATUS_OPTION_SET );
+
+ optionSet = new OptionSet();
+ optionSet = optionService.getOptionSet( (int) optionSetConstant.getValue() );
+
+
//equipment.getOrganisationUnit().getName();
//equipment.getModel().getName();
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentStatusHistoryFormAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentStatusHistoryFormAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentStatusHistoryFormAction.java 2013-10-18 05:57:53 +0000
@@ -1,14 +1,12 @@
package org.hisp.dhis.coldchain.equipment.action;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.hisp.dhis.coldchain.equipment.Equipment;
import org.hisp.dhis.coldchain.equipment.EquipmentService;
import org.hisp.dhis.coldchain.equipment.EquipmentStatus;
import org.hisp.dhis.coldchain.equipment.EquipmentStatusService;
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import com.opensymphony.xwork2.Action;
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/UpdateEquipmentAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/UpdateEquipmentAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/UpdateEquipmentAction.java 2013-10-18 05:57:53 +0000
@@ -23,6 +23,7 @@
import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttributeOptionService;
import org.hisp.dhis.coldchain.equipment.EquipmentType_Attribute;
import org.hisp.dhis.i18n.I18nFormat;
+import org.hisp.dhis.option.OptionSet;
import org.hisp.dhis.user.CurrentUserService;
import com.opensymphony.xwork2.Action;
@@ -134,17 +135,21 @@
if ( EquipmentTypeAttribute.TYPE_COMBO.equalsIgnoreCase( attribute.getValueType() ) )
{
- EquipmentTypeAttributeOption option = equipmentTypeAttributeOptionService.getEquipmentTypeAttributeOption( NumberUtils.toInt( value, 0 ) );
- if ( option != null )
+ //EquipmentTypeAttributeOption option = equipmentTypeAttributeOptionService.getEquipmentTypeAttributeOption( NumberUtils.toInt( value, 0 ) );
+
+ OptionSet equipmentTypeAttributeOption = attribute.getOptionSet();
+
+ //if ( option != null )
+ if ( equipmentTypeAttributeOption != null )
{
- equipmentAttributeValueDetails.setEquipmentTypeAttributeOption( option );
- equipmentAttributeValueDetails.setValue( option.getName() );
+ // equipmentAttributeValueDetails.setEquipmentTypeAttributeOption( option );
+ equipmentAttributeValueDetails.setValue( value );
if ( EquipmentStatus.WORKING_STATUS.equalsIgnoreCase( attribute.getDescription() ) )
{
//System.out.println( "Option ID is : " + option.getId() + "---Option Name is : "+option.getName() );
- if ( EquipmentStatus.STATUS_NOT_WORKING.equalsIgnoreCase( option.getName() ) )
+ if ( EquipmentStatus.STATUS_NOT_WORKING.equalsIgnoreCase( value ) )
{
equipment.setWorking( false );
equipmentService.updateEquipment( equipment );
@@ -165,7 +170,7 @@
equipmentStatus.setDescription( "Updated from edit equipmentAttributeValue screen" );
equipmentStatus.setEquipment( equipment );
- equipmentStatus.setStatus( option.getName() );
+ equipmentStatus.setStatus( value );
equipmentStatus.setReportingDate( format.parseDate( currentDate.trim() ) );
equipmentStatus.setUpdationDate( format.parseDate( currentDate.trim() ) );
@@ -206,21 +211,23 @@
{
if ( EquipmentTypeAttribute.TYPE_COMBO.equalsIgnoreCase( attribute.getValueType() ) )
{
- EquipmentTypeAttributeOption option = equipmentTypeAttributeOptionService.getEquipmentTypeAttributeOption( NumberUtils.toInt( value, 0 ) );
-
- //System.out.println( " Option is : " + option + "-- and value is --" + value.trim());
-
- if ( option != null )
+ //EquipmentTypeAttributeOption option = equipmentTypeAttributeOptionService.getEquipmentTypeAttributeOption( NumberUtils.toInt( value, 0 ) );
+
+ OptionSet equipmentTypeAttributeOption = attribute.getOptionSet();
+
+ //if ( option != null )
+
+ if ( equipmentTypeAttributeOption != null )
{
- equipmentAttributeValueDetails.setEquipmentTypeAttributeOption( option );
- equipmentAttributeValueDetails.setValue( option.getName() );
+ //equipmentAttributeValueDetails.setEquipmentTypeAttributeOption( option );
+ equipmentAttributeValueDetails.setValue( value );
if ( EquipmentStatus.WORKING_STATUS.equalsIgnoreCase( attribute.getDescription() ) )
{
//System.out.println( " Option ID is : " + option.getId() + "---Option Name is : " + option.getName() );
- if ( EquipmentStatus.STATUS_NOT_WORKING.equalsIgnoreCase( option.getName() ) )
+ if ( EquipmentStatus.STATUS_NOT_WORKING.equalsIgnoreCase( value ) )
{
equipment.setWorking( false );
equipmentService.updateEquipment( equipment );
@@ -240,7 +247,7 @@
equipmentStatus.setDescription( "Updated from edit equipmentAttributeValue screen" );
equipmentStatus.setEquipment( equipment );
- equipmentStatus.setStatus( option.getName() );
+ equipmentStatus.setStatus( value );
equipmentStatus.setReportingDate( format.parseDate( currentDate.trim() ) );
equipmentStatus.setUpdationDate( format.parseDate( currentDate.trim() ) );
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/UpdateEquipmentStatusAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/UpdateEquipmentStatusAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/UpdateEquipmentStatusAction.java 2013-10-18 05:57:53 +0000
@@ -83,6 +83,7 @@
if( equipmentAttributeValue == null )
{
equipmentAttributeValue = new EquipmentAttributeValue();
+
if( status.equalsIgnoreCase( EquipmentStatus.STATUS_WORKING_WELL ))
{
equipmentAttributeValue.setValue( EquipmentStatus.STATUS_WORKING_WELL.trim() );
@@ -96,6 +97,7 @@
{
equipmentAttributeValue.setValue( EquipmentStatus.STATUS_NOT_WORKING.trim() );
}
+
equipmentAttributeValueService.addEquipmentAttributeValue( equipmentAttributeValue );
}
else
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/GetFullOrganisationUnitDetailsAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/GetFullOrganisationUnitDetailsAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/GetFullOrganisationUnitDetailsAction.java 2013-10-18 05:57:53 +0000
@@ -271,8 +271,8 @@
orgUnitList = new ArrayList<OrganisationUnit>( organisationUnitService.getOrganisationUnitWithChildren( organisationUnit.getId() ) );
- List<OrganisationUnitGroup> ouGroups = new ArrayList<OrganisationUnitGroup>( organisationUnitGroupService.getOrganisationUnitGroupByName( EquipmentAttributeValue.HEALTHFACILITY ) );
- OrganisationUnitGroup ouGroup = ouGroups.get( 0 );
+ List<OrganisationUnitGroup> ouGroups = new ArrayList<OrganisationUnitGroup>( organisationUnitGroupService.getOrganisationUnitGroupByName( EquipmentAttributeValue.HEALTHFACILITY ) );
+ OrganisationUnitGroup ouGroup = ouGroups.get( 0 );
//OrganisationUnitGroup ouGroup = organisationUnitGroupService.getOrganisationUnitGroupByName( EquipmentAttributeValue.HEALTHFACILITY );
if ( ouGroup != null )
@@ -348,11 +348,14 @@
period = periodService.getPeriod( firstDay, lastDay, periodType );
- String createNewYearlyPeroid = "Yearly" + "_" + year + "-01-01";
+ //String createNewYearlyPeroid = "Yearly" + "_" + year + "-01-01";
+
+ String createNewYearlyPeroid = ""+year;
if( period == null )
{
- period = PeriodType.createPeriodExternalId( createNewYearlyPeroid );
+ //period = PeriodType.createPeriodExternalId( createNewYearlyPeroid );
+ period = PeriodType.getPeriodFromIsoString( createNewYearlyPeroid );
}
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/LoadFacilityDataEntryFormAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/LoadFacilityDataEntryFormAction.java 2013-08-13 12:40:46 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/LoadFacilityDataEntryFormAction.java 2013-10-18 05:57:53 +0000
@@ -153,8 +153,8 @@
dataSet = dataSetService.getDataSet( dataSetId );
- period = PeriodType.createPeriodExternalId( selectedPeriodId );
-
+ //period = PeriodType.createPeriodExternalId( selectedPeriodId );
+ period = PeriodType.getPeriodFromIsoString( selectedPeriodId );
dataElements = new ArrayList<DataElement>( dataSet.getDataElements() );
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/SaveFacilityDataValueAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/SaveFacilityDataValueAction.java 2013-08-13 12:40:46 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/SaveFacilityDataValueAction.java 2013-10-18 05:57:53 +0000
@@ -129,7 +129,9 @@
{
//System.out.println( "inside save data value" );
- Period period = PeriodType.createPeriodExternalId( selPeriodId );
+ //Period period = PeriodType.createPeriodExternalId( selPeriodId );
+
+ Period period = PeriodType.getPeriodFromIsoString( selPeriodId );
if ( period == null )
{
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/AddModelAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/AddModelAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/AddModelAction.java 2013-10-18 05:57:53 +0000
@@ -17,6 +17,7 @@
import org.hisp.dhis.coldchain.model.ModelTypeAttributeOption;
import org.hisp.dhis.coldchain.model.ModelTypeAttributeOptionService;
import org.hisp.dhis.coldchain.model.ModelTypeService;
+import org.hisp.dhis.option.OptionSet;
import com.opensymphony.xwork2.Action;
@@ -45,12 +46,14 @@
this.modelTypeService = modelTypeService;
}
+
private ModelTypeAttributeOptionService modelTypeAttributeOptionService;
public void setModelTypeAttributeOptionService( ModelTypeAttributeOptionService modelTypeAttributeOptionService )
{
this.modelTypeAttributeOptionService = modelTypeAttributeOptionService;
}
+
/*
private ModelAttributeValueService modelAttributeValueService;
@@ -142,8 +145,20 @@
if ( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( modelTypeAttribute.getValueType() ) )
{
- ModelTypeAttributeOption option = modelTypeAttributeOptionService.getModelTypeAttributeOption( NumberUtils.toInt( value ) );
-
+ //ModelTypeAttributeOption option = modelTypeAttributeOptionService.getModelTypeAttributeOption( NumberUtils.toInt( value ) );
+
+ OptionSet modelTypeAttributesOption = modelTypeAttribute.getOptionSet();
+
+ if ( modelTypeAttributesOption != null )
+ {
+ modelAttributeValue.setValue( value );
+ }
+ else
+ {
+
+ }
+
+ /*
if ( option != null )
{
modelAttributeValue.setModelTypeAttributeOption( option );
@@ -153,6 +168,7 @@
{
}
+ */
}
else
{
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/GetModelDetailsAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/GetModelDetailsAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/GetModelDetailsAction.java 2013-10-18 05:57:53 +0000
@@ -124,7 +124,9 @@
{
if ( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( modelAttributeValue.getModelTypeAttribute().getValueType() ) )
{
- modelTypeAttributeValueMap.put( modelAttributeValue.getModelTypeAttribute().getId(), modelAttributeValue.getModelTypeAttributeOption().getName() );
+ //modelTypeAttributeValueMap.put( modelAttributeValue.getModelTypeAttribute().getId(), modelAttributeValue.getModelTypeAttributeOption().getName() );
+
+ modelTypeAttributeValueMap.put( modelAttributeValue.getModelTypeAttribute().getId(), modelAttributeValue.getValue() );
}
else
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ShowAddModelFormAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ShowAddModelFormAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ShowAddModelFormAction.java 2013-10-18 05:57:53 +0000
@@ -1,14 +1,12 @@
package org.hisp.dhis.coldchain.model.action;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.hisp.dhis.coldchain.model.ModelDataEntryService;
-import org.hisp.dhis.coldchain.model.ModelAttributeValue;
import org.hisp.dhis.coldchain.model.ModelType;
import org.hisp.dhis.coldchain.model.ModelTypeAttribute;
import org.hisp.dhis.coldchain.model.ModelTypeAttributeGroup;
@@ -16,8 +14,8 @@
import org.hisp.dhis.coldchain.model.ModelTypeService;
import org.hisp.dhis.coldchain.model.comparator.ModelTypeAttributeGroupOrderComparator;
import org.hisp.dhis.coldchain.model.comparator.ModelTypeAttributeOptionComparator;
-import org.hisp.dhis.dataentryform.DataEntryForm;
import org.hisp.dhis.i18n.I18n;
+import org.hisp.dhis.option.OptionSet;
import com.opensymphony.xwork2.Action;
@@ -111,13 +109,21 @@
return modelTypeAttributesOptions;
}
*/
-
+ /*
private Map<Integer, List<ModelTypeAttributeOption>> modelTypeAttributesOptionsMap = new HashMap<Integer, List<ModelTypeAttributeOption>>();
public Map<Integer, List<ModelTypeAttributeOption>> getModelTypeAttributesOptionsMap()
{
return modelTypeAttributesOptionsMap;
}
+ */
+
+ private Map<Integer, List<String>> modelTypeAttributesOptionsMap = new HashMap<Integer, List<String>>();
+
+ public Map<Integer, List<String>> getModelTypeAttributesOptionsMap()
+ {
+ return modelTypeAttributesOptionsMap;
+ }
private List<ModelTypeAttributeGroup> modelTypeAttributeGroups;
@@ -167,13 +173,23 @@
for( ModelTypeAttribute modelTypeAttribute : modelTypeAttributes )
{
- List<ModelTypeAttributeOption> modelTypeAttributesOptions = new ArrayList<ModelTypeAttributeOption>();
+ //List<ModelTypeAttributeOption> modelTypeAttributesOptions = new ArrayList<ModelTypeAttributeOption>();
+
+ List<String> modelTypeAttributesOptions = new ArrayList<String>();
+
if( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( modelTypeAttribute.getValueType() ) )
{
//System.out.println(" inside ModelTypeAttribute.TYPE_COMBO ");
- modelTypeAttributesOptions = new ArrayList<ModelTypeAttributeOption>( modelTypeAttribute.getAttributeOptions() );
- Collections.sort( modelTypeAttributesOptions, new ModelTypeAttributeOptionComparator() );
+
+ modelTypeAttributesOptions = new ArrayList<String>( modelTypeAttribute.getOptionSet().getOptions() );
+
+ //modelTypeAttributesOptions = new ArrayList<ModelTypeAttributeOption>( modelTypeAttribute.getAttributeOptions() );
+
+ //Collections.sort( modelTypeAttributesOptions, new ModelTypeAttributeOptionComparator() );
+
modelTypeAttributesOptionsMap.put( modelTypeAttribute.getId(), modelTypeAttributesOptions );
+
+ // modelTypeAttributesOptionsMap.put( modelTypeAttribute.getId(), modelTypeAttributesOptions );
}
/*
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UpdateModelAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UpdateModelAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UpdateModelAction.java 2013-10-18 05:57:53 +0000
@@ -18,6 +18,7 @@
import org.hisp.dhis.coldchain.model.ModelTypeAttributeOption;
import org.hisp.dhis.coldchain.model.ModelTypeAttributeOptionService;
import org.hisp.dhis.coldchain.model.ModelTypeService;
+import org.hisp.dhis.option.OptionSet;
import com.opensymphony.xwork2.Action;
@@ -170,6 +171,19 @@
if ( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( modelTypeAttribute.getValueType() ) )
{
+
+ OptionSet modelTypeAttributesOption = modelTypeAttribute.getOptionSet();
+
+ if ( modelTypeAttributesOption != null )
+ {
+ modelAttributeValue.setValue( value );
+ }
+ else
+ {
+
+ }
+
+ /*
ModelTypeAttributeOption option = modelTypeAttributeOptionService.getModelTypeAttributeOption( NumberUtils.toInt( value ) );
if ( option != null )
@@ -181,6 +195,7 @@
{
}
+ */
}
else
{
@@ -192,6 +207,19 @@
{
if ( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( modelTypeAttribute.getValueType() ) )
{
+
+ OptionSet modelTypeAttributesOption = modelTypeAttribute.getOptionSet();
+
+ if ( modelTypeAttributesOption != null )
+ {
+ modelAttributeValue.setValue( value );
+ }
+ else
+ {
+
+ }
+
+ /*
ModelTypeAttributeOption option = modelTypeAttributeOptionService.getModelTypeAttributeOption( NumberUtils.toInt( value ));
if ( option != null )
{
@@ -201,6 +229,7 @@
else
{
}
+ */
}
else
{
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UpdateModelFormAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UpdateModelFormAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UpdateModelFormAction.java 2013-10-18 05:57:53 +0000
@@ -17,10 +17,8 @@
import org.hisp.dhis.coldchain.model.ModelType;
import org.hisp.dhis.coldchain.model.ModelTypeAttribute;
import org.hisp.dhis.coldchain.model.ModelTypeAttributeGroup;
-import org.hisp.dhis.coldchain.model.ModelTypeAttributeOption;
import org.hisp.dhis.coldchain.model.ModelTypeService;
import org.hisp.dhis.coldchain.model.comparator.ModelTypeAttributeGroupOrderComparator;
-import org.hisp.dhis.coldchain.model.comparator.ModelTypeAttributeOptionComparator;
import com.opensymphony.xwork2.Action;
@@ -139,12 +137,22 @@
return modelImage;
}
+ /*
private Map<Integer, List<ModelTypeAttributeOption>> modelTypeAttributesOptionsMap = new HashMap<Integer, List<ModelTypeAttributeOption>>();
public Map<Integer, List<ModelTypeAttributeOption>> getModelTypeAttributesOptionsMap()
{
return modelTypeAttributesOptionsMap;
}
+ */
+
+ private Map<Integer, List<String>> modelTypeAttributesOptionsMap = new HashMap<Integer, List<String>>();
+
+ public Map<Integer, List<String>> getModelTypeAttributesOptionsMap()
+ {
+ return modelTypeAttributesOptionsMap;
+ }
+
private List<ModelTypeAttributeGroup> modelTypeAttributeGroups;
@@ -277,7 +285,8 @@
{
if ( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( modelAttributeValue.getModelTypeAttribute().getValueType() ) )
{
- modelTypeAttributeValueMap.put( modelAttributeValue.getModelTypeAttribute().getId(), modelAttributeValue.getModelTypeAttributeOption().getName() );
+ //modelTypeAttributeValueMap.put( modelAttributeValue.getModelTypeAttribute().getId(), modelAttributeValue.getModelTypeAttributeOption().getName() );
+ modelTypeAttributeValueMap.put( modelAttributeValue.getModelTypeAttribute().getId(), modelAttributeValue.getValue() );
}
else
@@ -293,8 +302,11 @@
}
*/
+
+
for( ModelTypeAttribute modelTypeAttribute : modelTypeAttributes )
{
+ /*
List<ModelTypeAttributeOption> modelTypeAttributesOptions = new ArrayList<ModelTypeAttributeOption>();
if( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( modelTypeAttribute.getValueType() ) )
{
@@ -302,6 +314,19 @@
Collections.sort( modelTypeAttributesOptions, new ModelTypeAttributeOptionComparator() );
modelTypeAttributesOptionsMap.put( modelTypeAttribute.getId(), modelTypeAttributesOptions );
}
+ */
+
+ List<String> modelTypeAttributesOptions = new ArrayList<String>();
+
+ if( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( modelTypeAttribute.getValueType() ) )
+ {
+
+ modelTypeAttributesOptions = new ArrayList<String>( modelTypeAttribute.getOptionSet().getOptions() );
+ modelTypeAttributesOptionsMap.put( modelTypeAttribute.getId(), modelTypeAttributesOptions );
+ }
+
+
+
}
modelTypeAttributeGroups = new ArrayList<ModelTypeAttributeGroup>( modelType.getModelTypeAttributeGroups() );
=== modified file 'local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml 2013-10-18 05:57:53 +0000
@@ -592,6 +592,9 @@
class="org.hisp.dhis.coldchain.equipment.action.ShowEquipmentStatusFormAction"
scope="prototype">
<property name="equipmentService" ref="org.hisp.dhis.coldchain.equipment.EquipmentService" />
+ <property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
+ <property name="optionService" ref="org.hisp.dhis.option.OptionService" />
+
</bean>
<bean id="org.hisp.dhis.coldchain.equipment.action.UpdateEquipmentStatusAction"
class="org.hisp.dhis.coldchain.equipment.action.UpdateEquipmentStatusAction"
=== modified file 'local/in/dhis-web-coldchain/src/main/resources/struts.xml'
--- local/in/dhis-web-coldchain/src/main/resources/struts.xml 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/resources/struts.xml 2013-10-18 05:57:53 +0000
@@ -562,7 +562,7 @@
</action>
<action name="loadPeriods" class="org.hisp.dhis.coldchain.equipment.action.LoadPeriodsAction">
- <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonPeriods.vm</result>
+ <result name="success" type="velocity-json">/dhis-web-coldchain/jsonPeriods.vm</result>
</action>
<action name="getAvailableNextPrePeriods" class="org.hisp.dhis.coldchain.equipment.action.LoadNextPrePeriodsAction">
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentForm.vm 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentForm.vm 2013-10-18 05:57:53 +0000
@@ -85,9 +85,19 @@
#elseif( $attribute.valueType == "COMBO" )
<select id="attr$attribute.id" name="attr$attribute.id" class='#validate( "default" $attribute.mandatory )'>
<option value="">[$i18n.getString( "please_select" )]</option>
+ #foreach ($option in $attribute.optionSet.options )
+ <option value="$option">$option</option>
+ #end
+ <!--
#foreach ($option in $!equipmentTypeAttributeOptionsMap.get( $attribute.id ) )
<option value="$option.id" >$option.name</option>
#end
+ -->
+
+
+
+
+
</select>
#elseif( $attribute.valueType == "MODEL" )
<select id="attr$attribute.id" name="attr$attribute.id" onChange="modelDetails( this.value );" class='#validate( "default" $attribute.mandatory )'>
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentDataEntry.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentDataEntry.vm 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentDataEntry.vm 2013-10-18 05:57:53 +0000
@@ -48,8 +48,8 @@
<td><select id="selectedPeriodId" name="selectedPeriodId" style="width:220px" onchange="loadDataEntryForm()">
<option value="-1">[$i18n.getString( "select" )]</option>
#foreach( $period in $periods )
- <option value="$period.id">$encoder.htmlEncode( $period.name )</option>
- #end
+ <option value="$period.iso">$encoder.htmlEncode( $period.name )</option>
+ #end
</select>
<input type="button" id="prevButton" style="width:75px" value="$i18n.getString( 'prev_year' )" title="$i18n.getString('earlier_periods')" onclick="getAvailablePeriodsTemp( 'selectedPeriodId', 'selectedPeriodId', '-1' )" >
<input type="button" id="nextButton" style="width:75px" value="$i18n.getString( 'next_year' )" title="$i18n.getString('later_periods')" onclick="getAvailablePeriodsTemp( 'selectedPeriodId', 'selectedPeriodId', '1' )" >
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentList.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentList.vm 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentList.vm 2013-10-18 05:57:53 +0000
@@ -40,13 +40,13 @@
#foreach( $equipmentTypeAttribute in $equipmentTypeAttributeList )
#set( $mapId = $equipment.id + ':' + $equipmentTypeAttribute.equipmentTypeAttribute.id )
#if( $equipmentType.tracking && $equipmentTypeAttribute.equipmentTypeAttribute.getDescription().equalsIgnoreCase("WORKING_STATUS"))
- <td><a href="javascript:showEquipmentStatusHistoryForm( '$equipment.id','$equipment.getOrganisationUnit().getName()','$!equipment.model.name' ); " title='$i18n.getString( "equipment_tracking_history" )'>$!equipmentDetailsMap.get( $mapId )<a></td>
+ <td><a href="javascript:showEquipmentStatusHistoryForm( '$equipment.id','$equipment.getOrganisationUnit().getName()','$!equipment.model.name' ); " title='$i18n.getString( "equipment_tracking_history" )'>$!equipmentDetailsMap.get( $mapId )</a></td>
#else
<td>$!equipmentDetailsMap.get( $mapId )</td>
#end
#end
#if( $equipmentType.getDataSets().size() > 0 )
- <td><a href="javascript:showEquipmentDataEntryForm( '$equipment.id','$equipment.getOrganisationUnit().getName()','$!equipment.model.name' ); " title='$i18n.getString( "equipment_dataentry" )'>Dataentry<a></td>
+ <td><a href="javascript:showEquipmentDataEntryForm( '$equipment.id','$equipment.getOrganisationUnit().getName()','$!equipment.model.name' ); " title='$i18n.getString( "equipment_dataentry" )'>Dataentry</a></td>
#end
<!--<td>Dataentry</td>-->
<td><a href="javascript:showEquipmentDetails( '$equipment.id','$equipment.getOrganisationUnit().getName()','$!equipment.model.name', '$equipment.getEquipmentType().getName()' ); " title='$i18n.getString( "equipment_details" )'>Details</a></td>
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentStatusForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentStatusForm.vm 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentStatusForm.vm 2013-10-18 05:57:53 +0000
@@ -48,14 +48,19 @@
</script>
</td>
</tr>
- <tr>Not working
+ <tr>
<td>$i18n.getString( "status" ) : </td>
<td>
<select id="status" name="status" class="{validate:{required:true}}">
<option value="" >[$i18n.getString( "please_select" )]</option>
+ #foreach ($option in $optionSet.options )
+ <option value="$option">$option</option>
+ #end
+ <!--
<option value="Not working" >$i18n.getString( "notworking" )</option>
<option value="Working but needs maintenance" >$i18n.getString( "under_repair" )</option>
<option value="Working well">$i18n.getString( "working" )</option>
+ -->
</select>
</td>
</tr>
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipmentDataEntry.js'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipmentDataEntry.js 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipmentDataEntry.js 2013-10-18 05:57:53 +0000
@@ -42,7 +42,7 @@
$.getJSON( url, function( json ) {
for ( i in json.periods ) {
//addOptionToList( list, i, json.periods[i].name );
- addOptionToList( list, json.periods[i].externalId, json.periods[i].name );
+ addOptionToList( list, json.periods[i].isoDate, json.periods[i].name );
}
} );
@@ -166,7 +166,7 @@
for ( i in json.periods ) {
//addOptionToList( list, i, json.periods[i].name );
- addOptionToList( selectedList, json.periods[i].externalId, json.periods[i].name );
+ addOptionToList( selectedList, json.periods[i].isoDate, json.periods[i].name );
}
} );
@@ -290,7 +290,7 @@
$.getJSON( url, function( json ) {
for ( i in json.periods ) {
//addOptionToList( list, i, json.periods[i].name );
- addOptionToList( list, json.periods[i].externalId, json.periods[i].name );
+ addOptionToList( list, json.periods[i].isoDate, json.periods[i].name );
}
loadFacilityDataEntryForm();
} );
@@ -322,7 +322,7 @@
for ( i in json.periods ) {
//addOptionToList( list, i, json.periods[i].name );
- addOptionToList( selectedList, json.periods[i].externalId, json.periods[i].name );
+ addOptionToList( selectedList, json.periods[i].isoDate, json.periods[i].name );
}
loadFacilityDataEntryForm();
} );
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonPeriods.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonPeriods.vm 2012-05-23 06:35:17 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonPeriods.vm 2013-10-18 05:57:53 +0000
@@ -6,7 +6,8 @@
"startDate": "$!format.formatDate( ${period.startDate} )",
"endDate": "$!format.formatDate( ${period.endDate} )",
"name": "$!format.formatPeriod( ${period} )",
- "externalId": "$!{period.externalId}"
+ "externalId": "$!{period.externalId}",
+ "isoDate": "$!{period.isoDate}"
}#if( $velocityCount < $size ),#end
#end
] }
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/loadEquipmentIcePacksDataForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/loadEquipmentIcePacksDataForm.vm 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/loadEquipmentIcePacksDataForm.vm 2013-10-18 05:57:53 +0000
@@ -28,9 +28,17 @@
#elseif( $attribute.valueType == "COMBO" )
<select id="attr$attribute.id" name="attr$attribute.id" class='#validate( "default" $attribute.mandatory )'>
<option value="">[$i18n.getString( "please_select" )]</option>
+
+ #foreach ($option in $attribute.optionSet.options )
+ <option value="$option" #if($attributeValue == $option ) selected="selected" #end>$option</option>
+ #end
+
+ <!--
#foreach ($option in $!equipmentTypeAttributeOptionsMap.get( $attribute.id ) )
<option value="$option.id" #if($attributeValue == $option.name) selected="selected" #end>$option.name</option>
#end
+ -->
+
</select>
#elseif( $attribute.valueType == "MODEL" )
<select id="attr$attribute.id" name="attr$attribute.id" onChange="modelDetails( this.value );" class='#validate( "default" $attribute.mandatory )'>
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddModelForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddModelForm.vm 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddModelForm.vm 2013-10-18 05:57:53 +0000
@@ -74,10 +74,16 @@
<select id="attr$attribute.id" name="attr$attribute.id" class='#validate( "default" $attribute.mandatory )'>
<!--Collections.sort($attribute.attributeOptions))-->
##set ( $options = $sorter.sort($attribute.attributeOptions))
+
<option value="">[$i18n.getString( "please_select" )]</option>
+ <!--
#foreach ($option in $!modelTypeAttributesOptionsMap.get( $attribute.id ) )
<option value="$option.id" >$option.name</option>
- #end
+ #end
+ -->
+ #foreach ($option in $attribute.optionSet.options )
+ <option value="$option">$option</option>
+ #end
</select>
#else
<input type="text" id="attr$attribute.id" name="attr$attribute.id" class="{validate:{required:$attribute.mandatory #if($!attribute.noChars),maxlength:$attribute.noChars #end #if($attribute.valueType=='NUMBER'),number:true #end }}" />
@@ -123,9 +129,15 @@
<!--Collections.sort($attribute.attributeOptions))-->
##set ( $options = $sorter.sort($attribute.attributeOptions))
<option value="">[$i18n.getString( "please_select" )]</option>
+
+ <!--
#foreach ($option in $!modelTypeAttributesOptionsMap.get( $attribute.id ) )
<option value="$option.id" >$option.name</option>
- #end
+ #end
+ -->
+ #foreach ($option in $attribute.optionSet.options )
+ <option value="$option">$option</option>
+ #end
</select>
#else
<input type="text" id="attr$attribute.id" name="attr$attribute.id" class="{validate:{required:$attribute.mandatory #if($!attribute.noChars),maxlength:$attribute.noChars #end #if($attribute.valueType=='NUMBER'),number:true #end }}" />
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateEquipmentForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateEquipmentForm.vm 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateEquipmentForm.vm 2013-10-18 05:57:53 +0000
@@ -77,9 +77,17 @@
#elseif( $attribute.valueType == "COMBO" )
<select id="attr$attribute.id" name="attr$attribute.id" class='#validate( "default" $attribute.mandatory )'>
<option value="">[$i18n.getString( "please_select" )]</option>
+ #foreach ($option in $attribute.optionSet.options )
+ <option value="$option" #if($attributeValue == $option ) selected="selected" #end>$option</option>
+ #end
+
+ <!--
#foreach ($option in $!equipmentTypeAttributeOptionsMap.get( $attribute.id ) )
<option value="$option.id" #if($attributeValue == $option.name) selected="selected" #end>$option.name</option>
#end
+ -->
+
+
</select>
#elseif( $attribute.valueType == "MODEL" )
<select id="attr$attribute.id" name="attr$attribute.id" onChange="modelDetails( this.value );" class='#validate( "default" $attribute.mandatory )'>
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateModelForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateModelForm.vm 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateModelForm.vm 2013-10-18 05:57:53 +0000
@@ -90,9 +90,15 @@
#elseif( $attribute.valueType == "COMBO" )
<select id="attr$attribute.id" name="attr$attribute.id" class=' #validate( "default" $attribute.mandatory )' >
<option value="">[$i18n.getString( "please_select" )]</option>
- #foreach ($option in $!modelTypeAttributesOptionsMap.get( $attribute.id ) )
- <option value="$option.id" #if($attributeValue == $option.name ) selected="selected" #end>$option.name</option>
- #end
+ #foreach ($option in $attribute.optionSet.options )
+ <option value="$option" #if($attributeValue == $option ) selected="selected" #end>$option</option>
+ #end
+
+ <!--
+ #foreach ($option in $!modelTypeAttributesOptionsMap.get( $attribute.id ) )
+ <option value="$option.id" #if($attributeValue == $option.name ) selected="selected" #end>$option.name</option>
+ #end
+ -->
</select>
#else
<input type="text" id="attr$attribute.id" name="attr$attribute.id" value="$!attributeValue" class="{validate:{required:$attribute.mandatory #if($!attribute.noChars),maxlength:$attribute.noChars #end #if($attribute.valueType=='NUMBER'),number:true #end }}" >
@@ -145,9 +151,15 @@
#elseif( $attribute.valueType == "COMBO" )
<select id="attr$attribute.id" name="attr$attribute.id" class=' #validate( "default" $attribute.mandatory )' >
<option value="">[$i18n.getString( "please_select" )]</option>
+ #foreach ($option in $attribute.optionSet.options )
+ <option value="$option" #if($attributeValue == $option ) selected="selected" #end>$option</option>
+ #end
+
+ <!--
#foreach ($option in $!modelTypeAttributesOptionsMap.get( $attribute.id ) )
<option value="$option.id" #if($attributeValue == $option.name ) selected="selected" #end>$option.name</option>
#end
+ -->
</select>
#else
<input type="text" id="attr$attribute.id" name="attr$attribute.id" value="$!attributeValue" class="{validate:{required:$attribute.mandatory #if($!attribute.noChars),maxlength:$attribute.noChars #end #if($attribute.valueType=='NUMBER'),number:true #end }}" >
=== modified file 'local/in/dhis-web-dashboard/pom.xml'
--- local/in/dhis-web-dashboard/pom.xml 2013-03-26 15:19:15 +0000
+++ local/in/dhis-web-dashboard/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-dashboard</artifactId>
=== added directory 'local/in/dhis-web-dataentry-ccem'
=== added file 'local/in/dhis-web-dataentry-ccem/pom.xml'
--- local/in/dhis-web-dataentry-ccem/pom.xml 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/pom.xml 2013-10-18 05:57:53 +0000
@@ -0,0 +1,87 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web</artifactId>
+ <version>2.14-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>dhis-web-dataentry-ccem</artifactId>
+ <packaging>war</packaging>
+ <name>Data Entry CCEM</name>
+
+ <build>
+ <finalName>dhis-web-dataentry-ccem</finalName>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <!-- DHIS -->
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons-resources</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-aggregationengine-default</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-support-external</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-support-system</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-in-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-in-service-coldchain</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- Other -->
+ <dependency>
+ <groupId>net.sourceforge.jexcelapi</groupId>
+ <artifactId>jxl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ar.com.fdvs</groupId>
+ <artifactId>DynamicJasper</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+
+ </dependencies>
+ <properties>
+ <rootDir>../../</rootDir>
+ </properties>
+</project>
=== added directory 'local/in/dhis-web-dataentry-ccem/src'
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main'
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/java'
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/java/org'
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp'
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis'
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry'
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action'
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/GetEquipmentAndDataSetListAction.java'
--- local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/GetEquipmentAndDataSetListAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/GetEquipmentAndDataSetListAction.java 2013-10-18 05:57:53 +0000
@@ -0,0 +1,133 @@
+package org.hisp.dhis.dataentry.action;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hisp.dhis.coldchain.equipment.Equipment;
+import org.hisp.dhis.coldchain.equipment.EquipmentService;
+import org.hisp.dhis.coldchain.equipment.EquipmentType;
+import org.hisp.dhis.coldchain.equipment.EquipmentTypeService;
+import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Mithilesh Kumar Thakur
+ */
+public class GetEquipmentAndDataSetListAction implements Action
+{
+
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private OrganisationUnitService organisationUnitService;
+
+ public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+ {
+ this.organisationUnitService = organisationUnitService;
+ }
+
+ private EquipmentTypeService equipmentTypeService;
+
+ public void setEquipmentTypeService( EquipmentTypeService equipmentTypeService )
+ {
+ this.equipmentTypeService = equipmentTypeService;
+ }
+
+ private EquipmentService equipmentService;
+
+ public void setEquipmentService( EquipmentService equipmentService )
+ {
+ this.equipmentService = equipmentService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input/output
+ // -------------------------------------------------------------------------
+
+ private Integer orgUnitId;
+
+ public void setOrgUnitId( Integer orgUnitId )
+ {
+ this.orgUnitId = orgUnitId;
+ }
+
+ private Integer equipmentTypeId;
+
+ public void setEquipmentTypeId( Integer equipmentTypeId )
+ {
+ this.equipmentTypeId = equipmentTypeId;
+ }
+
+ private OrganisationUnit organisationUnit;
+
+ public OrganisationUnit getOrganisationUnit()
+ {
+ return organisationUnit;
+ }
+
+ private List<Equipment> equipments;
+
+ public List<Equipment> getEquipments()
+ {
+ return equipments;
+ }
+
+ private EquipmentType equipmentType;
+
+ public EquipmentType getEquipmentType()
+ {
+ return equipmentType;
+ }
+
+ private List<OrganisationUnit> orgUnitList;
+
+ public List<OrganisationUnit> getOrgUnitList()
+ {
+ return orgUnitList;
+ }
+
+ private List<DataSet> datasets;
+
+ public List<DataSet> getDatasets()
+ {
+ return datasets;
+ }
+
+ // -------------------------------------------------------------------------
+ // Implementation Action
+ // -------------------------------------------------------------------------
+
+ public String execute() throws Exception
+ {
+ datasets = new ArrayList<DataSet>();
+ equipments = new ArrayList<Equipment>();
+
+ equipmentType = equipmentTypeService.getEquipmentType( equipmentTypeId );
+
+ organisationUnit = organisationUnitService.getOrganisationUnit( orgUnitId );
+
+ if( organisationUnit != null && equipmentType != null)
+ {
+ // list of DataSets of Selected Equipment Type
+ datasets = new ArrayList<DataSet>( equipmentType.getDataSets() );
+
+ // list of Equipments of Selected organisationUnit and EquipmentType
+ equipments = new ArrayList<Equipment>( equipmentService.getEquipmentList( organisationUnit, equipmentType ) );
+
+ }
+
+ for( Equipment equipment : equipments)
+ {
+ equipment.getModel().getName();
+ }
+
+
+ return SUCCESS;
+ }
+}
+
+
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/GetOrganisationUnitAction.java'
--- local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/GetOrganisationUnitAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/GetOrganisationUnitAction.java 2013-10-18 05:57:53 +0000
@@ -0,0 +1,88 @@
+package org.hisp.dhis.dataentry.action;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hisp.dhis.coldchain.equipment.EquipmentAttributeValue;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+
+import com.opensymphony.xwork2.Action;
+
+public class GetOrganisationUnitAction implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private OrganisationUnitService organisationUnitService;
+
+ public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+ {
+ this.organisationUnitService = organisationUnitService;
+ }
+
+ private OrganisationUnitGroupService organisationUnitGroupService;
+
+ public void setOrganisationUnitGroupService( OrganisationUnitGroupService organisationUnitGroupService )
+ {
+ this.organisationUnitGroupService = organisationUnitGroupService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input/output
+ // -------------------------------------------------------------------------
+ private String message;
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ private Integer orgunitId;
+
+ public void setOrgunitId( Integer orgunitId )
+ {
+ this.orgunitId = orgunitId;
+ }
+
+ public Integer getOrgunitId()
+ {
+ return orgunitId;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute() throws Exception
+ {
+ OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( orgunitId );
+
+ List<OrganisationUnitGroup> ouGroups = new ArrayList<OrganisationUnitGroup>( organisationUnitGroupService.getOrganisationUnitGroupByName( EquipmentAttributeValue.HEALTHFACILITY ) );
+
+ OrganisationUnitGroup ouGroup = ouGroups.get( 0 );
+
+ if ( !ouGroup.getMembers().contains( organisationUnit ) )
+ {
+ message = organisationUnit.getName();
+
+ //System.out.println( message + "--------" + " Not in Group");
+
+ return INPUT;
+ }
+ else
+ {
+ message = organisationUnit.getName();
+
+ //System.out.println( message + "--------" + " In Side Group");
+
+ return SUCCESS;
+
+ }
+
+ }
+
+}
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadDataEntryFormAction.java'
--- local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadDataEntryFormAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadDataEntryFormAction.java 2013-10-18 05:57:53 +0000
@@ -0,0 +1,158 @@
+package org.hisp.dhis.dataentry.action;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.hisp.dhis.coldchain.equipment.EquipmentDataValue;
+import org.hisp.dhis.coldchain.equipment.EquipmentDataValueService;
+import org.hisp.dhis.coldchain.equipment.Equipment;
+import org.hisp.dhis.coldchain.equipment.EquipmentService;
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.dataset.Section;
+import org.hisp.dhis.dataset.comparator.SectionOrderComparator;
+import org.hisp.dhis.period.Period;
+import org.hisp.dhis.period.PeriodType;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Mithilesh Kumar Thakur
+ */
+
+public class LoadDataEntryFormAction implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private EquipmentService equipmentService;
+
+ public void setEquipmentService( EquipmentService equipmentService )
+ {
+ this.equipmentService = equipmentService;
+ }
+
+ private DataSetService dataSetService;
+
+ public void setDataSetService( DataSetService dataSetService )
+ {
+ this.dataSetService = dataSetService;
+ }
+
+ private EquipmentDataValueService equipmentDataValueService;
+
+ public void setEquipmentDataValueService( EquipmentDataValueService equipmentDataValueService )
+ {
+ this.equipmentDataValueService = equipmentDataValueService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Comparator
+ // -------------------------------------------------------------------------
+
+ private Comparator<DataElement> dataElementComparator;
+
+ public void setDataElementComparator( Comparator<DataElement> dataElementComparator )
+ {
+ this.dataElementComparator = dataElementComparator;
+ }
+
+
+ // -------------------------------------------------------------------------
+ // Input/Output
+ // -------------------------------------------------------------------------
+
+ private int dataSetId;
+
+ public void setDataSetId( int dataSetId )
+ {
+ this.dataSetId = dataSetId;
+ }
+
+ private int equipmentId;
+
+ public void setEquipmentId( int equipmentId )
+ {
+ this.equipmentId = equipmentId;
+ }
+
+ private String selectedPeriodId;
+
+ public void setSelectedPeriodId( String selectedPeriodId )
+ {
+ this.selectedPeriodId = selectedPeriodId;
+ }
+
+ private List<DataElement> dataElements = new ArrayList<DataElement>();
+
+ public List<DataElement> getDataElements()
+ {
+ return dataElements;
+ }
+
+ private Map<Integer, String> equipmentDataValueMap;
+
+ public Map<Integer, String> getEquipmentDataValueMap()
+ {
+ return equipmentDataValueMap;
+ }
+
+ private List<Section> sections;
+
+ public List<Section> getSections()
+ {
+ return sections;
+ }
+
+ private DataSet dataSet;
+
+ public DataSet getDataSet()
+ {
+ return dataSet;
+ }
+
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute() throws Exception
+ {
+ Equipment equipment = equipmentService.getEquipment( equipmentId );
+
+ //Period period = PeriodType.createPeriodExternalId( selectedPeriodId );
+ Period period = PeriodType.getPeriodFromIsoString( selectedPeriodId );
+
+ dataSet = dataSetService.getDataSet( dataSetId );
+
+ dataElements = new ArrayList<DataElement>( dataSet.getDataElements() );
+
+ Collections.sort( dataElements, dataElementComparator );
+
+ List<EquipmentDataValue> equipmentDataValues = new ArrayList<EquipmentDataValue>( equipmentDataValueService.getEquipmentDataValues( equipment, period, dataElements ) );
+
+ if ( equipmentDataValues != null && equipmentDataValues.size() > 0 )
+ {
+
+ equipmentDataValueMap = new HashMap<Integer, String>();
+
+ for( EquipmentDataValue equipmentDataValue : equipmentDataValues )
+ {
+ equipmentDataValueMap.put( equipmentDataValue.getDataElement().getId(), equipmentDataValue.getValue() );
+ }
+ }
+
+ sections = new ArrayList<Section>( dataSet.getSections() );
+
+ Collections.sort( sections, new SectionOrderComparator() );
+
+ return SUCCESS;
+ }
+
+}
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadNextPrePeriodsAction.java'
--- local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadNextPrePeriodsAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadNextPrePeriodsAction.java 2013-10-18 05:57:53 +0000
@@ -0,0 +1,121 @@
+package org.hisp.dhis.dataentry.action;
+
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.List;
+
+import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.i18n.I18nFormat;
+import org.hisp.dhis.period.CalendarPeriodType;
+import org.hisp.dhis.period.Period;
+import org.hisp.dhis.period.PeriodType;
+import org.hisp.dhis.system.filter.PastAndCurrentPeriodFilter;
+import org.hisp.dhis.system.util.FilterUtils;
+import org.hisp.dhis.util.SessionUtils;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Mithilesh Kumar Thakur
+ */
+
+public class LoadNextPrePeriodsAction implements Action
+{
+
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private DataSetService dataSetService;
+
+ public void setDataSetService( DataSetService dataSetService )
+ {
+ this.dataSetService = dataSetService;
+ }
+
+ private I18nFormat format;
+
+ public void setFormat( I18nFormat format )
+ {
+ this.format = format;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input
+ // -------------------------------------------------------------------------
+
+ private int dataSetId;
+
+ public void setDataSetId( int dataSetId )
+ {
+ this.dataSetId = dataSetId;
+ }
+
+ private int year;
+
+ public void setYear( int year )
+ {
+ this.year = year;
+ }
+
+ // -------------------------------------------------------------------------
+ // Output
+ // -------------------------------------------------------------------------
+
+ private List<Period> periods;
+
+ public List<Period> getPeriods()
+ {
+ return periods;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute() throws Exception
+ {
+
+ DataSet dataset = dataSetService.getDataSet( dataSetId );
+
+ String periodType = dataset.getPeriodType().getName();
+
+
+ //periodType = periodType != null && !periodType.isEmpty() ? periodType : MonthlyPeriodType.NAME;
+
+ CalendarPeriodType _periodType = (CalendarPeriodType) CalendarPeriodType.getPeriodTypeByName( periodType );
+
+ int thisYear = Calendar.getInstance().get( Calendar.YEAR );
+
+ int currentYear = (Integer) SessionUtils.getSessionVar( SessionUtils.KEY_CURRENT_YEAR, thisYear );
+
+ Calendar cal = PeriodType.createCalendarInstance();
+
+ // Cannot go to next year if current year equals this year
+
+ if ( !( currentYear == thisYear && year > 0 ) )
+ {
+ cal.set( Calendar.YEAR, currentYear );
+ cal.add( Calendar.YEAR, year );
+
+ SessionUtils.setSessionVar( SessionUtils.KEY_CURRENT_YEAR, cal.get( Calendar.YEAR ) );
+ }
+
+ periods = _periodType.generatePeriods( cal.getTime() );
+
+ FilterUtils.filter( periods, new PastAndCurrentPeriodFilter() );
+
+ Collections.reverse( periods );
+
+
+ for ( Period period : periods )
+ {
+ period.setName( format.formatPeriod( period ) );
+ }
+
+ return SUCCESS;
+ }
+
+
+}
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadPeriodsAction.java'
--- local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadPeriodsAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadPeriodsAction.java 2013-10-18 05:57:53 +0000
@@ -0,0 +1,100 @@
+package org.hisp.dhis.dataentry.action;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.i18n.I18nFormat;
+import org.hisp.dhis.period.CalendarPeriodType;
+import org.hisp.dhis.period.Period;
+import org.hisp.dhis.period.PeriodType;
+import org.hisp.dhis.system.filter.PastAndCurrentPeriodFilter;
+import org.hisp.dhis.system.util.FilterUtils;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Mithilesh Kumar Thakur
+ */
+
+public class LoadPeriodsAction implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private DataSetService dataSetService;
+
+ public void setDataSetService( DataSetService dataSetService )
+ {
+ this.dataSetService = dataSetService;
+ }
+
+ private I18nFormat format;
+
+ public void setFormat( I18nFormat format )
+ {
+ this.format = format;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input
+ // -------------------------------------------------------------------------
+
+ private int dataSetId;
+
+ public void setDataSetId( int dataSetId )
+ {
+ this.dataSetId = dataSetId;
+ }
+
+ // -------------------------------------------------------------------------
+ // Output
+ // -------------------------------------------------------------------------
+
+
+ private List<Period> periods = new ArrayList<Period>();
+
+ public Collection<Period> getPeriods()
+ {
+ return periods;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute() throws Exception
+ {
+
+ DataSet dataset = dataSetService.getDataSet( dataSetId );
+
+ String periodType = dataset.getPeriodType().getName();
+
+ CalendarPeriodType _periodType = (CalendarPeriodType) CalendarPeriodType.getPeriodTypeByName( periodType );
+
+ Calendar cal = PeriodType.createCalendarInstance();
+
+ periods = _periodType.generatePeriods( cal.getTime() );
+
+ //periods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( periodType ) );
+
+ FilterUtils.filter( periods, new PastAndCurrentPeriodFilter() );
+
+ Collections.reverse( periods );
+ //Collections.sort( periods );
+ for ( Period period : periods )
+ {
+ //System.out.println("ISO Date : " + period.getIsoDate() );
+
+ period.setName( format.formatPeriod( period ) );
+ }
+
+ return SUCCESS;
+ }
+}
+
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/PageInitAction.java'
--- local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/PageInitAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/PageInitAction.java 2013-10-18 05:57:53 +0000
@@ -0,0 +1,98 @@
+package org.hisp.dhis.dataentry.action;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hisp.dhis.coldchain.equipment.EquipmentType;
+import org.hisp.dhis.coldchain.equipment.EquipmentTypeService;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Mithilesh Kumar Thakur
+ */
+public class PageInitAction implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private OrganisationUnitSelectionManager selectionManager;
+
+ public void setSelectionManager( OrganisationUnitSelectionManager selectionManager )
+ {
+ this.selectionManager = selectionManager;
+ }
+
+ private EquipmentTypeService equipmentTypeService;
+
+ public void setEquipmentTypeService( EquipmentTypeService equipmentTypeService )
+ {
+ this.equipmentTypeService = equipmentTypeService;
+ }
+
+ private OrganisationUnitService organisationUnitService;
+
+ public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+ {
+ this.organisationUnitService = organisationUnitService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input/output
+ // -------------------------------------------------------------------------
+
+ private OrganisationUnit organisationUnit;
+
+ public OrganisationUnit getOrganisationUnit()
+ {
+ return organisationUnit;
+ }
+
+ private Integer orgUnitId;
+
+ public void setOrgUnitId( Integer orgUnitId )
+ {
+ this.orgUnitId = orgUnitId;
+ }
+
+ private List<EquipmentType> equipmentTypes;
+
+ public List<EquipmentType> getEquipmentTypes()
+ {
+ return equipmentTypes;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute() throws Exception
+ {
+ //selectionManager.clearSelectedOrganisationUnits();
+
+ organisationUnit = selectionManager.getSelectedOrganisationUnit();
+
+ if( organisationUnit == null )
+ {
+ //System.out.println("Organisationunit is null");
+ }
+ else
+ {
+ //System.out.println("Organisationunit is not null ---" + organisationUnit.getId() );
+ }
+
+ if( organisationUnit == null && orgUnitId != null )
+ {
+ organisationUnit = organisationUnitService.getOrganisationUnit( orgUnitId );
+ }
+
+ equipmentTypes = new ArrayList<EquipmentType>( equipmentTypeService.getAllEquipmentTypes() );
+
+ return SUCCESS;
+ }
+}
+
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/SaveEquipmentDataValueAction.java'
--- local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/SaveEquipmentDataValueAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/SaveEquipmentDataValueAction.java 2013-10-18 05:57:53 +0000
@@ -0,0 +1,223 @@
+package org.hisp.dhis.dataentry.action;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.hisp.dhis.coldchain.equipment.EquipmentDataValue;
+import org.hisp.dhis.coldchain.equipment.EquipmentDataValueService;
+import org.hisp.dhis.coldchain.equipment.Equipment;
+import org.hisp.dhis.coldchain.equipment.EquipmentService;
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.period.Period;
+import org.hisp.dhis.period.PeriodType;
+import org.hisp.dhis.user.CurrentUserService;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Mithilesh Kumar Thakur
+ */
+
+public class SaveEquipmentDataValueAction implements Action
+{
+ private static final Log log = LogFactory.getLog( SaveEquipmentDataValueAction.class );
+
+ public static final String PREFIX_DATAELEMENT = "dataelement";
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private EquipmentService equipmentService;
+
+ public void setEquipmentService( EquipmentService equipmentService )
+ {
+ this.equipmentService = equipmentService;
+ }
+
+ private DataSetService dataSetService;
+
+ public void setDataSetService( DataSetService dataSetService )
+ {
+ this.dataSetService = dataSetService;
+ }
+
+ private CurrentUserService currentUserService;
+
+ public void setCurrentUserService( CurrentUserService currentUserService )
+ {
+ this.currentUserService = currentUserService;
+ }
+
+ private EquipmentDataValueService equipmentDataValueService;
+
+ public void setEquipmentDataValueService( EquipmentDataValueService equipmentDataValueService )
+ {
+ this.equipmentDataValueService = equipmentDataValueService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input
+ // -------------------------------------------------------------------------
+
+
+ private int dataSetId;
+
+ public void setDataSetId( int dataSetId )
+ {
+ this.dataSetId = dataSetId;
+ }
+
+ private int equipmentId;
+
+ public void setEquipmentId( int equipmentId )
+ {
+ this.equipmentId = equipmentId;
+ }
+
+ private String selectedPeriodId;
+
+ public void setSelectedPeriodId( String selectedPeriodId )
+ {
+ this.selectedPeriodId = selectedPeriodId;
+ }
+
+
+ // -------------------------------------------------------------------------
+ // Output
+ // -------------------------------------------------------------------------
+
+ private int statusCode = 0;
+
+ public int getStatusCode()
+ {
+ return statusCode;
+ }
+
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute() throws Exception
+ {
+ //System.out.println( selectedPeriodId + " ====== :" + equipmentId + " -- " + dataSetId );
+
+ //Period period = PeriodType.createPeriodExternalId( selectedPeriodId );
+ Period period = PeriodType.getPeriodFromIsoString( selectedPeriodId );
+
+ if ( period == null )
+ {
+ return logError( "Illegal period identifier: " + selectedPeriodId );
+ }
+
+ Equipment equipment = equipmentService.getEquipment( equipmentId );
+
+ OrganisationUnit organisationUnit = equipment.getOrganisationUnit();
+
+ DataSet dataSet = dataSetService.getDataSet( dataSetId );
+
+
+ if ( dataSetService.isLocked( dataSet, period, organisationUnit, null ) )
+ {
+ return logError( "Entry locked for combination: " + dataSet + ", " + period + ", " + organisationUnit, 2 );
+ }
+
+ List<DataElement> dataElements = new ArrayList<DataElement>( dataSet.getDataElements() );
+
+ String storedBy = currentUserService.getCurrentUsername();
+
+ Date timestamp = new Date();
+
+ if ( storedBy == null )
+ {
+ storedBy = "[unknown]";
+ }
+
+
+ // ---------------------------------------------------------------------
+ // Add / Update data
+ // ---------------------------------------------------------------------
+ HttpServletRequest request = ServletActionContext.getRequest();
+
+ //String value = null;
+
+ if ( dataElements != null && dataElements.size() > 0 )
+ {
+ for ( DataElement dataElement : dataElements )
+ {
+ EquipmentDataValue equipmentDataValue = equipmentDataValueService.getEquipmentDataValue( equipment, period, dataElement );
+
+ String value = request.getParameter( PREFIX_DATAELEMENT + dataElement.getId() );
+
+ if ( value != null && value.trim().length() == 0 )
+ {
+ value = null;
+ }
+
+ if ( value != null )
+ {
+ value = value.trim();
+ }
+
+ if ( equipmentDataValue == null )
+ {
+ if ( value != null )
+ {
+ equipmentDataValue = new EquipmentDataValue();
+
+ equipmentDataValue.setValue( value );
+ equipmentDataValue.setDataElement( dataElement );
+ equipmentDataValue.setEquipment( equipment );
+ equipmentDataValue.setPeriod( period );
+ equipmentDataValue.setStoredBy( storedBy );
+ equipmentDataValue.setTimestamp( timestamp );
+ equipmentDataValueService.addEquipmentDataValue( equipmentDataValue );
+ }
+ }
+ else
+ {
+ //System.out.println( " dataElement :" + dataElement + "-- value : " + value );
+ equipmentDataValue.setDataElement( dataElement );
+ equipmentDataValue.setValue( value );
+ equipmentDataValue.setEquipment( equipment );
+ equipmentDataValue.setPeriod( period );
+ equipmentDataValue.setStoredBy( storedBy );
+ equipmentDataValue.setTimestamp( timestamp );
+ equipmentDataValueService.updateEquipmentDataValue( equipmentDataValue );
+ }
+ }
+
+ }
+
+ return SUCCESS;
+ }
+
+ // -------------------------------------------------------------------------
+ // Supportive methods
+ // -------------------------------------------------------------------------
+
+ private String logError( String message )
+ {
+ return logError( message, 1 );
+ }
+
+ private String logError( String message, int statusCode )
+ {
+ log.info( message );
+
+ this.statusCode = statusCode;
+
+ return SUCCESS;
+ }
+
+
+}
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/resources'
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/resources/META-INF'
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/resources/META-INF/dhis'
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-dataentry-ccem/src/main/resources/META-INF/dhis/beans.xml 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/resources/META-INF/dhis/beans.xml 2013-10-18 05:57:53 +0000
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
+
+<!-- Actions -->
+ <bean id="org.hisp.dhis.dataentry.action.PageInitAction" class="org.hisp.dhis.dataentry.action.PageInitAction">
+ <property name="selectionManager" ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+ <property name="equipmentTypeService" ref="org.hisp.dhis.coldchain.equipment.EquipmentTypeService" />
+ <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ </bean>
+
+ <!-- Get OrganisationUnit Unit name -->
+ <bean id="org.hisp.dhis.dataentry.action.GetOrganisationUnitAction" class="org.hisp.dhis.dataentry.action.GetOrganisationUnitAction" scope="prototype">
+ <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ <property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
+ </bean>
+
+ <!-- Get Equipment and DataSet name -->
+ <bean id="org.hisp.dhis.dataentry.action.GetEquipmentAndDataSetListAction" class="org.hisp.dhis.dataentry.action.GetEquipmentAndDataSetListAction" scope="prototype">
+ <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ <property name="equipmentTypeService" ref="org.hisp.dhis.coldchain.equipment.EquipmentTypeService" />
+ <property name="equipmentService" ref="org.hisp.dhis.coldchain.equipment.EquipmentService" />
+ </bean>
+
+ <!-- Get Periods -->
+ <bean id="org.hisp.dhis.dataentry.action.LoadPeriodsAction" class="org.hisp.dhis.dataentry.action.LoadPeriodsAction" scope="prototype">
+ <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService"/>
+ </bean>
+
+ <!-- Get Next and Previous Periods -->
+ <bean id="org.hisp.dhis.dataentry.action.LoadNextPrePeriodsAction" class="org.hisp.dhis.dataentry.action.LoadNextPrePeriodsAction" scope="prototype">
+ <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService"/>
+ </bean>
+
+
+ <!-- Load DataEntry Form -->
+ <bean id="org.hisp.dhis.dataentry.action.LoadDataEntryFormAction" class="org.hisp.dhis.dataentry.action.LoadDataEntryFormAction" scope="prototype">
+ <property name="equipmentService" ref="org.hisp.dhis.coldchain.equipment.EquipmentService" />
+ <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService"/>
+ <property name="equipmentDataValueService" ref="org.hisp.dhis.coldchain.equipment.EquipmentDataValueService"/>
+ </bean>
+
+ <!-- Save DataEntry Form -->
+ <bean id="org.hisp.dhis.dataentry.action.SaveEquipmentDataValueAction" class="org.hisp.dhis.dataentry.action.SaveEquipmentDataValueAction" scope="prototype">
+ <property name="equipmentService" ref="org.hisp.dhis.coldchain.equipment.EquipmentService" />
+ <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService"/>
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService"/>
+ <property name="equipmentDataValueService" ref="org.hisp.dhis.coldchain.equipment.EquipmentDataValueService"/>
+ </bean>
+
+
+
+
+
+</beans>
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/resources/org'
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/resources/org/hisp'
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/resources/org/hisp/dhis'
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/resources/org/hisp/dhis/dataentry'
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/resources/org/hisp/dhis/dataentry/i18n_module.properties'
--- local/in/dhis-web-dataentry-ccem/src/main/resources/org/hisp/dhis/dataentry/i18n_module.properties 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/resources/org/hisp/dhis/dataentry/i18n_module.properties 2013-10-18 05:57:53 +0000
@@ -0,0 +1,16 @@
+ccem_dataentry = CCEM Data Entry
+organisation_unit = Organisation Unit
+select_equipmenttype = Select Equipmenttype
+equipment_type = Equipmenttype
+equipment = Equipment
+dataset = Dataset
+select_equipmenttype = Please select equipmenttype
+select_equipment = Select Equipment
+select_dataSet = Select Dataset
+prev_year = Prev year
+next_year = Next year
+entry = Entry
+earlier_periods = Earlier periods
+later_periods = Later periods
+select = Select
+period = Period
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/resources/struts.xml'
--- local/in/dhis-web-dataentry-ccem/src/main/resources/struts.xml 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/resources/struts.xml 2013-10-18 05:57:53 +0000
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+"http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
+ <include file="dhis-web-commons.xml"/>
+
+ <package name="dhis-web-dataentry-ccem" extends="dhis-web-commons" namespace="/dhis-web-dataentry-ccem">
+
+ <action name="index" class="org.hisp.dhis.dataentry.action.PageInitAction">
+ <interceptor-ref name="organisationUnitTreeStack" />
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-dataentry-ccem/dataEntrySelection.vm</param>
+ <param name="menu">/dhis-web-dataentry-ccem/menu.vm</param>
+ <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/ccemDataEntry.js</param>
+ <param name="stylesheets">style/dhis-web-dataentry-ccem.css</param>
+ <!--<param name="manifest">../dhis-web-commons/cacheManifest.action</param>-->
+ </action>
+
+ <!-- Get OrganisationUnit Unit name -->
+ <action name="getOrganisationUnit" class="org.hisp.dhis.dataentry.action.GetOrganisationUnitAction">
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="input" type="velocity-json">/dhis-web-commons/ajax/jsonResponseInput.vm</result>
+ </action>
+
+
+ <!-- Get Equipment and DataSet name -->
+ <action name="getEquipmentAndDataSetList" class="org.hisp.dhis.dataentry.action.GetEquipmentAndDataSetListAction">
+ <result name="success" type="velocity-xml">/dhis-web-dataentry-ccem/responseEquipmentAndDataSets.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
+ <!-- Get Periods -->
+ <action name="loadPeriods" class="org.hisp.dhis.dataentry.action.LoadPeriodsAction">
+ <result name="success" type="velocity-json">/dhis-web-dataentry-ccem/jsonPeriods.vm</result>
+ </action>
+
+ <!-- Get Next and Previous Periods -->
+ <action name="getAvailableNextPrePeriods" class="org.hisp.dhis.dataentry.action.LoadNextPrePeriodsAction">
+ <result name="success" type="velocity-json">/dhis-web-dataentry-ccem/jsonPeriods.vm</result>
+ </action>
+
+
+ <!-- Load DataEntry Form -->
+ <action name="loadDataEntryForm" class="org.hisp.dhis.dataentry.action.LoadDataEntryFormAction">
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-dataentry-ccem/loadDataEntryForm.vm</param>
+ </action>
+
+ <!-- Save DataEntry Form -->
+ <action name="saveDataEntryForm" class="org.hisp.dhis.dataentry.action.SaveEquipmentDataValueAction">
+ <!--<result name="success" type="redirect">enquipmentSelect.action</result>-->
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ </action>
+
+ </package>
+
+
+
+
+</struts>
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/webapp'
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/webapp/WEB-INF'
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/webapp/WEB-INF/web.xml'
--- local/in/dhis-web-dataentry-ccem/src/main/webapp/WEB-INF/web.xml 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/webapp/WEB-INF/web.xml 2013-10-18 05:57:53 +0000
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd";>
+<web-app>
+ <display-name>DHIS Linelisting</display-name>
+
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>classpath*:/META-INF/dhis/beans.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>automaticAccessType</param-name>
+ <param-value>ghostAdmin</param-value>
+ </context-param>
+
+ <filter>
+ <filter-name>RedirectFilter</filter-name>
+ <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class>
+ <init-param>
+ <param-name>redirectPath</param-name>
+ <param-value>dhis-web-dataentry-ccem/index.action</param-value>
+ </init-param>
+ </filter>
+ <filter>
+ <filter-name>OpenSessionInViewFilter</filter-name>
+ <filter-class>org.springframework.orm.hibernate4.support.OpenSessionInViewFilter</filter-class>
+ </filter>
+ <filter>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+ </filter>
+ <filter>
+ <filter-name>Struts</filter-name>
+ <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>RedirectFilter</filter-name>
+ <url-pattern>/</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>OpenSessionInViewFilter</filter-name>
+ <url-pattern>*.action</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>Struts</filter-name>
+ <url-pattern>*.action</url-pattern>
+ </filter-mapping>
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
+ <listener>
+ <listener-class>org.hisp.dhis.system.startup.StartupListener</listener-class>
+ </listener>
+
+</web-app>
\ No newline at end of file
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem'
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/dataEntrySelection.vm'
--- local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/dataEntrySelection.vm 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/dataEntrySelection.vm 2013-10-18 05:57:53 +0000
@@ -0,0 +1,106 @@
+<script>
+
+ jQuery(document).ready( function(){
+ currentDiv = 'ccemDataEntryForm';
+ isSubmit = true;
+ jQuery("#ccemDataEntryForm").validate({
+ meta:"validate"
+ ,errorElement:"span"
+ ,submitHandler: function(form)
+ {
+ if( isSubmit )
+ {
+ saveEquipmentDataEntryForm();
+ }
+ }
+ });
+ });
+
+</script>
+
+<h3>$i18n.getString( "ccem_dataentry" )</h3>
+
+<form id="ccemDataEntryForm" name="ccemDataEntryForm" method="post" >
+<div>
+ <input type="hidden" id='selectedOrgunitID' name = 'selectedOrgunitID' value="$!organisationUnit.id" />
+ <input type="hidden" id='selectedOrgunitName' name = 'selectedOrgunitName' value="$!organisationUnit.name" />
+
+</div>
+
+<div class="inputCriteria" style="width:500px;height:130px;">
+<table>
+ <tr>
+ <td><label for="orgUnitName">$i18n.getString( "organisation_unit" )</label></td>
+ <td><input type="text" id="orgUnitName" name = "orgUnitName" readonly="readonly" value="$!organisationUnit.name" style="width:352px"></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "equipment_type" )</label></td>
+ <td>
+ <select id="equipmentTypeId" name = "equipmentTypeId" style="width:354px" disabled="disabled" onchange="loadEquipmentAndDataSet()">
+ <option value="-1">$i18n.getString( "select_equipmenttype" )</option>
+ #foreach( $equipmentType in $equipmentTypes )
+ <option value="$equipmentType.id">$equipmentType.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "equipment" )</label></td>
+ <td>
+ <select id="equipmentId" name = "equipmentId" style="width:354px" disabled="disabled" onchange="equipmentChange();">
+ <option value="-1">$i18n.getString( "select_equipment" )</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "dataset" )</label></td>
+ <td>
+ <select id="dataSetId" name = "dataSetId" style="width:354px" disabled="disabled" onchange="loadPeriods();">
+ <option value="-1">$i18n.getString( "select_dataSet" )</option>
+ </select>
+ </td>
+ </tr>
+
+
+ <tr>
+ <td><label for="selectedPeriodId">$i18n.getString( "period" )</label></td>
+ <td><select id="selectedPeriodId" name="selectedPeriodId" style="width:200px" disabled="disabled" onchange="loadDataEntryForm()">
+ <option value="-1">[$i18n.getString( "select" )]</option>
+ #foreach( $period in $periods )
+ <option value="$period.iso">$encoder.htmlEncode( $period.name )</option>
+ #end
+ </select>
+ <input type="button" id="prevButton" disabled="disabled" style="width:75px" value="$i18n.getString( 'prev_year' )" title="$i18n.getString('earlier_periods')" onclick="getAvailablePeriodsTemp( 'selectedPeriodId', 'selectedPeriodId', '-1' )" >
+ <input type="button" id="nextButton" disabled="disabled" style="width:75px" value="$i18n.getString( 'next_year' )" title="$i18n.getString('later_periods')" onclick="getAvailablePeriodsTemp( 'selectedPeriodId', 'selectedPeriodId', '1' )" >
+ </td>
+ </tr>
+
+</table>
+</div>
+
+
+#parse( "/dhis-web-commons/loader/loader.vm" )
+<div id='dataEntryFormDiv'></div> <!-- DataEntry Form -->
+
+<p>
+ <input type="button" value="$i18n.getString( 'Cancel' )" style="width:100px" onclick="window.location.href='index.action'"/>
+ <input type="submit" id="saveButton" name="saveButton" value="$i18n.getString( 'save' )" disabled="disabled" style="width:100px"/>
+</p>
+
+
+</form>
+
+<script type="text/javascript">
+
+var i18n_select_equipmenttype = '$encoder.jsEscape( $i18n.getString( "select_equipmenttype" ) , "'")';
+var i18n_select_equipment = '$encoder.jsEscape( $i18n.getString( "select_equipment" ) , "'")';
+var i18n_select_dataset = '$encoder.jsEscape( $i18n.getString( "select_dataSet" ) , "'")';
+
+
+jQuery( document ).ready( function()
+{
+});
+</script>
\ No newline at end of file
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/images'
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/images/ajax-loader.gif'
Binary files local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/images/ajax-loader.gif 1970-01-01 00:00:00 +0000 and local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/images/ajax-loader.gif 2013-10-18 05:57:53 +0000 differ
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/javascript'
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/javascript/ccemDataEntry.js'
--- local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/javascript/ccemDataEntry.js 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/javascript/ccemDataEntry.js 2013-10-18 05:57:53 +0000
@@ -0,0 +1,359 @@
+
+
+function orgUnitHasBeenSelected( orgUnitIds )
+{
+ $( '#dataEntryFormDiv' ).html( '' );
+
+ document.getElementById('selectedOrgunitID').value = orgUnitIds;
+
+ //alert( orgUnitIds );
+
+ if( orgUnitIds != null && orgUnitIds != "" )
+ {
+ $.getJSON( 'getOrganisationUnit.action', {orgunitId:orgUnitIds[0]}
+ , function( json )
+ {
+ var type = json.response;
+ setFieldValue('orgUnitName', json.message );
+ setFieldValue('selectedOrgunitName', json.message );
+
+ if( type == 'success' )
+ {
+ enable('equipmentTypeId');
+ setFieldValue('orgUnitName', json.message );
+ setFieldValue('selectedOrgunitName', json.message );
+ }
+ else if( type == 'input' )
+ {
+ disable('equipmentTypeId');
+ disable('equipmentId');
+ disable('dataSetId');
+ disable('selectedPeriodId');
+ disable('prevButton');
+ disable('nextButton');
+
+ setFieldValue('orgUnitName', json.message );
+ setFieldValue('selectedOrgunitName', json.message );
+ }
+ } );
+ }
+}
+
+selection.setListenerFunction( orgUnitHasBeenSelected );
+
+
+
+// Load Equipment and DataSet List
+function loadEquipmentAndDataSet()
+{
+ $( '#dataEntryFormDiv' ).html( '' );
+
+ var orgUnitId = $( '#selectedOrgunitID' ).val();
+ var equipmentTypeId = $( '#equipmentTypeId' ).val();
+
+ if ( equipmentTypeId == "-1" )
+ {
+ showWarningMessage( i18n_select_equipmenttype );
+
+ document.getElementById( "equipmentId" ).disabled = true;
+ document.getElementById( "dataSetId" ).disabled = true;
+
+ document.getElementById( "selectedPeriodId" ).disabled = true;
+ document.getElementById( "prevButton" ).disabled = true;
+ document.getElementById( "nextButton" ).disabled = true;
+
+ return false;
+ }
+
+ else
+ {
+ enable('equipmentId');
+ enable('dataSetId');
+
+ $.post("getEquipmentAndDataSetList.action",
+ {
+ equipmentTypeId:equipmentTypeId,
+ orgUnitId:orgUnitId
+ },
+ function(data)
+ {
+
+ populateEquipmentDataSetList( data );
+ //loadDataSets();
+ },'xml');
+ }
+
+}
+
+
+function populateEquipmentDataSetList( data )
+{
+ var equipmentId = document.getElementById("equipmentId");
+ clearList( equipmentId );
+
+ var dataSetId = document.getElementById("dataSetId");
+ clearList( dataSetId );
+
+ var equipmentList = data.getElementsByTagName("equipment");
+
+ equipmentId.options[0] = new Option( i18n_select_equipment, "-1" , false, false);
+
+ for ( var i = 0; i < equipmentList.length; i++ )
+ {
+ var id = equipmentList[ i ].getElementsByTagName("id")[0].firstChild.nodeValue;
+ var name = equipmentList[ i ].getElementsByTagName("name")[0].firstChild.nodeValue;
+
+ var option = document.createElement("option");
+ option.value = id;
+ option.text = name;
+ option.title = name;
+ equipmentId.add(option, null);
+ }
+
+ var dataSetList = data.getElementsByTagName("dataSet");
+
+ dataSetId.options[0] = new Option( i18n_select_dataset, "-1" , false, false);
+
+ for ( var i = 0; i < dataSetList.length; i++ )
+ {
+ var id = dataSetList[ i ].getElementsByTagName("id")[0].firstChild.nodeValue;
+ var name = dataSetList[ i ].getElementsByTagName("name")[0].firstChild.nodeValue;
+
+ var option = document.createElement("option");
+ option.value = id;
+ option.text = name;
+ option.title = name;
+ dataSetId.add(option, null);
+ }
+
+}
+
+
+
+function equipmentChange()
+{
+ $( '#dataEntryFormDiv' ).html( '' );
+
+ var orgUnitId = $( '#selectedOrgunitID' ).val();
+ var equipmentTypeId = $( '#equipmentTypeId' ).val();
+
+ var equipmentId = $( '#equipmentId' ).val();
+
+ var dataSetId = $( '#dataSetId' ).val();
+
+ if ( equipmentId == "-1" )
+ {
+ $( '#dataEntryFormDiv' ).html('');
+ showWarningMessage( i18n_select_equipment );
+
+ document.getElementById( "selectedPeriodId" ).disabled = true;
+ document.getElementById( "prevButton" ).disabled = true;
+ document.getElementById( "nextButton" ).disabled = true;
+ return false;
+ }
+
+ else if ( dataSetId == "-1" )
+ {
+ $( '#dataEntryFormDiv' ).html('');
+
+ showWarningMessage( i18n_select_dataset );
+
+ document.getElementById( "selectedPeriodId" ).disabled = true;
+ document.getElementById( "prevButton" ).disabled = true;
+ document.getElementById( "nextButton" ).disabled = true;
+ return false;
+ }
+
+ else
+ {
+ loadPeriods();
+ //loadDataEntryForm();
+ }
+
+}
+
+
+function loadPeriods()
+{
+ $( '#dataEntryFormDiv' ).html( '' );
+
+ //enable('selectedPeriodId');
+
+ var orgUnitId = $( '#selectedOrgunitID' ).val();
+ var equipmentTypeId = $( '#equipmentTypeId' ).val();
+
+ var equipmentId = $( '#equipmentId' ).val();
+
+ var dataSetId = $( '#dataSetId' ).val();
+
+ if ( equipmentId == "-1" )
+ {
+
+ showWarningMessage( i18n_select_equipment );
+
+ document.getElementById( "selectedPeriodId" ).disabled = true;
+ document.getElementById( "prevButton" ).disabled = true;
+ document.getElementById( "nextButton" ).disabled = true;
+ return false;
+ }
+
+ else if ( dataSetId == "-1" )
+ {
+ showWarningMessage( i18n_select_dataset );
+
+ document.getElementById( "selectedPeriodId" ).disabled = true;
+ document.getElementById( "prevButton" ).disabled = true;
+ document.getElementById( "nextButton" ).disabled = true;
+ return false;
+ }
+
+ else
+ {
+
+ enable('selectedPeriodId');
+
+ enable('prevButton');
+ enable('nextButton');
+
+ var url = 'loadPeriods.action?dataSetId=' + dataSetId;
+
+ var list = document.getElementById( 'selectedPeriodId' );
+
+ clearList( list );
+
+ addOptionToList( list, '-1', '[ Select ]' );
+
+ $.getJSON( url, function( json ) {
+ for ( i in json.periods ) {
+ addOptionToList( list, json.periods[i].isoDate, json.periods[i].name );
+ }
+ } );
+
+ }
+}
+
+
+//next and pre periods
+function getAvailablePeriodsTemp( availablePeriodsId, selectedPeriodsId, year )
+{
+ $( '#dataEntryFormDiv' ).html( '' );
+
+ var dataSetId = $( '#dataSetId' ).val();
+
+ var availableList = document.getElementById( availablePeriodsId );
+ var selectedList = document.getElementById( selectedPeriodsId );
+
+ clearList( selectedList );
+
+ addOptionToList( selectedList, '-1', '[ Select ]' );
+
+ $.getJSON( "getAvailableNextPrePeriods.action", {
+ "dataSetId": dataSetId ,
+ "year": year },
+ function( json ) {
+
+ for ( i in json.periods ) {
+ addOptionToList( selectedList, json.periods[i].isoDate, json.periods[i].name );
+ }
+
+ } );
+}
+
+
+
+
+function loadDataEntryForm()
+{
+ var orgUnitId = $( '#selectedOrgunitID' ).val();
+ var equipmentTypeId = $( '#equipmentTypeId' ).val();
+
+ var equipmentId = $( '#equipmentId' ).val();
+
+ var dataSetId = $( '#dataSetId' ).val();
+
+
+
+ $( '#dataEntryFormDiv' ).html('');
+
+ $( '#saveButton' ).removeAttr( 'disabled' );
+
+
+ var selectedPeriodId = $( '#selectedPeriodId' ).val();
+
+ if ( selectedPeriodId == "-1" && dataSetId == "-1" )
+ {
+ $( '#dataEntryFormDiv' ).html('');
+ document.getElementById( "saveButton" ).disabled = true;
+ return false;
+ }
+
+ else
+ {
+ jQuery('#loaderDiv').show();
+
+ jQuery('#dataEntryFormDiv').load('loadDataEntryForm.action',
+ {
+ dataSetId:dataSetId,
+ selectedPeriodId:selectedPeriodId,
+ equipmentId:equipmentId
+ }, function()
+ {
+ showById('dataEntryFormDiv');
+ jQuery('#loaderDiv').hide();
+ });
+ hideLoader();
+ }
+
+}
+
+
+function saveEquipmentDataEntryForm()
+{
+ $.ajax({
+ type: "POST",
+ url: 'saveDataEntryForm.action',
+ data: getParamsForDiv('ccemDataEntryForm'),
+ success: function( json ) {
+ //loadAllEquipments();
+
+ window.location.href='index.action';
+ }
+ });
+}
+
+
+
+//----------------------------------------------------------------
+//Get Params form Div
+//----------------------------------------------------------------
+
+function getParamsForDiv( equipmentDiv )
+{
+ var params = '';
+
+ jQuery("#" + equipmentDiv + " :input").each(function()
+ {
+ var elementId = $(this).attr('id');
+
+ if( $(this).attr('type') == 'checkbox' )
+ {
+ var checked = jQuery(this).attr('checked') ? true : false;
+ params += elementId + "=" + checked + "&";
+ }
+ else if( $(this).attr('type') != 'button' )
+ {
+ var value = "";
+ if( jQuery(this).val() != '' )
+ {
+ value = htmlEncode(jQuery(this).val());
+ }
+ params += elementId + "="+ value + "&";
+ }
+
+ });
+
+ //alert( params );
+
+ return params;
+}
+
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/jsonPeriods.vm'
--- local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/jsonPeriods.vm 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/jsonPeriods.vm 2013-10-18 05:57:53 +0000
@@ -0,0 +1,13 @@
+#set( $size = $periods.size() )
+{ "periods": [
+#foreach( $period in $periods )
+ {
+ "id": $!{period.id},
+ "startDate": "$!format.formatDate( ${period.startDate} )",
+ "endDate": "$!format.formatDate( ${period.endDate} )",
+ "name": "$!format.formatPeriod( ${period} )",
+ "externalId": "$!{period.externalId}",
+ "isoDate": "$!{period.isoDate}"
+ }#if( $velocityCount < $size ),#end
+#end
+] }
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/loadDataEntryForm.vm'
--- local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/loadDataEntryForm.vm 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/loadDataEntryForm.vm 2013-10-18 05:57:53 +0000
@@ -0,0 +1,128 @@
+## Macro for generating the jQuery validation rules
+#macro( validate $type $require )
+ #if( $type == "NUMBER" || $type == "number" )
+ {validate:{ number:true #if($require), required:true #end }}
+
+ #elseif( $type == "int" )
+ {validate:{ integer:true #if($require), required:true #end }}
+
+ #elseif( $type == "positiveNumber" )
+ {validate:{ positive_integer:true #if($require), required:true #end }}
+
+ #elseif( $type == "negativeNumber" )
+ {validate:{ negative_integer:true #if($require), required:true #end }}
+
+
+ #elseif( $require )
+ {validate:{required:true}}
+ #end
+#end
+
+<!-- DATAELEMENTS WITH SECTIONS-->
+#set( $tabIndex = 1 )
+#if( $sections.size() > 0 )
+ #foreach( $section in $sections )
+ <table class="formSection" width="50%">
+ <tr><td> </td><td> </td></tr>
+ <tr bgcolor="#285C91">
+ <td><font color="#FFFFFF"><strong>$encoder.htmlEncode( $section.name )</strong></font></td>
+ <td><font color="#FFFFFF"><strong>Value</strong></font></td>
+ </tr><br />
+
+ #if ( $section.dataElements.size() > 0 )
+ #set( $mark = false )
+ #foreach($dataElement in $section.dataElements )
+ #set( $equipmentDataValue = "" )
+ #set( $equipmentDataValue = $!equipmentDataValueMap.get( $dataElement.id ) )
+ <tr #alternate($mark)>
+ <!--#set( $dataEntryId = "${dataElement.id}" )-->
+ <td width="75%"><label>$dataElement.getFormNameFallback()</label></td>
+ <td>
+ #if( $dataElement.type == "bool" )
+ <select name="dataelement$dataElement.id" id="dataelement$dataElement.id" tabindex="$tabIndex" width="25%">
+ <option value="">[$i18n.getString( "please_select" )]</option>
+ <option value="Yes" #if( $equipmentDataValue == "Yes" ) selected="selected" #end >$i18n.getString( "yes" )</option>
+ <option value="No" #if( $equipmentDataValue == "No") selected="selected" #end >$i18n.getString( "no" )</option>
+ </select>
+ #elseif( $dataElement.type == "date" )
+ <input type="text" id="dataelement$dataElement.id" name="dataelement$dataElement.id" value="$!equipmentDataValue" tabindex="$tabIndex" width="25%">
+ <script type="text/javascript">
+ datePickerValid( 'dataelement${dataElement.id}' );
+ </script>
+
+ #elseif( $!dataElement.optionSet )
+ <select name="dataelement$dataElement.id" id="dataelement$dataElement.id" tabindex="$tabIndex" width="25%">
+ <option value="">[$i18n.getString( "please_select" )]</option>
+ #foreach ($option in $dataElement.optionSet.options )
+ <option value="$option" #if($equipmentDataValue == $option ) selected="selected" #end>$option</option>
+ #end
+ </select>
+
+ #else
+ <!--<input type="text" id="dataelement$dataElement.id" name="dataelement$dataElement.id" value="$!equipmentDataValue" tabindex="$tabIndex" width="25%">-->
+ <input type="text" id="dataelement$dataElement.id" name="dataelement$dataElement.id" value="$!equipmentDataValue" tabindex="$tabIndex" width="25%" #if($dataElement.type =='number') class="{validate:{number:true}}" #elseif($dataElement.type =='int') class="{validate:{integer:true}}" #elseif($dataElement.type =='positiveNumber') class="{validate:{positive_integer:true}}" #elseif($dataElement.type =='negativeNumber') class="{validate:{negative_integer:true}}" #end/>
+ <!--<input type="text" id="dataelement$dataElement.id" name="dataelement$dataElement.id" value="$!equipmentDataValue" tabindex="$tabIndex" width="25%" #if($dataElement.type =='int') class="{validate:{number:true}}" #end/>-->
+ #end
+ </td>
+ </tr>
+ #set( $tabIndex = $tabIndex + 1 )
+ #set( $mark = !$mark)
+ #end
+ #end
+ </table>
+ <br>
+#end
+
+#else
+<!-- DATAELEMENTS WITH NO SECTIONS-->
+<table class="formSection">
+ <tr><td> </td><td> </td></tr>
+
+ <tr bgcolor="#285C91">
+ <td><font color="#FFFFFF"><strong>$encoder.htmlEncode( $dataSet.getShortName() )</strong></font></td>
+ <td><font color="#FFFFFF"><strong>Value</strong></font></td>
+ </tr>
+<br />
+#set( $tabIndex = 1 )
+#if ( $dataElements.size() > 0)
+ #set( $mark = false )
+ #foreach($dataElement in $dataElements )
+ #set( $equipmentDataValue = "" )
+ #set( $equipmentDataValue = $!equipmentDataValueMap.get( $dataElement.id ) )
+ <tr #alternate($mark)>
+ <!--#set( $dataEntryId = "${dataElement.id}" )-->
+ <td><label>$dataElement.getFormNameFallback()</label></td>
+ <td>
+ #if( $dataElement.type == "bool" )
+ <select name="dataelement$dataElement.id" id="dataelement$dataElement.id" tabindex="$tabIndex" style="width:150px">
+ <option value="">[$i18n.getString( "please_select" )]</option>
+ <option value="Yes" #if( $equipmentDataValue == "Yes" ) selected="selected" #end >$i18n.getString( "yes" )</option>
+ <option value="No" #if( $equipmentDataValue == "No") selected="selected" #end >$i18n.getString( "no" )</option>
+ </select>
+ #elseif( $dataElement.type == "date" )
+ <input type="text" id="dataelement$dataElement.id" name="dataelement$dataElement.id" value="$!equipmentDataValue" tabindex="$tabIndex" style="width:150px" />
+ <script type="text/javascript">
+ datePickerValid( 'dataelement${dataElement.id}' );
+ </script>
+ #elseif( $!dataElement.optionSet )
+ <select name="dataelement$dataElement.id" id="dataelement$dataElement.id" tabindex="$tabIndex" width="25%">
+ <option value="">[$i18n.getString( "please_select" )]</option>
+ #foreach ($option in $dataElement.optionSet.options )
+ <option value="$option" #if($equipmentDataValue == $option ) selected="selected" #end>$option</option>
+ #end
+ </select>
+
+ #else
+ <!--<input type="text" id="dataelement$dataElement.id" name="dataelement$dataElement.id" value="$!equipmentDataValue" tabindex="$tabIndex" style="width:150px" />-->
+ <input type="text" id="dataelement$dataElement.id" name="dataelement$dataElement.id" value="$!equipmentDataValue" tabindex="$tabIndex" width="25%" #if($dataElement.type =='number') class="{validate:{number:true}}" #elseif($dataElement.type =='int') class="{validate:{integer:true}}" #elseif($dataElement.type =='positiveNumber') class="{validate:{positive_integer:true}}" #elseif($dataElement.type =='negativeNumber') class="{validate:{negative_integer:true}}" #end/>
+ <!--<input type="text" id="dataelement$dataElement.id" name="dataelement$dataElement.id" value="$!equipmentDataValue" tabindex="$tabIndex" width="25%" #if($dataElement.type =='int') class="{validate:{number:true}}" #end/>-->
+ #end
+ </td>
+ </tr>
+ #set( $tabIndex = $tabIndex + 1 )
+ #set( $mark = !$mark)
+ #end
+#end
+</table>
+
+#end
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/menu.vm'
--- local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/menu.vm 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/menu.vm 2013-10-18 05:57:53 +0000
@@ -0,0 +1,9 @@
+
+<a href="index.action"><h2>$i18n.getString( "ccem_dataentry" ) </h2></a>
+<ul>
+ <!--<li>$i18n.getString( "cold_chain_equipment" )</li>-->
+ <!--<li><a href="enquipmentSelect.action">$i18n.getString( "equipment_management" )</a></li>-->
+</ul>
+<br>
+
+#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
\ No newline at end of file
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/responseEquipmentAndDataSets.vm'
--- local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/responseEquipmentAndDataSets.vm 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/responseEquipmentAndDataSets.vm 2013-10-18 05:57:53 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<equipments>
+ #foreach( $equipment in $equipments )
+ <equipment>
+ <id>$equipment.id</id>
+ <name>$equipment.getModel().getName()</name>
+ </equipment>
+ #end
+ #foreach( $dataset in $datasets )
+ <dataSet>
+ <id>$dataset.id</id>
+ <name>$dataset.name</name>
+ </dataSet>
+ #end
+</equipments>
=== added directory 'local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/style'
=== added file 'local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/style/dhis-web-dataentry-ccem.css'
--- local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/style/dhis-web-dataentry-ccem.css 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/style/dhis-web-dataentry-ccem.css 2013-10-18 05:57:53 +0000
@@ -0,0 +1,102 @@
+
+#currentSelection
+{
+ padding: 6px;
+ background-color: #eee;
+ border: 1px solid #bbb;
+ font-size: 14px;
+ text-align: right;
+ position: fixed;
+ top: 55px;
+ right: 10px;
+ filter: alpha(opacity=85);
+ opacity: 0.85;
+ border-radius: 3px;
+}
+
+#actions
+{
+ float: right;
+ width: 160px;
+ text-align: right;
+}
+
+#closeCurrentSelection
+{
+ float:left;
+ cursor:pointer;
+ margin-right:5px;
+}
+
+#contentDiv
+{
+ margin-bottom: 8px;
+}
+
+#completenessDiv
+{
+ display: none;
+ width: 386px;
+ height: 29px;
+}
+
+#infoDiv
+{
+ display: none;
+ width: 386px;
+ height: 20px;
+}
+
+#completedByDiv
+{
+ display: none;
+}
+
+.currentRow
+{
+ background-color: #d5ffc5;
+ padding-right: 50px;
+}
+
+.hidden
+{
+ display: none;
+}
+
+input[type=text],textarea
+{
+ padding-left: 0;
+ padding-right: 0;
+ margin-top: 1px;
+ margin-bottom: 1px;
+}
+
+.formSection td
+{
+ padding-right: 2px;
+ padding-left: 2px;
+ height: 28px;
+ white-space: nowrap;
+}
+
+.formSection th
+{
+ text-align: center;
+ min-width: 46px;
+}
+
+.sectionFilter
+{
+ padding: 5px;
+ border: solid 1px #f0f0f0;
+ outline: 0;
+ color: #333;
+ height: 14px;
+}
+
+.historyHeader
+{
+ color: #606060;
+ font-size: 17px;
+ padding: 5px 0;
+}
=== modified file 'local/in/dhis-web-dataentry-linelisting/pom.xml'
--- local/in/dhis-web-dataentry-linelisting/pom.xml 2013-03-25 05:08:43 +0000
+++ local/in/dhis-web-dataentry-linelisting/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-web-excelimport/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-web-ihrissyncmanager/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-SNAPSHOT</version>
</parent>
<repositories>
=== modified file 'local/in/dhis-web-leprosy/pom.xml'
--- local/in/dhis-web-leprosy/pom.xml 2013-03-25 05:08:43 +0000
+++ local/in/dhis-web-leprosy/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-web-linelisting-in/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-08-13 12:40:46 +0000
+++ local/in/dhis-web-maintenance-ccem/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.13-SNAPSHOT</version>
+ <version>2.14-SNAPSHOT</version>
</parent>
<repositories>
<repository>
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/LoadDataEntryFormAction.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/LoadDataEntryFormAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/LoadDataEntryFormAction.java 2013-10-18 05:57:53 +0000
@@ -111,7 +111,8 @@
//OrganisationUnit organisationUnit = equipment.getOrganisationUnit();
//EquipmentType equipmentType = equipment.getEquipmentType();
- Period period = PeriodType.createPeriodExternalId( selectedPeriodId );
+ //Period period = PeriodType.createPeriodExternalId( selectedPeriodId );
+ Period period = PeriodType.getPeriodFromIsoString( selectedPeriodId );
DataSet dataSet = dataSetService.getDataSet( dataSetId );
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/SaveEquipmentDataValueAction.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/SaveEquipmentDataValueAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/SaveEquipmentDataValueAction.java 2013-10-18 05:57:53 +0000
@@ -105,7 +105,8 @@
public String execute()
{
- Period period = PeriodType.createPeriodExternalId( selectedPeriodId );
+ //Period period = PeriodType.createPeriodExternalId( selectedPeriodId );
+ Period period = PeriodType.getPeriodFromIsoString( selectedPeriodId );
if ( period == null )
{
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/AddEquipmentTypeAttributeAction.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/AddEquipmentTypeAttributeAction.java 2013-09-30 12:17:15 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/AddEquipmentTypeAttributeAction.java 2013-10-18 05:57:53 +0000
@@ -95,8 +95,8 @@
public void setOptionSetId(Integer optionSetId)
{
- this.optionSetId = optionSetId;
- }
+ this.optionSetId = optionSetId;
+ }
// -------------------------------------------------------------------------
// Action implementation
@@ -114,13 +114,15 @@
equipmentTypeAttribute.setValueType( valueType );
//equipmentTypeAttribute.setDisplay( display );
+ //System.out.println( "optionSetId == " + optionSetId );
+
if ( EquipmentTypeAttribute.TYPE_COMBO.equalsIgnoreCase( valueType ) )
{
- if( optionSetId != -1 )
- {
- OptionSet optionSet = optionService.getOptionSet( optionSetId );
- equipmentTypeAttribute.setOptionSet( optionSet );
- }
+ if( optionSetId != -1 && optionSetId != null )
+ {
+ OptionSet optionSet = optionService.getOptionSet( optionSetId );
+ equipmentTypeAttribute.setOptionSet( optionSet );
+ }
}
equipmentTypeAttributeService.addEquipmentTypeAttribute( equipmentTypeAttribute );
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/ShowEquipmentTypeDataSetFormAction.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/ShowEquipmentTypeDataSetFormAction.java 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/ShowEquipmentTypeDataSetFormAction.java 2013-10-18 05:57:53 +0000
@@ -46,6 +46,14 @@
return selEquipmentTypeDataSets;
}
+ private List<EquipmentType> equipmentTypeList;
+
+ public List<EquipmentType> getEquipmentTypeList()
+ {
+ return equipmentTypeList;
+ }
+
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -55,6 +63,16 @@
selEquipmentTypeDataSets = new ArrayList<DataSet>( equipmentType.getDataSets() );
+ equipmentTypeList = new ArrayList<EquipmentType>();
+
+ for( EquipmentType equipmentType : equipmentTypeService.getAllEquipmentTypes() )
+ {
+ if( equipmentType.getDataSets() != null && equipmentType.getDataSets().size() != 0 )
+ {
+ equipmentTypeList.add( equipmentType );
+ }
+ }
+
return SUCCESS;
}
}
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/UpdateEquipmentTypeAttributeAction.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/UpdateEquipmentTypeAttributeAction.java 2013-09-30 12:17:15 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/UpdateEquipmentTypeAttributeAction.java 2013-10-18 05:57:53 +0000
@@ -97,7 +97,7 @@
this.noChars = noChars;
}
- private boolean display;
+ private boolean display;
public void setDisplay( boolean display )
{
@@ -108,8 +108,8 @@
public void setOptionSetId(Integer optionSetId)
{
- this.optionSetId = optionSetId;
- }
+ this.optionSetId = optionSetId;
+ }
// -------------------------------------------------------------------------
// Action implementation
@@ -128,15 +128,15 @@
if ( EquipmentTypeAttribute.TYPE_COMBO.equalsIgnoreCase( valueType ) )
{
- if( optionSetId != -1 )
- {
- OptionSet optionSet = optionService.getOptionSet( optionSetId );
- equipmentTypeAttribute.setOptionSet( optionSet );
- }
- else
- {
- equipmentTypeAttribute.setOptionSet( null );
- }
+ if( optionSetId != -1 && optionSetId != null )
+ {
+ OptionSet optionSet = optionService.getOptionSet( optionSetId );
+ equipmentTypeAttribute.setOptionSet( optionSet );
+ }
+ else
+ {
+ equipmentTypeAttribute.setOptionSet( null );
+ }
}
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddColdChainModelTypeAttributeForm.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddColdChainModelTypeAttributeForm.java 2013-09-30 12:17:15 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddColdChainModelTypeAttributeForm.java 2013-10-18 05:57:53 +0000
@@ -1,8 +1,10 @@
package org.hisp.dhis.ccem.model.action;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.option.OptionService;
import org.hisp.dhis.option.OptionSet;
@@ -17,8 +19,8 @@
public void setOptionService(OptionService optionService)
{
- this.optionService = optionService;
- }
+ this.optionService = optionService;
+ }
// -------------------------------------------------------------------------
// Input/Output
@@ -26,19 +28,22 @@
private List<OptionSet> optionSets;
- public List<OptionSet> getOptionSets()
- {
- return optionSets;
- }
+ public List<OptionSet> getOptionSets()
+ {
+ return optionSets;
+ }
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
- public String execute() throws Exception
+ public String execute() throws Exception
+
{
- optionSets = new ArrayList<OptionSet>( optionService.getAllOptionSets() );
-
+ optionSets = new ArrayList<OptionSet>( optionService.getAllOptionSets() );
+
+ Collections.sort( optionSets, new IdentifiableObjectNameComparator() );
+
return SUCCESS;
}
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelTypeAttributeAction.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelTypeAttributeAction.java 2013-09-30 12:17:15 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelTypeAttributeAction.java 2013-10-18 05:57:53 +0000
@@ -115,11 +115,11 @@
if ( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( valueType ) )
{
- if( optionSetId != -1 )
- {
- OptionSet optionSet = optionService.getOptionSet( optionSetId );
- modelTypeAttribute.setOptionSet( optionSet );
- }
+ if( optionSetId != -1 && optionSetId != null )
+ {
+ OptionSet optionSet = optionService.getOptionSet( optionSetId );
+ modelTypeAttribute.setOptionSet( optionSet );
+ }
}
modelTypeAttributeService.addModelTypeAttribute( modelTypeAttribute );
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ShowUpdateModelTypeAttributeFormAction.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ShowUpdateModelTypeAttributeFormAction.java 2013-09-30 12:17:15 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ShowUpdateModelTypeAttributeFormAction.java 2013-10-18 05:57:53 +0000
@@ -1,10 +1,12 @@
package org.hisp.dhis.ccem.model.action;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.hisp.dhis.coldchain.model.ModelTypeAttribute;
import org.hisp.dhis.coldchain.model.ModelTypeAttributeService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.option.OptionService;
import org.hisp.dhis.option.OptionSet;
@@ -28,8 +30,8 @@
public void setOptionService(OptionService optionService)
{
- this.optionService = optionService;
- }
+ this.optionService = optionService;
+ }
// -------------------------------------------------------------------------
// Input/Output
@@ -51,10 +53,10 @@
private List<OptionSet> optionSets;
- public List<OptionSet> getOptionSets()
- {
- return optionSets;
- }
+ public List<OptionSet> getOptionSets()
+ {
+ return optionSets;
+ }
// -------------------------------------------------------------------------
// Action implementation
@@ -67,6 +69,8 @@
optionSets = new ArrayList<OptionSet>( optionService.getAllOptionSets() );
+ Collections.sort( optionSets, new IdentifiableObjectNameComparator() );
+
return SUCCESS;
}
}
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UpdateModelTypeAttributeAction.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UpdateModelTypeAttributeAction.java 2013-09-30 12:17:15 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UpdateModelTypeAttributeAction.java 2013-10-18 05:57:53 +0000
@@ -111,8 +111,8 @@
public void setOptionSetId(Integer optionSetId)
{
- this.optionSetId = optionSetId;
- }
+ this.optionSetId = optionSetId;
+ }
// -------------------------------------------------------------------------
// Action implementation
@@ -132,15 +132,15 @@
if ( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( valueType ) )
{
- if( optionSetId != -1 )
- {
- OptionSet optionSet = optionService.getOptionSet( optionSetId );
- modelTypeAttribute.setOptionSet( optionSet );
- }
- else
- {
- modelTypeAttribute.setOptionSet( null );
- }
+ if( optionSetId != -1 && optionSetId != null )
+ {
+ OptionSet optionSet = optionService.getOptionSet( optionSetId );
+ modelTypeAttribute.setOptionSet( optionSet );
+ }
+ else
+ {
+ modelTypeAttribute.setOptionSet( null );
+ }
}
/*
=== 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-09-05 11:11:36 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/transferfacilitydata/action/TraferFacilityDataResultAction.java 2013-10-18 05:57:53 +0000
@@ -219,11 +219,14 @@
previousPeriod = periodService.getPeriod( firstDayPreviousYear, lastDaypreviousYear, periodType );
- String createPreviousYearlyPeroid = "Yearly" + "_" + previousYear + "-01-01";
+ //String createPreviousYearlyPeroid = "Yearly" + "_" + previousYear + "-01-01";
+
+ String createPreviousYearlyPeroid = ""+previousYear;
if( previousPeriod == null )
{
- previousPeriod = PeriodType.createPeriodExternalId( createPreviousYearlyPeroid );
+ //previousPeriod = PeriodType.createPeriodExternalId( createPreviousYearlyPeroid );
+ previousPeriod = PeriodType.getPeriodFromIsoString( createPreviousYearlyPeroid );
}
@@ -238,17 +241,19 @@
currentPeriod = periodService.getPeriod( firstDayCurrentYear, lastDayCurrentYear, periodType );
- String createCurrentYearlyPeroid = "Yearly" + "_" + currentYear + "-01-01";
+ //String createCurrentYearlyPeroid = "Yearly" + "_" + currentYear + "-01-01";
+ String createCurrentYearlyPeroid = ""+currentYear;
if( currentPeriod == null )
{
- currentPeriod = PeriodType.createPeriodExternalId( createCurrentYearlyPeroid );
+ //currentPeriod = PeriodType.createPeriodExternalId( createCurrentYearlyPeroid );
+ currentPeriod = PeriodType.getPeriodFromIsoString( createCurrentYearlyPeroid );
}
System.out.println( "Transfering Facility Data Start Time is : \t" + new Date() );
int flag = 1;
- int orgUnitCount = 1;
+ //int orgUnitCount = 1;
for( OrganisationUnit organisationUnit : orgUnitList )
{
for( DataElement dataElement : dataElementList )
@@ -290,7 +295,7 @@
}
}
//System.out.println( "-SL No- " + orgUnitCount + " --Data Transfer for facility- " + " : "+ organisationUnit.getId() + " : " + organisationUnit.getName() + " --currentPeriod : " + currentPeriod.getId() + " --previousPeriod : " + previousPeriod.getId() );
- orgUnitCount++;
+ //orgUnitCount++;
}
if(flag != 1)
=== 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-09-30 12:17:15 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties 2013-10-18 05:57:53 +0000
@@ -160,3 +160,5 @@
equipment_manager = Equipment Manager
transfer = Transfer
transfer_facility_data = Transfer facility data
+
+option_set = Option Set
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addEquipmentTypeAttributeForm.vm'
--- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addEquipmentTypeAttributeForm.vm 2013-09-30 12:17:15 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addEquipmentTypeAttributeForm.vm 2013-10-18 05:57:53 +0000
@@ -66,7 +66,7 @@
<td></td>
</tr>
- <tr>
+ <tr id="attributeComboRow">
<td><label for="optionSetId">$i18n.getString( "option_set" )</label></td>
<td>
<select id="optionSetId" name="optionSetId">
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/equipmentTypeAttribute.js'
--- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/equipmentTypeAttribute.js 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/equipmentTypeAttribute.js 2013-10-18 05:57:53 +0000
@@ -40,6 +40,7 @@
}
}else {
jQuery("#attributeComboRow").hide();
+ $("#optionSetId option").removeAttr('selected');
}
},
checkOnSubmit : function ()
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/modelTypeAttribute.js'
--- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/modelTypeAttribute.js 2013-09-05 11:11:36 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/modelTypeAttribute.js 2013-10-18 05:57:53 +0000
@@ -39,9 +39,19 @@
}else if ( jQuery(this_).val() == "DATE" )
{
jQuery("#attributeNoCharRow").hide();
+ jQuery("#attributeComboRow").hide();
+ $("#optionSetId option").removeAttr('selected');
}else {
jQuery("#attributeNoCharRow").show();
jQuery("#attributeComboRow").hide();
+
+ //var list = document.getElementById( 'optionSetId' );
+
+ //clearList( list );
+ $("#optionSetId option").removeAttr('selected');
+ //addOptionToList( list, '-1', 'Please Select' );
+
+ //$( '#optionSetId' ).val() = "";
}
},
checkOnSubmit : function ()
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/transferFacilityDataForm.vm'
--- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/transferFacilityDataForm.vm 2013-08-13 12:40:46 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/transferFacilityDataForm.vm 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<input type="hidden" id="previousYear" name="previousYear" value="$previousYear" />
<input type="hidden" id="currentYear" name="currentYear" value="$currentYear" />
<table>
- <tr><td> </td>
+ <tr><td> </td></tr>
<tr>
<td class="NormalB"><input type="button" id="transfer" name="transfer" value="$i18n.getString( 'transfer_facility_data' )" style="width:200px" onclick="transferFacilityData()" /></td>
</tr>
=== modified file 'local/in/dhis-web-maintenance-in/pom.xml'
--- local/in/dhis-web-maintenance-in/pom.xml 2013-09-25 09:45:36 +0000
+++ local/in/dhis-web-maintenance-in/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.13-SNAPSHOT</version>
+ <version>2.14-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-maintenance-in</artifactId>
=== modified file 'local/in/dhis-web-reports-in/pom.xml'
--- local/in/dhis-web-reports-in/pom.xml 2013-03-25 05:08:43 +0000
+++ local/in/dhis-web-reports-in/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-web-reports-national/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-web-sandbox/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-web-sandboxbk/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-web-survey/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-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-03-25 05:08:43 +0000
+++ local/in/dhis-web-validationrule-in/pom.xml 2013-10-18 05:57:53 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.12-SNAPSHOT</version>
+ <version>2.14-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-validationrule-in</artifactId>
=== modified file 'local/in/pom.xml'
--- local/in/pom.xml 2013-09-25 09:45:36 +0000
+++ local/in/pom.xml 2013-10-18 05:57:53 +0000
@@ -5,7 +5,7 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-local</artifactId>
- <version>2.13-SNAPSHOT</version>
+ <version>2.14-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Local India Modules</name>
@@ -13,15 +13,17 @@
<module>dhis-in-api</module>
<module>dhis-in-services</module>
-
+
+ <module>dhis-web-maintenance-in</module>
+ <module>dhis-web-maintenance-ccem</module>
<module>dhis-web-coldchain</module>
- <module>dhis-web-maintenance-ccem</module>
+ <module>dhis-web-dataentry-ccem</module>
<!--<module>dhis-web-dashboard</module>
<module>dhis-web-dataentry-linelisting</module>
<module>dhis-web-excelimport</module>-->
<!--<module>dhis-web-linelisting-in</module> -->
- <module>dhis-web-maintenance-in</module>
+
<!--<module>dhis-web-mobile</module>
<module>dhis-web-reports-in</module>-->
<!--<module>dhis-web-reports-national</module>
