dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18481
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7805: local/in Bug fixed in CCEM
------------------------------------------------------------
revno: 7805
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-08-01 17:51:34 +0530
message:
local/in Bug fixed in CCEM
added:
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/inventory/comparator/InventoryTypeAttributeOptionComparator.java
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/ccemReportMenu.vm
modified:
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/UpdateCatalogFormAction.java
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/ShowAddEquipmentFormAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentDataEntryFormAction.java
local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties
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/addInventoryTypeForm.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogTypeList.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/ccemReportsPage.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/equipmentMenu.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/catalog.js
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/responseUplodImageStatus.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddCatalogForm.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentStatusHistory.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateCatalogForm.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateEquipmentForm.vm
--
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
=== 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<CatalogTypeAttributeOption>
+{
+ 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<InventoryTypeAttributeOption>
+{
+ 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<CatalogTypeAttributeOption> catalogTypeAttributesOptions = new ArrayList<CatalogTypeAttributeOption>();
+
+ public List<CatalogTypeAttributeOption> getCatalogTypeAttributesOptions()
+ {
+ return catalogTypeAttributesOptions;
+ }
+ */
+
+ private Map<Integer, List<CatalogTypeAttributeOption>> catalogTypeAttributesOptionsMap = new HashMap<Integer, List<CatalogTypeAttributeOption>>();
+
+ public Map<Integer, List<CatalogTypeAttributeOption>> getCatalogTypeAttributesOptionsMap()
+ {
+ return catalogTypeAttributesOptionsMap;
+ }
// -------------------------------------------------------------------------
@@ -130,6 +150,25 @@
catalogTypeAttributes = new ArrayList<CatalogTypeAttribute> ( catalogType.getCatalogTypeAttributes() );
+ for( CatalogTypeAttribute catalogTypeAttribute : catalogTypeAttributes )
+ {
+ List<CatalogTypeAttributeOption> catalogTypeAttributesOptions = new ArrayList<CatalogTypeAttributeOption>();
+ if( CatalogTypeAttribute.TYPE_COMBO.equalsIgnoreCase( catalogTypeAttribute.getValueType() ) )
+ {
+ System.out.println(" inside CatalogTypeAttribute.TYPE_COMBO ");
+ catalogTypeAttributesOptions = new ArrayList<CatalogTypeAttributeOption>( 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<Integer, List<CatalogTypeAttributeOption>> catalogTypeAttributesOptionsMap = new HashMap<Integer, List<CatalogTypeAttributeOption>>();
+
+ public Map<Integer, List<CatalogTypeAttributeOption>> getCatalogTypeAttributesOptionsMap()
+ {
+ return catalogTypeAttributesOptionsMap;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -273,9 +283,17 @@
}
*/
-
-
-
+ for( CatalogTypeAttribute catalogTypeAttribute : catalogTypeAttributes )
+ {
+ List<CatalogTypeAttributeOption> catalogTypeAttributesOptions = new ArrayList<CatalogTypeAttributeOption>();
+ if( CatalogTypeAttribute.TYPE_COMBO.equalsIgnoreCase( catalogTypeAttribute.getValueType() ) )
+ {
+ catalogTypeAttributesOptions = new ArrayList<CatalogTypeAttributeOption>( 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<Integer, List<InventoryTypeAttributeOption>> inventoryTypeAttributeOptionsMap = new HashMap<Integer, List<InventoryTypeAttributeOption>>();
+
+ public Map<Integer, List<InventoryTypeAttributeOption>> getInventoryTypeAttributeOptionsMap()
+ {
+ return inventoryTypeAttributeOptionsMap;
+ }
// -------------------------------------------------------------------------
// Action Implementation
@@ -135,6 +140,21 @@
}
}
+ for( InventoryTypeAttribute inventoryTypeAttribute : inventoryTypeAttributes )
+ {
+ List<InventoryTypeAttributeOption> inventoryTypeAttributeOptions = new ArrayList<InventoryTypeAttributeOption>();
+ if( InventoryTypeAttribute.TYPE_COMBO.equalsIgnoreCase( inventoryTypeAttribute.getValueType() ) )
+ {
+ System.out.println(" inside inventoryTypeAttribute.TYPE_COMBO ");
+ inventoryTypeAttributeOptions = new ArrayList<InventoryTypeAttributeOption>( 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<Integer, List<InventoryTypeAttributeOption>> inventoryTypeAttributeOptionsMap = new HashMap<Integer, List<InventoryTypeAttributeOption>>();
+
+ public Map<Integer, List<InventoryTypeAttributeOption>> getInventoryTypeAttributeOptionsMap()
+ {
+ return inventoryTypeAttributeOptionsMap;
+ }
// -------------------------------------------------------------------------
// Action Implementation
@@ -103,7 +116,26 @@
{
inventoryTypeAttributes.add( inventoryType_Attribute.getInventoryTypeAttribute() );
}
-
+
+ for( InventoryTypeAttribute inventoryTypeAttribute : inventoryTypeAttributes )
+ {
+ List<InventoryTypeAttributeOption> inventoryTypeAttributeOptions = new ArrayList<InventoryTypeAttributeOption>();
+ if( InventoryTypeAttribute.TYPE_COMBO.equalsIgnoreCase( inventoryTypeAttribute.getValueType() ) )
+ {
+ System.out.println(" inside inventoryTypeAttribute.TYPE_COMBO ");
+ inventoryTypeAttributeOptions = new ArrayList<InventoryTypeAttributeOption>( 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<String, String> inventryTypeAttributeAndValueMap;
-
-
public Map<String, String> 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<InventoryTypeAttribute>( 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 @@
<action name="showAddColdChainCatalogTypeAttributeForm" class="org.hisp.dhis.coldchain.catalog.action.AddColdChainCatalogTypeAttributeForm">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-coldchain/addColdChainCatalogTypeAttributeForm.vm</param>
+ <param name="menu">/dhis-web-coldchain/menu.vm</param>
<param name="javascripts">javascript/catalogTypeAttribute.js</param>
<param name="stylesheets">css/style.css</param>
<param name="requiredAuthorities">F_CATALOGTYPEATTRIBUTE_ADD</param>
@@ -66,6 +67,7 @@
<action name="showUpdateCatalogTypeAttributeForm" class="org.hisp.dhis.coldchain.catalog.action.ShowUpdateCatalogTypeAttributeFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-coldchain/updateCatalogTypeAttibuteForm.vm</param>
+ <param name="menu">/dhis-web-coldchain/menu.vm</param>
<param name="javascripts">javascript/catalogTypeAttribute.js</param>
<param name="stylesheets">css/style.css</param>
<param name="requiredAuthorities">F_CATALOGTYPEATTRIBUTE_UPDATE</param>
@@ -364,6 +366,7 @@
<action name="showAddInventoryTypeForm" class="org.hisp.dhis.coldchain.inventory.action.ShowAddInventoryTypeAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-coldchain/addInventoryTypeForm.vm</param>
+ <param name="menu">/dhis-web-coldchain/menu.vm</param>
<param name="javascripts">javascript/inventoryType.js</param>
<param name="stylesheets">css/basic.css</param>
<param name="requiredAuthorities">F_INVENTORYTYPE_ADD</param>
@@ -382,6 +385,7 @@
class="org.hisp.dhis.coldchain.inventory.action.ShowUpdateInventoryTypeAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-coldchain/updateInventoryTypeForm.vm</param>
+ <param name="menu">/dhis-web-coldchain/menu.vm</param>
<param name="javascripts">javascript/inventoryType.js,../dhis-web-commons/javascripts/jQuery/ui/jquery.cluetip.min.js</param>
<param name="stylesheets">css/basic.css</param>
<param name="requiredAuthorities">F_INVENTORYTYPE_UPDATE</param>
@@ -585,7 +589,7 @@
<action name="ccemReportsPage" class="org.hisp.dhis.coldchain.reports.action.CCEMReportPageAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-coldchain/ccemReportsPage.vm</param>
- <param name="menu">/dhis-web-coldchain/menu.vm</param>
+ <param name="menu">/dhis-web-coldchain/ccemReportMenu.vm</param>
<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/ccemReports.js</param>
<interceptor-ref name="organisationUnitTreeStack" />
</action>
=== 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" )
<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.attributeOptions )
+ #foreach ($option in $!inventoryTypeAttributeOptionsMap.get( $attribute.id ) )
<option value="$option.id" >$option.name</option>
#end
</select>
=== 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 @@
<table>
<thead>
<tr>
- <th>$i18n.getString( "dataelement" )</th>
+ <th>$i18n.getString( "attributes" )</th>
<th width="20px">$i18n.getString( "display" )</th>
</thead>
<tbody id="selectedInventoryTypeAttributeList"></tbody>
=== 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 @@
<tr id="tr${catalogType.id}">
<td onclick="showCalatogTypeDetails( $catalogType.id )">$encoder.htmlEncode( $catalogType.name )</td>
<td style="text-align:right">
- <a href="showUploadCatalogTypeImageForm.action?id=$catalogType.id" title="$i18n.getString( 'upload_image' )"><img src="images/upload.png" alt="$i18n.getString( 'upload_image' )"></a>
+ <a href="showUploadCatalogTypeImageForm.action?id=$catalogType.id" title="$i18n.getString( 'upload_image_default' )"><img src="images/upload.png" alt="$i18n.getString( 'upload_image' )"></a>
<a href="editCatalogTypeForm.action?id=$catalogType.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
<a href="javascript:removeItem( '$catalogType.id', '$encoder.jsEncode( $catalogType.name )', i18n_confirm_delete , 'removeCatalogType.action' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
<a href="viewCatalogDataEntryForm.action?catalogTypeId=$catalogType.id" title="$i18n.getString( 'design_data_entry_form' )"><img src="../images/edit_layout.png" alt="$i18n.getString( 'design_data_entry_form' )"></a>
=== 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 @@
+
+<a href="index.action"><h2>$i18n.getString( "ccem_reports_page" ) </h2></a>
+<ul>
+ <li><a href="ccemReportsPage.action">$i18n.getString( "ccem_reports_page" )</a></li>
+</ul>
+
+<br>
+##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 @@
<script src="javascript/highcharts.js"></script>
<script src="javascript/exporting.js"></script>
-
+<!--
<script>
leftBar.hideAnimated();
</script>
-
+-->
<h3>$i18n.getString( "ccem_reports_page" )</h3>
-<form id="ccemReportForm" name="ccemReportForm" action="#" method="post" >
+<form id="ccemReportForm" name="ccemReportForm" action="#" method="post">
#foreach( $ccemReport in $reportList )
<input type="hidden" id="$ccemReport.reportId" value="$ccemReport.periodRequire" />
#end
<table boarder="1">
<tr>
- <td>
+ <td> </td>
+ <!-- <td>
<table style="border-collapse: collapse;border-style: solid;border-width: 1px;">
<tr style="background-color: #C0C0C0;"><td><strong>$i18n.getString( "orgunit_tree" )</strong></td></tr>
- <tr><td><div style="height:450px;width:200px;overflow:auto;">#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )</div></td></tr>
+ <tr><td><div style="height:450px;width:200px;overflow:auto;">#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )</div></td></tr>
</table>
- </td>
- <td>
+ </td>-->
+ <td>
<table style="border-collapse: collapse;border-style: solid;border-width: 1px;">
<tr style="background-color: #C0C0C0;"><td><strong>$i18n.getString( "ccem_reports_list" )</strong></td></tr>
<tr>
@@ -37,10 +38,10 @@
<tr style="background-color: #C0C0C0;"><td><strong>$i18n.getString( "ccem_reports_period_list" ):</strong></td></tr>
<tr>
<td>
- <input type="radio" id="periodRadio" name="periodRadio" value="LAST_3_MONTHS" disabled />$i18n.getString( "last_3months" )
- <input type="radio" id="periodRadio" name="periodRadio" value="CURRENT_YEAR" disabled />$i18n.getString( "current_year" )<br/>
- <input type="radio" id="periodRadio" name="periodRadio" value="LAST_6_MONTHS" disabled />$i18n.getString( "last_6months" )
- <input type="radio" id="periodRadio" name="periodRadio" value="LAST_YEAR" disabled />$i18n.getString( "last_year" )
+ <strong><input type="radio" id="periodRadio" name="periodRadio" value="LAST_3_MONTHS" disabled /></strong>$i18n.getString( "last_3months" )
+ <strong><input type="radio" id="periodRadio" name="periodRadio" value="CURRENT_YEAR" disabled /></strong>$i18n.getString( "current_year" )<br/>
+ <strong><input type="radio" id="periodRadio" name="periodRadio" value="LAST_6_MONTHS" disabled /></strong>$i18n.getString( "last_6months" )
+ <strong><input type="radio" id="periodRadio" name="periodRadio" value="LAST_YEAR" disabled /></strong>$i18n.getString( "last_year" )
</td>
</tr>
<tr>
@@ -76,13 +77,17 @@
</table>
</td>
<td>
- <table style="border-collapse: collapse;border-style: solid;border-width: 1px;">
- <tr><td><div>#parse( "/dhis-web-commons/loader/loader.vm" )</div>
- <div id="resultContent"> </div></td>
- </tr>
- </table>
+ <!--<table style="border-collapse: collapse;border-style: solid;border-width: 1px;">
+ <tr><td><div>#parse( "/dhis-web-commons/loader/loader.vm" )</div>
+ <div id="resultContent"> </div></td>
+ </tr>
+ </table>-->
+ <table>
+ <tr><td><div>#parse( "/dhis-web-commons/loader/loader.vm" )</div>
+ <div id="resultContent"> </div></td>
+ </tr>
+ </table>
</td>
</tr>
</table>
-</form>
-
+</form>
\ 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 @@
<td><label for="selectedInventorytype">$i18n.getString( "inventorytype" )</label></td>
<td><input type="text" id="selectedInventorytype" readonly="readonly" value="$!inventoryType.name" style="width:367px"></td>
</tr>
+ <!--
<tr>
<td><label for="inventoryTypeAttribute">$i18n.getString( "inventorytype_attribute" )</label></td>
<td>$inventoryTypeAttributeName</td>
@@ -41,11 +42,16 @@
<tr>
<td><label for="selectedInventorytype">$i18n.getString( "equipment_details" )</label></td>
<td>$inventoryTypeAttributeValue</td>
+ </tr>
+ -->
+ <tr>
+ <td><label for="inventoryTypeAttribute">$i18n.getString( "catalog" )</label></td>
+ <td><input type="text" id="catalogName" readonly="readonly" value="$catalogName" style="width:367px"></td>
</tr>
<tr>
<td><label for="selectedDataSetId">$i18n.getString( "dataset" )</label></td>
<td><select id="selectedDataSetId" name="selectedDataSetId" style="width:371px" onchange="getPeriods()">
- <option value="0">$i18n.getString( "please_select" )</option>
+ <!--<option value="0">$i18n.getString( "please_select" )</option>-->
#foreach( $dataSet in $dataSetList )
<!--$dataSet.periodtype.id --------- $dataSet.periodtype.name-->
<!--<option value="$dataSet.id:$dataSet.PeriodType.name">$dataSet.name</option>-->
@@ -74,7 +80,14 @@
<p>
<input type="submit" class="button" id="saveButton" name="saveButton" value="$i18n.getString( 'save' )" disabled="disabled"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='enquipmentSelect.action'" />
+ <!--<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='enquipmentSelect.action'" />-->
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="loadAllEquipments();"/>
</p>
</form>
+<script type="text/javascript">
+jQuery( document ).ready( function()
+{
+ getPeriods();
+});
+</script>
=== 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 @@
-<a href="index.action"><h2>$i18n.getString( "coldchain_management" ) </h2></a>
-
+<a href="index.action"><h2>$i18n.getString( "ccem_entry" ) </h2></a>
<ul>
- <li><a href="enquipmentSelect.action">$i18n.getString( "equipment_registration" )</a></li>
+ <li><a href="enquipmentSelect.action">$i18n.getString( "equipment_management" )</a></li>
</ul>
<br>
-#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 @@
<tr>
<td>$i18n.getString( "reporting_date" ) : </td>
<td>
- <input type="text" id="reportingDate" name="reportingDate" />
+ <input type="text" id="reportingDate" name="reportingDate" class="{validate:{required:true}}" />
<script type="text/javascript">
datePickerValid( 'reportingDate' );
</script>
@@ -37,7 +37,7 @@
<tr>
<td>$i18n.getString( "date_of_updation" ) : </td>
<td>
- <input type="text" id="dateOfUpdation" name="dateOfUpdation" />
+ <input type="text" id="dateOfUpdation" name="dateOfUpdation" class="{validate:{required:true}}" />
<script type="text/javascript">
datePickerValid( 'dateOfUpdation' );
</script>
@@ -46,7 +46,7 @@
<tr>
<td>$i18n.getString( "status" ) : </td>
<td>
- <select id="status" name="status" >
+ <select id="status" name="status" class="{validate:{required:true}}">
<option value="" >[$i18n.getString( "please_select" )]</option>
<option value="WORKING">$i18n.getString( "working" )</option>
<option value="NOTWORKING" >$i18n.getString( "notworking" )</option>
@@ -56,7 +56,7 @@
</tr>
<tr>
<td>$i18n.getString( "description" ) : </td>
- <td><textarea id="description" name="description"></textarea></td>
+ <td><textarea id="description" name="description" class="{validate:{required:true}}"></textarea></td>
</tr>
</table>
=== 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 @@
+<script type="text/javascript" src="javascript/catalog.js"></script>
<span id="message" style="display:block">$encoder.xmlEncode( $message )</span>
<br/><br/>
-<input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='catalog.action'" />
+<!--<input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='catalog.action'" />-->
+
+<input type="button" value="$i18n.getString( 'back' )" onclick="loadAllCatalogs();"/>
=== 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 @@
</script>
#elseif( $attribute.valueType == "COMBO" )
<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 $attribute.attributeOptions )
+ #foreach ($option in $!catalogTypeAttributesOptionsMap.get( $attribute.id ) )
<option value="$option.id" >$option.name</option>
- #end
+ #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/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 @@
<th>$i18n.getString( "stored_by" )</th>
</tr>
</thead>
-
+ <!--value='$format.formatDate($!patient.birthDate)'-->
<tbody id="list">
#foreach( $equimentStatus in $equipmentStatusHistory )
<tr>
- <td>$equimentStatus.reportingDate</td>
- <td>$equimentStatus.updationDate</td>
+ <td>$!format.formatDate($!equimentStatus.reportingDate)</td>
+ <td>$!format.formatDate($!equimentStatus.updationDate)</td>
<td>$equimentStatus.status</td>
<td>$equimentStatus.description</td>
<td>$equimentStatus.storedBy</td>
=== 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" )
<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.attributeOptions )
+ #foreach ($option in $!catalogTypeAttributesOptionsMap.get( $attribute.id ) )
<option value="$option.id" #if($attributeValue == $option.name) selected="selected" #end>$option.name</option>
#end
</select>
=== 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" )
<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.attributeOptions )
+ #foreach ($option in $!inventoryTypeAttributeOptionsMap.get( $attribute.id ) )
<option value="$option.id" #if($attributeValue == $option.name) selected="selected" #end>$option.name</option>
#end
</select>
