=== added directory 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/dataentryform'
=== added directory 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/dataentryform/action'
=== added file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/dataentryform/action/ViewCatalogTypeDataEntryFormAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/dataentryform/action/ViewCatalogTypeDataEntryFormAction.java	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/dataentryform/action/ViewCatalogTypeDataEntryFormAction.java	2012-05-17 09:53:19 +0000
@@ -0,0 +1,63 @@
+package org.hisp.dhis.coldchain.catalog.dataentryform.action;
+
+import org.hisp.dhis.coldchain.catalog.CatalogType;
+import org.hisp.dhis.coldchain.catalog.CatalogTypeService;
+import org.hisp.dhis.dataentryform.DataEntryForm;
+import org.hisp.dhis.dataentryform.DataEntryFormService;
+
+import com.opensymphony.xwork2.Action;
+
+public class ViewCatalogTypeDataEntryFormAction implements Action
+{
+
+    // -------------------------------------------------------------------------
+    // Dependency
+    // -------------------------------------------------------------------------
+    private CatalogTypeService catalogTypeService;
+    
+    public void setCatalogTypeService( CatalogTypeService catalogTypeService )
+    {
+        this.catalogTypeService = catalogTypeService;
+    }
+
+    private DataEntryFormService dataEntryFormService;
+
+    public void setDataEntryFormService( DataEntryFormService dataEntryFormService )
+    {
+        this.dataEntryFormService = dataEntryFormService;
+    }
+
+    // -------------------------------------------------------------------------
+    // Getters & Setters
+    // -------------------------------------------------------------------------
+
+    private Integer catalogTypeId;
+
+    public void setCatalogTypeId( Integer catalogTypeId )
+    {
+        this.catalogTypeId = catalogTypeId;
+    }
+    
+    private DataEntryForm dataEntryForm;
+
+    public DataEntryForm getDataEntryForm()
+    {
+        return dataEntryForm;
+    }
+
+    // -------------------------------------------------------------------------
+    // Action implementation
+    // -------------------------------------------------------------------------
+
+    public String execute()
+        throws Exception
+    {
+        CatalogType catalogType = catalogTypeService.getCatalogType( catalogTypeId );
+        
+        // ---------------------------------------------------------------------
+        // Get dataEntryForm of selected catalogtype
+        // ---------------------------------------------------------------------
+
+        return SUCCESS;
+    }
+}

=== added 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	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentDataEntryFormAction.java	2012-05-17 09:53:19 +0000
@@ -0,0 +1,58 @@
+package org.hisp.dhis.coldchain.equipment.action;
+
+import org.hisp.dhis.coldchain.inventory.EquipmentDataValueService;
+
+import com.opensymphony.xwork2.Action;
+
+public class ShowEquipmentDataEntryFormAction implements Action
+{
+
+    // -------------------------------------------------------------------------
+    // Dependency
+    // -------------------------------------------------------------------------
+
+    private EquipmentDataValueService equipmentDataValueService;
+    
+    public void setEquipmentDataValueService( EquipmentDataValueService equipmentDataValueService )
+    {
+        this.equipmentDataValueService = equipmentDataValueService;
+    }
+    
+    // -------------------------------------------------------------------------
+    // Input & Output
+    // -------------------------------------------------------------------------
+
+    private Integer equipmentInstanceId;
+
+    public void setEquipmentInstanceId( Integer equipmentInstanceId )
+    {
+        this.equipmentInstanceId = equipmentInstanceId;
+    }
+
+    private Integer dataSetId;
+    
+    public void setDataSetId( Integer dataSetId )
+    {
+        this.dataSetId = dataSetId;
+    }
+
+    private Integer periodId;
+    
+    public void setPeriodId( Integer periodId )
+    {
+        this.periodId = periodId;
+    }
+
+
+
+
+    // -------------------------------------------------------------------------
+    // Action Implementation
+    // -------------------------------------------------------------------------
+    public String execute() throws Exception
+    {
+
+        return SUCCESS;
+    }
+
+}

=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentInstanceList.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentInstanceList.vm	2012-05-05 11:16:25 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentInstanceList.vm	2012-05-17 09:53:19 +0000
@@ -61,6 +61,7 @@
                   #end
                 <td>
                   <a href="javascript:showUpdateEquipmentForm( '$equipmentInstance.id' )" title='$i18n.getString( "edit_equipment" )'><img src="../images/edit.png" alt='$i18n.getString( "edit_equipment" )'></a>
+				  <a href="javascript:showEquipmentDataEntryForm( '$equipmentInstance.id' ); " title='$i18n.getString( "equipment_dataentry" )'><img src="../icons/dataentry.png" alt='$i18n.getString( "equipment_tracking" )' style='width:25px; height:25px'></a>	
                   #if( $inventoryType.tracking )
 					<a href="javascript:showEquipmentStatusForm( '$equipmentInstance.id' ); " title='$i18n.getString( "equipment_tracking" )'><img src="../icons/dataentry.png" alt='$i18n.getString( "equipment_tracking" )' style='width:25px; height:25px'></a>
                     <a href="javascript:showEquipmentStatusHistoryForm( '$equipmentInstance.id' ); " title='$i18n.getString( "equipment_tracking_history" )'><img src="../icons/dataentry.png" alt='$i18n.getString( "equipment_tracking_history" )' style='width:25px; height:25px'></a>

=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipment.js'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipment.js	2012-05-16 07:06:15 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipment.js	2012-05-17 09:53:19 +0000
@@ -402,8 +402,6 @@
 		showById('detailsCatalogInfo');
 	});
 	
-	
-	
 	/*
 	jQuery.getJSON( 'getCatalogDetails.action', { id: catalogId }, function ( json ) {
 		//setInnerHTML( 'nameField', json.catalog.name );	
@@ -413,12 +411,9 @@
 		showById('detailsCatalogInfo');
 		//showDetails();
 	});
-		
 	
 	//showById('detailsCatalogInfo');
 	
-	
-	
 	$('#detailsCatalogInfo').load("getCatalogDetails.action", 
 				{
 					id:catalogId
@@ -435,3 +430,44 @@
 				});;
 	*/
 }
+
+
+//------------------------------------------------------------------------------
+// Equipment Routine Data Entry
+//------------------------------------------------------------------------------
+
+//------------------------------------------------------------------------------
+//Update Equipment Data
+//------------------------------------------------------------------------------
+
+function showEquipmentDataEntryForm( equipmentInstanceId )
+{
+	hideById('listEquipmentDiv');
+	hideById('selectDiv');
+	hideById('searchEquipmentDiv');
+	hideById('editEquipmentStatusDiv');
+	
+	jQuery('#loaderDiv').show();
+	jQuery('#editEquipmentDataDiv').load('showEquipmentDataEntryForm.action',
+		{
+			equipmentInstanceId:equipmentInstanceId
+		}, function()
+		{
+			showById('editEquipmentDataDiv');
+			jQuery('#loaderDiv').hide();
+		});
+		
+	jQuery('#resultSearchDiv').dialog('close');
+}
+
+function updateEquipmentDataEntry()
+{
+	$.ajax({
+    type: "POST",
+    url: 'updateEquipmentData.action',
+    data: getParamsForDiv('editEquipmentDataDiv'),
+    success: function( json ) {
+		loadAllEquipments();
+    }
+   });
+}

=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectEquipment.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectEquipment.vm	2012-05-14 09:01:41 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectEquipment.vm	2012-05-17 09:53:19 +0000
@@ -54,6 +54,7 @@
 <div id='listEquipmentDiv'></div> <!-- List All/Filtered Equipments -->
 <div id='editEquipmentDiv'></div> <!-- Add / Edit Equipment Form -->
 <div id='editEquipmentStatusDiv'></div> <!-- Add / Edit Equipment Status -->
+<div id='editEquipmentDataDiv'></div> <!-- Add / Edit Equipment Data -->
 <div id='equipmentStatusHistoryDiv'></div> <!-- List Equipment Status History -->
 <div id='resultSearchDiv' style='font-size:13px'></div> <!-- List searching Equipment -->