dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17333
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6851: CCEM work in progress
------------------------------------------------------------
revno: 6851
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-05-04 13:12:28 +0530
message:
CCEM work in progress
added:
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/RemoveEquipmentInstanceAction.java
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentData.vm
modified:
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstanceService.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentInstanceService.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-coldchain/src/main/resources/struts.xml
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/showEquipmentStatusHistory.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-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstanceService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstanceService.java 2012-05-02 09:18:42 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstanceService.java 2012-05-04 07:42:28 +0000
@@ -15,6 +15,8 @@
void deleteEquipmentInstance( EquipmentInstance equipmentInstance );
+ void deleteCompleteEquipmentInstance( EquipmentInstance equipmentInstance );
+
int createEquipment( EquipmentInstance equipmentInstance, List<EquipmentDetails> equipmentDetails );
EquipmentInstance getEquipmentInstance( int id );
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentInstanceService.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentInstanceService.java 2012-05-02 09:18:42 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentInstanceService.java 2012-05-04 07:42:28 +0000
@@ -1,5 +1,6 @@
package org.hisp.dhis.coldchain.inventory;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -28,6 +29,13 @@
this.equipmentDetailsService = equipmentDetailsService;
}
+ private EquipmentStatusService equipmentStatusService;
+
+ public void setEquipmentStatusService( EquipmentStatusService equipmentStatusService )
+ {
+ this.equipmentStatusService = equipmentStatusService;
+ }
+
// -------------------------------------------------------------------------
// EquipmentInstance
// -------------------------------------------------------------------------
@@ -44,6 +52,24 @@
//equipmentInstanceStore.deleteEquipmentInstance( equipmentInstance );
equipmentInstanceStore.delete( equipmentInstance );
}
+
+ public void deleteCompleteEquipmentInstance( EquipmentInstance equipmentInstance )
+ {
+ List<EquipmentDetails> equipmentDetailsList = new ArrayList<EquipmentDetails>( equipmentDetailsService.getEquipmentDetails( equipmentInstance ) );
+ for( EquipmentDetails equipmentDetails : equipmentDetailsList )
+ {
+ equipmentDetailsService.deleteEquipmentDetails( equipmentDetails );
+ }
+
+ List<EquipmentStatus> equipmentStatusHistory = new ArrayList<EquipmentStatus>( equipmentStatusService.getEquipmentStatusHistory( equipmentInstance ) );
+ for( EquipmentStatus equipmentStatus : equipmentStatusHistory )
+ {
+ equipmentStatusService.deleteEquipmentStatus( equipmentStatus );
+ }
+
+ deleteEquipmentInstance( equipmentInstance );
+ }
+
@Override
public Collection<EquipmentInstance> getAllEquipmentInstance()
{
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml 2012-05-02 09:18:42 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml 2012-05-04 07:42:28 +0000
@@ -86,6 +86,7 @@
class="org.hisp.dhis.coldchain.inventory.DefaultEquipmentInstanceService">
<property name="equipmentInstanceStore" ref="org.hisp.dhis.coldchain.inventory.EquipmentInstanceStore"/>
<property name="equipmentDetailsService" ref="org.hisp.dhis.coldchain.inventory.EquipmentDetailsService"/>
+ <property name="equipmentStatusService" ref="org.hisp.dhis.coldchain.inventory.EquipmentStatusService"/>
</bean>
<bean id="org.hisp.dhis.coldchain.inventory.EquipmentStatusService"
class="org.hisp.dhis.coldchain.inventory.DefaultEquipmentStatusService">
=== added file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/RemoveEquipmentInstanceAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/RemoveEquipmentInstanceAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/RemoveEquipmentInstanceAction.java 2012-05-04 07:42:28 +0000
@@ -0,0 +1,66 @@
+package org.hisp.dhis.coldchain.equipment.action;
+
+import org.hisp.dhis.coldchain.inventory.EquipmentInstance;
+import org.hisp.dhis.coldchain.inventory.EquipmentInstanceService;
+import org.hisp.dhis.common.DeleteNotAllowedException;
+import org.hisp.dhis.i18n.I18n;
+
+import com.opensymphony.xwork2.Action;
+
+public class RemoveEquipmentInstanceAction implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+ private EquipmentInstanceService equipmentInstanceService;
+
+ public void setEquipmentInstanceService( EquipmentInstanceService equipmentInstanceService )
+ {
+ this.equipmentInstanceService = equipmentInstanceService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input/Output
+ // -------------------------------------------------------------------------
+ private int id;
+
+ public void setId( int id )
+ {
+ this.id = id;
+ }
+ private I18n i18n;
+
+ public void setI18n( I18n i18n )
+ {
+ this.i18n = i18n;
+ }
+
+ private String message;
+
+ public String getMessage()
+ {
+ return message;
+ }
+ // -------------------------------------------------------------------------
+ // Action Implementation
+ // -------------------------------------------------------------------------
+ public String execute() throws Exception
+ {
+ try
+ {
+ EquipmentInstance equipmentInstance = equipmentInstanceService.getEquipmentInstance( id );
+
+ equipmentInstanceService.deleteCompleteEquipmentInstance( equipmentInstance );
+ }
+ catch ( DeleteNotAllowedException ex )
+ {
+ if ( ex.getErrorCode().equals( DeleteNotAllowedException.ERROR_ASSOCIATED_BY_OTHER_OBJECTS ) )
+ {
+ message = i18n.getString( "object_not_deleted_associated_by_objects" ) + " " + ex.getMessage();
+ }
+
+ return ERROR;
+ }
+ return SUCCESS;
+ }
+}
=== modified file 'local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml 2012-05-02 09:18:42 +0000
+++ local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml 2012-05-04 07:42:28 +0000
@@ -427,6 +427,11 @@
<property name="equipmentInstanceService" ref="org.hisp.dhis.coldchain.inventory.EquipmentInstanceService" />
<property name="equipmentStatusService" ref="org.hisp.dhis.coldchain.inventory.EquipmentStatusService" />
</bean>
+ <bean id="org.hisp.dhis.coldchain.equipment.action.RemoveEquipmentInstanceAction"
+ class="org.hisp.dhis.coldchain.equipment.action.RemoveEquipmentInstanceAction"
+ scope="prototype">
+ <property name="equipmentInstanceService" ref="org.hisp.dhis.coldchain.inventory.EquipmentInstanceService" />
+ </bean>
</beans>
\ 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-03 11:07:19 +0000
+++ local/in/dhis-web-coldchain/src/main/resources/struts.xml 2012-05-04 07:42:28 +0000
@@ -420,6 +420,18 @@
<param name="stylesheets">css/basic.css</param>
<param name="requiredAuthorities">F_EQUIPMENTSTATUSHISTORY</param>
</action>
-
+ <action name="showEquipmentInstanceDetails"
+ class="org.hisp.dhis.coldchain.equipment.action.GetEquipmentInstanceDataAction">
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-coldchain/showEquipmentData.vm</param>
+ </action>
+
+ <action name="removeEquipmentInstance"
+ class="org.hisp.dhis.coldchain.equipment.action.RemoveEquipmentInstanceAction">
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
+ <param name="requiredAuthorities">F_EQUIPMENT_DELETE</param>
+ </action>
+
</package>
</struts>
\ No newline at end of file
=== 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 11:07:19 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipment.js 2012-05-04 07:42:28 +0000
@@ -322,6 +322,16 @@
}
});
}
+
+//-----------------------------------------------------------------------------
+//Remove equipment
+//-----------------------------------------------------------------------------
+
+function removeEquipment( equipmentId, name )
+{
+ removeItem( equipmentId, name, i18n_confirm_delete, 'removeEquipmentInstance.action' );
+}
+
//----------------------------------------------------------------
//Get Params form Div
//----------------------------------------------------------------
@@ -356,3 +366,26 @@
return params;
}
+//----------------------------------------------------------------
+//Show EquipmentInstance Details
+//----------------------------------------------------------------
+function showEquipmentDetails( equipmentInstanceId )
+{
+ hideById('editEquipmentStatusDiv');
+ hideById('selectDiv');
+ hideById('searchEquipmentDiv');
+
+ setInnerHTML('editEquipmentDiv', '');
+
+ jQuery('#equipmentStatusHistoryDiv').dialog('destroy').remove();
+ jQuery('<div id="equipmentStatusHistoryDiv">' ).load( 'showEquipmentInstanceDetails.action?equipmentInstanceId='+equipmentInstanceId ).dialog({
+ title: 'i18n_equipment_details',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 500,
+ height: 450
+ });
+
+}
=== added file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentData.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentData.vm 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentData.vm 2012-05-04 07:42:28 +0000
@@ -0,0 +1,28 @@
+
+
+<h3>$i18n.getString( "equipment_details" )</h3>
+
+ <table>
+ <tr>
+ <td>$i18n.getString( "registering_unit" ) : </td>
+ <td>$equipmentInstance.organisationUnit.name</td>
+ </tr>
+ <tr>
+ <td>$i18n.getString( "inventory_type" ) : </th>
+ <td>$equipmentInstance.inventoryType.name</th>
+ </tr>
+
+ <!-- InventoryType Attributes -->
+ <tr><td> </td><td> </td></tr>
+ <tr><th colspan="2" class="heading-column">$i18n.getString( "inventory_attribute_details" )</th></tr>
+ #foreach( $attribute in $inventoryTypeAttributes )
+ #set( $attributeValue = "" )
+ #set( $attributeValue = $!equipmentValueMap.get( $attribute.id ) )
+ <tr>
+ <td class='text-column'><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
+ <td class="text-column">$!attributeValue</td>
+ </tr>
+ #end
+ </table>
+
+
=== 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-03 11:07:19 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentStatusHistory.vm 2012-05-04 07:42:28 +0000
@@ -1,21 +1,44 @@
-<table>
+<table class="mainPageTable">
<tr>
- <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 )
- <tr>
- <td>$equimentStatus.reportingDate</td>
- <td>$equimentStatus.updationDate</td>
- <td>$equimentStatus.status</td>
- <td>$equimentStatus.description</td>
- <td>$equimentStatus.storedBy</td>
- </tr>
- #end
-
-</table>
\ No newline at end of file
+ <td>
+ <table class="listTable" id="equipmentList" width='100%'>
+ <col/>
+ <col/>
+ <col/>
+ <col/>
+ <col/>
+
+ <thead>
+ <tr>
+ <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>
+ </thead>
+
+ <tbody id="list">
+ #foreach( $equimentStatus in $equipmentStatusHistory )
+ <tr>
+ <td>$equimentStatus.reportingDate</td>
+ <td>$equimentStatus.updationDate</td>
+ <td>$equimentStatus.status</td>
+ <td>$equimentStatus.description</td>
+ <td>$equimentStatus.storedBy</td>
+ </tr>
+ #end
+ </tbody>
+ </table>
+ </td>
+ </tr>
+</table>
+
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'equipmentList' );
+ });
+</script>
+
+
