=== added directory 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain' === added directory 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog' === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/Catalog.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/Catalog.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/Catalog.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,113 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.io.Serializable; + +public class Catalog implements Serializable +{ + private int id; + + private String name; + + private String description; + + private CatalogType catalogType; + + // ------------------------------------------------------------------------- + // Contructors + // ------------------------------------------------------------------------- + public Catalog() + { + + } + + public Catalog( String name, CatalogType catalogType ) + { + this.name = name; + this.catalogType = catalogType; + } + + public Catalog( String name, String description, CatalogType catalogType ) + { + this.name = name; + this.description = description; + this.catalogType = catalogType; + } + + // ------------------------------------------------------------------------- + // hashCode and equals + // ------------------------------------------------------------------------- + + @Override + public int hashCode() + { + return name.hashCode(); + } + + @Override + public boolean equals( Object o ) + { + if ( this == o ) + { + return true; + } + + if ( o == null ) + { + return false; + } + + if ( !(o instanceof Catalog) ) + { + return false; + } + + final Catalog other = (Catalog) o; + + return name.equals( other.getName() ); + } + + // ------------------------------------------------------------------------- + // Getters and setters + // ------------------------------------------------------------------------- + + public int getId() + { + return id; + } + + public void setId( int id ) + { + this.id = id; + } + + public String getName() + { + return name; + } + + public void setName( String name ) + { + this.name = name; + } + + public String getDescription() + { + return description; + } + + public void setDescription( String description ) + { + this.description = description; + } + + public CatalogType getCatalogType() + { + return catalogType; + } + + public void setCatalogType( CatalogType catalogType ) + { + this.catalogType = catalogType; + } + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogDataValue.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogDataValue.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogDataValue.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,107 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.io.Serializable; + +public class CatalogDataValue implements Serializable +{ + + private Catalog catalog; + + private CatalogTypeAttribute catalogTypeAttribute; + + private String value; + + private CatalogTypeAttributeOption catalogTypeAttributeOption; + + // ------------------------------------------------------------------------- + // Constructor + // ------------------------------------------------------------------------- + public CatalogDataValue( ) + { + + } + public CatalogDataValue( Catalog catalog, CatalogTypeAttribute catalogTypeAttribute, String value ) + { + this.catalog = catalog; + this.catalogTypeAttribute = catalogTypeAttribute; + this.value = value; + } + + // ------------------------------------------------------------------------- + // hashCode and equals + // ------------------------------------------------------------------------- + + @Override + public boolean equals( Object o ) + { + if ( this == o ) + { + return true; + } + + if ( o == null ) + { + return false; + } + + if ( !(o instanceof CatalogDataValue) ) + { + return false; + } + + final CatalogDataValue other = (CatalogDataValue) o; + + return catalogTypeAttribute.equals( other.getCatalogTypeAttribute() ) && catalog.equals( other.getCatalog() ); + + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + + result = result * prime + catalogTypeAttribute.hashCode(); + result = result * prime + catalog.hashCode(); + + return result; + } + + // ------------------------------------------------------------------------- + // Getters and setters + // ------------------------------------------------------------------------- + + public Catalog getCatalog() + { + return catalog; + } + public void setCatalog( Catalog catalog ) + { + this.catalog = catalog; + } + public CatalogTypeAttribute getCatalogTypeAttribute() + { + return catalogTypeAttribute; + } + public void setCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ) + { + this.catalogTypeAttribute = catalogTypeAttribute; + } + public String getValue() + { + return value; + } + public void setValue( String value ) + { + this.value = value; + } + public CatalogTypeAttributeOption getCatalogTypeAttributeOption() + { + return catalogTypeAttributeOption; + } + public void setCatalogTypeAttributeOption( CatalogTypeAttributeOption catalogTypeAttributeOption ) + { + this.catalogTypeAttributeOption = catalogTypeAttributeOption; + } + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogDataValueService.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogDataValueService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogDataValueService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +public interface CatalogDataValueService +{ + String ID = CatalogDataValueService.class.getName(); + + int addCatalogDataValue( CatalogDataValue catalogDataValue ); + + void updateCatalogDataValue( CatalogDataValue catalogDataValue ); + + void deleteCatalogDataValue( CatalogDataValue catalogDataValue ); + + Collection getAllCatalogDataValues(); + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogDataValueStore.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogDataValueStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogDataValueStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +public interface CatalogDataValueStore +{ + String ID = CatalogDataValueStore.class.getName(); + + int addCatalogDataValue( CatalogDataValue catalogDataValue ); + + void updateCatalogDataValue( CatalogDataValue catalogDataValue ); + + void deleteCatalogDataValue( CatalogDataValue catalogDataValue ); + + Collection getAllCatalogDataValues(); + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogService.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +public interface CatalogService +{ + String ID = CatalogService.class.getName(); + + int addCatalog( Catalog catalog ); + + void updateCatalog( Catalog catalog ); + + void deleteCatalog( Catalog catalog ); + + Collection getAllCatalogs(); + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogStore.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,18 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +public interface CatalogStore +{ + + String ID = CatalogStore.class.getName(); + + int addCatalog( Catalog catalog ); + + void updateCatalog( Catalog catalog ); + + void deleteCatalog( Catalog catalog ); + + Collection getAllCatalogs(); + +} === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogType.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,104 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.io.Serializable; +import java.util.Set; + +public class CatalogType implements Serializable +{ + private int id; + + private String name; + + private String description; + + private Set catalogTypeAttributes; + + // ------------------------------------------------------------------------- + // Contructors + // ------------------------------------------------------------------------- + public CatalogType() + { + + } + public CatalogType( String name ) + { + this.name = name; + } + + public CatalogType( String name, String description ) + { + this.name = name; + this.description = description; + } + + // ------------------------------------------------------------------------- + // hashCode and equals + // ------------------------------------------------------------------------- + + @Override + public int hashCode() + { + return name.hashCode(); + } + + @Override + public boolean equals( Object o ) + { + if ( this == o ) + { + return true; + } + + if ( o == null ) + { + return false; + } + + if ( !(o instanceof CatalogType) ) + { + return false; + } + + final CatalogType other = (CatalogType) o; + + return name.equals( other.getName() ); + } + + // ------------------------------------------------------------------------- + // Getters and setters + // ------------------------------------------------------------------------- + + public int getId() + { + return id; + } + public void setId( int id ) + { + this.id = id; + } + public String getName() + { + return name; + } + public void setName( String name ) + { + this.name = name; + } + public String getDescription() + { + return description; + } + public void setDescription( String description ) + { + this.description = description; + } + public Set getCatalogTypeAttributes() + { + return catalogTypeAttributes; + } + public void setCatalogTypeAttributes( Set catalogTypeAttributes ) + { + this.catalogTypeAttributes = catalogTypeAttributes; + } + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttribute.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttribute.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttribute.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,154 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Set; + +public class CatalogTypeAttribute +{ + public static final String TYPE_DATE = "DATE"; + + public static final String TYPE_STRING = "TEXT"; + + public static final String TYPE_INT = "NUMBER"; + + public static final String TYPE_BOOL = "YES/NO"; + + public static final String TYPE_COMBO = "COMBO"; + + private int id; + + private String name; + + private String description; + + private String valueType; + + private boolean mandatory; + + private Integer noChars; + + private Set attributeOptions; + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + public CatalogTypeAttribute() + { + } + + // ------------------------------------------------------------------------- + // hashCode, equals and toString + // ------------------------------------------------------------------------- + + @Override + public int hashCode() + { + return name.hashCode(); + } + + @Override + public boolean equals( Object o ) + { + if ( this == o ) + { + return true; + } + + if ( o == null ) + { + return false; + } + + if ( !(o instanceof CatalogTypeAttribute) ) + { + return false; + } + + final CatalogTypeAttribute other = (CatalogTypeAttribute) o; + + return name.equals( other.getName() ); + } + + @Override + public String toString() + { + return "[" + name + "]"; + } + + // ------------------------------------------------------------------------- + // Getters and setters + // ------------------------------------------------------------------------- + + public int getId() + { + return id; + } + + public void setId( int id ) + { + this.id = id; + } + + public String getName() + { + return name; + } + + public void setName( String name ) + { + this.name = name; + } + + public String getDescription() + { + return description; + } + + public void setDescription( String description ) + { + this.description = description; + } + + public String getValueType() + { + return valueType; + } + + public void setValueType( String valueType ) + { + this.valueType = valueType; + } + + public boolean isMandatory() + { + return mandatory; + } + + public void setMandatory( boolean mandatory ) + { + this.mandatory = mandatory; + } + + public Integer getNoChars() + { + return noChars; + } + + public void setNoChars( Integer noChars ) + { + this.noChars = noChars; + } + + public Set getAttributeOptions() + { + return attributeOptions; + } + + public void setAttributeOptions( Set attributeOptions ) + { + this.attributeOptions = attributeOptions; + } + + + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeOption.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeOption.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeOption.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,98 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.io.Serializable; + +public class CatalogTypeAttributeOption implements Serializable +{ + + private int id; + + private String name; + + private CatalogTypeAttribute catalogTypeAttribute; + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + public CatalogTypeAttributeOption() + { + + } + + // ------------------------------------------------------------------------- + // hashCode, equals and toString + // ------------------------------------------------------------------------- + + @Override + public int hashCode() + { + return name.hashCode(); + } + + @Override + public boolean equals( Object o ) + { + if ( this == o ) + { + return true; + } + + if ( o == null ) + { + return false; + } + + if ( !(o instanceof CatalogTypeAttributeOption) ) + { + return false; + } + + final CatalogTypeAttributeOption other = (CatalogTypeAttributeOption) o; + + return name.equals( other.getName() ); + } + + @Override + public String toString() + { + return "[" + name + "]"; + } + + // ------------------------------------------------------------------------- + // Getters and setters + // ------------------------------------------------------------------------- + + public int getId() + { + return id; + } + + public void setId( int id ) + { + this.id = id; + } + + public String getName() + { + return name; + } + + public void setName( String name ) + { + this.name = name; + } + + public CatalogTypeAttribute getCatalogTypeAttribute() + { + return catalogTypeAttribute; + } + + public void setCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ) + { + this.catalogTypeAttribute = catalogTypeAttribute; + } + + + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeOptionService.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeOptionService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeOptionService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +public interface CatalogTypeAttributeOptionService +{ + String ID = CatalogTypeAttributeOptionService.class.getName(); + + int addCatalogTypeAttributeOption( CatalogTypeAttributeOption catalogTypeAttributeOption ); + + void updateCatalogTypeAttributeOption( CatalogTypeAttributeOption catalogTypeAttributeOption ); + + void deleteCatalogTypeAttributeOption( CatalogTypeAttributeOption catalogTypeAttributeOption ); + + Collection getAllCatalogTypeAttributeOptions(); + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeOptionStore.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeOptionStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeOptionStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +public interface CatalogTypeAttributeOptionStore +{ + String ID = CatalogTypeAttributeOptionStore.class.getName(); + + int addCatalogTypeAttributeOption( CatalogTypeAttributeOption catalogTypeAttributeOption ); + + void updateCatalogTypeAttributeOption( CatalogTypeAttributeOption catalogTypeAttributeOption ); + + void deleteCatalogTypeAttributeOption( CatalogTypeAttributeOption catalogTypeAttributeOption ); + + Collection getAllCatalogTypeAttributeOptions(); + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeService.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +public interface CatalogTypeAttributeService +{ + String ID = CatalogTypeAttributeService.class.getName(); + + int addCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ); + + void updateCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ); + + void deleteCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ); + + Collection getAllCatalogTypeAttributes(); + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeStore.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +public interface CatalogTypeAttributeStore +{ + String ID = CatalogTypeAttributeStore.class.getName(); + + int addCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ); + + void updateCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ); + + void deleteCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ); + + Collection getAllCatalogTypeAttributes(); + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeService.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +public interface CatalogTypeService +{ + String ID = CatalogTypeService.class.getName(); + + int addCatalogType( CatalogType catalogType ); + + void updateCatalogType( CatalogType catalogType ); + + void deleteCatalogType( CatalogType catalogType ); + + Collection getAllCatalogTypes(); + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeStore.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +public interface CatalogTypeStore +{ + String ID = CatalogTypeStore.class.getName(); + + int addCatalogType( CatalogType catalogType ); + + void updateCatalogType( CatalogType catalogType ); + + void deleteCatalogType( CatalogType catalogType ); + + Collection getAllCatalogTypes(); + +} === added directory 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory' === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentDetails.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentDetails.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentDetails.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,106 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.io.Serializable; + +public class EquipmentDetails implements Serializable +{ + + private EquipmentInstance equipmentInstance; + + private InventoryTypeAttribute inventoryTypeAttribute; + + private String value; + + private InventoryTypeAttributeOption inventoryTypeAttributeOption; + + // ------------------------------------------------------------------------- + // Constructor + // ------------------------------------------------------------------------- + + public EquipmentDetails() + { + + } + public EquipmentDetails( EquipmentInstance equipmentInstance, InventoryTypeAttribute inventoryTypeAttribute, String value ) + { + this.equipmentInstance = equipmentInstance; + this.inventoryTypeAttribute = inventoryTypeAttribute; + this.value = value; + } + + // ------------------------------------------------------------------------- + // hashCode and equals + // ------------------------------------------------------------------------- + @Override + public boolean equals( Object o ) + { + if ( this == o ) + { + return true; + } + + if ( o == null ) + { + return false; + } + + if ( !(o instanceof EquipmentDetails) ) + { + return false; + } + + final EquipmentDetails other = (EquipmentDetails) o; + + return equipmentInstance.equals( other.getEquipmentInstance() ) && inventoryTypeAttribute.equals( other.getInventoryTypeAttribute() ); + + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + + result = result * prime + equipmentInstance.hashCode(); + result = result * prime + inventoryTypeAttribute.hashCode(); + + return result; + } + + // ------------------------------------------------------------------------- + // Getters and setters + // ------------------------------------------------------------------------- + + public EquipmentInstance getEquipmentInstance() + { + return equipmentInstance; + } + public void setEquipmentInstance( EquipmentInstance equipmentInstance ) + { + this.equipmentInstance = equipmentInstance; + } + public InventoryTypeAttribute getInventoryTypeAttribute() + { + return inventoryTypeAttribute; + } + public void setInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ) + { + this.inventoryTypeAttribute = inventoryTypeAttribute; + } + public String getValue() + { + return value; + } + public void setValue( String value ) + { + this.value = value; + } + public InventoryTypeAttributeOption getInventoryTypeAttributeOption() + { + return inventoryTypeAttributeOption; + } + public void setInventoryTypeAttributeOption( InventoryTypeAttributeOption inventoryTypeAttributeOption ) + { + this.inventoryTypeAttributeOption = inventoryTypeAttributeOption; + } +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentDetailsService.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentDetailsService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentDetailsService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +public interface EquipmentDetailsService +{ + String ID = EquipmentDetailsService.class.getName(); + + int addEquipmentDetails( EquipmentDetails equipmentDetails ); + + void updateEquipmentDetails( EquipmentDetails equipmentDetails ); + + void deleteEquipmentDetails( EquipmentDetails equipmentDetails ); + + Collection getAllEquipmentDetails(); + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentDetailsStore.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentDetailsStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentDetailsStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +public interface EquipmentDetailsStore +{ + String ID = EquipmentDetailsStore.class.getName(); + + int addEquipmentDetails( EquipmentDetails equipmentDetails ); + + void updateEquipmentDetails( EquipmentDetails equipmentDetails ); + + void deleteEquipmentDetails( EquipmentDetails equipmentDetails ); + + Collection getAllEquipmentDetails(); + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,118 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.io.Serializable; + +import org.hisp.dhis.organisationunit.OrganisationUnit; +import org.hisp.dhis.program.ProgramStageInstance; + +public class EquipmentInstance implements Serializable +{ + + private int id; + + private InventoryType inventoryType; + + private OrganisationUnit organisationUnit; + + private boolean working = true; + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + public EquipmentInstance() + { + + } + + public EquipmentInstance( InventoryType inventoryType, OrganisationUnit organisationUnit ) + { + this.inventoryType = inventoryType; + this.organisationUnit = organisationUnit; + } + + // ------------------------------------------------------------------------- + // hashCode and equals + // ------------------------------------------------------------------------- + + @Override + public boolean equals( Object o ) + { + if ( this == o ) + { + return true; + } + + if ( o == null ) + { + return false; + } + + if ( !(o instanceof EquipmentInstance) ) + { + return false; + } + + final EquipmentInstance other = (EquipmentInstance) o; + + return inventoryType.equals( other.getInventoryType() ) && organisationUnit.equals( other.getOrganisationUnit() ); + + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + + result = result * prime + inventoryType.hashCode(); + result = result * prime + organisationUnit.hashCode(); + + return result; + } + + // ------------------------------------------------------------------------- + // Getters and setters + // ------------------------------------------------------------------------- + + public int getId() + { + return id; + } + + public void setId( int id ) + { + this.id = id; + } + + public InventoryType getInventoryType() + { + return inventoryType; + } + + public void setInventoryType( InventoryType inventoryType ) + { + this.inventoryType = inventoryType; + } + + public OrganisationUnit getOrganisationUnit() + { + return organisationUnit; + } + + public void setOrganisationUnit( OrganisationUnit organisationUnit ) + { + this.organisationUnit = organisationUnit; + } + + public boolean isWorking() + { + return working; + } + + public void setWorking( boolean working ) + { + this.working = working; + } + +} === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstanceService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +public interface EquipmentInstanceService +{ + String ID = EquipmentInstanceService.class.getName(); + + int addEquipmentInstance( EquipmentInstance equipmentInstance ); + + void updateEquipmentInstance( EquipmentInstance equipmentInstance ); + + void deleteEquipmentInstance( EquipmentInstance equipmentInstance ); + + Collection getAllEquipmentInstance(); + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstanceStore.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstanceStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstanceStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,16 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +public interface EquipmentInstanceStore +{ + String ID = EquipmentInstanceStore.class.getName(); + + int addEquipmentInstance( EquipmentInstance equipmentInstance ); + + void updateEquipmentInstance( EquipmentInstance equipmentInstance ); + + void deleteEquipmentInstance( EquipmentInstance equipmentInstance ); + + Collection getAllEquipmentInstance(); +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatus.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatus.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatus.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,138 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.io.Serializable; +import java.util.Date; + +public class EquipmentWorkingStatus implements Serializable +{ + + private EquipmentInstance equipmentInstance; + + private Date reportingDate; + + private Date updationDate; + + private String status; + + private String description; + + private String storedBy; + + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + public EquipmentWorkingStatus( ) + { + + } + + public EquipmentWorkingStatus( EquipmentInstance equipmentInstance, Date reportingDate, Date updationDate, String status ) + { + this.equipmentInstance = equipmentInstance; + } + + // ------------------------------------------------------------------------- + // hashCode and equals + // ------------------------------------------------------------------------- + @Override + public boolean equals( Object o ) + { + if ( this == o ) + { + return true; + } + + if ( o == null ) + { + return false; + } + + if ( !(o instanceof EquipmentWorkingStatus) ) + { + return false; + } + + final EquipmentWorkingStatus other = (EquipmentWorkingStatus) o; + + return equipmentInstance.equals( other.getEquipmentInstance() ); + + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + + result = result * prime + equipmentInstance.hashCode(); + + return result; + } + + // ------------------------------------------------------------------------- + // Getters and setters + // ------------------------------------------------------------------------- + + public EquipmentInstance getEquipmentInstance() + { + return equipmentInstance; + } + + public void setEquipmentInstance( EquipmentInstance equipmentInstance ) + { + this.equipmentInstance = equipmentInstance; + } + + public Date getReportingDate() + { + return reportingDate; + } + + public void setReportingDate( Date reportingDate ) + { + this.reportingDate = reportingDate; + } + + public Date getUpdationDate() + { + return updationDate; + } + + public void setUpdationDate( Date updationDate ) + { + this.updationDate = updationDate; + } + + public String getStatus() + { + return status; + } + + public void setStatus( String status ) + { + this.status = status; + } + + public String getDescription() + { + return description; + } + + public void setDescription( String description ) + { + this.description = description; + } + + public String getStoredBy() + { + return storedBy; + } + + public void setStoredBy( String storedBy ) + { + this.storedBy = storedBy; + } + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusService.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +public interface EquipmentWorkingStatusService +{ + String ID = EquipmentWorkingStatusService.class.getName(); + + int addEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus ); + + void updateEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus ); + + void deleteEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus ); + + Collection getAllEquipmentWorkingStatus(); + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusStore.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentWorkingStatusStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +public interface EquipmentWorkingStatusStore +{ + String ID = EquipmentWorkingStatusStore.class.getName(); + + int addEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus ); + + void updateEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus ); + + void deleteEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus ); + + Collection getAllEquipmentWorkingStatus(); + +} === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,129 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.io.Serializable; +import java.util.Set; + +import org.hisp.dhis.coldchain.catalog.CatalogType; + +public class InventoryType implements Serializable +{ + private int id; + + private String name; + + private String description; + + private boolean tracking; + + private CatalogType catalogType; + + private Set inventoryTypeAttributes; + + // ------------------------------------------------------------------------- + // Contructors + // ------------------------------------------------------------------------- + + public InventoryType() + { + + } + public InventoryType( String name, boolean tracking ) + { + this.name = name; + this.tracking = tracking; + } + + public InventoryType( String name, String description, boolean tracking, CatalogType catalogType ) + { + this.name = name; + this.description = description; + this.tracking = tracking; + this.catalogType = catalogType; + } + + // ------------------------------------------------------------------------- + // hashCode, equals and toString + // ------------------------------------------------------------------------- + @Override + public int hashCode() + { + return name.hashCode(); + } + + @Override + public boolean equals( Object o ) + { + if ( this == o ) + { + return true; + } + + if ( o == null ) + { + return false; + } + + if ( !(o instanceof InventoryType) ) + { + return false; + } + + final InventoryType other = (InventoryType) o; + + return name.equals( other.getName() ); + } + + // ------------------------------------------------------------------------- + // Getters and setters + // ------------------------------------------------------------------------- + + public int getId() + { + return id; + } + public void setId( int id ) + { + this.id = id; + } + public String getName() + { + return name; + } + public void setName( String name ) + { + this.name = name; + } + public String getDescription() + { + return description; + } + public void setDescription( String description ) + { + this.description = description; + } + public boolean isTracking() + { + return tracking; + } + public void setTracking( boolean tracking ) + { + this.tracking = tracking; + } + public CatalogType getCatalogType() + { + return catalogType; + } + public void setCatalogType( CatalogType catalogType ) + { + this.catalogType = catalogType; + } + public Set getInventoryTypeAttributes() + { + return inventoryTypeAttributes; + } + public void setInventoryTypeAttributes( Set inventoryTypeAttributes ) + { + this.inventoryTypeAttributes = inventoryTypeAttributes; + } + +} === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttribute.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,153 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.io.Serializable; +import java.util.Set; + +public class InventoryTypeAttribute implements Serializable +{ + public static final String TYPE_DATE = "DATE"; + + public static final String TYPE_STRING = "TEXT"; + + public static final String TYPE_INT = "NUMBER"; + + public static final String TYPE_BOOL = "YES/NO"; + + public static final String TYPE_COMBO = "COMBO"; + + private int id; + + private String name; + + private String description; + + private String valueType; + + private boolean mandatory; + + private Integer noChars; + + private Set attributeOptions; + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + public InventoryTypeAttribute() + { + } + + // ------------------------------------------------------------------------- + // hashCode, equals and toString + // ------------------------------------------------------------------------- + + @Override + public int hashCode() + { + return name.hashCode(); + } + + @Override + public boolean equals( Object o ) + { + if ( this == o ) + { + return true; + } + + if ( o == null ) + { + return false; + } + + if ( !(o instanceof InventoryTypeAttribute) ) + { + return false; + } + + final InventoryTypeAttribute other = (InventoryTypeAttribute) o; + + return name.equals( other.getName() ); + } + + @Override + public String toString() + { + return "[" + name + "]"; + } + + // ------------------------------------------------------------------------- + // Getters and setters + // ------------------------------------------------------------------------- + + public int getId() + { + return id; + } + + public void setId( int id ) + { + this.id = id; + } + + public String getName() + { + return name; + } + + public void setName( String name ) + { + this.name = name; + } + + public String getDescription() + { + return description; + } + + public void setDescription( String description ) + { + this.description = description; + } + + public String getValueType() + { + return valueType; + } + + public void setValueType( String valueType ) + { + this.valueType = valueType; + } + + public boolean isMandatory() + { + return mandatory; + } + + public void setMandatory( boolean mandatory ) + { + this.mandatory = mandatory; + } + + public Integer getNoChars() + { + return noChars; + } + + public void setNoChars( Integer noChars ) + { + this.noChars = noChars; + } + + public Set getAttributeOptions() + { + return attributeOptions; + } + + public void setAttributeOptions( Set attributeOptions ) + { + this.attributeOptions = attributeOptions; + } + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeOption.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeOption.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeOption.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,94 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.io.Serializable; + +public class InventoryTypeAttributeOption implements Serializable +{ + private int id; + + private String name; + + private InventoryTypeAttribute inventoryTypeAttribute; + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + public InventoryTypeAttributeOption() + { + + } + + // ------------------------------------------------------------------------- + // hashCode, equals and toString + // ------------------------------------------------------------------------- + + @Override + public int hashCode() + { + return name.hashCode(); + } + + @Override + public boolean equals( Object o ) + { + if ( this == o ) + { + return true; + } + + if ( o == null ) + { + return false; + } + + if ( !(o instanceof InventoryTypeAttributeOption) ) + { + return false; + } + + final InventoryTypeAttributeOption other = (InventoryTypeAttributeOption) o; + + return name.equals( other.getName() ); + } + + @Override + public String toString() + { + return "[" + name + "]"; + } + + // ------------------------------------------------------------------------- + // Getters and setters + // ------------------------------------------------------------------------- + + public int getId() + { + return id; + } + + public void setId( int id ) + { + this.id = id; + } + + public String getName() + { + return name; + } + + public void setName( String name ) + { + this.name = name; + } + + public InventoryTypeAttribute getInventoryTypeAttribute() + { + return inventoryTypeAttribute; + } + + public void setInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ) + { + this.inventoryTypeAttribute = inventoryTypeAttribute; + } + +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeOptionService.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeOptionService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeOptionService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,16 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +public interface InventoryTypeAttributeOptionService +{ + String ID = InventoryTypeAttributeOptionService.class.getName(); + + int addInventoryTypeAttributeOption( InventoryTypeAttributeOption inventoryTypeAttributeOption ); + + void updateInventoryTypeAttributeOption( InventoryTypeAttributeOption inventoryTypeAttributeOption ); + + void deleteInventoryTypeAttributeOption( InventoryTypeAttributeOption inventoryTypeAttributeOption ); + + Collection getAllInventoryTypeAttributeOptions(); +} === added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeOptionStore.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeOptionStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeOptionStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +public interface InventoryTypeAttributeOptionStore +{ + String ID = InventoryTypeAttributeOptionStore.class.getName(); + + int addInventoryTypeAttributeOption( InventoryTypeAttributeOption inventoryTypeAttributeOption ); + + void updateInventoryTypeAttributeOption( InventoryTypeAttributeOption inventoryTypeAttributeOption ); + + void deleteInventoryTypeAttributeOption( InventoryTypeAttributeOption inventoryTypeAttributeOption ); + + Collection getAllInventoryTypeAttributeOptions(); + +} === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,17 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +public interface InventoryTypeAttributeService +{ + String ID = InventoryTypeAttributeService.class.getName(); + + int addInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ); + + void updateInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ); + + void deleteInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ); + + Collection getAllInventoryTypeAttributes(); + +} === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,16 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +public interface InventoryTypeAttributeStore +{ + String ID = InventoryTypeAttributeStore.class.getName(); + + int addInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ); + + void updateInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ); + + void deleteInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ); + + Collection getAllInventoryTypeAttributes(); +} === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,16 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +public interface InventoryTypeService +{ + String ID = InventoryTypeService.class.getName(); + + int addInventoryType( InventoryType inventoryType ); + + void updateInventoryType( InventoryType inventoryType ); + + void deleteInventoryType( InventoryType inventoryType ); + + Collection getAllInventoryTypes(); +} === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,16 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +public interface InventoryTypeStore +{ + String ID = InventoryTypeStore.class.getName(); + + int addInventoryType( InventoryType inventoryType ); + + void updateInventoryType( InventoryType inventoryType ); + + void deleteInventoryType( InventoryType inventoryType ); + + Collection getAllInventoryTypes(); +} === modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportStore.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportStore.java 2011-04-27 17:15:13 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportStore.java 2012-04-16 11:29:53 +0000 @@ -32,33 +32,34 @@ import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.PeriodType; -public interface ReportStore +public interface ReportStore { - String ID = ReportStore.class.getName(); - + String ID = ReportStore.class.getName(); + // ------------------------------------------------------------------------- // Report_in // ------------------------------------------------------------------------- - int addReport( Report_in report ); - - void updateReport( Report_in report ); - - void deleteReport( Report_in report ); - - Report_in getReport( int id ); - - Report_in getReportByName( String name ); - - Collection getReportBySource( OrganisationUnit source ); - - Collection getAllReports(); - - Collection getReportsByReportType( String reportType ); - - Collection getReportsByPeriodType( PeriodType periodType ); - - Collection getReportsByPeriodAndReportType( PeriodType periodType, String reportType ); - - Collection getReportsByPeriodSourceAndReportType( PeriodType periodType, OrganisationUnit source, String reportType ); + int addReport( Report_in report ); + + void updateReport( Report_in report ); + + void deleteReport( Report_in report ); + + Report_in getReport( int id ); + + Report_in getReportByName( String name ); + + Collection getReportBySource( OrganisationUnit source ); + + Collection getAllReports(); + + Collection getReportsByReportType( String reportType ); + + Collection getReportsByPeriodType( PeriodType periodType ); + + Collection getReportsByPeriodAndReportType( PeriodType periodType, String reportType ); + + Collection getReportsByPeriodSourceAndReportType( PeriodType periodType, OrganisationUnit source, + String reportType ); } === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain' === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/pom.xml' --- local/in/dhis-in-services/dhis-in-service-coldchain/pom.xml 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/pom.xml 2012-04-16 11:29:53 +0000 @@ -0,0 +1,65 @@ + + 4.0.0 + + + org.hisp.dhis + dhis-in-services + 2.8-SNAPSHOT + + + dhis-in-service-coldchain + jar + DHIS India ColdChain Service + + + + + + + org.hisp.dhis + dhis-api + + + org.hisp.dhis + dhis-in-api + ${project.version} + + + org.hisp.dhis + dhis-service-core + + + org.hisp.dhis + dhis-in-service-configuration + ${project.version} + + + org.hisp.dhis + dhis-service-aggregationengine-default + ${project.version} + + + org.hisp.dhis + dhis-support-system + + + org.hisp.dhis + dhis-service-reporting + + + + + + + commons-logging + commons-logging + + + commons-math + commons-math + + + + === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src' === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main' === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java' === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org' === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp' === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis' === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain' === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog' === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogDataValueService.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogDataValueService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogDataValueService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,52 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +import org.springframework.transaction.annotation.Transactional; + +public class DefaultCatalogDataValueService implements CatalogDataValueService +{ + + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private CatalogDataValueStore catalogDataValueStore; + + public void setCatalogDataValueStore( CatalogDataValueStore catalogDataValueStore ) + { + this.catalogDataValueStore = catalogDataValueStore; + } + + // ------------------------------------------------------------------------- + // CatalogDataValue + // ------------------------------------------------------------------------- + @Transactional + @Override + public int addCatalogDataValue( CatalogDataValue catalogDataValue ) + { + return catalogDataValueStore.addCatalogDataValue( catalogDataValue ); + } + + @Transactional + @Override + public void deleteCatalogDataValue( CatalogDataValue catalogDataValue ) + { + catalogDataValueStore.deleteCatalogDataValue( catalogDataValue ); + } + + @Transactional + @Override + public Collection getAllCatalogDataValues() + { + return catalogDataValueStore.getAllCatalogDataValues(); + } + + @Transactional + @Override + public void updateCatalogDataValue( CatalogDataValue catalogDataValue ) + { + catalogDataValueStore.updateCatalogDataValue( catalogDataValue ); + } + +} === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogService.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,47 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +import org.springframework.transaction.annotation.Transactional; + +public class DefaultCatalogService implements CatalogService +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private CatalogStore catalogStore; + + public void setCatalogStore( CatalogStore catalogStore ) + { + this.catalogStore = catalogStore; + } + + // ------------------------------------------------------------------------- + // Catalog + // ------------------------------------------------------------------------- + @Transactional + public int addCatalog( Catalog catalog ) + { + return catalogStore.addCatalog( catalog ); + } + + @Transactional + public void deleteCatalog( Catalog catalog ) + { + catalogStore.deleteCatalog( catalog ); + } + + @Transactional + public void updateCatalog( Catalog catalog ) + { + catalogStore.updateCatalog( catalog ); + } + + @Transactional + public Collection getAllCatalogs() + { + return catalogStore.getAllCatalogs(); + } + +} === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeAttributeOptionService.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeAttributeOptionService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeAttributeOptionService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,52 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +import org.springframework.transaction.annotation.Transactional; + +public class DefaultCatalogTypeAttributeOptionService implements CatalogTypeAttributeOptionService +{ + + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private CatalogTypeAttributeOptionStore catalogTypeAttributeOptionStore; + + public void setCatalogTypeAttributeOptionStore( CatalogTypeAttributeOptionStore catalogTypeAttributeOptionStore ) + { + this.catalogTypeAttributeOptionStore = catalogTypeAttributeOptionStore; + } + + // ------------------------------------------------------------------------- + // CatalogTypeAttributeOption + // ------------------------------------------------------------------------- + @Transactional + @Override + public int addCatalogTypeAttributeOption( CatalogTypeAttributeOption catalogTypeAttributeOption ) + { + return catalogTypeAttributeOptionStore.addCatalogTypeAttributeOption( catalogTypeAttributeOption ); + } + + @Transactional + @Override + public void deleteCatalogTypeAttributeOption( CatalogTypeAttributeOption catalogTypeAttributeOption ) + { + catalogTypeAttributeOptionStore.deleteCatalogTypeAttributeOption( catalogTypeAttributeOption ); + } + + @Transactional + @Override + public Collection getAllCatalogTypeAttributeOptions() + { + return catalogTypeAttributeOptionStore.getAllCatalogTypeAttributeOptions(); + } + + @Transactional + @Override + public void updateCatalogTypeAttributeOption( CatalogTypeAttributeOption catalogTypeAttributeOption ) + { + catalogTypeAttributeOptionStore.updateCatalogTypeAttributeOption( catalogTypeAttributeOption ); + } + +} === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeAttributeService.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeAttributeService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeAttributeService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,51 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +import org.springframework.transaction.annotation.Transactional; + +public class DefaultCatalogTypeAttributeService implements CatalogTypeAttributeService +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private CatalogTypeAttributeStore catalogTypeAttributeStore; + + public void setCatalogTypeAttributeStore( CatalogTypeAttributeStore catalogTypeAttributeStore ) + { + this.catalogTypeAttributeStore = catalogTypeAttributeStore; + } + + // ------------------------------------------------------------------------- + // CatalogTypeAttribute + // ------------------------------------------------------------------------- + @Transactional + @Override + public int addCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ) + { + return catalogTypeAttributeStore.addCatalogTypeAttribute( catalogTypeAttribute ); + } + + @Transactional + @Override + public void deleteCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ) + { + catalogTypeAttributeStore.deleteCatalogTypeAttribute( catalogTypeAttribute ); + } + + @Transactional + @Override + public Collection getAllCatalogTypeAttributes() + { + return catalogTypeAttributeStore.getAllCatalogTypeAttributes(); + } + + @Transactional + @Override + public void updateCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ) + { + catalogTypeAttributeStore.updateCatalogTypeAttribute( catalogTypeAttribute ); + } + +} === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeService.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,52 @@ +package org.hisp.dhis.coldchain.catalog; + +import java.util.Collection; + +import org.springframework.transaction.annotation.Transactional; + +public class DefaultCatalogTypeService implements CatalogTypeService +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private CatalogTypeStore catalogTypeStore; + + public void setCatalogTypeStore( CatalogTypeStore catalogTypeStore ) + { + this.catalogTypeStore = catalogTypeStore; + } + + // ------------------------------------------------------------------------- + // CatalogType + // ------------------------------------------------------------------------- + + @Transactional + @Override + public int addCatalogType( CatalogType catalogType ) + { + return catalogTypeStore.addCatalogType( catalogType ); + } + + @Transactional + @Override + public void deleteCatalogType( CatalogType catalogType ) + { + catalogTypeStore.deleteCatalogType( catalogType ); + } + + @Transactional + @Override + public Collection getAllCatalogTypes() + { + return catalogTypeStore.getAllCatalogTypes(); + } + + @Transactional + @Override + public void updateCatalogType( CatalogType catalogType ) + { + catalogTypeStore.updateCatalogType( catalogType ); + } + +} === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate' === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogDataValueStore.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogDataValueStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogDataValueStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,59 @@ +package org.hisp.dhis.coldchain.catalog.hibernate; + +import java.util.Collection; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hisp.dhis.coldchain.catalog.CatalogDataValue; +import org.hisp.dhis.coldchain.catalog.CatalogDataValueStore; + +public class HibernateCatalogDataValueStore implements CatalogDataValueStore +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private SessionFactory sessionFactory; + + public void setSessionFactory( SessionFactory sessionFactory ) + { + this.sessionFactory = sessionFactory; + } + + // ------------------------------------------------------------------------- + // CatalogDataValue + // ------------------------------------------------------------------------- + + @Override + public int addCatalogDataValue( CatalogDataValue catalogDataValue ) + { + Session session = sessionFactory.getCurrentSession(); + + return (Integer) session.save( catalogDataValue ); + } + + @Override + public void deleteCatalogDataValue( CatalogDataValue catalogDataValue ) + { + Session session = sessionFactory.getCurrentSession(); + + session.delete( catalogDataValue ); + } + + @Override + public Collection getAllCatalogDataValues() + { + Session session = sessionFactory.getCurrentSession(); + + return session.createCriteria( CatalogDataValue.class ).list(); + } + + @Override + public void updateCatalogDataValue( CatalogDataValue catalogDataValue ) + { + Session session = sessionFactory.getCurrentSession(); + + session.update( catalogDataValue ); + } + +} === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogStore.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,56 @@ +package org.hisp.dhis.coldchain.catalog.hibernate; + +import java.util.Collection; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hisp.dhis.coldchain.catalog.Catalog; +import org.hisp.dhis.coldchain.catalog.CatalogStore; + +public class HibernateCatalogStore implements CatalogStore +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private SessionFactory sessionFactory; + + public void setSessionFactory( SessionFactory sessionFactory ) + { + this.sessionFactory = sessionFactory; + } + + // ------------------------------------------------------------------------- + // Catalog + // ------------------------------------------------------------------------- + + public int addCatalog( Catalog catalog ) + { + Session session = sessionFactory.getCurrentSession(); + + return (Integer) session.save( catalog ); + } + + public void deleteCatalog( Catalog catalog ) + { + Session session = sessionFactory.getCurrentSession(); + + session.delete( catalog ); + } + + public void updateCatalog( Catalog catalog ) + { + Session session = sessionFactory.getCurrentSession(); + + session.update( catalog ); + } + + @SuppressWarnings( "unchecked" ) + public Collection getAllCatalogs() + { + Session session = sessionFactory.getCurrentSession(); + + return session.createCriteria( Catalog.class ).list(); + } + +} === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeAttributeOptionStore.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeAttributeOptionStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeAttributeOptionStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,59 @@ +package org.hisp.dhis.coldchain.catalog.hibernate; + +import java.util.Collection; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hisp.dhis.coldchain.catalog.CatalogTypeAttributeOption; +import org.hisp.dhis.coldchain.catalog.CatalogTypeAttributeOptionStore; + +public class HibernateCatalogTypeAttributeOptionStore implements CatalogTypeAttributeOptionStore +{ + + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private SessionFactory sessionFactory; + + public void setSessionFactory( SessionFactory sessionFactory ) + { + this.sessionFactory = sessionFactory; + } + + // ------------------------------------------------------------------------- + // CatalogTypeAttributeOption + // ------------------------------------------------------------------------- + @Override + public int addCatalogTypeAttributeOption( CatalogTypeAttributeOption catalogTypeAttributeOption ) + { + Session session = sessionFactory.getCurrentSession(); + + return (Integer) session.save( catalogTypeAttributeOption ); + } + + @Override + public void deleteCatalogTypeAttributeOption( CatalogTypeAttributeOption catalogTypeAttributeOption ) + { + Session session = sessionFactory.getCurrentSession(); + + session.delete( catalogTypeAttributeOption ); + } + + @Override + public Collection getAllCatalogTypeAttributeOptions() + { + Session session = sessionFactory.getCurrentSession(); + + return session.createCriteria( CatalogTypeAttributeOption.class ).list(); + } + + @Override + public void updateCatalogTypeAttributeOption( CatalogTypeAttributeOption catalogTypeAttributeOption ) + { + Session session = sessionFactory.getCurrentSession(); + + session.update( catalogTypeAttributeOption ); + } + +} === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeAttributeStore.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeAttributeStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeAttributeStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,59 @@ +package org.hisp.dhis.coldchain.catalog.hibernate; + +import java.util.Collection; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hisp.dhis.coldchain.catalog.CatalogTypeAttribute; +import org.hisp.dhis.coldchain.catalog.CatalogTypeAttributeStore; + +public class HibernateCatalogTypeAttributeStore implements CatalogTypeAttributeStore +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private SessionFactory sessionFactory; + + public void setSessionFactory( SessionFactory sessionFactory ) + { + this.sessionFactory = sessionFactory; + } + + // ------------------------------------------------------------------------- + // CatalogTypeAttribute + // ------------------------------------------------------------------------- + + @Override + public int addCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ) + { + Session session = sessionFactory.getCurrentSession(); + + return (Integer) session.save( catalogTypeAttribute ); + } + + @Override + public void deleteCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ) + { + Session session = sessionFactory.getCurrentSession(); + + session.delete( catalogTypeAttribute ); + } + + @Override + public Collection getAllCatalogTypeAttributes() + { + Session session = sessionFactory.getCurrentSession(); + + return session.createCriteria( CatalogTypeAttribute.class ).list(); + } + + @Override + public void updateCatalogTypeAttribute( CatalogTypeAttribute catalogTypeAttribute ) + { + Session session = sessionFactory.getCurrentSession(); + + session.update( catalogTypeAttribute ); + } + +} === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeStore.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,59 @@ +package org.hisp.dhis.coldchain.catalog.hibernate; + +import java.util.Collection; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hisp.dhis.coldchain.catalog.CatalogType; +import org.hisp.dhis.coldchain.catalog.CatalogTypeStore; + +public class HibernateCatalogTypeStore implements CatalogTypeStore +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private SessionFactory sessionFactory; + + public void setSessionFactory( SessionFactory sessionFactory ) + { + this.sessionFactory = sessionFactory; + } + + // ------------------------------------------------------------------------- + // CatalogType + // ------------------------------------------------------------------------- + + @Override + public int addCatalogType( CatalogType catalogType ) + { + Session session = sessionFactory.getCurrentSession(); + + return (Integer) session.save( catalogType ); + } + + @Override + public void deleteCatalogType( CatalogType catalogType ) + { + Session session = sessionFactory.getCurrentSession(); + + session.delete( catalogType ); + } + + @Override + public Collection getAllCatalogTypes() + { + Session session = sessionFactory.getCurrentSession(); + + return session.createCriteria( CatalogType.class ).list(); + } + + @Override + public void updateCatalogType( CatalogType catalogType ) + { + Session session = sessionFactory.getCurrentSession(); + + session.update( catalogType ); + } + +} === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory' === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentDetailsService.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentDetailsService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentDetailsService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,49 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +import org.springframework.transaction.annotation.Transactional; + +public class DefaultEquipmentDetailsService implements EquipmentDetailsService +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private EquipmentDetailsStore equipmentDetailsStore; + + public void setEquipmentDetailsStore( EquipmentDetailsStore equipmentDetailsStore ) + { + this.equipmentDetailsStore = equipmentDetailsStore; + } + + // ------------------------------------------------------------------------- + // EquipmentDetails + // ------------------------------------------------------------------------- + + @Transactional + @Override + public int addEquipmentDetails( EquipmentDetails equipmentDetails ) + { + return equipmentDetailsStore.addEquipmentDetails( equipmentDetails ); + } + @Transactional + @Override + public void deleteEquipmentDetails( EquipmentDetails equipmentDetails ) + { + equipmentDetailsStore.deleteEquipmentDetails( equipmentDetails ); + } + @Transactional + @Override + public Collection getAllEquipmentDetails() + { + return equipmentDetailsStore.getAllEquipmentDetails(); + } + @Transactional + @Override + public void updateEquipmentDetails( EquipmentDetails equipmentDetails ) + { + equipmentDetailsStore.updateEquipmentDetails( equipmentDetails ); + } + +} === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentInstanceService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,50 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +import org.springframework.transaction.annotation.Transactional; + +public class DefaultEquipmentInstanceService implements EquipmentInstanceService +{ + + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private EquipmentInstanceStore equipmentInstanceStore; + + public void setEquipmentInstanceStore( EquipmentInstanceStore equipmentInstanceStore ) + { + this.equipmentInstanceStore = equipmentInstanceStore; + } + + // ------------------------------------------------------------------------- + // EquipmentInstance + // ------------------------------------------------------------------------- + @Transactional + @Override + public int addEquipmentInstance( EquipmentInstance equipmentInstance ) + { + return equipmentInstanceStore.addEquipmentInstance( equipmentInstance ); + } + @Transactional + @Override + public void deleteEquipmentInstance( EquipmentInstance equipmentInstance ) + { + equipmentInstanceStore.deleteEquipmentInstance( equipmentInstance ); + } + @Transactional + @Override + public Collection getAllEquipmentInstance() + { + return equipmentInstanceStore.getAllEquipmentInstance(); + } + @Transactional + @Override + public void updateEquipmentInstance( EquipmentInstance equipmentInstance ) + { + equipmentInstanceStore.updateEquipmentInstance( equipmentInstance ); + } + + +} === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentWorkingStatusService.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentWorkingStatusService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentWorkingStatusService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,48 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +import org.springframework.transaction.annotation.Transactional; + +public class DefaultEquipmentWorkingStatusService implements EquipmentWorkingStatusService +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private EquipmentWorkingStatusStore equipmentWorkingStatusStore; + + public void setEquipmentWorkingStatusStore( EquipmentWorkingStatusStore equipmentWorkingStatusStore ) + { + this.equipmentWorkingStatusStore = equipmentWorkingStatusStore; + } + + // ------------------------------------------------------------------------- + // EquipmentWorkingStatus + // ------------------------------------------------------------------------- + @Transactional + @Override + public int addEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus ) + { + return equipmentWorkingStatusStore.addEquipmentWorkingStatus( equipmentWorkingStatus ); + } + @Transactional + @Override + public void deleteEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus ) + { + equipmentWorkingStatusStore.deleteEquipmentWorkingStatus( equipmentWorkingStatus ); + } + @Transactional + @Override + public Collection getAllEquipmentWorkingStatus() + { + return equipmentWorkingStatusStore.getAllEquipmentWorkingStatus(); + } + @Transactional + @Override + public void updateEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus ) + { + equipmentWorkingStatusStore.updateEquipmentWorkingStatus( equipmentWorkingStatus ); + } + +} === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeOptionService.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeOptionService.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeOptionService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,47 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +import org.springframework.transaction.annotation.Transactional; + +public class DefaultInventoryTypeAttributeOptionService implements InventoryTypeAttributeOptionService +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + private InventoryTypeAttributeOptionStore inventoryTypeAttributeOptionStore; + + public void setInventoryTypeAttributeOptionStore( InventoryTypeAttributeOptionStore inventoryTypeAttributeOptionStore ) + { + this.inventoryTypeAttributeOptionStore = inventoryTypeAttributeOptionStore; + } + + // ------------------------------------------------------------------------- + // InventoryTypeAttributeOption + // ------------------------------------------------------------------------- + @Transactional + @Override + public int addInventoryTypeAttributeOption( InventoryTypeAttributeOption inventoryTypeAttributeOption ) + { + return inventoryTypeAttributeOptionStore.addInventoryTypeAttributeOption( inventoryTypeAttributeOption ); + } + @Transactional + @Override + public void deleteInventoryTypeAttributeOption( InventoryTypeAttributeOption inventoryTypeAttributeOption ) + { + inventoryTypeAttributeOptionStore.deleteInventoryTypeAttributeOption( inventoryTypeAttributeOption ); + } + @Transactional + @Override + public Collection getAllInventoryTypeAttributeOptions() + { + return inventoryTypeAttributeOptionStore.getAllInventoryTypeAttributeOptions(); + } + @Transactional + @Override + public void updateInventoryTypeAttributeOption( InventoryTypeAttributeOption inventoryTypeAttributeOption ) + { + inventoryTypeAttributeOptionStore.updateInventoryTypeAttributeOption( inventoryTypeAttributeOption ); + } + +} === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,49 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +import org.springframework.transaction.annotation.Transactional; + +public class DefaultInventoryTypeAttributeService implements InventoryTypeAttributeService +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private InventoryTypeAttributeStore inventoryTypeAttributeStore; + + public void setInventoryTypeAttributeStore( InventoryTypeAttributeStore inventoryTypeAttributeStore ) + { + this.inventoryTypeAttributeStore = inventoryTypeAttributeStore; + } + + // ------------------------------------------------------------------------- + // InventoryTypeAttribute + // ------------------------------------------------------------------------- + @Transactional + @Override + public int addInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ) + { + return inventoryTypeAttributeStore.addInventoryTypeAttribute( inventoryTypeAttribute ); + } + @Transactional + @Override + public void deleteInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ) + { + inventoryTypeAttributeStore.deleteInventoryTypeAttribute( inventoryTypeAttribute ); + } + @Transactional + @Override + public Collection getAllInventoryTypeAttributes() + { + return inventoryTypeAttributeStore.getAllInventoryTypeAttributes(); + } + @Transactional + @Override + public void updateInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ) + { + inventoryTypeAttributeStore.updateInventoryTypeAttribute( inventoryTypeAttribute ); + } + + +} === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeService.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,45 @@ +package org.hisp.dhis.coldchain.inventory; + +import java.util.Collection; + +public class DefaultInventoryTypeService implements InventoryTypeService +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + private InventoryTypeStore inventoryTypeStore; + + public void setInventoryTypeStore( InventoryTypeStore inventoryTypeStore ) + { + this.inventoryTypeStore = inventoryTypeStore; + } + + // ------------------------------------------------------------------------- + // InventoryType + // ------------------------------------------------------------------------- + + @Override + public int addInventoryType( InventoryType inventoryType ) + { + return inventoryTypeStore.addInventoryType( inventoryType ); + } + + @Override + public void deleteInventoryType( InventoryType inventoryType ) + { + inventoryTypeStore.deleteInventoryType( inventoryType ); + } + + @Override + public Collection getAllInventoryTypes() + { + return inventoryTypeStore.getAllInventoryTypes(); + } + + @Override + public void updateInventoryType( InventoryType inventoryType ) + { + inventoryTypeStore.updateInventoryType( inventoryType ); + } + +} === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate' === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentDetailsStore.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentDetailsStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentDetailsStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,59 @@ +package org.hisp.dhis.coldchain.inventory.hibernate; + +import java.util.Collection; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hisp.dhis.coldchain.inventory.EquipmentDetails; +import org.hisp.dhis.coldchain.inventory.EquipmentDetailsStore; + +public class HibernateEquipmentDetailsStore implements EquipmentDetailsStore +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private SessionFactory sessionFactory; + + public void setSessionFactory( SessionFactory sessionFactory ) + { + this.sessionFactory = sessionFactory; + } + + // ------------------------------------------------------------------------- + // EquipmentDetails + // ------------------------------------------------------------------------- + + @Override + public int addEquipmentDetails( EquipmentDetails equipmentDetails ) + { + Session session = sessionFactory.getCurrentSession(); + + return (Integer) session.save( equipmentDetails ); + } + + @Override + public void deleteEquipmentDetails( EquipmentDetails equipmentDetails ) + { + Session session = sessionFactory.getCurrentSession(); + + session.delete( equipmentDetails ); + } + + @Override + public Collection getAllEquipmentDetails() + { + Session session = sessionFactory.getCurrentSession(); + + return session.createCriteria( EquipmentDetails.class ).list(); + } + + @Override + public void updateEquipmentDetails( EquipmentDetails equipmentDetails ) + { + Session session = sessionFactory.getCurrentSession(); + + session.update( equipmentDetails ); + } + +} === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentInstanceStore.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentInstanceStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentInstanceStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,59 @@ +package org.hisp.dhis.coldchain.inventory.hibernate; + +import java.util.Collection; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hisp.dhis.coldchain.inventory.EquipmentInstance; +import org.hisp.dhis.coldchain.inventory.EquipmentInstanceStore; + +public class HibernateEquipmentInstanceStore implements EquipmentInstanceStore +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private SessionFactory sessionFactory; + + public void setSessionFactory( SessionFactory sessionFactory ) + { + this.sessionFactory = sessionFactory; + } + + // ------------------------------------------------------------------------- + // EquipmentInstance + // ------------------------------------------------------------------------- + + @Override + public int addEquipmentInstance( EquipmentInstance equipmentInstance ) + { + Session session = sessionFactory.getCurrentSession(); + + return (Integer) session.save( equipmentInstance ); + } + + @Override + public void deleteEquipmentInstance( EquipmentInstance equipmentInstance ) + { + Session session = sessionFactory.getCurrentSession(); + + session.delete( equipmentInstance ); + } + + @Override + public Collection getAllEquipmentInstance() + { + Session session = sessionFactory.getCurrentSession(); + + return session.createCriteria( EquipmentInstance.class ).list(); + } + + @Override + public void updateEquipmentInstance( EquipmentInstance equipmentInstance ) + { + Session session = sessionFactory.getCurrentSession(); + + session.update( equipmentInstance ); + } + +} === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentWorkingStatusStore.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentWorkingStatusStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentWorkingStatusStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,59 @@ +package org.hisp.dhis.coldchain.inventory.hibernate; + +import java.util.Collection; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hisp.dhis.coldchain.inventory.EquipmentWorkingStatus; +import org.hisp.dhis.coldchain.inventory.EquipmentWorkingStatusStore; + +public class HibernateEquipmentWorkingStatusStore implements EquipmentWorkingStatusStore +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private SessionFactory sessionFactory; + + public void setSessionFactory( SessionFactory sessionFactory ) + { + this.sessionFactory = sessionFactory; + } + + // ------------------------------------------------------------------------- + // EquipmentWorkingStatus + // ------------------------------------------------------------------------- + + @Override + public int addEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus ) + { + Session session = sessionFactory.getCurrentSession(); + + return (Integer) session.save( equipmentWorkingStatus ); + } + + @Override + public void deleteEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus ) + { + Session session = sessionFactory.getCurrentSession(); + + session.delete( equipmentWorkingStatus ); + } + + @Override + public Collection getAllEquipmentWorkingStatus() + { + Session session = sessionFactory.getCurrentSession(); + + return session.createCriteria( EquipmentWorkingStatus.class ).list(); + } + + @Override + public void updateEquipmentWorkingStatus( EquipmentWorkingStatus equipmentWorkingStatus ) + { + Session session = sessionFactory.getCurrentSession(); + + session.update( equipmentWorkingStatus ); + } + +} === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeOptionStore.java' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeOptionStore.java 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeOptionStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,59 @@ +package org.hisp.dhis.coldchain.inventory.hibernate; + +import java.util.Collection; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeOption; +import org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeOptionStore; + +public class HibernateInventoryTypeAttributeOptionStore implements InventoryTypeAttributeOptionStore +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private SessionFactory sessionFactory; + + public void setSessionFactory( SessionFactory sessionFactory ) + { + this.sessionFactory = sessionFactory; + } + + // ------------------------------------------------------------------------- + // InventoryTypeAttributeOption + // ------------------------------------------------------------------------- + + @Override + public int addInventoryTypeAttributeOption( InventoryTypeAttributeOption inventoryTypeAttributeOption ) + { + Session session = sessionFactory.getCurrentSession(); + + return (Integer) session.save( inventoryTypeAttributeOption ); + } + + @Override + public void deleteInventoryTypeAttributeOption( InventoryTypeAttributeOption inventoryTypeAttributeOption ) + { + Session session = sessionFactory.getCurrentSession(); + + session.delete( inventoryTypeAttributeOption ); + } + + @Override + public Collection getAllInventoryTypeAttributeOptions() + { + Session session = sessionFactory.getCurrentSession(); + + return session.createCriteria( InventoryTypeAttributeOption.class ).list(); + } + + @Override + public void updateInventoryTypeAttributeOption( InventoryTypeAttributeOption inventoryTypeAttributeOption ) + { + Session session = sessionFactory.getCurrentSession(); + + session.update( inventoryTypeAttributeOption ); + } + +} === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,59 @@ +package org.hisp.dhis.coldchain.inventory.hibernate; + +import java.util.Collection; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hisp.dhis.coldchain.inventory.InventoryTypeAttribute; +import org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeStore; + +public class HibernateInventoryTypeAttributeStore implements InventoryTypeAttributeStore +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + private SessionFactory sessionFactory; + + public void setSessionFactory( SessionFactory sessionFactory ) + { + this.sessionFactory = sessionFactory; + } + + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + @Override + public int addInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ) + { + Session session = sessionFactory.getCurrentSession(); + + return (Integer) session.save( inventoryTypeAttribute ); + } + + @Override + public void deleteInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ) + { + Session session = sessionFactory.getCurrentSession(); + + session.delete( inventoryTypeAttribute ); + } + + @Override + public Collection getAllInventoryTypeAttributes() + { + Session session = sessionFactory.getCurrentSession(); + + return session.createCriteria( InventoryTypeAttribute.class ).list(); + } + + @Override + public void updateInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute ) + { + Session session = sessionFactory.getCurrentSession(); + + session.update( inventoryTypeAttribute ); + } + + +} === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeStore.java 2012-04-16 11:29:53 +0000 @@ -0,0 +1,58 @@ +package org.hisp.dhis.coldchain.inventory.hibernate; + +import java.util.Collection; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hisp.dhis.coldchain.inventory.InventoryType; +import org.hisp.dhis.coldchain.inventory.InventoryTypeStore; + +public class HibernateInventoryTypeStore implements InventoryTypeStore +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + private SessionFactory sessionFactory; + + public void setSessionFactory( SessionFactory sessionFactory ) + { + this.sessionFactory = sessionFactory; + } + + // ------------------------------------------------------------------------- + // InventoryTypeStore + // ------------------------------------------------------------------------- + @Override + public int addInventoryType( InventoryType inventoryType ) + { + Session session = sessionFactory.getCurrentSession(); + + return (Integer) session.save( inventoryType ); + } + + @Override + public void deleteInventoryType( InventoryType inventoryType ) + { + Session session = sessionFactory.getCurrentSession(); + + session.delete( inventoryType ); + } + + @Override + public Collection getAllInventoryTypes() + { + Session session = sessionFactory.getCurrentSession(); + + return session.createCriteria( InventoryType.class ).list(); + } + + @Override + public void updateInventoryType( InventoryType inventoryType ) + { + Session session = sessionFactory.getCurrentSession(); + + session.update( inventoryType ); + } + + +} === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources' === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF' === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis' === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml 2012-04-16 11:29:53 +0000 @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org' === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp' === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis' === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain' === added directory 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate' === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/Catalog.hbm.xml' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/Catalog.hbm.xml 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/Catalog.hbm.xml 2012-04-16 11:29:53 +0000 @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogDataValue.hbm.xml' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogDataValue.hbm.xml 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogDataValue.hbm.xml 2012-04-16 11:29:53 +0000 @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogType.hbm.xml' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogType.hbm.xml 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogType.hbm.xml 2012-04-16 11:29:53 +0000 @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttribute.hbm.xml' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttribute.hbm.xml 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttribute.hbm.xml 2012-04-16 11:29:53 +0000 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttributeOption.hbm.xml' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttributeOption.hbm.xml 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttributeOption.hbm.xml 2012-04-16 11:29:53 +0000 @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + === added 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 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttribute.hbm.xml 2012-04-16 11:29:53 +0000 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + === added file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttributeOption.hbm.xml' --- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttributeOption.hbm.xml 1970-01-01 00:00:00 +0000 +++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttributeOption.hbm.xml 2012-04-16 11:29:53 +0000 @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + === modified file 'local/in/dhis-web-dashboard/pom.xml' --- local/in/dhis-web-dashboard/pom.xml 2012-03-30 08:17:05 +0000 +++ local/in/dhis-web-dashboard/pom.xml 2012-04-16 11:29:53 +0000 @@ -93,6 +93,13 @@ dhis-in-service-dataentrystatus ${project.version} + + org.hisp.dhis + dhis-in-service-coldchain + ${project.version} + + +