dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17319
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6845: CCEM work in progress
------------------------------------------------------------
revno: 6845
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-05-03 16:37:19 +0530
message:
CCEM work in progress
modified:
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/equipmentInstanceList.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/equipment.js
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectEquipment.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/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
=== 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-05-03 07:02:57 +0000
+++ local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties 2012-05-03 11:07:19 +0000
@@ -48,7 +48,7 @@
-inventorytype_attribute_management = Inventorytype attribute aanagement
+inventorytype_attribute_management = Inventorytype attribute management
inventorytype_attribute = Inventorytype attribute
create_new_inventorytype_attribute = Create new inventorytype attribute
inventorytype_attribute_details = Inventorytype attribute details
@@ -64,8 +64,10 @@
edit_inventorytype = Edit inventorytype
inventorytype_details = Details inventorytype
edit_inventorytype_attribute = Edit inventorytype attribute
-
-
+inventory_attribute_details = Details inventory attribute
+
+
+equipment = Equipment
equipment_registration = Equipment registration
equipment_management = Equipment management
registering_unit = Registering unit
@@ -82,4 +84,13 @@
working = Working
notworking = Not working
repair = Repair
-
+add_new_equipment = Add new equipment
+update_equipment = Update 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
+stored_by = Stored by
\ No newline at end of file
=== modified file 'local/in/dhis-web-coldchain/src/main/resources/struts.xml'
--- local/in/dhis-web-coldchain/src/main/resources/struts.xml 2012-05-02 09:18:42 +0000
+++ local/in/dhis-web-coldchain/src/main/resources/struts.xml 2012-05-03 11:07:19 +0000
@@ -378,6 +378,7 @@
class="org.hisp.dhis.coldchain.equipment.action.ShowAddEquipmentFormAction">
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-coldchain/addEquipmentForm.vm</param>
+ <param name="stylesheets">css/basic.css</param>
<param name="requiredAuthorities">F_EQUIPMENT_ADD</param>
</action>
<action name="addEquipment"
@@ -389,6 +390,7 @@
class="org.hisp.dhis.coldchain.equipment.action.GetEquipmentInstanceDataAction">
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-coldchain/updateEquipmentForm.vm</param>
+ <param name="stylesheets">css/basic.css</param>
<param name="requiredAuthorities">F_EQUIPMENT_UPDATE</param>
</action>
<action name="updateEquipment"
@@ -401,6 +403,7 @@
class="org.hisp.dhis.coldchain.equipment.action.ShowEquipmentStatusFormAction">
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-coldchain/equipmentStatusForm.vm</param>
+ <param name="stylesheets">css/basic.css</param>
<param name="requiredAuthorities">F_EQUIPMENTSTATUS_UPDATE</param>
</action>
@@ -414,6 +417,7 @@
class="org.hisp.dhis.coldchain.equipment.action.ShowEquipmentStatusHistoryFormAction">
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-coldchain/showEquipmentStatusHistory.vm</param>
+ <param name="stylesheets">css/basic.css</param>
<param name="requiredAuthorities">F_EQUIPMENTSTATUSHISTORY</param>
</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-05-02 09:18:42 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentForm.vm 2012-05-03 11:07:19 +0000
@@ -1,3 +1,4 @@
+<script type="text/javascript" src="javascript/equipment.js"></script>
## Macro for generating the jQuery validation rules
#macro( validate $type $require )
#if( $type == "NUMBER" )
@@ -33,15 +34,15 @@
<h3>$i18n.getString( "add_new_equipment" )</h3>
<form id="equipmentForm" name="equipmentForm" method="post" >
- <input type="text" id="ouId" name="ouId" value="$organisationUnit.id" />
- <input type="text" id="itypeId" name="itypeId" value="$inventoryType.id" />
+ <input type="hidden" id="ouId" name="ouId" value="$organisationUnit.id" />
+ <input type="hidden" id="itypeId" name="itypeId" value="$inventoryType.id" />
<table>
<tr>
<td>$i18n.getString( "registering_unit" ) : </td>
<td>$organisationUnit.name</td>
</tr>
<tr>
- <td>$i18n.getString( "inventory_type" ) : </th>
+ <td>$i18n.getString( "inventorytype" ) : </th>
<td>$inventoryType.name</th>
</tr>
=== 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-03 07:02:57 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentInstanceList.vm 2012-05-03 11:07:19 +0000
@@ -25,11 +25,10 @@
<tr>
<td>
<table class="listTable" id="equipmentList" width='100%'>
+ <col width="30"/>
#foreach( $inventoryTypeAttribute in $inventoryTypeAttributeList )
<col/>
#end
- <col/>
- <col/>
<col width="200"/>
<thead>
@@ -114,4 +113,5 @@
var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")';
var i18n_create_new_encounter = '$encoder.jsEscape( $i18n.getString( "create_new_encounter" ) , "'")';
var i18n_save_success = '$encoder.jsEscape( $i18n.getString( "save_success" ) , "'")';
+
</script>
=== 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-02 09:18:42 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentStatusForm.vm 2012-05-03 11:07:19 +0000
@@ -23,7 +23,7 @@
<h3>$i18n.getString( "equipmentstatus" )</h3>
<form id="equipmentStatusForm" name="equipmentStatusForm" method="post" >
- <input type="text" id="equipmentInstanceId" name="equipmentInstanceId" value="$equipmentInstanceId" />
+ <input type="hidden" id="equipmentInstanceId" name="equipmentInstanceId" value="$equipmentInstanceId" />
<table>
<tr>
<td>$i18n.getString( "reporting_date" ) : </td>
@@ -56,7 +56,7 @@
</tr>
<tr>
<td>$i18n.getString( "description" ) : </td>
- <td><textarea id="description" name="description" style="width: 240px; height:8em;"></textarea></td>
+ <td><textarea id="description" name="description"></textarea></td>
</tr>
</table>
=== 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-03 07:02:57 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipment.js 2012-05-03 11:07:19 +0000
@@ -176,8 +176,8 @@
{
//hideById('listEquipmentDiv');
hideById('editEquipmentStatusDiv');
- hideById('selectDiv');
- hideById('searchEquipmentDiv');
+ //hideById('selectDiv');
+ //hideById('searchEquipmentDiv');
setInnerHTML('editEquipmentDiv', '');
@@ -185,7 +185,7 @@
jQuery('#equipmentStatusHistoryDiv').dialog('destroy').remove();
jQuery('<div id="equipmentStatusHistoryDiv">' ).load( 'showEquipmentStatusHistoryForm.action?equipmentInstanceId='+equipmentInstanceId ).dialog({
- title: 'i18n_equipment_status_history',
+ title: i18n_equipment_status_history,
maximize: true,
closable: true,
modal:true,
=== 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-03 07:02:57 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectEquipment.vm 2012-05-03 11:07:19 +0000
@@ -60,6 +60,7 @@
#parse( "/dhis-web-commons/loader/loader.vm" )
<script>
+ var i18n_equipment_status_history = '$encoder.jsEscape( $i18n.getString( "equipment_status_history" ) , "'")';
var i18n_select_inventorytype = '$encoder.jsEscape( $i18n.getString( "select_inventorytype" ) , "'")';
var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'")';
var i18n_can_not_register_patient_for_orgunit = '$encoder.jsEscape( $i18n.getString( "can_not_register_patient_for_orgunit" ), "'")';
=== 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-02 09:18:42 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentStatusHistory.vm 2012-05-03 11:07:19 +0000
@@ -1,11 +1,11 @@
<table>
<tr>
- <th>Reporting Date</th>
- <th>Date of Updation</th>
- <th>Status</th>
- <th>Description</th>
- <th>Stored by</th>
+ <th>$i18n.getString( "reporting_date" )</th>
+ <th>$i18n.getString( "updation_date" )</th>
+ <th>$i18n.getString( "status" )</th>
+ <th>$i18n.getString( "description" )</th>
+ <th>$i18n.getString( "stored_by" )</th>
</tr>
#foreach( $equimentStatus in $equipmentStatusHistory )
=== 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-05-02 09:18:42 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateEquipmentForm.vm 2012-05-03 11:07:19 +0000
@@ -1,3 +1,4 @@
+<script type="text/javascript" src="javascript/equipment.js"></script>
## Macro for generating the jQuery validation rules
#macro( validate $type $require )
#if( $type == "NUMBER" )
@@ -33,14 +34,14 @@
<h3>$i18n.getString( "update_equipment" )</h3>
<form id="equipmentForm" name="equipmentForm" method="post" >
- <input type="text" id="equipmentInstanceID" name="equipmentInstanceID" value="$equipmentInstance.id" />
+ <input type="hidden" id="equipmentInstanceID" name="equipmentInstanceID" value="$equipmentInstance.id" />
<table>
<tr>
<td>$i18n.getString( "registering_unit" ) : </td>
<td>$equipmentInstance.organisationUnit.name</td>
</tr>
<tr>
- <td>$i18n.getString( "inventory_type" ) : </th>
+ <td>$i18n.getString( "inventorytype" ) : </th>
<td>$equipmentInstance.inventoryType.name</th>
</tr>
