=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeAttribute.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeAttribute.java 2013-09-05 11:11:36 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeAttribute.java 2013-09-30 12:17:15 +0000 @@ -3,9 +3,24 @@ import java.util.HashSet; import java.util.Set; +import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.BaseNameableObject; +import org.hisp.dhis.common.DxfNamespaces; +import org.hisp.dhis.common.IdentifiableObject; +import org.hisp.dhis.common.view.DetailedView; +import org.hisp.dhis.common.view.ExportView; +import org.hisp.dhis.option.OptionSet; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; //public class EquipmentTypeAttribute implements Serializable + +@JacksonXmlRootElement( localName = "equipmentTypeAttribute", namespace = DxfNamespaces.DXF_2_0 ) public class EquipmentTypeAttribute extends BaseNameableObject { /** @@ -25,11 +40,11 @@ public static final String TYPE_MODEL = "MODEL"; - private int id; - - private String name; - - private String description; + //private int id; + + //private String name; + + //private String description; private String valueType; @@ -44,6 +59,8 @@ private Set attributeOptions; + private OptionSet optionSet; + // ------------------------------------------------------------------------- // Constructors // ------------------------------------------------------------------------- @@ -94,7 +111,11 @@ // ------------------------------------------------------------------------- // Getters and setters // ------------------------------------------------------------------------- - + + /* + @JsonProperty + @JsonView( { DetailedView.class, ExportView.class } ) + @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public int getId() { return id; @@ -105,6 +126,9 @@ this.id = id; } + @JsonProperty + @JsonView( { DetailedView.class, ExportView.class } ) + @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public String getName() { return name; @@ -115,6 +139,9 @@ this.name = name; } + @JsonProperty + @JsonView( { DetailedView.class, ExportView.class } ) + @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public String getDescription() { return description; @@ -124,7 +151,10 @@ { this.description = description; } - +*/ + @JsonProperty + @JsonView( { DetailedView.class, ExportView.class } ) + @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public String getValueType() { return valueType; @@ -135,6 +165,9 @@ this.valueType = valueType; } + @JsonProperty + @JsonView( { DetailedView.class, ExportView.class } ) + @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public boolean isMandatory() { return mandatory; @@ -145,6 +178,9 @@ this.mandatory = mandatory; } + @JsonProperty + @JsonView( { DetailedView.class, ExportView.class } ) + @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public Integer getNoChars() { return noChars; @@ -172,6 +208,16 @@ attributeOptions.add( option ); } + public OptionSet getOptionSet() + { + return optionSet; + } + + public void setOptionSet(OptionSet optionSet) + { + this.optionSet = optionSet; + } + /* public boolean isDisplay() { @@ -183,4 +229,27 @@ this.display = display; } */ + + /* + public void mergeWith(IdentifiableObject other ) + { + + super.mergeWith( other ); + if ( other.getClass().isInstance( this ) ) + { + EquipmentTypeAttribute equipmentTypeAttribute= (EquipmentTypeAttribute) other; + + id = equipmentTypeAttribute.getId(); + mandatory = equipmentTypeAttribute.isMandatory(); + noChars = equipmentTypeAttribute.getNoChars(); + valueType = equipmentTypeAttribute.getValueType() == null ? valueType : equipmentTypeAttribute.getValueType(); + name =equipmentTypeAttribute.getName() == null ? name : equipmentTypeAttribute.getName(); + description = equipmentTypeAttribute.getDescription() == null ? description : equipmentTypeAttribute.getDescription(); + + attributeOptions.clear(); + attributeOptions.addAll(equipmentTypeAttribute.getAttributeOptions()); + + } + } + */ } === modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttribute.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttribute.java 2013-09-05 11:11:36 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttribute.java 2013-09-30 12:17:15 +0000 @@ -3,6 +3,7 @@ import java.util.Set; import org.hisp.dhis.common.BaseNameableObject; +import org.hisp.dhis.option.OptionSet; public class ModelTypeAttribute extends BaseNameableObject { @@ -40,6 +41,8 @@ private Set attributeOptions; + private OptionSet optionSet; + // ------------------------------------------------------------------------- // Default Constructors // ------------------------------------------------------------------------- @@ -170,4 +173,15 @@ { this.display = display; } + + public OptionSet getOptionSet() + { + return optionSet; + } + + public void setOptionSet(OptionSet optionSet) + { + this.optionSet = optionSet; + } + } === modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentAttributeValue.hbm.xml' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentAttributeValue.hbm.xml 2013-09-05 11:11:36 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentAttributeValue.hbm.xml 2013-09-30 12:17:15 +0000 @@ -15,8 +15,8 @@ - + === modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentTypeAttribute.hbm.xml' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentTypeAttribute.hbm.xml 2013-09-05 11:11:36 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentTypeAttribute.hbm.xml 2013-09-30 12:17:15 +0000 @@ -1,14 +1,18 @@ + "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" + [] + > - + + &identifiableProperties; + @@ -21,10 +25,15 @@ + + + === removed file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentTypeAttributeOption.hbm.xml' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentTypeAttributeOption.hbm.xml 2013-09-05 11:11:36 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentTypeAttributeOption.hbm.xml 1970-01-01 00:00:00 +0000 @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - === modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/ModelAttributeValue.hbm.xml' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/ModelAttributeValue.hbm.xml 2013-09-05 11:11:36 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/ModelAttributeValue.hbm.xml 2013-09-30 12:17:15 +0000 @@ -15,8 +15,8 @@ - + === modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/ModelTypeAttribute.hbm.xml' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/ModelTypeAttribute.hbm.xml 2013-09-05 11:11:36 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/ModelTypeAttribute.hbm.xml 2013-09-30 12:17:15 +0000 @@ -21,10 +21,15 @@ + + + === removed file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/ModelTypeAttributeOption.hbm.xml' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/ModelTypeAttributeOption.hbm.xml 2013-09-05 11:11:36 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/ModelTypeAttributeOption.hbm.xml 1970-01-01 00:00:00 +0000 @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - === modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/AddEquipmentTypeAttributeAction.java' --- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/AddEquipmentTypeAttributeAction.java 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/AddEquipmentTypeAttributeAction.java 2013-09-30 12:17:15 +0000 @@ -6,6 +6,9 @@ import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttributeOption; import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttributeOptionService; import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttributeService; +import org.hisp.dhis.coldchain.model.ModelTypeAttribute; +import org.hisp.dhis.option.OptionService; +import org.hisp.dhis.option.OptionSet; import com.opensymphony.xwork2.Action; @@ -23,12 +26,18 @@ private EquipmentTypeAttributeOptionService equipmentTypeAttributeOptionService; - public void setEquipmentTypeAttributeOptionService( - EquipmentTypeAttributeOptionService equipmentTypeAttributeOptionService ) + public void setEquipmentTypeAttributeOptionService( EquipmentTypeAttributeOptionService equipmentTypeAttributeOptionService ) { this.equipmentTypeAttributeOptionService = equipmentTypeAttributeOptionService; } + private OptionService optionService; + + public void setOptionService(OptionService optionService) + { + this.optionService = optionService; + } + // ------------------------------------------------------------------------- // Input/Output // ------------------------------------------------------------------------- @@ -82,7 +91,13 @@ this.display = display; } - + private Integer optionSetId; + + public void setOptionSetId(Integer optionSetId) + { + this.optionSetId = optionSetId; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- @@ -99,8 +114,18 @@ equipmentTypeAttribute.setValueType( valueType ); //equipmentTypeAttribute.setDisplay( display ); + if ( EquipmentTypeAttribute.TYPE_COMBO.equalsIgnoreCase( valueType ) ) + { + if( optionSetId != -1 ) + { + OptionSet optionSet = optionService.getOptionSet( optionSetId ); + equipmentTypeAttribute.setOptionSet( optionSet ); + } + } + equipmentTypeAttributeService.addEquipmentTypeAttribute( equipmentTypeAttribute ); + /* if ( EquipmentTypeAttribute.TYPE_COMBO.equalsIgnoreCase( valueType ) ) { EquipmentTypeAttributeOption opt = null; @@ -113,6 +138,7 @@ equipmentTypeAttributeOptionService.addEquipmentTypeAttributeOption( opt ); } } + */ return SUCCESS; } === modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/ShowUpdateEquipmentTypeAttributeAction.java' --- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/ShowUpdateEquipmentTypeAttributeAction.java 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/ShowUpdateEquipmentTypeAttributeAction.java 2013-09-30 12:17:15 +0000 @@ -1,7 +1,12 @@ package org.hisp.dhis.ccem.equipmenttype.action; +import java.util.ArrayList; +import java.util.List; + import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttribute; import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttributeService; +import org.hisp.dhis.option.OptionService; +import org.hisp.dhis.option.OptionSet; import com.opensymphony.xwork2.Action; @@ -10,13 +15,21 @@ // ------------------------------------------------------------------------- // Dependency // ------------------------------------------------------------------------- - private EquipmentTypeAttributeService equipmentTypeAttributeService; + + private EquipmentTypeAttributeService equipmentTypeAttributeService; public void setEquipmentTypeAttributeService( EquipmentTypeAttributeService equipmentTypeAttributeService ) { this.equipmentTypeAttributeService = equipmentTypeAttributeService; } + private OptionService optionService; + + public void setOptionService(OptionService optionService) + { + this.optionService = optionService; + } + // ------------------------------------------------------------------------- // Input/Output // ------------------------------------------------------------------------- @@ -34,6 +47,13 @@ return equipmentTypeAttribute; } + private List optionSets; + + public List getOptionSets() + { + return optionSets; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- @@ -42,6 +62,8 @@ { equipmentTypeAttribute = equipmentTypeAttributeService.getEquipmentTypeAttribute( id ); + optionSets = new ArrayList( optionService.getAllOptionSets() ); + return SUCCESS; } } === modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/UpdateEquipmentTypeAttributeAction.java' --- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/UpdateEquipmentTypeAttributeAction.java 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/UpdateEquipmentTypeAttributeAction.java 2013-09-30 12:17:15 +0000 @@ -11,6 +11,9 @@ import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttributeOption; import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttributeOptionService; import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttributeService; +import org.hisp.dhis.coldchain.model.ModelTypeAttribute; +import org.hisp.dhis.option.OptionService; +import org.hisp.dhis.option.OptionSet; import com.opensymphony.xwork2.Action; @@ -30,12 +33,18 @@ private EquipmentTypeAttributeOptionService equipmentTypeAttributeOptionService; - public void setEquipmentTypeAttributeOptionService( - EquipmentTypeAttributeOptionService equipmentTypeAttributeOptionService ) + public void setEquipmentTypeAttributeOptionService( EquipmentTypeAttributeOptionService equipmentTypeAttributeOptionService ) { this.equipmentTypeAttributeOptionService = equipmentTypeAttributeOptionService; } + private OptionService optionService; + + public void setOptionService(OptionService optionService) + { + this.optionService = optionService; + } + // ------------------------------------------------------------------------- // Input/Output // ------------------------------------------------------------------------- @@ -95,6 +104,12 @@ this.display = display; } + private Integer optionSetId; + + public void setOptionSetId(Integer optionSetId) + { + this.optionSetId = optionSetId; + } // ------------------------------------------------------------------------- // Action implementation @@ -110,7 +125,22 @@ equipmentTypeAttribute.setNoChars( noChars ); equipmentTypeAttribute.setValueType( valueType ); //equipmentTypeAttribute.setDisplay( display ); + + if ( EquipmentTypeAttribute.TYPE_COMBO.equalsIgnoreCase( valueType ) ) + { + if( optionSetId != -1 ) + { + OptionSet optionSet = optionService.getOptionSet( optionSetId ); + equipmentTypeAttribute.setOptionSet( optionSet ); + } + else + { + equipmentTypeAttribute.setOptionSet( null ); + } + } + + /* HttpServletRequest request = ServletActionContext.getRequest(); Collection attributeOptions = equipmentTypeAttributeOptionService.get( equipmentTypeAttribute ); @@ -145,6 +175,7 @@ } } } + */ equipmentTypeAttributeService.updateEquipmentTypeAttribute( equipmentTypeAttribute ); === modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddColdChainModelTypeAttributeForm.java' --- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddColdChainModelTypeAttributeForm.java 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddColdChainModelTypeAttributeForm.java 2013-09-30 12:17:15 +0000 @@ -1,5 +1,11 @@ package org.hisp.dhis.ccem.model.action; +import java.util.ArrayList; +import java.util.List; + +import org.hisp.dhis.option.OptionService; +import org.hisp.dhis.option.OptionSet; + import com.opensymphony.xwork2.Action; public class AddColdChainModelTypeAttributeForm implements Action @@ -7,24 +13,33 @@ // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- + private OptionService optionService; + public void setOptionService(OptionService optionService) + { + this.optionService = optionService; + } // ------------------------------------------------------------------------- // Input/Output // ------------------------------------------------------------------------- + private List optionSets; + + public List getOptionSets() + { + return optionSets; + } // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- - public String execute() - throws Exception + public String execute() throws Exception { - - + optionSets = new ArrayList( optionService.getAllOptionSets() ); + return SUCCESS; } - } === modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelTypeAttributeAction.java' --- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelTypeAttributeAction.java 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelTypeAttributeAction.java 2013-09-30 12:17:15 +0000 @@ -6,6 +6,8 @@ import org.hisp.dhis.coldchain.model.ModelTypeAttributeOption; import org.hisp.dhis.coldchain.model.ModelTypeAttributeOptionService; import org.hisp.dhis.coldchain.model.ModelTypeAttributeService; +import org.hisp.dhis.option.OptionService; +import org.hisp.dhis.option.OptionSet; import com.opensymphony.xwork2.Action; @@ -28,6 +30,13 @@ { this.modelTypeAttributeOptionService = modelTypeAttributeOptionService; } + + private OptionService optionService; + + public void setOptionService(OptionService optionService) + { + this.optionService = optionService; + } // ------------------------------------------------------------------------- // Input/Output @@ -82,11 +91,18 @@ this.display = display; } + private Integer optionSetId; + + public void setOptionSetId(Integer optionSetId) + { + this.optionSetId = optionSetId; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- - public String execute() throws Exception + public String execute() throws Exception { ModelTypeAttribute modelTypeAttribute = new ModelTypeAttribute(); @@ -97,8 +113,18 @@ modelTypeAttribute.setNoChars( noChars ); modelTypeAttribute.setDisplay( display ); + if ( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( valueType ) ) + { + if( optionSetId != -1 ) + { + OptionSet optionSet = optionService.getOptionSet( optionSetId ); + modelTypeAttribute.setOptionSet( optionSet ); + } + } + modelTypeAttributeService.addModelTypeAttribute( modelTypeAttribute ); + /* if ( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( valueType ) ) { ModelTypeAttributeOption option = null; @@ -111,6 +137,7 @@ modelTypeAttributeOptionService.addModelTypeAttributeOption( option ); } } + */ return SUCCESS; } === modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ShowUpdateModelTypeAttributeFormAction.java' --- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ShowUpdateModelTypeAttributeFormAction.java 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ShowUpdateModelTypeAttributeFormAction.java 2013-09-30 12:17:15 +0000 @@ -1,7 +1,12 @@ package org.hisp.dhis.ccem.model.action; +import java.util.ArrayList; +import java.util.List; + import org.hisp.dhis.coldchain.model.ModelTypeAttribute; import org.hisp.dhis.coldchain.model.ModelTypeAttributeService; +import org.hisp.dhis.option.OptionService; +import org.hisp.dhis.option.OptionSet; import com.opensymphony.xwork2.Action; @@ -19,6 +24,12 @@ this.modelTypeAttributeService = modelTypeAttributeService; } + private OptionService optionService; + + public void setOptionService(OptionService optionService) + { + this.optionService = optionService; + } // ------------------------------------------------------------------------- // Input/Output @@ -38,6 +49,13 @@ return modelTypeAttribute; } + private List optionSets; + + public List getOptionSets() + { + return optionSets; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- @@ -47,6 +65,8 @@ { modelTypeAttribute = modelTypeAttributeService.getModelTypeAttribute( id ); + optionSets = new ArrayList( optionService.getAllOptionSets() ); + return SUCCESS; } } === modified file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UpdateModelTypeAttributeAction.java' --- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UpdateModelTypeAttributeAction.java 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UpdateModelTypeAttributeAction.java 2013-09-30 12:17:15 +0000 @@ -7,10 +7,13 @@ import org.apache.commons.lang.StringUtils; import org.apache.struts2.ServletActionContext; +import org.hisp.dhis.coldchain.equipment.EquipmentTypeAttribute; import org.hisp.dhis.coldchain.model.ModelTypeAttribute; import org.hisp.dhis.coldchain.model.ModelTypeAttributeOption; import org.hisp.dhis.coldchain.model.ModelTypeAttributeOptionService; import org.hisp.dhis.coldchain.model.ModelTypeAttributeService; +import org.hisp.dhis.option.OptionService; +import org.hisp.dhis.option.OptionSet; import com.opensymphony.xwork2.Action; @@ -35,6 +38,14 @@ { this.modelTypeAttributeOptionService = modelTypeAttributeOptionService; } + + private OptionService optionService; + + public void setOptionService(OptionService optionService) + { + this.optionService = optionService; + } + // ------------------------------------------------------------------------- // Input/Output @@ -75,8 +86,6 @@ this.mandatory = mandatory; } - - private List attrOptions; public void setAttrOptions( List attrOptions ) @@ -98,14 +107,19 @@ this.display = display; } + private Integer optionSetId; + + public void setOptionSetId(Integer optionSetId) + { + this.optionSetId = optionSetId; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- - public String execute() - throws Exception - { - + public String execute() throws Exception + { ModelTypeAttribute modelTypeAttribute = modelTypeAttributeService.getModelTypeAttribute( id ); modelTypeAttribute.setName( name ); @@ -116,7 +130,20 @@ modelTypeAttribute.setNoChars( noChars ); modelTypeAttribute.setDisplay( display ); - + if ( ModelTypeAttribute.TYPE_COMBO.equalsIgnoreCase( valueType ) ) + { + if( optionSetId != -1 ) + { + OptionSet optionSet = optionService.getOptionSet( optionSetId ); + modelTypeAttribute.setOptionSet( optionSet ); + } + else + { + modelTypeAttribute.setOptionSet( null ); + } + } + + /* HttpServletRequest request = ServletActionContext.getRequest(); Collection attributeOptions = modelTypeAttributeOptionService.getModelTypeAttributeOptions( modelTypeAttribute ); @@ -153,6 +180,7 @@ } } } + */ modelTypeAttributeService.updateModelTypeAttribute( modelTypeAttribute ); === modified file 'local/in/dhis-web-maintenance-ccem/src/main/resources/META-INF/dhis/beans.xml' --- local/in/dhis-web-maintenance-ccem/src/main/resources/META-INF/dhis/beans.xml 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/resources/META-INF/dhis/beans.xml 2013-09-30 12:17:15 +0000 @@ -24,6 +24,7 @@ + @@ -33,7 +34,8 @@ + ref="org.hisp.dhis.coldchain.model.ModelTypeAttributeOptionService" /> + @@ -63,18 +65,17 @@ - + + - - + + + @@ -365,6 +366,7 @@ scope="prototype"> + + + javascript/equipmentTypeAttribute.js - + /main.vm /dhis-web-maintenance-ccem/addEquipmentTypeAttributeForm.vm /dhis-web-maintenance-ccem/menu.vm === modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addColdChainModelTypeAttributeForm.vm' --- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addColdChainModelTypeAttributeForm.vm 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addColdChainModelTypeAttributeForm.vm 2013-09-30 12:17:15 +0000 @@ -62,12 +62,25 @@ + + + + + + + === modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addEquipmentTypeAttributeForm.vm' --- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addEquipmentTypeAttributeForm.vm 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addEquipmentTypeAttributeForm.vm 2013-09-30 12:17:15 +0000 @@ -65,13 +65,26 @@ + + + + + + + + === modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addEquipmentTypeAttributeForm.js' --- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addEquipmentTypeAttributeForm.js 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addEquipmentTypeAttributeForm.js 2013-09-30 12:17:15 +0000 @@ -1,6 +1,6 @@ jQuery(document).ready( function(){ validation( 'addEquipmentTypeAttributeForm', function(form){ - if( isSubmit && ATTRIBUTE_OPTION.checkOnSubmit() ) { + if( isSubmit ) { form.submit(i18n_field_is_required); } }, function(){ @@ -8,10 +8,12 @@ var fields = jQuery("#addEquipmentTypeAttributeForm").serializeArray(); jQuery.each(fields, function(i, field) { + /* if( field.name.match("^attrOption")=='attrOption' && field.value == ""){ setInnerHTML("attrMessage", i18n_field_is_required); isSubmit = false; } + */ }); }); === modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addModelTypeAttributeForm.js' --- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addModelTypeAttributeForm.js 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addModelTypeAttributeForm.js 2013-09-30 12:17:15 +0000 @@ -1,6 +1,6 @@ jQuery(document).ready( function(){ validation( 'addModelTypeAttributeForm', function(form){ - if( isSubmit && ATTRIBUTE_OPTION.checkOnSubmit() ) { + if( isSubmit ) { form.submit(i18n_field_is_required); } }, function(){ @@ -8,10 +8,11 @@ var fields = jQuery("#addModelTypeAttributeForm").serializeArray(); jQuery.each(fields, function(i, field) { + /* if( field.name.match("^attrOption")=='attrOption' && field.value == ""){ setInnerHTML("attrMessage", i18n_field_is_required); isSubmit = false; - } + }*/ }); }); === modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateEquipmentTypeAttributeForm.js' --- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateEquipmentTypeAttributeForm.js 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateEquipmentTypeAttributeForm.js 2013-09-30 12:17:15 +0000 @@ -1,6 +1,6 @@ jQuery(document).ready( function(){ validation( 'updateEquipmentTypeAttributeForm', function(form){ - if( isSubmit && ATTRIBUTE_OPTION.checkOnSubmit() ) { + if( isSubmit ) { form.submit(i18n_field_is_required); } }, function(){ @@ -8,10 +8,12 @@ var fields = $("#addEquipmentTypeAttributeForm").serializeArray(); jQuery.each(fields, function(i, field) { + /* if( field.name.match("^attrOption")=='attrOption' && field.value == ""){ setInnerHTML("attrMessage", i18n_field_is_required); isSubmit = false; } + */ }); }); === modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateModelTypeAttributeForm.js' --- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateModelTypeAttributeForm.js 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateModelTypeAttributeForm.js 2013-09-30 12:17:15 +0000 @@ -1,6 +1,6 @@ jQuery(document).ready( function(){ validation( 'updateModelTypeAttributeForm', function(form){ - if( isSubmit && ATTRIBUTE_OPTION.checkOnSubmit() ) { + if( isSubmit ) { form.submit(i18n_field_is_required); } }, function(){ @@ -8,10 +8,12 @@ var fields = $("#updateModelTypeAttributeForm").serializeArray(); jQuery.each(fields, function(i, field) { + /* if( field.name.match("^attrOption")=='attrOption' && field.value == ""){ setInnerHTML("attrMessage", i18n_field_is_required); isSubmit = false; } + */ }); }); === modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateEquipmentTypeAttibuteForm.vm' --- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateEquipmentTypeAttibuteForm.vm 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateEquipmentTypeAttibuteForm.vm 2013-09-30 12:17:15 +0000 @@ -66,7 +66,20 @@ + + + + + + + + === modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateModelTypeAttibuteForm.vm' --- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateModelTypeAttibuteForm.vm 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateModelTypeAttibuteForm.vm 2013-09-30 12:17:15 +0000 @@ -63,7 +63,20 @@ - + + + + + + + + +