dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17429
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6932: CCEM work in progress
------------------------------------------------------------
revno: 6932
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-05-14 14:55:17 +0530
message:
CCEM work in progress
modified:
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogType.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryType.hbm.xml
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/AddCatalogTypeAction.java
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/UpdateCatalogTypeAction.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/inventory/action/AddInventoryTypeAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/UpdateInventoryTypeAction.java
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeForm.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/inventoryType.js
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeForm.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/catalog/CatalogType.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogType.java 2012-05-09 12:08:52 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogType.java 2012-05-14 09:25:17 +0000
@@ -4,7 +4,6 @@
import java.util.List;
import org.hisp.dhis.common.BaseNameableObject;
-import org.hisp.dhis.common.annotation.Scanned;
import org.hisp.dhis.dataentryform.DataEntryForm;
//public class CatalogType implements Serializable
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType.java 2012-05-09 07:02:15 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType.java 2012-05-14 09:25:17 +0000
@@ -1,9 +1,11 @@
package org.hisp.dhis.coldchain.inventory;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
import org.hisp.dhis.coldchain.catalog.CatalogType;
import org.hisp.dhis.common.BaseNameableObject;
+import org.hisp.dhis.dataentryform.DataEntryForm;
//public class InventoryType implements Serializable
public class InventoryType extends BaseNameableObject
@@ -23,7 +25,12 @@
private CatalogType catalogType;
- private Set<InventoryTypeAttribute> inventoryTypeAttributes;
+ // private Set<InventoryTypeAttribute> inventoryTypeAttributes;
+
+ private List<InventoryTypeAttribute> inventoryTypeAttributes = new ArrayList<InventoryTypeAttribute>();
+
+ private DataEntryForm dataEntryForm;
+
// -------------------------------------------------------------------------
// Contructors
@@ -123,6 +130,7 @@
{
this.catalogType = catalogType;
}
+ /*
public Set<InventoryTypeAttribute> getInventoryTypeAttributes()
{
return inventoryTypeAttributes;
@@ -131,5 +139,24 @@
{
this.inventoryTypeAttributes = inventoryTypeAttributes;
}
+ */
+ public List<InventoryTypeAttribute> getInventoryTypeAttributes()
+ {
+ return inventoryTypeAttributes;
+ }
+ public void setInventoryTypeAttributes( List<InventoryTypeAttribute> inventoryTypeAttributes )
+ {
+ this.inventoryTypeAttributes = inventoryTypeAttributes;
+ }
+ public DataEntryForm getDataEntryForm()
+ {
+ return dataEntryForm;
+ }
+ public void setDataEntryForm( DataEntryForm dataEntryForm )
+ {
+ this.dataEntryForm = dataEntryForm;
+ }
+
+
}
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryType.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryType.hbm.xml 2012-05-02 06:03:10 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryType.hbm.xml 2012-05-14 09:25:17 +0000
@@ -17,13 +17,22 @@
foreign-key="fk_inventorytype_catalogypeid" />
<property name="tracking" column="tracking" />
-
+<!--
<set name="inventoryTypeAttributes" table="inventorytype_attributes">
<key column="inventorytypeid" foreign-key="fk_inventorytype_attributes_inventorytypeid" />
<many-to-many class="org.hisp.dhis.coldchain.inventory.InventoryTypeAttribute" column="inventorytypeattributeid"
foreign-key="fk_inventorytype_attributes_inventorytypeattributeid" />
</set>
-
+-->
+ <list name="inventoryTypeAttributes" table="inventorytype_attributes">
+ <key column="inventorytypeid" foreign-key="fk_inventorytype_attributes_inventorytypeid" />
+ <list-index column="sort_order" base="0" />
+ <many-to-many class="org.hisp.dhis.coldchain.inventory.InventoryTypeAttribute" column="inventorytypeattributeid"
+ foreign-key="fk_inventorytype_attributes_inventorytypeattributeid" />
+ </list>
+
+ <many-to-one name="dataEntryForm" class="org.hisp.dhis.dataentryform.DataEntryForm"
+ foreign-key="fk_inventorytype_dataentryform" />
</class>
</hibernate-mapping>
\ No newline at end of file
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/AddCatalogTypeAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/AddCatalogTypeAction.java 2012-05-09 12:08:52 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/AddCatalogTypeAction.java 2012-05-14 09:25:17 +0000
@@ -1,9 +1,7 @@
package org.hisp.dhis.coldchain.catalog.action;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import org.hisp.dhis.coldchain.catalog.CatalogType;
import org.hisp.dhis.coldchain.catalog.CatalogTypeAttribute;
=== 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-05-09 12:08:52 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/ShowAddCatalogFormAction.java 2012-05-14 09:25:17 +0000
@@ -1,14 +1,11 @@
package org.hisp.dhis.coldchain.catalog.action;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import org.hisp.dhis.coldchain.catalog.CatalogType;
import org.hisp.dhis.coldchain.catalog.CatalogTypeAttribute;
import org.hisp.dhis.coldchain.catalog.CatalogTypeService;
-import org.hisp.dhis.coldchain.catalog.comparator.CatalogTypeAttributeComparator;
import com.opensymphony.xwork2.Action;
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/UpdateCatalogTypeAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/UpdateCatalogTypeAction.java 2012-05-09 12:08:52 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/UpdateCatalogTypeAction.java 2012-05-14 09:25:17 +0000
@@ -1,9 +1,7 @@
package org.hisp.dhis.coldchain.catalog.action;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import org.hisp.dhis.coldchain.catalog.CatalogType;
import org.hisp.dhis.coldchain.catalog.CatalogTypeAttribute;
=== 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-05-02 09:18:42 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowAddEquipmentFormAction.java 2012-05-14 09:25:17 +0000
@@ -105,6 +105,15 @@
{
catalogs = new ArrayList<Catalog>( catalogService.getCatalogs( catalogType ) );
}
+ /*
+ System.out.println( "Size of catalogs is --- " + catalogs.size() );
+
+ for( Catalog catalog : catalogs)
+ {
+ System.out.println( "Catalog name is " + catalog.getName() );
+ System.out.println( "Catalog Id is " + catalog.getId() );
+ }
+ */
return SUCCESS;
}
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/AddInventoryTypeAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/AddInventoryTypeAction.java 2012-05-02 06:03:10 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/AddInventoryTypeAction.java 2012-05-14 09:25:17 +0000
@@ -1,9 +1,7 @@
package org.hisp.dhis.coldchain.inventory.action;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import org.hisp.dhis.coldchain.catalog.CatalogTypeService;
import org.hisp.dhis.coldchain.inventory.InventoryType;
@@ -93,7 +91,9 @@
inventoryType.setCatalogType( catalogTypeService.getCatalogType( catalogType ) );
}
- Set<InventoryTypeAttribute> inventoryTypeSet = new HashSet<InventoryTypeAttribute>();
+ //Set<InventoryTypeAttribute> inventoryTypeSet = new HashSet<InventoryTypeAttribute>();
+
+ List<InventoryTypeAttribute> inventoryTypeSet = new ArrayList<InventoryTypeAttribute>();
if ( selectedInventoryTypeAttributeList != null && selectedInventoryTypeAttributeList.size() > 0 )
{
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/UpdateInventoryTypeAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/UpdateInventoryTypeAction.java 2012-05-02 06:03:10 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/UpdateInventoryTypeAction.java 2012-05-14 09:25:17 +0000
@@ -1,8 +1,7 @@
package org.hisp.dhis.coldchain.inventory.action;
-import java.util.HashSet;
+import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
import org.hisp.dhis.coldchain.catalog.CatalogTypeService;
import org.hisp.dhis.coldchain.inventory.InventoryType;
@@ -105,7 +104,9 @@
inventoryType.getInventoryTypeAttributes().clear();
}
- Set<InventoryTypeAttribute> inventoryTypeSet = new HashSet<InventoryTypeAttribute>();
+ //Set<InventoryTypeAttribute> inventoryTypeSet = new HashSet<InventoryTypeAttribute>();
+
+ List<InventoryTypeAttribute> inventoryTypeSet = new ArrayList<InventoryTypeAttribute>( );
if ( selectedInventoryTypeAttributeList != null && selectedInventoryTypeAttributeList.size() > 0 )
{
=== 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-05-02 06:03:10 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeForm.vm 2012-05-14 09:25:17 +0000
@@ -77,6 +77,11 @@
<td>
<select id="selectedInventoryTypeAttributeList" name="selectedInventoryTypeAttributeList" multiple="multiple" style="height: 200px; width: 100%" ondblclick="moveSelectedById( 'selectedInventoryTypeAttributeList', 'availableInventoryTypeAttributeList' )"></select>
</td>
+ <td>
+ <a href="javascript:moveUpSelectedOption( 'selectedInventoryTypeAttributeList' )"><img src="../images/move_up.png"/></a><br/><br/>
+ <a href="javascript:moveDownSelectedOption( 'selectedInventoryTypeAttributeList' )"><img src="../images/move_down.png"/></a><br/><br/>
+ </td>
+
</tr>
<tr>
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/inventoryType.js'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/inventoryType.js 2012-04-26 10:00:48 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/inventoryType.js 2012-05-14 09:25:17 +0000
@@ -26,3 +26,51 @@
removeItem( invenotryTypeId, name, i18n_confirm_delete, 'removeInventoryType.action' );
}
+//-----------------------------------------------------------------------------
+//Move Table Row Up and Down
+//-----------------------------------------------------------------------------
+
+/**
+* Moves the selected option in a select list up one position.
+*
+* @param listId the id of the list.
+*/
+function moveUpSelectedOption( listId ){
+ var list = document.getElementById( listId );
+ for ( var i = 0; i < list.length; i++ ) {
+ if ( list.options[ i ].selected ) {
+ if ( i > 0 ) { // Cannot move up the option at the top
+ var precedingOption = new Option( list.options[ i - 1 ].text, list.options[ i - 1 ].value );
+ var currentOption = new Option( list.options[ i ].text, list.options[ i ].value );
+
+ list.options[ i - 1 ] = currentOption; // Swapping place in the
+ // list
+ list.options[ i - 1 ].selected = true;
+ list.options[ i ] = precedingOption;
+ }
+ }
+ }
+}
+/**
+* Moves the selected option in a list down one position.
+*
+* @param listId the id of the list.
+*/
+function moveDownSelectedOption( listId ) {
+ var list = document.getElementById( listId );
+
+ for ( var i = list.options.length - 1; i >= 0; i-- ) {
+ if ( list.options[ i ].selected ) {
+ if ( i < list.options.length - 1 ) { // Cannot move down the
+ // option at the bottom
+ var subsequentOption = new Option( list.options[ i + 1 ].text, list.options[ i + 1 ].value );
+ var currentOption = new Option( list.options[ i ].text, list.options[ i ].value );
+
+ list.options[ i + 1 ] = currentOption; // Swapping place in the
+ // list
+ list.options[ i + 1 ].selected = true;
+ list.options[ i ] = subsequentOption;
+ }
+ }
+ }
+}
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeForm.vm 2012-05-02 06:03:10 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeForm.vm 2012-05-14 09:25:17 +0000
@@ -81,11 +81,16 @@
#end
</select>
</td>
+ <td>
+ <a href="javascript:moveUpSelectedOption( 'selectedInventoryTypeAttributeList' )"><img src="../images/move_up.png"/></a><br/><br/>
+ <a href="javascript:moveDownSelectedOption( 'selectedInventoryTypeAttributeList' )"><img src="../images/move_down.png"/></a><br/><br/>
+ </td>
+
</tr>
<tr>
<td colspan="3">
- <input type="submit" value="$i18n.getString( 'add' )" />
+ <input type="submit" value="$i18n.getString( 'update' )" />
<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='inventoryTypeList.action'" />
</td>
</tr>
