' ).load( 'showUploadImageForm.action?id='+catalogId ).dialog({
+ title: i18n_upload_catalog_image,
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 800,
+ height: 450
+ });
+
+}
+*/
+function upLoadImage()
+{
+
+ $( '#imageSaveDiv' ).html( ' ' );
+
+ var catalogID = $( '#catalogID' ).val();
+ //var sDateLB = $( '#sDateLB' ).val();
+ //var eDateLB = $( '#eDateLB' ).val();
+
+ //jQuery('#loaderDiv').show();
+ //document.getElementById( "aggregate" ).disabled = true;
+
+ jQuery('#imageSaveDiv').load('uploadCatalogImage.action',
+ {
+ catalogID:catalogID,
+ enctype:"multipart/form-data"
+ //eDateLB:eDateLB
+ }, function()
+ {
+ showById('imageSaveDiv');
+ //document.getElementById( "aggregate" ).disabled = false;
+ //jQuery('#loaderDiv').hide();
+ });
+}
function showUploadCatalogImageForm( catalogId )
{
@@ -517,7 +561,7 @@
jQuery('#resultSearchDiv').dialog('close');
}
-
+/*
function uploadCatalogImage()
{
$.ajax({
@@ -530,7 +574,7 @@
}
});
}
-
+*/
//----------------------------------------------------------------
=== 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-06-27 06:56:57 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipment.js 2012-08-03 11:10:18 +0000
@@ -38,8 +38,10 @@
// ----------------------------------------------------------------
// On InventoryType Change - Loading InventoryTypeAttributes
// ----------------------------------------------------------------
-function inventoryTypeChange( inventoryTypeId )
+//function inventoryTypeChange( inventoryTypeId )
+function inventoryTypeChange()
{
+ var inventoryTypeId = $( '#inventoryType' ).val();
if( inventoryTypeId == "0" )
return;
@@ -106,6 +108,7 @@
hideById('editEquipmentDiv');
hideById('resultSearchDiv');
hideById('editEquipmentStatusDiv');
+ hideById('equipmentDataEntryDiv');
showById('selectDiv');
showById('searchEquipmentDiv');
@@ -150,8 +153,10 @@
hideById('editEquipmentDiv');
hideById('resultSearchDiv');
hideById('editEquipmentStatusDiv');
+ hideById('equipmentDataEntryDiv');
showById('selectDiv');
showById('searchEquipmentDiv');
+
jQuery('#loaderDiv').show();
contentDiv = 'listEquipmentDiv';
@@ -178,18 +183,18 @@
function showEquipmentStatusHistoryForm( equipmentInstanceId )
{
//hideById('listEquipmentDiv');
- hideById('editEquipmentStatusDiv');
+ //hideById('editEquipmentStatusDiv');
//hideById('selectDiv');
//hideById('searchEquipmentDiv');
- setInnerHTML('editEquipmentDiv', '');
+ setInnerHTML('equipmentStatusHistoryDiv', '');
//jQuery('#loaderDiv').show();
jQuery('#equipmentStatusHistoryDiv').dialog('destroy').remove();
jQuery('
' ).load( 'showEquipmentStatusHistoryForm.action?equipmentInstanceId='+equipmentInstanceId ).dialog({
title: i18n_equipment_status_history,
- maximize: true,
+ maximize: true,
closable: true,
modal:true,
overlay:{background:'#000000', opacity:0.1},
@@ -199,7 +204,6 @@
}
-
//----------------------------------------------------------------
//Show Equipment Tracking Form
//----------------------------------------------------------------
@@ -210,8 +214,10 @@
hideById('editEquipmentStatusDiv');
hideById('selectDiv');
hideById('searchEquipmentDiv');
+ hideById('equipmentDataEntryDiv');
+ hideById('editEquipmentDiv');
- setInnerHTML('editEquipmentDiv', '');
+ setInnerHTML('editEquipmentStatusDiv', '');
jQuery('#loaderDiv').show();
jQuery('#editEquipmentStatusDiv').load('showEquipmentStatusForm.action',
@@ -260,6 +266,9 @@
hideById('selectDiv');
hideById('searchEquipmentDiv');
hideById('editEquipmentStatusDiv');
+ hideById('equipmentDataEntryDiv');
+ setInnerHTML('editEquipmentDiv', '');
+
jQuery('#loaderDiv').show();
jQuery('#editEquipmentDiv').load('showAddEquipmentForm.action',{
@@ -298,6 +307,7 @@
hideById('selectDiv');
hideById('searchEquipmentDiv');
hideById('editEquipmentStatusDiv');
+ hideById('equipmentDataEntryDiv');
setInnerHTML('editEquipmentDiv', '');
@@ -327,6 +337,46 @@
});
}
+function showEquipmentDataEntryForm( equipmentInstanceId )
+{
+ hideById('listEquipmentDiv');
+ hideById('selectDiv');
+ hideById('searchEquipmentDiv');
+ hideById('editEquipmentStatusDiv');
+ hideById('editEquipmentDiv');
+ hideById('equipmentDataEntryDiv');
+
+ setInnerHTML('equipmentDataEntryDiv', '');
+
+ //jQuery('#loaderDiv').show();
+ jQuery('#equipmentDataEntryDiv').load('showEquipmentDataEntryForm.action',
+ {
+ equipmentInstanceId:equipmentInstanceId
+ }, function()
+ {
+ showById('equipmentDataEntryDiv');
+ jQuery('#searchEquipmentDiv').dialog('close');
+ //jQuery('#loaderDiv').hide();
+ });
+
+ jQuery('#resultSearchDiv').dialog('close');
+
+ //window.location.href = "showEquipmentDataEntryForm.action?equipmentInstanceId=" + equipmentInstanceId;
+
+}
+
+function editEquipmentDataEntryForm()
+{
+ $.ajax({
+ type: "POST",
+ url: 'saveDataEntryForm.action',
+ data: getParamsForDiv('equipmentDataEntryDiv'),
+ success: function( json ) {
+ loadAllEquipments();
+ }
+ });
+}
+
//-----------------------------------------------------------------------------
//Remove equipment
//-----------------------------------------------------------------------------
@@ -441,7 +491,7 @@
//------------------------------------------------------------------------------
//Update Equipment Data
//------------------------------------------------------------------------------
-
+/*
function showEquipmentDataEntryForm( equipmentInstanceId )
{
@@ -463,9 +513,9 @@
});
jQuery('#resultSearchDiv').dialog('close');
- */
+
}
-
+*/
function updateEquipmentDataEntry()
{
$.ajax({
=== 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-08-01 12:21:34 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseUplodImageStatus.vm 2012-08-03 11:10:18 +0000
@@ -3,6 +3,6 @@
-
+
-
+
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectCatalog.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectCatalog.vm 2012-06-27 06:56:57 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectCatalog.vm 2012-08-03 11:10:18 +0000
@@ -6,8 +6,9 @@
|
- |
-
+