=== added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/comparator/CatalogTypeAttributeOptionComparator.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/comparator/CatalogTypeAttributeOptionComparator.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/comparator/CatalogTypeAttributeOptionComparator.java 2012-08-01 12:21:34 +0000 @@ -0,0 +1,18 @@ +package org.hisp.dhis.coldchain.catalog.comparator; + +import java.util.Comparator; + +import org.hisp.dhis.coldchain.catalog.CatalogTypeAttributeOption; + +/** + * @author Mithilesh Kumar Thakur + * + * @version CatalogTypeAttributeOptionComparator.java Aug 1, 2012 12:57:58 PM + */ +public class CatalogTypeAttributeOptionComparator implements Comparator +{ + public int compare( CatalogTypeAttributeOption catalogTypeAttributeOption0, CatalogTypeAttributeOption catalogTypeAttributeOption1 ) + { + return catalogTypeAttributeOption0.getName().compareToIgnoreCase( catalogTypeAttributeOption1.getName() ); + } +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/comparator/InventoryTypeAttributeOptionComparator.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/comparator/InventoryTypeAttributeOptionComparator.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/comparator/InventoryTypeAttributeOptionComparator.java 2012-08-01 12:21:34 +0000 @@ -0,0 +1,19 @@ +package org.hisp.dhis.coldchain.inventory.comparator; + +import java.util.Comparator; + +import org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeOption; + +/** + * @author Mithilesh Kumar Thakur + * + * @version InventoryTypeAttributeOptionComparator.java Aug 1, 2012 3:50:35 PM + */ +public class InventoryTypeAttributeOptionComparator implements Comparator +{ + public int compare( InventoryTypeAttributeOption inventoryTypeAttributeOption0, InventoryTypeAttributeOption inventoryTypeAttributeOption1 ) + { + return inventoryTypeAttributeOption0.getName().compareToIgnoreCase( inventoryTypeAttributeOption1.getName() ); + } +} + === modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/ShowAddCatalogFormAction.java' --- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/ShowAddCatalogFormAction.java 2012-07-21 10:27:27 +0000 +++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/ShowAddCatalogFormAction.java 2012-08-01 12:21:34 +0000 @@ -2,13 +2,18 @@ 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.catalog.CatalogDataEntryService; import org.hisp.dhis.coldchain.catalog.CatalogDataValue; import org.hisp.dhis.coldchain.catalog.CatalogType; import org.hisp.dhis.coldchain.catalog.CatalogTypeAttribute; +import org.hisp.dhis.coldchain.catalog.CatalogTypeAttributeOption; import org.hisp.dhis.coldchain.catalog.CatalogTypeService; +import org.hisp.dhis.coldchain.catalog.comparator.CatalogTypeAttributeOptionComparator; import org.hisp.dhis.dataentryform.DataEntryForm; import org.hisp.dhis.i18n.I18n; @@ -96,6 +101,21 @@ { this.i18n = i18n; } + /* + private List catalogTypeAttributesOptions = new ArrayList(); + + public List getCatalogTypeAttributesOptions() + { + return catalogTypeAttributesOptions; + } + */ + + private Map> catalogTypeAttributesOptionsMap = new HashMap>(); + + public Map> getCatalogTypeAttributesOptionsMap() + { + return catalogTypeAttributesOptionsMap; + } // ------------------------------------------------------------------------- @@ -130,6 +150,25 @@ catalogTypeAttributes = new ArrayList ( catalogType.getCatalogTypeAttributes() ); + for( CatalogTypeAttribute catalogTypeAttribute : catalogTypeAttributes ) + { + List catalogTypeAttributesOptions = new ArrayList(); + if( CatalogTypeAttribute.TYPE_COMBO.equalsIgnoreCase( catalogTypeAttribute.getValueType() ) ) + { + System.out.println(" inside CatalogTypeAttribute.TYPE_COMBO "); + catalogTypeAttributesOptions = new ArrayList( catalogTypeAttribute.getAttributeOptions() ); + Collections.sort( catalogTypeAttributesOptions, new CatalogTypeAttributeOptionComparator() ); + catalogTypeAttributesOptionsMap.put( catalogTypeAttribute.getId(), catalogTypeAttributesOptions ); + } + + /* + System.out.println( "Name :" + catalogTypeAttribute.getName() ); + System.out.println( "valueType :" + catalogTypeAttribute.getValueType() ); + System.out.println( "Is mandatory :" + catalogTypeAttribute.isMandatory() ); + */ + } + + //Collections.sort( catalogTypeAttributes, new CatalogTypeAttributeComparator() ); /* === modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/UpdateCatalogFormAction.java' --- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/UpdateCatalogFormAction.java 2012-05-30 10:46:26 +0000 +++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/UpdateCatalogFormAction.java 2012-08-01 12:21:34 +0000 @@ -5,6 +5,7 @@ import java.io.OutputStream; import java.net.URL; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -15,7 +16,9 @@ import org.hisp.dhis.coldchain.catalog.CatalogService; import org.hisp.dhis.coldchain.catalog.CatalogType; import org.hisp.dhis.coldchain.catalog.CatalogTypeAttribute; +import org.hisp.dhis.coldchain.catalog.CatalogTypeAttributeOption; import org.hisp.dhis.coldchain.catalog.CatalogTypeService; +import org.hisp.dhis.coldchain.catalog.comparator.CatalogTypeAttributeOptionComparator; import com.opensymphony.xwork2.Action; @@ -135,6 +138,13 @@ return cataLogImage; } + private Map> catalogTypeAttributesOptionsMap = new HashMap>(); + + public Map> getCatalogTypeAttributesOptionsMap() + { + return catalogTypeAttributesOptionsMap; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- @@ -273,9 +283,17 @@ } */ - - - + for( CatalogTypeAttribute catalogTypeAttribute : catalogTypeAttributes ) + { + List catalogTypeAttributesOptions = new ArrayList(); + if( CatalogTypeAttribute.TYPE_COMBO.equalsIgnoreCase( catalogTypeAttribute.getValueType() ) ) + { + catalogTypeAttributesOptions = new ArrayList( catalogTypeAttribute.getAttributeOptions() ); + Collections.sort( catalogTypeAttributesOptions, new CatalogTypeAttributeOptionComparator() ); + catalogTypeAttributesOptionsMap.put( catalogTypeAttribute.getId(), catalogTypeAttributesOptions ); + } + } + return SUCCESS; } === modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentInstanceDataAction.java' --- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentInstanceDataAction.java 2012-06-21 09:47:23 +0000 +++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentInstanceDataAction.java 2012-08-01 12:21:34 +0000 @@ -1,6 +1,7 @@ package org.hisp.dhis.coldchain.equipment.action; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -13,7 +14,9 @@ import org.hisp.dhis.coldchain.inventory.EquipmentInstance; import org.hisp.dhis.coldchain.inventory.EquipmentInstanceService; import org.hisp.dhis.coldchain.inventory.InventoryTypeAttribute; +import org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeOption; import org.hisp.dhis.coldchain.inventory.InventoryType_Attribute; +import org.hisp.dhis.coldchain.inventory.comparator.InventoryTypeAttributeOptionComparator; import com.opensymphony.xwork2.Action; @@ -91,10 +94,12 @@ return equipmentInstanceCatalogId; } - - - - + private Map> inventoryTypeAttributeOptionsMap = new HashMap>(); + + public Map> getInventoryTypeAttributeOptionsMap() + { + return inventoryTypeAttributeOptionsMap; + } // ------------------------------------------------------------------------- // Action Implementation @@ -135,6 +140,21 @@ } } + for( InventoryTypeAttribute inventoryTypeAttribute : inventoryTypeAttributes ) + { + List inventoryTypeAttributeOptions = new ArrayList(); + if( InventoryTypeAttribute.TYPE_COMBO.equalsIgnoreCase( inventoryTypeAttribute.getValueType() ) ) + { + System.out.println(" inside inventoryTypeAttribute.TYPE_COMBO "); + inventoryTypeAttributeOptions = new ArrayList( inventoryTypeAttribute.getAttributeOptions() ); + Collections.sort( inventoryTypeAttributeOptions, new InventoryTypeAttributeOptionComparator() ); + inventoryTypeAttributeOptionsMap.put( inventoryTypeAttribute.getId(), inventoryTypeAttributeOptions ); + } + + } + + + CatalogType catalogType = equipmentInstance.getInventoryType().getCatalogType(); if( catalogType != 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 2012-06-21 09:47:23 +0000 +++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowAddEquipmentFormAction.java 2012-08-01 12:21:34 +0000 @@ -1,15 +1,21 @@ package org.hisp.dhis.coldchain.equipment.action; import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.hisp.dhis.coldchain.catalog.Catalog; import org.hisp.dhis.coldchain.catalog.CatalogService; import org.hisp.dhis.coldchain.catalog.CatalogType; +import org.hisp.dhis.coldchain.catalog.CatalogTypeAttributeOption; import org.hisp.dhis.coldchain.inventory.InventoryType; import org.hisp.dhis.coldchain.inventory.InventoryTypeAttribute; +import org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeOption; import org.hisp.dhis.coldchain.inventory.InventoryTypeService; import org.hisp.dhis.coldchain.inventory.InventoryType_Attribute; +import org.hisp.dhis.coldchain.inventory.comparator.InventoryTypeAttributeOptionComparator; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; @@ -86,6 +92,13 @@ { return catalogs; } + + private Map> inventoryTypeAttributeOptionsMap = new HashMap>(); + + public Map> getInventoryTypeAttributeOptionsMap() + { + return inventoryTypeAttributeOptionsMap; + } // ------------------------------------------------------------------------- // Action Implementation @@ -103,7 +116,26 @@ { inventoryTypeAttributes.add( inventoryType_Attribute.getInventoryTypeAttribute() ); } - + + for( InventoryTypeAttribute inventoryTypeAttribute : inventoryTypeAttributes ) + { + List inventoryTypeAttributeOptions = new ArrayList(); + if( InventoryTypeAttribute.TYPE_COMBO.equalsIgnoreCase( inventoryTypeAttribute.getValueType() ) ) + { + System.out.println(" inside inventoryTypeAttribute.TYPE_COMBO "); + inventoryTypeAttributeOptions = new ArrayList( inventoryTypeAttribute.getAttributeOptions() ); + Collections.sort( inventoryTypeAttributeOptions, new InventoryTypeAttributeOptionComparator() ); + inventoryTypeAttributeOptionsMap.put( inventoryTypeAttribute.getId(), inventoryTypeAttributeOptions ); + } + + /* + System.out.println( "Name :" + catalogTypeAttribute.getName() ); + System.out.println( "valueType :" + catalogTypeAttribute.getValueType() ); + System.out.println( "Is mandatory :" + catalogTypeAttribute.isMandatory() ); + */ + } + + CatalogType catalogType = inventoryType.getCatalogType(); if( catalogType != null ) === modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentDataEntryFormAction.java' --- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentDataEntryFormAction.java 2012-06-21 09:47:23 +0000 +++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentDataEntryFormAction.java 2012-08-01 12:21:34 +0000 @@ -114,8 +114,6 @@ private Map inventryTypeAttributeAndValueMap; - - public Map getInventryTypeAttributeAndValueMap() { return inventryTypeAttributeAndValueMap; @@ -141,9 +139,13 @@ { return inventoryTypeAttributeValue; } - - - + + private String catalogName; + + public String getCatalogName() + { + return catalogName; + } // ------------------------------------------------------------------------- // Action Implementation @@ -152,6 +154,19 @@ { EquipmentInstance equipmentInstance = equipmentInstanceService.getEquipmentInstance( equipmentInstanceId ); + + if( equipmentInstance.getCatalog()!= null ) + { + catalogName = equipmentInstance.getCatalog().getName(); + System.out.println( "Catalog Name is : -- " + equipmentInstance.getCatalog().getName() ); + } + + else + { + catalogName = " "; + } + + //equipmentInstance.getCatalog().getName(); //equipmentInstance.getInventoryType().getDataSets(); organisationUnit = equipmentInstance.getOrganisationUnit(); inventoryType = equipmentInstance.getInventoryType(); @@ -164,7 +179,7 @@ System.out.println( dataSet.getPeriodType().getId() +"--------" +dataSet.getPeriodType().getName()); } */ - + inventoryTypeAttributeList = new ArrayList( inventoryTypeService.getAllInventoryTypeAttributesForDisplay( inventoryType )); if( inventoryTypeAttributeList == null || inventoryTypeAttributeList.size() == 0 ) === modified file 'local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties' --- local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties 2012-07-11 08:55:42 +0000 +++ local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties 2012-08-01 12:21:34 +0000 @@ -1,12 +1,12 @@ - +attributes = Attributes coldchain = Cold Chain coldchain_management = Cold chain management -coldchain_catalog_type_attribute_management = Catalogtype attribute management +coldchain_catalog_type_attribute_management = Catalog Attributes filter_by_name = Filter by name -catalogType_attribute = Catalogtype attribute -catalogType_details = Catalogtype details -create_new_catalog_type_attribute = Create new catalogtype attribute -catalog_type_attribute_details = Catalogtype attribute details +catalogType_attribute = Catalog Attributes +catalogType_details = Catalogs details +create_new_catalog_type_attribute = Add New Catalog Attribute +catalog_type_attribute_details = Catalog Attributes details mandatory = Mandatory no_of_char = Number of characters attribute_combo_type = Predefined value @@ -15,64 +15,64 @@ add_more_option = Add option at_least_2_option = Please add at least two attribute options remove_option = Remove option -confirm_delete_catalogType_attribute = Are you sure you want to delete catalogtype attribute? -warning_delete_catalogType_attribute_option = This option has relationship with catalogtype attribute value. You must not delete it. -success_delete_ctalogType_attribute_option = Delete catalog type attribute option successfully. -edit_catalogType_attribute = Edit catalogtype attribute -catalogType_attribute_details = Catalogtype attribute details -error_delete_catalogType_attribute_option = Can not find catalogtype attribute option to delete. +confirm_delete_catalogType_attribute = Are you sure you want to delete Catalog Attributes? +warning_delete_catalogType_attribute_option = This option has relationship with Catalog Attributes value. You must not delete it. +success_delete_ctalogType_attribute_option = Delete Catalog Attributes option successfully. +edit_catalogType_attribute = Edit Catalog Attribute +catalogType_attribute_details = Catalog Attributes details +error_delete_catalogType_attribute_option = Can not find Catalog Attributes option to delete. name_in_use = Name in use everything_is_ok = Everything is ok -catalogType = Catalogtype -confirm_delete = Are you sure you want to delete this catalogtype? -catalogType_management = Catalogtype management -available_catalogType_attribute = Available Catalogtype attributes -selected_catalogType_attribute = Selected data catalogtype attributes -create_new_catalogType = Create new catalogtype -catalogType_attributes = Catalogtype attributes -edit_catalogType = Edit catalogtype -catalog_type_details = Details of catalogtype +catalogType = Catalogs +confirm_delete = Are you sure you want to delete this Catalogs? +catalogType_management = Catalogs +available_catalogType_attribute = Available Catalog Attributes +selected_catalogType_attribute = Selected Catalog Attributes +create_new_catalogType = Add New Catalog +catalogType_attributes = Catalog Attributes +edit_catalogType = Edit Catalog +catalog_type_details = Details of Catalogs object_not_deleted_associated_by_objects = Object not deleted because it is associated by other objects -confirm_delete_catalog_type = Are you sure you want to delete this catalogtype? +confirm_delete_catalog_type = Are you sure you want to delete this Catalogs? duplicate_names = Name is already in use -no_of_catalogTypeAttributes = Number of catalogtype attributes to be collected +no_of_catalogTypeAttributes = Number of Catalogs Attributes to be collected catalog = Catalog -catalog_management = Catalog management -add_new_catalog = Add new catalog -please_select_catalog_type = Please select catalogtype +catalog_management = Catalog Entries +add_new_catalog = Add New Catalog Entry +please_select_catalog_type = Please select Catalogs please_select = Please select confirm_delete_catalog = Are you sure you want to delete catalog? -edit_catalog = Edit catalog +edit_catalog = Edit Catalog Entry catalog__details = Details of catalog attributes = Attributes -select_catalogType = Select catalogype +select_catalogType = Select Catalogs list_all_catalogs = List all catalogs search_catalog_by_attributes = Search catalog by attributes -inventorytype_attribute_management = Inventorytype attribute management -inventorytype_attribute = Inventorytype attribute -create_new_inventorytype_attribute = Create new inventorytype attribute -inventorytype_attribute_details = Inventorytype attribute details -create_new_inventorytype = Create new inventorytype -confirm_delete_inventorytype_attribute = Are you sure you want to delete inventorytype attribute? +inventorytype_attribute_management = Inventory Attributes +inventorytype_attribute = Inventory Attributes +create_new_inventorytype_attribute = Add New Inventory Attribute +inventorytype_attribute_details = Inventory Attributes details +create_new_inventorytype = Add new Inventory +confirm_delete_inventorytype_attribute = Are you sure you want to delete Inventory Attributes? tracking = Tracking -available_inventorytype_attributes = Available inventorytype attributes -selected_inventorytype_attributes = Selected data inventorytype attributes -confirm_delete_inventorytype = Are you sure you want to delete inventorytype? -inventorytype = Inventorytype +available_inventorytype_attributes = Available Inventory Attributes +selected_inventorytype_attributes = Selected Inventory Attributes +confirm_delete_inventorytype = Are you sure you want to delete Inventories? +inventorytype = Inventories inventory = Inventory -inventorytype_management = Inventorytype management -edit_inventorytype = Edit inventorytype -inventorytype_details = Details inventorytype -edit_inventorytype_attribute = Edit inventorytype attribute -inventory_attribute_details = Details inventory attribute +inventorytype_management = Inventories +edit_inventorytype = Edit Inventory +inventorytype_details = Details Inventories +edit_inventorytype_attribute = Edit Inventory Attribute +inventory_attribute_details = Details Inventory Attributes equipment = Equipment equipment_registration = Equipment registration -equipment_management = Equipment management +equipment_management = Equipment registering_unit = Registering unit select_inventorytype = Please select inventorytype list_all_equipments = List all equipments @@ -88,21 +88,21 @@ notworking = Not working under_repair = Under repair add_new_equipment = Add new equipment -update_equipment = Update equipment +update_equipment = Edit Equipment edit_equipment = Edit equipment equipment_tracking = Equipment tracking equipment_tracking_history = Equipment tracking history equipment_details = Equipment details equipment_status_history = Equipment status history reporting_date = Reporting date -updation_date = Date of updation +updation_date = Date of Change stored_by = Stored by confirm_delete_equipment = Are you sure you want to delete equipment? equipment_details = Equipment details display = For display available_datasets = Available datasets selected_datasets = Selected datasets -dataset_inventorytype = Dataset inventorytype +dataset_inventorytype = Inventory Datasets dataset = Dataset equipment_dataentry = Equipment dataentry period = Period @@ -117,13 +117,13 @@ ccem_entry = CCEM Entry ccem_reports = CCEM Reports upload_image = Upload image -upload_catalog_image = Upload catalog image +upload_catalog_image = Edit Catalog Entry working_status = Working status - +upload_image_default = Upload default image design_data_entry_form = Design data entry form -dataentryform_management_for_catalogType = Data entry form management for catalogtype +dataentryform_management_for_catalogType = Edit Catalog Dataentry dataentryform_details = Data entry form details design_dataentry_form = Design data entry form specify_catalogType_attribute = Please specify a catalogtype attribute === modified file 'local/in/dhis-web-coldchain/src/main/resources/struts.xml' --- local/in/dhis-web-coldchain/src/main/resources/struts.xml 2012-07-24 05:31:29 +0000 +++ local/in/dhis-web-coldchain/src/main/resources/struts.xml 2012-08-01 12:21:34 +0000 @@ -29,6 +29,7 @@ /main.vm /dhis-web-coldchain/addColdChainCatalogTypeAttributeForm.vm + /dhis-web-coldchain/menu.vm javascript/catalogTypeAttribute.js css/style.css F_CATALOGTYPEATTRIBUTE_ADD @@ -66,6 +67,7 @@ /main.vm /dhis-web-coldchain/updateCatalogTypeAttibuteForm.vm + /dhis-web-coldchain/menu.vm javascript/catalogTypeAttribute.js css/style.css F_CATALOGTYPEATTRIBUTE_UPDATE @@ -364,6 +366,7 @@ /main.vm /dhis-web-coldchain/addInventoryTypeForm.vm + /dhis-web-coldchain/menu.vm javascript/inventoryType.js css/basic.css F_INVENTORYTYPE_ADD @@ -382,6 +385,7 @@ class="org.hisp.dhis.coldchain.inventory.action.ShowUpdateInventoryTypeAction"> /main.vm /dhis-web-coldchain/updateInventoryTypeForm.vm + /dhis-web-coldchain/menu.vm javascript/inventoryType.js,../dhis-web-commons/javascripts/jQuery/ui/jquery.cluetip.min.js css/basic.css F_INVENTORYTYPE_UPDATE @@ -585,7 +589,7 @@ /main.vm /dhis-web-coldchain/ccemReportsPage.vm - /dhis-web-coldchain/menu.vm + /dhis-web-coldchain/ccemReportMenu.vm ../dhis-web-commons/ouwt/ouwt.js,javascript/ccemReports.js === 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 2012-06-13 06:35:38 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentForm.vm 2012-08-01 12:21:34 +0000 @@ -83,7 +83,7 @@ #elseif( $attribute.valueType == "COMBO" ) === modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeForm.vm' --- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeForm.vm 2012-06-18 09:15:09 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeForm.vm 2012-08-01 12:21:34 +0000 @@ -91,7 +91,7 @@ - + === modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogTypeList.vm' --- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogTypeList.vm 2012-07-21 10:27:27 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogTypeList.vm 2012-08-01 12:21:34 +0000 @@ -36,7 +36,7 @@ + + + + - +
$i18n.getString( "dataelement" )$i18n.getString( "attributes" ) $i18n.getString( "display" )
$encoder.htmlEncode( $catalogType.name ) - $i18n.getString( 'upload_image' ) + $i18n.getString( 'upload_image' ) $i18n.getString( 'edit' ) $i18n.getString( $i18n.getString( 'design_data_entry_form' ) === added file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/ccemReportMenu.vm' --- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/ccemReportMenu.vm 1970-01-01 00:00:00 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/ccemReportMenu.vm 2012-08-01 12:21:34 +0000 @@ -0,0 +1,9 @@ + +

$i18n.getString( "ccem_reports_page" ) 

 + + +
+##parse( "/dhis-web-commons/ouwt/orgunittree.vm" ) +#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) \ No newline at end of file === modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/ccemReportsPage.vm' --- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/ccemReportsPage.vm 2012-06-27 06:56:57 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/ccemReportsPage.vm 2012-08-01 12:21:34 +0000 @@ -1,25 +1,26 @@ - +

$i18n.getString( "ccem_reports_page" )

-
+ #foreach( $ccemReport in $reportList ) #end - + +
+   @@ -37,10 +38,10 @@ @@ -76,13 +77,17 @@
$i18n.getString( "ccem_reports_list" )
$i18n.getString( "ccem_reports_period_list" ):
- $i18n.getString( "last_3months" ) - $i18n.getString( "current_year" )
- $i18n.getString( "last_6months" ) - $i18n.getString( "last_year" ) + $i18n.getString( "last_3months" ) + $i18n.getString( "current_year" )
+ $i18n.getString( "last_6months" ) + $i18n.getString( "last_year" )
- - - -
#parse( "/dhis-web-commons/loader/loader.vm" )
-
+ + + + +
#parse( "/dhis-web-commons/loader/loader.vm" )
+
-
- + \ No newline at end of file === 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 2012-05-23 10:03:31 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentDataEntry.vm 2012-08-01 12:21:34 +0000 @@ -34,6 +34,7 @@
- + +

+ === modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentMenu.vm' --- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentMenu.vm 2012-05-03 07:02:57 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentMenu.vm 2012-08-01 12:21:34 +0000 @@ -1,10 +1,10 @@ -

$i18n.getString( "coldchain_management" ) 

 - +

$i18n.getString( "ccem_entry" ) 
-#parse( "/dhis-web-commons/ouwt/orgunittree.vm" ) +##parse( "/dhis-web-commons/ouwt/orgunittree.vm" ) +#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" ) === 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 2012-05-05 11:16:25 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentStatusForm.vm 2012-08-01 12:21:34 +0000 @@ -28,7 +28,7 @@
$i18n.getString( "reporting_date" ) : - + @@ -37,7 +37,7 @@
$i18n.getString( "date_of_updation" ) : - + @@ -46,7 +46,7 @@
$i18n.getString( "status" ) : - @@ -56,7 +56,7 @@
$i18n.getString( "description" ) :
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/catalog.js' --- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/catalog.js 2012-07-21 10:27:27 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/catalog.js 2012-08-01 12:21:34 +0000 @@ -522,6 +522,7 @@ { $.ajax({ type: "POST", + contentType: 'multipart/form-data', url: 'uploadCatalogImage.action', data: getParamsForDiv('uploadCatalogImageDiv'), success: function( json ) { === 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 2012-05-23 10:03:31 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipmentDataEntry.js 2012-08-01 12:21:34 +0000 @@ -18,7 +18,7 @@ var dataSetId = $( '#selectedDataSetId' ).val(); - + //alert( dataSetId ); //var dataSetPeriod = dataSetId.split(":"); //var dataSetId = dataSetPeriod[0]; === modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseUplodImageStatus.vm' --- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseUplodImageStatus.vm 2012-05-30 10:46:26 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseUplodImageStatus.vm 2012-08-01 12:21:34 +0000 @@ -1,5 +1,8 @@ + $encoder.xmlEncode( $message )

- + + + === modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddCatalogForm.vm' --- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddCatalogForm.vm 2012-07-21 10:27:27 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddCatalogForm.vm 2012-08-01 12:21:34 +0000 @@ -101,10 +101,12 @@ #elseif( $attribute.valueType == "COMBO" ) #else === modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentStatusHistory.vm' --- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentStatusHistory.vm 2012-05-04 07:42:28 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentStatusHistory.vm 2012-08-01 12:21:34 +0000 @@ -18,12 +18,12 @@ $i18n.getString( "stored_by" ) - + #foreach( $equimentStatus in $equipmentStatusHistory ) - $equimentStatus.reportingDate - $equimentStatus.updationDate + $!format.formatDate($!equimentStatus.reportingDate) + $!format.formatDate($!equimentStatus.updationDate) $equimentStatus.status $equimentStatus.description $equimentStatus.storedBy === modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateCatalogForm.vm' --- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateCatalogForm.vm 2012-06-26 08:38:56 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateCatalogForm.vm 2012-08-01 12:21:34 +0000 @@ -105,7 +105,7 @@ #elseif( $attribute.valueType == "COMBO" ) === 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 2012-06-26 08:38:56 +0000 +++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateEquipmentForm.vm 2012-08-01 12:21:34 +0000 @@ -78,7 +78,7 @@ #elseif( $attribute.valueType == "COMBO" )