dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17459
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6954: CCEM work in progress
------------------------------------------------------------
revno: 6954
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-05-16 12:36:15 +0530
message:
CCEM work in progress
modified:
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/InventoryTypeAttribute.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeService.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeStore.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeService.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeStore.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeService.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeService.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeStore.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeStore.java
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/InventoryTypeAttribute.hbm.xml
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentInstanceListAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/AddInventoryTypeAttributeAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/UpdateInventoryTypeAttributeAction.java
local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentForm.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeAttributeForm.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/updateEquipmentForm.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeAttibuteForm.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/InventoryType.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType.java 2012-05-14 09:25:17 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType.java 2012-05-16 07:06:15 +0000
@@ -23,6 +23,8 @@
private boolean tracking;
+
+
private CatalogType catalogType;
// private Set<InventoryTypeAttribute> inventoryTypeAttributes;
@@ -54,6 +56,8 @@
this.catalogType = catalogType;
}
+
+
// -------------------------------------------------------------------------
// hashCode, equals and toString
// -------------------------------------------------------------------------
@@ -157,6 +161,4 @@
this.dataEntryForm = dataEntryForm;
}
-
-
}
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttribute.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttribute.java 2012-05-09 07:02:15 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttribute.java 2012-05-16 07:06:15 +0000
@@ -34,7 +34,9 @@
private String valueType;
private boolean mandatory;
-
+
+ private boolean display;
+
private Integer noChars;
private Set<InventoryTypeAttributeOption> attributeOptions;
@@ -166,4 +168,14 @@
attributeOptions = new HashSet<InventoryTypeAttributeOption>();
attributeOptions.add( option );
}
+
+ public boolean isDisplay()
+ {
+ return display;
+ }
+
+ public void setDisplay( boolean display )
+ {
+ this.display = display;
+ }
}
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeService.java 2012-05-09 07:02:15 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeService.java 2012-05-16 07:06:15 +0000
@@ -28,6 +28,9 @@
Collection<InventoryTypeAttribute> getInventoryTypeAttributesBetweenByName( String name, int first, int max );
+
+ //Collection<InventoryTypeAttribute> getAllInventoryTypeAttributesForDisplay( InventoryTypeAttribute inventoryTypeAttribute );
+
}
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeStore.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeStore.java 2012-05-09 07:02:15 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeStore.java 2012-05-16 07:06:15 +0000
@@ -22,4 +22,7 @@
InventoryTypeAttribute getInventoryTypeAttributeByName( String name );
+ //Collection<InventoryTypeAttribute> getAllInventoryTypeAttributesForDisplay( InventoryTypeAttribute inventoryTypeAttribute );
+
+
}
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeService.java 2012-05-09 07:02:15 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeService.java 2012-05-16 07:06:15 +0000
@@ -2,8 +2,6 @@
import java.util.Collection;
-import org.hisp.dhis.coldchain.catalog.CatalogType;
-
public interface InventoryTypeService
{
String ID = InventoryTypeService.class.getName();
@@ -30,5 +28,7 @@
Collection<InventoryType> getInventoryTypesBetweenByName( String name, int first, int max );
+ Collection<InventoryTypeAttribute> getAllInventoryTypeAttributesForDisplay( InventoryType inventoryType );
+
}
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeStore.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeStore.java 2012-05-09 07:02:15 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeStore.java 2012-05-16 07:06:15 +0000
@@ -21,4 +21,6 @@
InventoryType getInventoryTypeByName( String name );
InventoryType getInventoryType( int id );
+
+ //Collection<InventoryTypeAttribute> getAllInventoryTypeAttributesForDisplay( InventoryType inventoryType );
}
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeService.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeService.java 2012-05-09 07:02:15 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeService.java 2012-05-16 07:06:15 +0000
@@ -129,4 +129,10 @@
{
return getObjectsBetweenByName( i18nService, inventoryTypeAttributeStore, name, first, max );
}
+ /*
+ public Collection<InventoryTypeAttribute> getAllInventoryTypeAttributesForDisplay( InventoryTypeAttribute inventoryTypeAttribute )
+ {
+ return inventoryTypeAttributeStore.getAllInventoryTypeAttributesForDisplay( inventoryTypeAttribute );
+ }
+ */
}
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeService.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeService.java 2012-05-09 07:02:15 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeService.java 2012-05-16 07:06:15 +0000
@@ -4,7 +4,9 @@
import static org.hisp.dhis.i18n.I18nUtils.getObjectsBetween;
import static org.hisp.dhis.i18n.I18nUtils.getObjectsBetweenByName;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import org.hisp.dhis.i18n.I18nService;
import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +29,8 @@
{
i18nService = service;
}
+
+
// -------------------------------------------------------------------------
// InventoryType
// -------------------------------------------------------------------------
@@ -71,6 +75,7 @@
*/
+
@Override
public int addInventoryType( InventoryType inventoryType )
{
@@ -124,6 +129,29 @@
public Collection<InventoryType> getInventoryTypesBetweenByName( String name, int first, int max )
{
return getObjectsBetweenByName( i18nService, inventoryTypeStore, name, first, max );
- }
+ }
+ /*
+ public Collection<InventoryTypeAttribute> getAllInventoryTypeAttributesForDisplay( InventoryType inventoryType )
+ {
+ return inventoryTypeStore.getAllInventoryTypeAttributesForDisplay( inventoryType );
+ }
+ */
+ public Collection<InventoryTypeAttribute> getAllInventoryTypeAttributesForDisplay( InventoryType inventoryType )
+ {
+ List<InventoryTypeAttribute> inventoryTypeAttributeList = new ArrayList<InventoryTypeAttribute>();
+ List<InventoryTypeAttribute> tempInventoryTypeAttributeList = new ArrayList<InventoryTypeAttribute>( inventoryType.getInventoryTypeAttributes() );
+
+ for ( InventoryTypeAttribute inventoryTypeAttribute : tempInventoryTypeAttributeList )
+ {
+ if ( inventoryTypeAttribute.isDisplay())
+ {
+ inventoryTypeAttributeList.add( inventoryTypeAttribute );
+ }
+ }
+ return inventoryTypeAttributeList;
+ }
+
+
+
}
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeStore.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeStore.java 2012-05-09 07:02:15 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeStore.java 2012-05-16 07:06:15 +0000
@@ -94,5 +94,17 @@
{
return (InventoryTypeAttribute) getCriteria( Restrictions.eq( "name", name ) ).uniqueResult();
- }
+ }
+ /*
+ @SuppressWarnings( "unchecked" )
+ public Collection<InventoryTypeAttribute> getAllInventoryTypeAttributesForDisplay( InventoryTypeAttribute inventoryTypeAttribute )
+ {
+ //return sessionFactory.getCurrentSession().createCriteria( InventoryTypeAttribute.class,inventoryTypeAttribute.isDisplay() ).list();
+
+ Criteria criteria = sessionFactory.getCurrentSession().createCriteria( InventoryTypeAttribute.class );
+ criteria.setProjection( Projections.property( "display" ) );
+ return criteria.list();
+ }
+ */
+
}
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeStore.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeStore.java 2012-05-09 07:02:15 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeStore.java 2012-05-16 07:06:15 +0000
@@ -94,4 +94,15 @@
{
return (InventoryType) sessionFactory.getCurrentSession().get( InventoryType.class, id );
}
+ /*
+ @Override
+ @SuppressWarnings( "unchecked" )
+ public Collection<InventoryTypeAttribute> getAllInventoryTypeAttributesForDisplay( InventoryType inventoryType )
+ {
+ Criteria criteria = sessionFactory.getCurrentSession().createCriteria( InventoryTypeAttribute.class );
+ criteria.setProjection( Projections.property( "display" ) );
+ return criteria.list();
+ }
+ */
+
}
=== 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-14 09:25:17 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryType.hbm.xml 2012-05-16 07:06:15 +0000
@@ -17,6 +17,7 @@
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" />
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttribute.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttribute.hbm.xml 2012-04-17 11:59:19 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttribute.hbm.xml 2012-05-16 07:06:15 +0000
@@ -16,6 +16,8 @@
<property name="valueType" column="valuetype" not-null="true" />
<property name="mandatory" column="mandatory" not-null="true" />
+
+ <property name="display" column="display" not-null="true" />
<property name="noChars" />
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentInstanceListAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentInstanceListAction.java 2012-05-15 10:33:46 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentInstanceListAction.java 2012-05-16 07:06:15 +0000
@@ -172,24 +172,50 @@
private void getInventoryTypeAttributeData()
{
- inventoryTypeAttributeList = new ArrayList<InventoryTypeAttribute>( inventoryType.getInventoryTypeAttributes() );
-
- Collections.sort( inventoryTypeAttributeList, new InventoryTypeAttributeMandatoryComparator() );
- if( inventoryTypeAttributeList != null && inventoryTypeAttributeList.size() > 3 )
- {
- int count = 1;
- Iterator<InventoryTypeAttribute> iterator = inventoryTypeAttributeList.iterator();
- while( iterator.hasNext() )
- {
- iterator.next();
-
- if( count > 3 )
- iterator.remove();
-
- count++;
- }
- }
-
+ //InventoryTypeAttribute tempInventoryTypeAttribute = inventoryTypeAttributeService.getInventoryTypeAttribute( Integer.parseInt( inventoryTypeAttributeId ) );
+
+ inventoryTypeAttributeList = new ArrayList<InventoryTypeAttribute>( inventoryTypeService.getAllInventoryTypeAttributesForDisplay( inventoryType ));
+
+ /*
+ List<InventoryTypeAttribute> tempinventoryTypeAttributeList = new ArrayList<InventoryTypeAttribute>( inventoryType.getInventoryTypeAttributes() ) ;
+
+ if( tempinventoryTypeAttributeList != null )
+ {
+
+ for( InventoryTypeAttribute tempInventoryTypeAttribute : tempinventoryTypeAttributeList )
+ {
+ if ( tempInventoryTypeAttribute.isDisplay() )
+ {
+ inventoryTypeAttributeList.add( tempInventoryTypeAttribute );
+ }
+ }
+ }
+ */
+ //inventoryTypeAttributeList = new ArrayList<InventoryTypeAttribute>( inventoryType.getInventoryTypeAttributes() );
+
+ //System.out.println("size of inventoryTypeAttributeList " + inventoryTypeAttributeList.size() );
+
+ if( inventoryTypeAttributeList == null || inventoryTypeAttributeList.size() == 0 )
+ {
+ inventoryTypeAttributeList = new ArrayList<InventoryTypeAttribute>( inventoryType.getInventoryTypeAttributes() );
+ Collections.sort( inventoryTypeAttributeList, new InventoryTypeAttributeMandatoryComparator() );
+ if( inventoryTypeAttributeList != null && inventoryTypeAttributeList.size() > 3 )
+ {
+ int count = 1;
+ Iterator<InventoryTypeAttribute> iterator = inventoryTypeAttributeList.iterator();
+ while( iterator.hasNext() )
+ {
+ iterator.next();
+
+ if( count > 3 )
+ iterator.remove();
+
+ count++;
+ }
+ }
+
+ }
+
for( EquipmentInstance equipmentInstance : equipmentInstanceList )
{
for( InventoryTypeAttribute inventoryTypeAttribute1 : inventoryTypeAttributeList )
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/AddInventoryTypeAttributeAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/AddInventoryTypeAttributeAction.java 2012-04-21 12:57:24 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/AddInventoryTypeAttributeAction.java 2012-05-16 07:06:15 +0000
@@ -74,6 +74,16 @@
{
this.noChars = noChars;
}
+
+ private boolean display;
+
+ public void setDisplay( boolean display )
+ {
+ this.display = display;
+ }
+
+
+
// -------------------------------------------------------------------------
// Action implementation
@@ -89,6 +99,7 @@
inventoryTypeAttribute.setMandatory( mandatory );
inventoryTypeAttribute.setNoChars( noChars );
inventoryTypeAttribute.setValueType( valueType );
+ inventoryTypeAttribute.setDisplay( display );
inventoryTypeAttributeService.addInventoryTypeAttribute( inventoryTypeAttribute );
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/UpdateInventoryTypeAttributeAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/UpdateInventoryTypeAttributeAction.java 2012-04-21 12:57:24 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/UpdateInventoryTypeAttributeAction.java 2012-05-16 07:06:15 +0000
@@ -88,6 +88,14 @@
this.noChars = noChars;
}
+ private boolean display;
+
+ public void setDisplay( boolean display )
+ {
+ this.display = display;
+ }
+
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -101,6 +109,7 @@
inventoryTypeAttribute.setMandatory( mandatory );
inventoryTypeAttribute.setNoChars( noChars );
inventoryTypeAttribute.setValueType( valueType );
+ inventoryTypeAttribute.setDisplay( display );
HttpServletRequest request = ServletActionContext.getRequest();
Collection<InventoryTypeAttributeOption> attributeOptions = inventoryTypeAttributeOptionService.get( inventoryTypeAttribute );
=== 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-10 05:39:14 +0000
+++ local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties 2012-05-16 07:06:15 +0000
@@ -96,4 +96,5 @@
updation_date = Date of updation
stored_by = Stored by
confirm_delete_equipment = Are you sure you want to delete equipment?
-equipment_details = Equipment details
\ No newline at end of file
+equipment_details = Equipment details
+display = For display
\ No newline at end of file
=== 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-03 11:07:19 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentForm.vm 2012-05-16 07:06:15 +0000
@@ -1,5 +1,5 @@
<script type="text/javascript" src="javascript/equipment.js"></script>
-## Macro for generating the jQuery validation rules
+## Macro for generating the jQuery validation rules
#macro( validate $type $require )
#if( $type == "NUMBER" )
{validate:{ number:true #if($require), required:true #end }}
@@ -72,7 +72,7 @@
#end
</select>
#elseif( $attribute.valueType == "CATALOG" )
- <select id="attr$attribute.id" name="attr$attribute.id" class='#validate( "default" $attribute.mandatory )'>
+ <select id="attr$attribute.id" name="attr$attribute.id" onChange="catalogDetails( this.value );" class='#validate( "default" $attribute.mandatory )'>
<option value="">[$i18n.getString( "please_select" )]</option>
#foreach ($catalog in $catalogs )
<option value="$catalog.id" >$catalog.name</option>
@@ -92,8 +92,9 @@
</p>
</form>
-
+<div id="detailsCatalogInfo"></div>
<script>
var i18n_error_connect_to_server = '$encoder.jsEscape( $i18n.getString( "error_connect_to_server" ) , "'" )';
var i18n_add_equipment_successfully = '$encoder.jsEscape( $i18n.getString( "add_equipment_successfully" ) , "'" )';
+
</script>
\ No newline at end of file
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeAttributeForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeAttributeForm.vm 2012-05-01 06:15:42 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeAttributeForm.vm 2012-05-16 07:06:15 +0000
@@ -20,6 +20,17 @@
<td><input type="text" id="description" name="description" class="{validate:{required:true,minlength:2}}"/></td>
<td></td>
</tr>
+
+ <tr>
+ <td><label for="display">$i18n.getString( "display" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td>
+ <select id="display" name="display">
+ <option value="true" >$i18n.getString( "yes" )</option>
+ <option value="false" selected="selected">$i18n.getString( "no" )</option>
+ </select>
+ </td>
+ <td></td>
+ </tr>
<tr>
<td><label for="mandatory">$i18n.getString( "mandatory" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
=== 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-05 11:16:25 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipment.js 2012-05-16 07:06:15 +0000
@@ -391,3 +391,47 @@
});
}
+
+
+function catalogDetails( catalogId )
+{
+ jQuery('#detailsCatalogInfo').load('getCatalogDetails.action',{
+ id: catalogId
+ },
+ function(){
+ showById('detailsCatalogInfo');
+ });
+
+
+
+ /*
+ jQuery.getJSON( 'getCatalogDetails.action', { id: catalogId }, function ( json ) {
+ //setInnerHTML( 'nameField', json.catalog.name );
+ //setInnerHTML( 'descriptionField', json.catalog.description );
+ //setInnerHTML( 'catalogTypeField', json.catalog.catalogType );
+
+ showById('detailsCatalogInfo');
+ //showDetails();
+ });
+
+
+ //showById('detailsCatalogInfo');
+
+
+
+ $('#detailsCatalogInfo').load("getCatalogDetails.action",
+ {
+ id:catalogId
+ }
+ , function( ){
+ }).dialog({
+ title: 'Catalog details',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 400,
+ height: 400
+ });;
+ */
+}
=== 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-03 11:07:19 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateEquipmentForm.vm 2012-05-16 07:06:15 +0000
@@ -73,7 +73,7 @@
#end
</select>
#elseif( $attribute.valueType == "CATALOG" )
- <select id="attr$attribute.id" name="attr$attribute.id" class='#validate( "default" $attribute.mandatory )'>
+ <select id="attr$attribute.id" name="attr$attribute.id" onChange="catalogDetails( this.value );" class='#validate( "default" $attribute.mandatory )'>
<option value="">[$i18n.getString( "please_select" )]</option>
#foreach ($catalog in $catalogs )
<option value="$catalog.id" #if($attributeValue == $catalog.name) selected="selected" #end>$catalog.name</option>
@@ -93,7 +93,7 @@
</p>
</form>
-
+<div id="detailsCatalogInfo"></div>
<script>
var i18n_error_connect_to_server = '$encoder.jsEscape( $i18n.getString( "error_connect_to_server" ) , "'" )';
var i18n_add_equipment_successfully = '$encoder.jsEscape( $i18n.getString( "updated_equipment_successfully" ) , "'" )';
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeAttibuteForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeAttibuteForm.vm 2012-05-10 05:39:14 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeAttibuteForm.vm 2012-05-16 07:06:15 +0000
@@ -33,6 +33,17 @@
</td>
<td></td>
</tr>
+
+ <tr>
+ <td><label for="display">$i18n.getString( "display" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td>
+ <select id="display" name="display">
+ <option value="true" #if( $inventoryTypeAttribute.display ) selected="selected" #end>$i18n.getString( "yes" )</option>
+ <option value="false" #if( !$inventoryTypeAttribute.display ) selected="selected" #end>$i18n.getString( "no" )</option>
+ </select>
+ </td>
+ <td></td>
+ </tr>
<tr>
<td><label for="noChar">$i18n.getString( "no_of_char" )</label></td>
