dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17375
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6887: CCEM work in progress
------------------------------------------------------------
revno: 6887
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-05-09 12:32:15 +0530
message:
CCEM work in progress
modified:
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/CatalogService.java
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/CatalogType.java
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/CatalogTypeStore.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttribute.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeService.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeStore.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeService.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeStore.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogService.java
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/hibernate/HibernateCatalogStore.java
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/HibernateCatalogTypeStore.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeService.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeService.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeStore.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeStore.java
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/CatalogListAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/CatalogTypeListAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/GetColdChainCatalogTypeAttributeListAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeAttributeListAction.java
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeListAction.java
local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogList.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogTypeList.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/coldChainCatalogTypeAttribute.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeAttributeList.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeList.vm
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddCatalogForm.vm
local/in/pom.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/Catalog.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/Catalog.java 2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/Catalog.java 2012-05-09 07:02:15 +0000
@@ -1,9 +1,14 @@
package org.hisp.dhis.coldchain.catalog;
-import java.io.Serializable;
-
-public class Catalog implements Serializable
+import org.hisp.dhis.common.BaseNameableObject;
+//public class Catalog implements Serializable
+public class Catalog extends BaseNameableObject
{
+ /**
+ * Determines if a de-serialized file is compatible with this class.
+ */
+ private static final long serialVersionUID = -6551567526188061690L;
+
private int id;
private String name;
=== modified 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 2012-05-02 09:18:42 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogService.java 2012-05-09 07:02:15 +0000
@@ -28,4 +28,17 @@
void updateCatalogAndDataValue( Catalog catalog, List<CatalogDataValue> valuesForSave, List<CatalogDataValue> valuesForUpdate, Collection<CatalogDataValue> valuesForDelete );
void deleteCatalogAndDataValue( Catalog catalog );
+
+
+ // methods
+
+ int getCatalogCount();
+
+ int getCatalogCountByName( String name );
+
+ Collection<Catalog> getCatalogsBetween( int first, int max );
+
+ Collection<Catalog> getCatalogsBetweenByName( String name, int first, int max );
+
+
}
=== modified 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 2012-05-02 09:18:42 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogStore.java 2012-05-09 07:02:15 +0000
@@ -2,19 +2,19 @@
import java.util.Collection;
-import org.hisp.dhis.common.GenericStore;
+import org.hisp.dhis.common.GenericNameableObjectStore;
-public interface CatalogStore extends GenericStore<Catalog>
+public interface CatalogStore extends GenericNameableObjectStore<Catalog>
{
String ID = CatalogStore.class.getName();
-
+ /*
int addCatalog( Catalog catalog );
void updateCatalog( Catalog catalog );
void deleteCatalog( Catalog catalog );
-
+ */
Catalog getCatalog( int id );
Catalog getCatalogByName( String name );
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogType.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogType.java 2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogType.java 2012-05-09 07:02:15 +0000
@@ -1,10 +1,17 @@
package org.hisp.dhis.coldchain.catalog;
-import java.io.Serializable;
import java.util.Set;
-public class CatalogType implements Serializable
+import org.hisp.dhis.common.BaseNameableObject;
+
+//public class CatalogType implements Serializable
+public class CatalogType extends BaseNameableObject
{
+ /**
+ * Determines if a de-serialized file is compatible with this class.
+ */
+ private static final long serialVersionUID = -6551567526188061690L;
+
private int id;
private String name;
=== modified 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 2012-04-25 05:52:37 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeService.java 2012-05-09 07:02:15 +0000
@@ -17,5 +17,14 @@
CatalogType getCatalogTypeByName( String name );
Collection<CatalogType> getAllCatalogTypes();
-
+
+ // methods
+
+ int getCatalogTypeCount();
+
+ int getCatalogTypeCountByName( String name );
+
+ Collection<CatalogType> getCatalogTypesBetween( int first, int max );
+
+ Collection<CatalogType> getCatalogTypesBetweenByName( String name, int first, int max );
}
=== modified 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 2012-04-25 05:52:37 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeStore.java 2012-05-09 07:02:15 +0000
@@ -2,15 +2,19 @@
import java.util.Collection;
-public interface CatalogTypeStore
+import org.hisp.dhis.common.GenericNameableObjectStore;
+
+//public interface CatalogTypeStore
+public interface CatalogTypeStore extends GenericNameableObjectStore<CatalogType>
{
String ID = CatalogTypeStore.class.getName();
-
+ /*
int addCatalogType( CatalogType catalogType );
void updateCatalogType( CatalogType catalogType );
void deleteCatalogType( CatalogType catalogType );
+ */
CatalogType getCatalogType( int id );
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType.java 2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType.java 2012-05-09 07:02:15 +0000
@@ -1,12 +1,18 @@
package org.hisp.dhis.coldchain.inventory;
-import java.io.Serializable;
import java.util.Set;
import org.hisp.dhis.coldchain.catalog.CatalogType;
+import org.hisp.dhis.common.BaseNameableObject;
-public class InventoryType implements Serializable
+//public class InventoryType implements Serializable
+public class InventoryType extends BaseNameableObject
{
+ /**
+ * Determines if a de-serialized file is compatible with this class.
+ */
+ private static final long serialVersionUID = -6551567526188061690L;
+
private int id;
private String name;
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttribute.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttribute.java 2012-05-01 06:15:42 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttribute.java 2012-05-09 07:02:15 +0000
@@ -1,13 +1,18 @@
package org.hisp.dhis.coldchain.inventory;
-import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
-import org.hisp.dhis.patient.PatientAttributeOption;
+import org.hisp.dhis.common.BaseNameableObject;
-public class InventoryTypeAttribute implements Serializable
+//public class InventoryTypeAttribute implements Serializable
+public class InventoryTypeAttribute extends BaseNameableObject
{
+ /**
+ * Determines if a de-serialized file is compatible with this class.
+ */
+ private static final long serialVersionUID = -6551567526188061690L;
+
public static final String TYPE_DATE = "DATE";
public static final String TYPE_STRING = "TEXT";
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeService.java 2012-04-21 12:57:24 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeService.java 2012-05-09 07:02:15 +0000
@@ -17,6 +17,17 @@
InventoryTypeAttribute getInventoryTypeAttribute( int id );
InventoryTypeAttribute getInventoryTypeAttributeByName( String name );
+
+ // methods
+
+ int getInventoryTypeAttributeCount();
+
+ int getInventoryTypeAttributeCountByName( String name );
+
+ Collection<InventoryTypeAttribute> getInventoryTypeAttributesBetween( int first, int max );
+
+ Collection<InventoryTypeAttribute> getInventoryTypeAttributesBetweenByName( String name, int first, int max );
+
}
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeStore.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeStore.java 2012-04-21 12:57:24 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeStore.java 2012-05-09 07:02:15 +0000
@@ -2,16 +2,20 @@
import java.util.Collection;
-public interface InventoryTypeAttributeStore
+import org.hisp.dhis.common.GenericNameableObjectStore;
+
+//public interface InventoryTypeAttributeStore
+public interface InventoryTypeAttributeStore extends GenericNameableObjectStore<InventoryTypeAttribute>
{
String ID = InventoryTypeAttributeStore.class.getName();
-
+ /*
int addInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute );
void updateInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute );
void deleteInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute );
-
+ */
+
Collection<InventoryTypeAttribute> getAllInventoryTypeAttributes();
InventoryTypeAttribute getInventoryTypeAttribute( int id );
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeService.java 2012-04-26 10:00:48 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeService.java 2012-05-09 07:02:15 +0000
@@ -2,6 +2,8 @@
import java.util.Collection;
+import org.hisp.dhis.coldchain.catalog.CatalogType;
+
public interface InventoryTypeService
{
String ID = InventoryTypeService.class.getName();
@@ -17,4 +19,16 @@
InventoryType getInventoryTypeByName( String name );
InventoryType getInventoryType( int id );
+
+ // methods
+
+ int getInventoryTypeCount();
+
+ int getInventoryTypeCountByName( String name );
+
+ Collection<InventoryType> getInventoryTypesBetween( int first, int max );
+
+ Collection<InventoryType> getInventoryTypesBetweenByName( String name, int first, int max );
+
+
}
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeStore.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeStore.java 2012-04-26 10:00:48 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeStore.java 2012-05-09 07:02:15 +0000
@@ -2,16 +2,20 @@
import java.util.Collection;
-public interface InventoryTypeStore
+import org.hisp.dhis.common.GenericNameableObjectStore;
+
+//public interface InventoryTypeStore
+
+public interface InventoryTypeStore extends GenericNameableObjectStore<InventoryType>
{
String ID = InventoryTypeStore.class.getName();
-
+ /*
int addInventoryType( InventoryType inventoryType );
void updateInventoryType( InventoryType inventoryType );
void deleteInventoryType( InventoryType inventoryType );
-
+ */
Collection<InventoryType> getAllInventoryTypes();
InventoryType getInventoryTypeByName( String name );
=== modified 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 2012-05-02 09:18:42 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogService.java 2012-05-09 07:02:15 +0000
@@ -1,9 +1,13 @@
package org.hisp.dhis.coldchain.catalog;
+import static org.hisp.dhis.i18n.I18nUtils.getCountByName;
+import static org.hisp.dhis.i18n.I18nUtils.getObjectsBetween;
+import static org.hisp.dhis.i18n.I18nUtils.getObjectsBetweenByName;
+
import java.util.Collection;
import java.util.List;
-import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
+import org.hisp.dhis.i18n.I18nService;
import org.springframework.transaction.annotation.Transactional;
@Transactional
@@ -26,11 +30,18 @@
{
this.catalogDataValueService = catalogDataValueService;
}
+
+ private I18nService i18nService;
+
+ public void setI18nService( I18nService service )
+ {
+ i18nService = service;
+ }
// -------------------------------------------------------------------------
// Catalog
// -------------------------------------------------------------------------
-
+ /*
public int addCatalog( Catalog catalog )
{
return catalogStore.addCatalog( catalog );
@@ -41,17 +52,33 @@
catalogStore.deleteCatalog( catalog );
}
+ public void updateCatalog( Catalog catalog )
+ {
+ catalogStore.updateCatalog( catalog );
+ }
+ */
+
+ @Override
+ public int addCatalog( Catalog catalog )
+ {
+ return catalogStore.save( catalog );
+ }
+ @Override
+ public void deleteCatalog( Catalog catalog )
+ {
+ catalogStore.delete( catalog );
+ }
+ @Override
+ public void updateCatalog( Catalog catalog )
+ {
+ catalogStore.update( catalog );
+ }
@Override
public void deleteCatalogData( Catalog catalog )
{
catalogStore.delete( catalog );
}
- public void updateCatalog( Catalog catalog )
- {
- catalogStore.updateCatalog( catalog );
- }
-
public Collection<Catalog> getAllCatalogs()
{
return catalogStore.getAllCatalogs();
@@ -85,8 +112,8 @@
@Override
public void updateCatalogAndDataValue( Catalog catalog, List<CatalogDataValue> valuesForSave, List<CatalogDataValue> valuesForUpdate, Collection<CatalogDataValue> valuesForDelete )
{
- //catalogStore.update( catalog );
- catalogStore.updateCatalog( catalog );
+ catalogStore.update( catalog );
+ //catalogStore.updateCatalog( catalog );
for ( CatalogDataValue catalogDataValueAdd : valuesForSave )
{
@@ -120,4 +147,25 @@
{
return catalogStore.getCatalogs( catalogType );
}
+
+ //Methods
+ public int getCatalogCount()
+ {
+ return catalogStore.getCount();
+ }
+
+ public int getCatalogCountByName( String name )
+ {
+ return getCountByName( i18nService, catalogStore, name );
+ }
+
+ public Collection<Catalog> getCatalogsBetween( int first, int max )
+ {
+ return getObjectsBetween( i18nService, catalogStore, first, max );
+ }
+
+ public Collection<Catalog> getCatalogsBetweenByName( String name, int first, int max )
+ {
+ return getObjectsBetweenByName( i18nService, catalogStore, name, first, max );
+ }
}
=== modified 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 2012-04-25 05:52:37 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeService.java 2012-05-09 07:02:15 +0000
@@ -1,9 +1,14 @@
package org.hisp.dhis.coldchain.catalog;
+import static org.hisp.dhis.i18n.I18nUtils.getCountByName;
+import static org.hisp.dhis.i18n.I18nUtils.getObjectsBetween;
+import static org.hisp.dhis.i18n.I18nUtils.getObjectsBetweenByName;
+
import java.util.Collection;
+import org.hisp.dhis.i18n.I18nService;
import org.springframework.transaction.annotation.Transactional;
-
+@Transactional
public class DefaultCatalogTypeService implements CatalogTypeService
{
// -------------------------------------------------------------------------
@@ -16,11 +21,17 @@
{
this.catalogTypeStore = catalogTypeStore;
}
+ private I18nService i18nService;
+
+ public void setI18nService( I18nService service )
+ {
+ i18nService = service;
+ }
// -------------------------------------------------------------------------
// CatalogType
// -------------------------------------------------------------------------
-
+ /*
@Transactional
@Override
public int addCatalogType( CatalogType catalogType )
@@ -62,6 +73,67 @@
{
return catalogTypeStore.getCatalogTypeByName( name );
}
-
-
+ */
+
+
+ // -------------------------------------------------------------------------
+ // CatalogType
+ // -------------------------------------------------------------------------
+
+ @Override
+ public int addCatalogType( CatalogType catalogType )
+ {
+ return catalogTypeStore.save( catalogType );
+ }
+
+ @Override
+ public void deleteCatalogType( CatalogType catalogType )
+ {
+ catalogTypeStore.delete( catalogType );
+ }
+
+ @Override
+ public void updateCatalogType( CatalogType catalogType )
+ {
+ catalogTypeStore.update( catalogType );
+ }
+
+ @Override
+ public Collection<CatalogType> getAllCatalogTypes()
+ {
+ return catalogTypeStore.getAllCatalogTypes();
+ }
+
+ @Override
+ public CatalogType getCatalogType( int id )
+ {
+ return catalogTypeStore.getCatalogType( id );
+ }
+
+ @Override
+ public CatalogType getCatalogTypeByName( String name )
+ {
+ return catalogTypeStore.getCatalogTypeByName( name );
+ }
+
+ //Methods
+ public int getCatalogTypeCount()
+ {
+ return catalogTypeStore.getCount();
+ }
+
+ public int getCatalogTypeCountByName( String name )
+ {
+ return getCountByName( i18nService, catalogTypeStore, name );
+ }
+
+ public Collection<CatalogType> getCatalogTypesBetween( int first, int max )
+ {
+ return getObjectsBetween( i18nService, catalogTypeStore, first, max );
+ }
+
+ public Collection<CatalogType> getCatalogTypesBetweenByName( String name, int first, int max )
+ {
+ return getObjectsBetweenByName( i18nService, catalogTypeStore, name, first, max );
+ }
}
=== modified 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 2012-05-02 09:18:42 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogStore.java 2012-05-09 07:02:15 +0000
@@ -2,9 +2,6 @@
import java.util.Collection;
-import org.hibernate.Criteria;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
import org.hibernate.criterion.Restrictions;
import org.hisp.dhis.coldchain.catalog.Catalog;
import org.hisp.dhis.coldchain.catalog.CatalogStore;
@@ -16,18 +13,18 @@
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
-
+ /*
private SessionFactory sessionFactory;
public void setSessionFactory( SessionFactory sessionFactory )
{
this.sessionFactory = sessionFactory;
}
-
+ */
// -------------------------------------------------------------------------
// Catalog
// -------------------------------------------------------------------------
-
+ /*
public int addCatalog( Catalog catalog )
{
Session session = sessionFactory.getCurrentSession();
@@ -85,5 +82,34 @@
return criteria.list();
}
-
+ */
+ // -------------------------------------------------------------------------
+ // Catalog
+ // -------------------------------------------------------------------------
+
+ @Override
+ @SuppressWarnings( "unchecked" )
+ public Collection<Catalog> getAllCatalogs()
+ {
+ return sessionFactory.getCurrentSession().createCriteria( Catalog.class ).list();
+ }
+
+ @Override
+ public Catalog getCatalog( int id )
+ {
+ return (Catalog) sessionFactory.getCurrentSession().get( Catalog.class, id );
+ }
+
+ @Override
+ public Catalog getCatalogByName( String name )
+ {
+ return (Catalog) getCriteria( Restrictions.eq( "name", name ) ).uniqueResult();
+ }
+ @Override
+ @SuppressWarnings( "unchecked" )
+ public Collection<Catalog> getCatalogs( CatalogType catalogType )
+ {
+ return getCriteria( Restrictions.eq( "catalogType", catalogType ) ).list();
+ }
+
}
=== modified 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 2012-05-07 11:49:40 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeAttributeStore.java 2012-05-09 07:02:15 +0000
@@ -97,8 +97,4 @@
return session.createCriteria( CatalogTypeAttribute.class ).list();
*/
}
-
-
-
-
}
=== modified 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 2012-04-30 11:56:21 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeStore.java 2012-05-09 07:02:15 +0000
@@ -2,30 +2,30 @@
import java.util.Collection;
-import org.hibernate.Criteria;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
import org.hibernate.criterion.Restrictions;
import org.hisp.dhis.coldchain.catalog.CatalogType;
import org.hisp.dhis.coldchain.catalog.CatalogTypeStore;
-
-public class HibernateCatalogTypeStore implements CatalogTypeStore
+import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore;
+
+
+//public class HibernateCatalogTypeStore implements CatalogTypeStore
+public class HibernateCatalogTypeStore extends HibernateIdentifiableObjectStore<CatalogType> implements CatalogTypeStore
{
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
-
+ /*
private SessionFactory sessionFactory;
public void setSessionFactory( SessionFactory sessionFactory )
{
this.sessionFactory = sessionFactory;
}
-
+ */
// -------------------------------------------------------------------------
// CatalogType
// -------------------------------------------------------------------------
-
+ /*
@Override
public int addCatalogType( CatalogType catalogType )
{
@@ -43,6 +43,7 @@
}
@Override
+ @SuppressWarnings( "unchecked" )
public Collection<CatalogType> getAllCatalogTypes()
{
Session session = sessionFactory.getCurrentSession();
@@ -75,19 +76,61 @@
criteria.add( Restrictions.eq( "name", name ) );
return (CatalogType) criteria.uniqueResult();
-
- }
- /*
- @Override
- public CatalogType getCatalogTypeByAttribute( CatalogType catalogType, CatalogTypeAttribute catalogTypeAttribute)
- {
- Session session = sessionFactory.getCurrentSession();
-
- Criteria criteria = session.createCriteria( CatalogType.class );
- criteria.add( Restrictions.eq( "name", catalogTypeAttribute ) );
-
- return (CatalogType) criteria.uniqueResult();
-
- }
- */
+ }
+ */
+
+ /*
+ @Override
+ public CatalogType getCatalogTypeByAttribute( CatalogType catalogType, CatalogTypeAttribute catalogTypeAttribute)
+ {
+ Session session = sessionFactory.getCurrentSession();
+
+ Criteria criteria = session.createCriteria( CatalogType.class );
+ criteria.add( Restrictions.eq( "name", catalogTypeAttribute ) );
+
+ return (CatalogType) criteria.uniqueResult();
+ }
+ */
+
+ // -------------------------------------------------------------------------
+ // CatalogType
+ // -------------------------------------------------------------------------
+
+ @Override
+ @SuppressWarnings( "unchecked" )
+ public Collection<CatalogType> getAllCatalogTypes()
+ {
+ return sessionFactory.getCurrentSession().createCriteria( CatalogType.class ).list();
+ }
+
+ @Override
+ public CatalogType getCatalogType( int id )
+ {
+ return (CatalogType) sessionFactory.getCurrentSession().get( CatalogType.class, id );
+ }
+
+ @Override
+ public CatalogType getCatalogTypeByName( String name )
+ {
+ return (CatalogType) getCriteria( Restrictions.eq( "name", name ) ).uniqueResult();
+ }
+
+ /*
+ @Override
+ public CatalogType getCatalogTypeByAttribute( CatalogType catalogType, CatalogTypeAttribute catalogTypeAttribute)
+ {
+ Session session = sessionFactory.getCurrentSession();
+
+ Criteria criteria = session.createCriteria( CatalogType.class );
+ criteria.add( Restrictions.eq( "name", catalogTypeAttribute ) );
+
+ return (CatalogType) criteria.uniqueResult();
+
+ }
+ */
+
+
+
+
+
}
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeService.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeService.java 2012-05-02 06:03:10 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeService.java 2012-05-09 07:02:15 +0000
@@ -1,7 +1,12 @@
package org.hisp.dhis.coldchain.inventory;
+import static org.hisp.dhis.i18n.I18nUtils.getCountByName;
+import static org.hisp.dhis.i18n.I18nUtils.getObjectsBetween;
+import static org.hisp.dhis.i18n.I18nUtils.getObjectsBetweenByName;
+
import java.util.Collection;
+import org.hisp.dhis.i18n.I18nService;
import org.springframework.transaction.annotation.Transactional;
@Transactional
@@ -17,11 +22,18 @@
{
this.inventoryTypeAttributeStore = inventoryTypeAttributeStore;
}
+
+ private I18nService i18nService;
+
+ public void setI18nService( I18nService service )
+ {
+ i18nService = service;
+ }
// -------------------------------------------------------------------------
// InventoryTypeAttribute
// -------------------------------------------------------------------------
-
+ /*
@Transactional
@Override
public int addInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute )
@@ -59,5 +71,62 @@
{
return inventoryTypeAttributeStore.getInventoryTypeAttributeByName( name );
}
-
+ */
+
+
+ @Override
+ public int addInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute )
+ {
+ return inventoryTypeAttributeStore.save( inventoryTypeAttribute );
+ }
+
+ @Override
+ public void deleteInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute )
+ {
+ inventoryTypeAttributeStore.delete( inventoryTypeAttribute );
+ }
+
+ @Override
+ public Collection<InventoryTypeAttribute> getAllInventoryTypeAttributes()
+ {
+ return inventoryTypeAttributeStore.getAllInventoryTypeAttributes();
+ }
+
+ @Override
+ public void updateInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute )
+ {
+ inventoryTypeAttributeStore.update( inventoryTypeAttribute );
+ }
+
+ public InventoryTypeAttribute getInventoryTypeAttribute( int id )
+ {
+ return inventoryTypeAttributeStore.getInventoryTypeAttribute( id );
+ }
+
+ public InventoryTypeAttribute getInventoryTypeAttributeByName( String name )
+ {
+ return inventoryTypeAttributeStore.getInventoryTypeAttributeByName( name );
+ }
+
+
+ //Methods
+ public int getInventoryTypeAttributeCount()
+ {
+ return inventoryTypeAttributeStore.getCount();
+ }
+
+ public int getInventoryTypeAttributeCountByName( String name )
+ {
+ return getCountByName( i18nService, inventoryTypeAttributeStore, name );
+ }
+
+ public Collection<InventoryTypeAttribute> getInventoryTypeAttributesBetween( int first, int max )
+ {
+ return getObjectsBetween( i18nService, inventoryTypeAttributeStore, first, max );
+ }
+
+ public Collection<InventoryTypeAttribute> getInventoryTypeAttributesBetweenByName( String name, int first, int max )
+ {
+ return getObjectsBetweenByName( i18nService, inventoryTypeAttributeStore, name, first, max );
+ }
}
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeService.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeService.java 2012-05-02 06:03:10 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeService.java 2012-05-09 07:02:15 +0000
@@ -1,9 +1,14 @@
package org.hisp.dhis.coldchain.inventory;
+import static org.hisp.dhis.i18n.I18nUtils.getCountByName;
+import static org.hisp.dhis.i18n.I18nUtils.getObjectsBetween;
+import static org.hisp.dhis.i18n.I18nUtils.getObjectsBetweenByName;
+
import java.util.Collection;
+import org.hisp.dhis.i18n.I18nService;
import org.springframework.transaction.annotation.Transactional;
-
+@Transactional
public class DefaultInventoryTypeService implements InventoryTypeService
{
// -------------------------------------------------------------------------
@@ -15,11 +20,17 @@
{
this.inventoryTypeStore = inventoryTypeStore;
}
+
+ private I18nService i18nService;
+ public void setI18nService( I18nService service )
+ {
+ i18nService = service;
+ }
// -------------------------------------------------------------------------
// InventoryType
// -------------------------------------------------------------------------
-
+ /*
@Transactional
@Override
public int addInventoryType( InventoryType inventoryType )
@@ -57,5 +68,62 @@
{
return inventoryTypeStore.getInventoryType( id );
}
+ */
+
+
+ @Override
+ public int addInventoryType( InventoryType inventoryType )
+ {
+ return inventoryTypeStore.save( inventoryType );
+ }
+
+ @Override
+ public void deleteInventoryType( InventoryType inventoryType )
+ {
+ inventoryTypeStore.delete( inventoryType );
+ }
+
+ @Override
+ public void updateInventoryType( InventoryType inventoryType )
+ {
+ inventoryTypeStore.update( inventoryType );
+ }
+ @Override
+ public Collection<InventoryType> getAllInventoryTypes()
+ {
+ return inventoryTypeStore.getAllInventoryTypes();
+ }
+ @Override
+ public InventoryType getInventoryTypeByName( String name )
+ {
+ return inventoryTypeStore.getInventoryTypeByName( name );
+ }
+ @Override
+ public InventoryType getInventoryType( int id )
+ {
+ return inventoryTypeStore.getInventoryType( id );
+ }
+
+
+ //Methods
+ public int getInventoryTypeCount()
+ {
+ return inventoryTypeStore.getCount();
+ }
+
+ public int getInventoryTypeCountByName( String name )
+ {
+ return getCountByName( i18nService, inventoryTypeStore, name );
+ }
+
+ public Collection<InventoryType> getInventoryTypesBetween( int first, int max )
+ {
+ return getObjectsBetween( i18nService, inventoryTypeStore, first, max );
+ }
+
+ public Collection<InventoryType> getInventoryTypesBetweenByName( String name, int first, int max )
+ {
+ return getObjectsBetweenByName( i18nService, inventoryTypeStore, name, first, max );
+ }
}
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeStore.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeStore.java 2012-04-21 12:57:24 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeStore.java 2012-05-09 07:02:15 +0000
@@ -2,30 +2,28 @@
import java.util.Collection;
-import org.hibernate.Criteria;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
import org.hibernate.criterion.Restrictions;
import org.hisp.dhis.coldchain.inventory.InventoryTypeAttribute;
import org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeStore;
-import org.hisp.dhis.reports.Report_in;
+import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore;
-public class HibernateInventoryTypeAttributeStore implements InventoryTypeAttributeStore
+public class HibernateInventoryTypeAttributeStore extends HibernateIdentifiableObjectStore<InventoryTypeAttribute> implements InventoryTypeAttributeStore
{
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
+ /*
private SessionFactory sessionFactory;
public void setSessionFactory( SessionFactory sessionFactory )
{
this.sessionFactory = sessionFactory;
}
-
+ */
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
-
+ /*
@Override
public int addInventoryTypeAttribute( InventoryTypeAttribute inventoryTypeAttribute )
{
@@ -74,5 +72,27 @@
return (InventoryTypeAttribute) criteria.uniqueResult();
}
-
+ */
+
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ @Override
+ @SuppressWarnings( "unchecked" )
+ public Collection<InventoryTypeAttribute> getAllInventoryTypeAttributes()
+ {
+ return sessionFactory.getCurrentSession().createCriteria( InventoryTypeAttribute.class ).list();
+ }
+
+ public InventoryTypeAttribute getInventoryTypeAttribute( int id )
+ {
+ return (InventoryTypeAttribute) sessionFactory.getCurrentSession().get( InventoryTypeAttribute.class, id );
+ }
+
+ public InventoryTypeAttribute getInventoryTypeAttributeByName( String name )
+ {
+ return (InventoryTypeAttribute) getCriteria( Restrictions.eq( "name", name ) ).uniqueResult();
+
+ }
}
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeStore.java'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeStore.java 2012-05-02 06:03:10 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeStore.java 2012-05-09 07:02:15 +0000
@@ -2,28 +2,28 @@
import java.util.Collection;
-import org.hibernate.Criteria;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
import org.hibernate.criterion.Restrictions;
import org.hisp.dhis.coldchain.inventory.InventoryType;
import org.hisp.dhis.coldchain.inventory.InventoryTypeStore;
-
-public class HibernateInventoryTypeStore implements InventoryTypeStore
+import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore;
+//public class HibernateInventoryTypeStore implements InventoryTypeStore
+public class HibernateInventoryTypeStore extends HibernateIdentifiableObjectStore<InventoryType> implements InventoryTypeStore
{
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
+ /*
private SessionFactory sessionFactory;
public void setSessionFactory( SessionFactory sessionFactory )
{
this.sessionFactory = sessionFactory;
}
-
+ */
// -------------------------------------------------------------------------
// InventoryTypeStore
// -------------------------------------------------------------------------
+ /*
@Override
public int addInventoryType( InventoryType inventoryType )
{
@@ -72,5 +72,26 @@
return (InventoryType) session.get( InventoryType.class, id );
}
-
+ */
+
+ // -------------------------------------------------------------------------
+ // InventoryTypeStore
+ // -------------------------------------------------------------------------
+
+ @Override
+ @SuppressWarnings( "unchecked" )
+ public Collection<InventoryType> getAllInventoryTypes()
+ {
+ return sessionFactory.getCurrentSession().createCriteria( InventoryType.class ).list();
+ }
+ @Override
+ public InventoryType getInventoryTypeByName( String name )
+ {
+ return (InventoryType) getCriteria( Restrictions.eq( "name", name ) ).uniqueResult();
+ }
+ @Override
+ public InventoryType getInventoryType( int id )
+ {
+ return (InventoryType) sessionFactory.getCurrentSession().get( InventoryType.class, id );
+ }
}
=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml 2012-05-07 11:49:40 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml 2012-05-09 07:02:15 +0000
@@ -21,15 +21,24 @@
<property name="sessionFactory" ref="sessionFactory"/>
<property name="cacheable" value="true" />
</bean>
+<!--
+ <bean id="org.hisp.dhis.coldchain.catalog.CatalogTypeStore"
+ class="org.hisp.dhis.coldchain.catalog.hibernate.HibernateCatalogTypeStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
+-->
+ <bean id="org.hisp.dhis.coldchain.catalog.CatalogTypeStore"
+ class="org.hisp.dhis.coldchain.catalog.hibernate.HibernateCatalogTypeStore">
+ <property name="clazz" value="org.hisp.dhis.coldchain.catalog.CatalogType" />
+ <property name="sessionFactory" ref="sessionFactory"/>
+ <property name="cacheable" value="true" />
+ </bean>
- <bean id="org.hisp.dhis.coldchain.catalog.CatalogTypeStore"
- class="org.hisp.dhis.coldchain.catalog.hibernate.HibernateCatalogTypeStore">
- <property name="sessionFactory" ref="sessionFactory"/>
- </bean>
<bean id="org.hisp.dhis.coldchain.catalog.CatalogStore"
class="org.hisp.dhis.coldchain.catalog.hibernate.HibernateCatalogStore">
<property name="clazz" value="org.hisp.dhis.coldchain.catalog.Catalog" />
<property name="sessionFactory" ref="sessionFactory"/>
+ <property name="cacheable" value="true" />
</bean>
<bean id="org.hisp.dhis.coldchain.catalog.CatalogDataValueStore"
class="org.hisp.dhis.coldchain.catalog.hibernate.HibernateCatalogDataValueStore">
@@ -54,15 +63,31 @@
class="org.hisp.dhis.coldchain.inventory.hibernate.HibernateInventoryTypeAttributeOptionStore">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
- <bean id="org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeStore"
- class="org.hisp.dhis.coldchain.inventory.hibernate.HibernateInventoryTypeAttributeStore">
- <property name="sessionFactory" ref="sessionFactory"/>
- </bean>
- <bean id="org.hisp.dhis.coldchain.inventory.InventoryTypeStore"
- class="org.hisp.dhis.coldchain.inventory.hibernate.HibernateInventoryTypeStore">
- <property name="sessionFactory" ref="sessionFactory"/>
- </bean>
+<!--
+ <bean id="org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeStore"
+ class="org.hisp.dhis.coldchain.inventory.hibernate.HibernateInventoryTypeAttributeStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
+-->
+ <bean id="org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeStore"
+ class="org.hisp.dhis.coldchain.inventory.hibernate.HibernateInventoryTypeAttributeStore">
+ <property name="clazz" value="org.hisp.dhis.coldchain.catalog.CatalogTypeAttribute" />
+ <property name="sessionFactory" ref="sessionFactory"/>
+ <property name="cacheable" value="true" />
+ </bean>
+<!--
+ <bean id="org.hisp.dhis.coldchain.inventory.InventoryTypeStore"
+ class="org.hisp.dhis.coldchain.inventory.hibernate.HibernateInventoryTypeStore">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
+-->
+ <bean id="org.hisp.dhis.coldchain.inventory.InventoryTypeStore"
+ class="org.hisp.dhis.coldchain.inventory.hibernate.HibernateInventoryTypeStore">
+ <property name="clazz" value="org.hisp.dhis.coldchain.catalog.CatalogTypeAttribute" />
+ <property name="sessionFactory" ref="sessionFactory"/>
+ <property name="cacheable" value="true" />
+ </bean>
<!-- Service definitions -->
<bean id="org.hisp.dhis.coldchain.catalog.CatalogTypeAttributeOptionService"
@@ -80,15 +105,24 @@
<property name="catalogTypeAttributeStore" ref="org.hisp.dhis.coldchain.catalog.CatalogTypeAttributeStore"/>
<property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
</bean>
-
+<!--
<bean id="org.hisp.dhis.coldchain.catalog.CatalogTypeService"
class="org.hisp.dhis.coldchain.catalog.DefaultCatalogTypeService">
<property name="catalogTypeStore" ref="org.hisp.dhis.coldchain.catalog.CatalogTypeStore"/>
</bean>
+-->
+
+ <bean id="org.hisp.dhis.coldchain.catalog.CatalogTypeService"
+ class="org.hisp.dhis.coldchain.catalog.DefaultCatalogTypeService">
+ <property name="catalogTypeStore" ref="org.hisp.dhis.coldchain.catalog.CatalogTypeStore"/>
+ <property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
+ </bean>
+
<bean id="org.hisp.dhis.coldchain.catalog.CatalogService"
class="org.hisp.dhis.coldchain.catalog.DefaultCatalogService">
<property name="catalogStore" ref="org.hisp.dhis.coldchain.catalog.CatalogStore"/>
<property name="catalogDataValueService" ref="org.hisp.dhis.coldchain.catalog.CatalogDataValueService"/>
+ <property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
</bean>
<bean id="org.hisp.dhis.coldchain.catalog.CatalogDataValueService"
class="org.hisp.dhis.coldchain.catalog.DefaultCatalogDataValueService">
@@ -116,10 +150,12 @@
<bean id="org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeService"
class="org.hisp.dhis.coldchain.inventory.DefaultInventoryTypeAttributeService">
<property name="inventoryTypeAttributeStore" ref="org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeStore"/>
+ <property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
</bean>
<bean id="org.hisp.dhis.coldchain.inventory.InventoryTypeService"
class="org.hisp.dhis.coldchain.inventory.DefaultInventoryTypeService">
<property name="inventoryTypeStore" ref="org.hisp.dhis.coldchain.inventory.InventoryTypeStore"/>
+ <property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
</bean>
<!-- DeletionHandlers -->
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/CatalogListAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/CatalogListAction.java 2012-05-04 09:05:30 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/CatalogListAction.java 2012-05-09 07:02:15 +0000
@@ -1,5 +1,7 @@
package org.hisp.dhis.coldchain.catalog.action;
+import static org.apache.commons.lang.StringUtils.isNotBlank;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -8,13 +10,15 @@
import org.hisp.dhis.coldchain.catalog.CatalogService;
import org.hisp.dhis.coldchain.catalog.CatalogType;
import org.hisp.dhis.coldchain.catalog.CatalogTypeService;
-import org.hisp.dhis.coldchain.catalog.comparator.CatalogComparator;
-import org.hisp.dhis.coldchain.catalog.comparator.CatalogTypeComparator;
-
-import com.opensymphony.xwork2.Action;
-
-public class CatalogListAction implements Action
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
+import org.hisp.dhis.paging.ActionPagingSupport;
+import org.hisp.dhis.user.UserSettingService;
+
+//public class CatalogListAction implements Action
+public class CatalogListAction extends ActionPagingSupport<Catalog>
{
+
+ final String KEY_CURRENT_CATALOG = "currentCatalog";
// -------------------------------------------------------------------------
// Dependency
// -------------------------------------------------------------------------
@@ -33,6 +37,12 @@
this.catalogTypeService = catalogTypeService;
}
+ private UserSettingService userSettingService;
+
+ public void setUserSettingService( UserSettingService userSettingService )
+ {
+ this.userSettingService = userSettingService;
+ }
// -------------------------------------------------------------------------
// Output
// -------------------------------------------------------------------------
@@ -69,13 +79,76 @@
{
return catalogType;
}
+
+ private String key;
+
+ public String getKey()
+ {
+ return key;
+ }
+ public void setKey( String key )
+ {
+ this.key = key;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
public String execute() throws Exception
{
+
+ if ( id == null ) // None, get current data dictionary
+ {
+ id = (Integer) userSettingService.getUserSetting( KEY_CURRENT_CATALOG );
+ }
+ else if ( id == -1 ) // All, reset current data dictionary
+ {
+ userSettingService.saveUserSetting( KEY_CURRENT_CATALOG, null );
+
+ id = null;
+ }
+ else // Specified, set current data dictionary
+ {
+ userSettingService.saveUserSetting( KEY_CURRENT_CATALOG, id );
+ }
+
+ catalogTypes = new ArrayList<CatalogType>( catalogTypeService.getAllCatalogTypes());
+ Collections.sort( catalogTypes, IdentifiableObjectNameComparator.INSTANCE );
+
+ // -------------------------------------------------------------------------
+ // Criteria
+ // -------------------------------------------------------------------------
+
+ if ( isNotBlank( key ) ) // Filter on key only if set
+ {
+ this.paging = createPaging( catalogService.getCatalogCountByName( key ) );
+
+ catalogs = new ArrayList<Catalog>( catalogService.getCatalogsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+ }
+
+ else if ( id != null )
+ {
+ catalogType = catalogTypeService.getCatalogType( id );
+
+ catalogs = new ArrayList<Catalog>( catalogService.getCatalogs( catalogType ) );
+
+ this.paging = createPaging( catalogs.size() );
+
+ catalogs = getBlockElement( catalogs, paging.getStartPos(), paging.getPageSize() );
+ }
+
+ else
+ {
+ this.paging = createPaging( catalogService.getCatalogCount() );
+
+ catalogs = new ArrayList<Catalog>( catalogService.getCatalogsBetween( paging.getStartPos(), paging.getPageSize() ) );
+ }
+
+ Collections.sort( catalogs, new IdentifiableObjectNameComparator() );
+
+ /*
catalogTypes = new ArrayList<CatalogType>( catalogTypeService.getAllCatalogTypes());
Collections.sort( catalogTypes, new CatalogTypeComparator() );
@@ -84,15 +157,13 @@
catalogType = catalogTypeService.getCatalogType( id );
catalogs = new ArrayList<Catalog>( catalogService.getCatalogs( catalogType ) );
- Collections.sort( catalogs, new CatalogComparator() );
}
else
{
catalogs = new ArrayList<Catalog>( catalogService.getAllCatalogs() );
-
- Collections.sort( catalogs, new CatalogComparator() );
}
-
+ Collections.sort( catalogs, new CatalogComparator() );
+ */
return SUCCESS;
}
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/CatalogTypeListAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/CatalogTypeListAction.java 2012-05-02 06:03:10 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/CatalogTypeListAction.java 2012-05-09 07:02:15 +0000
@@ -1,12 +1,14 @@
package org.hisp.dhis.coldchain.catalog.action;
+import static org.apache.commons.lang.StringUtils.isNotBlank;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.hisp.dhis.coldchain.catalog.CatalogType;
import org.hisp.dhis.coldchain.catalog.CatalogTypeService;
-import org.hisp.dhis.coldchain.catalog.comparator.CatalogTypeComparator;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.paging.ActionPagingSupport;
public class CatalogTypeListAction
@@ -61,28 +63,24 @@
throws Exception
{
-
+ if ( isNotBlank( key ) ) // Filter on key only if set
+ {
+ this.paging = createPaging( catalogTypeService.getCatalogTypeCountByName( key ) );
+
+ catalogTypes = new ArrayList<CatalogType>( catalogTypeService.getCatalogTypesBetweenByName( key, paging.getStartPos(), paging.getPageSize() ));
+ }
+ else
+ {
+ this.paging = createPaging( catalogTypeService.getCatalogTypeCount() );
+
+ catalogTypes = new ArrayList<CatalogType>( catalogTypeService.getCatalogTypesBetween( paging.getStartPos(), paging.getPageSize() ));
+ }
+ /*
catalogTypes = new ArrayList<CatalogType>( catalogTypeService.getAllCatalogTypes());
Collections.sort( catalogTypes, new CatalogTypeComparator() );
- /*
- if ( isNotBlank( key ) ) // Filter on key only if set
- {
- this.paging = createPaging( dataSetService.getDataSetCountByName( key ) );
-
-
-
- dataSets = new ArrayList<DataSet>( dataSetService.getDataSetsBetweenByName( key, paging.getStartPos(),
- paging.getPageSize() ) );
- }
- else
- {
- this.paging = createPaging( dataSetService.getDataSetCount() );
-
- dataSets = new ArrayList<DataSet>( dataSetService.getDataSetsBetween( paging.getStartPos(), paging
- .getPageSize() ) );
- }
*/
- //Collections.sort( catalogTypes, new IdentifiableObjectNameComparator() );
+
+ Collections.sort( catalogTypes, new IdentifiableObjectNameComparator() );
return SUCCESS;
}
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/GetColdChainCatalogTypeAttributeListAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/GetColdChainCatalogTypeAttributeListAction.java 2012-05-07 11:49:40 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/GetColdChainCatalogTypeAttributeListAction.java 2012-05-09 07:02:15 +0000
@@ -9,6 +9,7 @@
import org.hisp.dhis.coldchain.catalog.CatalogTypeAttribute;
import org.hisp.dhis.coldchain.catalog.CatalogTypeAttributeService;
import org.hisp.dhis.coldchain.catalog.comparator.CatalogTypeAttributeComparator;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.paging.ActionPagingSupport;
//public class GetColdChainCatalogTypeAttributeListAction implements Action
@@ -71,8 +72,13 @@
catalogTypeAttributes = new ArrayList<CatalogTypeAttribute>( catalogTypeAttributeService.getCatalogTypeAttributesBetween( paging.getStartPos(), paging.getPageSize() ));
}
+ Collections.sort( catalogTypeAttributes, new IdentifiableObjectNameComparator() );
+
+ /*
+ catalogTypeAttributes = new ArrayList<CatalogTypeAttribute>( catalogTypeAttributeService.getAllCatalogTypeAttributes() );
+
Collections.sort( catalogTypeAttributes, new CatalogTypeAttributeComparator() );
-
+ */
return SUCCESS;
}
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeAttributeListAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeAttributeListAction.java 2012-05-02 06:03:10 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeAttributeListAction.java 2012-05-09 07:02:15 +0000
@@ -1,5 +1,7 @@
package org.hisp.dhis.coldchain.inventory.action;
+import static org.apache.commons.lang.StringUtils.isNotBlank;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -8,11 +10,10 @@
import org.hisp.dhis.coldchain.inventory.InventoryTypeAttribute;
import org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeService;
import org.hisp.dhis.coldchain.inventory.InventoryTypeService;
-import org.hisp.dhis.coldchain.inventory.comparator.InventoryTypeAttributeComparator;
-
-import com.opensymphony.xwork2.Action;
-
-public class GetInventoryTypeAttributeListAction implements Action
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
+import org.hisp.dhis.paging.ActionPagingSupport;
+
+public class GetInventoryTypeAttributeListAction extends ActionPagingSupport<InventoryTypeAttribute>
{
// -------------------------------------------------------------------------
// Dependency
@@ -47,14 +48,56 @@
{
this.id = id;
}
+
+ private String key;
+
+ public String getKey()
+ {
+ return key;
+ }
+ public void setKey( String key )
+ {
+ this.key = key;
+ }
+
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
public String execute()
throws Exception
{
+
+ if ( isNotBlank( key ) ) // Filter on key only if set
+ {
+ this.paging = createPaging( inventoryTypeAttributeService.getInventoryTypeAttributeCountByName( key ) );
+
+ inventoryTypeAttributes = new ArrayList<InventoryTypeAttribute>( inventoryTypeAttributeService.getInventoryTypeAttributesBetweenByName( key, paging.getStartPos(), paging.getPageSize() ));
+ }
+
+ else if ( id != null )
+ {
+ InventoryType inventoryType = inventoryTypeService.getInventoryType( id );
+
+ inventoryTypeAttributes = new ArrayList<InventoryTypeAttribute>( inventoryType.getInventoryTypeAttributes() );
+
+ this.paging = createPaging( inventoryTypeAttributes.size() );
+
+ inventoryTypeAttributes = getBlockElement( inventoryTypeAttributes, paging.getStartPos(), paging.getPageSize() );
+ }
+
+ else
+ {
+ this.paging = createPaging( inventoryTypeAttributeService.getInventoryTypeAttributeCount() );
+
+ inventoryTypeAttributes = new ArrayList<InventoryTypeAttribute>( inventoryTypeAttributeService.getInventoryTypeAttributesBetween( paging.getStartPos(), paging.getPageSize() ));
+ }
+
+ Collections.sort( inventoryTypeAttributes, new IdentifiableObjectNameComparator() );
+
//System.out.println(" Inside GetInventoryTypeAttributeListAction");
+ /*
if( id != null )
{
InventoryType inventoryType = inventoryTypeService.getInventoryType( id );
@@ -66,7 +109,7 @@
inventoryTypeAttributes = new ArrayList<InventoryTypeAttribute>( inventoryTypeAttributeService.getAllInventoryTypeAttributes() );
}
Collections.sort( inventoryTypeAttributes, new InventoryTypeAttributeComparator() );
-
+ */
/**
* TODO - need to write comparator for sorting the list
=== modified file 'local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeListAction.java'
--- local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeListAction.java 2012-05-02 06:03:10 +0000
+++ local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeListAction.java 2012-05-09 07:02:15 +0000
@@ -1,16 +1,17 @@
package org.hisp.dhis.coldchain.inventory.action;
+import static org.apache.commons.lang.StringUtils.isNotBlank;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.hisp.dhis.coldchain.inventory.InventoryType;
import org.hisp.dhis.coldchain.inventory.InventoryTypeService;
-import org.hisp.dhis.coldchain.inventory.comparator.InventoryTypeComparator;
-
-import com.opensymphony.xwork2.Action;
-
-public class GetInventoryTypeListAction implements Action
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
+import org.hisp.dhis.paging.ActionPagingSupport;
+
+public class GetInventoryTypeListAction extends ActionPagingSupport<InventoryType>
{
// -------------------------------------------------------------------------
// Dependency
@@ -31,16 +32,45 @@
{
return inventoryTypes;
}
+
+ private String key;
+
+ public String getKey()
+ {
+ return key;
+ }
+
+ public void setKey( String key )
+ {
+ this.key = key;
+ }
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
public String execute() throws Exception
{
+
+ if ( isNotBlank( key ) ) // Filter on key only if set
+ {
+ this.paging = createPaging( inventoryTypeService.getInventoryTypeCountByName( key ) );
+
+ inventoryTypes = new ArrayList<InventoryType>( inventoryTypeService.getInventoryTypesBetweenByName( key, paging.getStartPos(), paging.getPageSize()) );
+ }
+ else
+ {
+ this.paging = createPaging( inventoryTypeService.getInventoryTypeCount() );
+
+ inventoryTypes = new ArrayList<InventoryType>( inventoryTypeService.getInventoryTypesBetween(paging.getStartPos(), paging.getPageSize()) );
+ }
+
+ Collections.sort( inventoryTypes, new IdentifiableObjectNameComparator() );
+
+ /*
inventoryTypes = new ArrayList<InventoryType>( inventoryTypeService.getAllInventoryTypes() );
Collections.sort( inventoryTypes, new InventoryTypeComparator() );
-
+ */
/**
* TODO - need to write comparator for sorting the list
*/
=== modified file 'local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml 2012-05-04 09:05:30 +0000
+++ local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml 2012-05-09 07:02:15 +0000
@@ -171,7 +171,9 @@
<property name="catalogService"
ref="org.hisp.dhis.coldchain.catalog.CatalogService" />
<property name="catalogTypeService"
- ref="org.hisp.dhis.coldchain.catalog.CatalogTypeService" />
+ ref="org.hisp.dhis.coldchain.catalog.CatalogTypeService" />
+ <property name="userSettingService"
+ ref="org.hisp.dhis.user.UserSettingService" />
</bean>
<!-- Add Catalog Form -->
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogList.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogList.vm 2012-05-04 09:05:30 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogList.vm 2012-05-09 07:02:15 +0000
@@ -1,26 +1,35 @@
-
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'listTable' );
+ });
+
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_catalog" ) , "'" )';
+ var i18n_catalog_details = '$encoder.jsEscape( $i18n.getString( "catalog__details" ) , "'" )';
+</script>
<h3>$i18n.getString( "catalog_management" ) #openHelp( "catalog" )</h3>
<table class="mainPageTable">
<tr>
<td style="vertical-align:top">
<table width="100%">
<tr>
- <td>
- $i18n.getString( "filter_by_name" ): <input type="text" onkeyup="filterValues( this.value , 1)" style="width:250px"/>
-
- <label>$i18n.getString( "select_catalogType" )</label>
- <select id="id" name="id" style="min-width:20em" onchange="getCatalogByCatalogType( this.value )">
- <option value="" selected="selected" >[ $i18n.getString( "all" ) ]</option>
- #foreach( $catalogType in $catalogTypes )
- <option value="$catalogType.id" #if($id==$catalogType.id) selected="selected" #end>$catalogType.name</option>
- #end
- </select>
- </td>
+ <!--<td>$i18n.getString( "filter_by_name" ): <input type="text" onkeyup="filterValues( this.value , 1)" style="width:250px"/></td>-->
+ <td>#filterDiv( "catalog" )</td>
+ <td>$i18n.getString( "select_catalogType" ):
+ <div style="inline">
+ <select id="id" name="id" style="min-width:20em" onchange="getCatalogByCatalogType( this.value )">
+ <!--<option value="" selected="selected" >[ $i18n.getString( "all" ) ]</option>-->
+ <option value="-1">[ $i18n.getString( "all" ) ]</option>
+ #foreach( $catalogType in $catalogTypes )
+ <option value="$catalogType.id" #if($id==$catalogType.id) selected="selected" #end>$catalogType.name</option>
+ #end
+ </select>
+ </div>
+ </td>
<td colspan="3" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='addCatalogForm.action'" style="width:70px"></td>
</tr>
</table>
- <table class="listTable">
+ <table class="listTable" id="listTable">
<col>
<col width="20">
<col width="20">
@@ -56,6 +65,8 @@
</tbody>
</table>
+ <p></p>
+ #parse( "/dhis-web-commons/paging/paging.vm" )
</td>
<td style="width:20em; padding-left:2em; vertical-align:top">
@@ -77,8 +88,3 @@
<div id="detailsCatalogInfo"></div>
-<script type="text/javascript">
- var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_catalog" ) , "'" )';
- var i18n_catalog_details = '$encoder.jsEscape( $i18n.getString( "catalog__details" ) , "'" )';
-</script>
-
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogTypeList.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogTypeList.vm 2012-04-30 11:24:11 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogTypeList.vm 2012-05-09 07:02:15 +0000
@@ -15,8 +15,8 @@
<td style="vertical-align:top">
<table width="100%">
<tr>
- <!--<td>#filterDiv( "catalogType" )</td>-->
- <td>$i18n.getString( "filter_by_name" ): <input type="text" onkeyup="filterValues( this.value , 1)" style="width:250px"/></td>
+ <td>#filterDiv( "catalogType" )</td>
+ <!--<td>$i18n.getString( "filter_by_name" ): <input type="text" onkeyup="filterValues( this.value , 1)" style="width:250px"/></td>-->
<td colspan="9" style="text-align:right">
<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='addCatalogTypeForm.action'" style="width:80px"/></a>
</td>
@@ -47,7 +47,7 @@
</table>
<p></p>
- ##parse( "/dhis-web-commons/paging/paging.vm" )
+ #parse( "/dhis-web-commons/paging/paging.vm" )
</td>
<td style="width:20em; padding-left:2em; vertical-align:top">
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/coldChainCatalogTypeAttribute.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/coldChainCatalogTypeAttribute.vm 2012-05-07 11:49:40 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/coldChainCatalogTypeAttribute.vm 2012-05-09 07:02:15 +0000
@@ -1,4 +1,9 @@
-
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'listTable' );
+ leftBar.showAnimated();
+ });
+</script>
<h3>$i18n.getString( "coldchain_catalog_type_attribute_management" ) #openHelp( "catalogTypeAttribute" )</h3>
<table class="mainPageTable">
<tr>
@@ -12,7 +17,7 @@
</tr>
</table>
- <table class="listTable">
+ <table class="listTable" id="listTable">
<col>
<col width="20">
<col width="20">
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeAttributeList.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeAttributeList.vm 2012-04-26 10:00:48 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeAttributeList.vm 2012-05-09 07:02:15 +0000
@@ -1,4 +1,10 @@
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'listTable' );
+ leftBar.showAnimated();
+ });
+</script>
<h3>$i18n.getString( "inventorytype_attribute_management" ) #openHelp( "inventorytype_attribute" )</h3>
<table class="mainPageTable">
@@ -6,14 +12,15 @@
<td style="vertical-align:top">
<table width="100%">
<tr>
- <td>
+ <!--<td>
$i18n.getString( "filter_by_name" ): <input type="text" onkeyup="filterValues( this.value , 1)" style="width:250px"/>
- </td>
+ </td>-->
+ <td>#filterDiv( "inventoryTypeAttributeList" )</td>
<td colspan="3" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddInventoryTypeAttributeForm.action'" style="width:70px"></td>
</tr>
</table>
- <table class="listTable">
+ <table class="listTable" id="listTable">
<col>
<col width="20">
<col width="20">
@@ -48,6 +55,8 @@
</tbody>
</table>
+ <p></p>
+ #parse( "/dhis-web-commons/paging/paging.vm" )
</td>
<td style="width:20em; padding-left:2em; vertical-align:top">
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeList.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeList.vm 2012-05-01 06:15:42 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeList.vm 2012-05-09 07:02:15 +0000
@@ -1,4 +1,10 @@
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'listTable' );
+ leftBar.showAnimated();
+ });
+</script>
<h3>$i18n.getString( "inventorytype_management" ) #openHelp( "inventorytype" )</h3>
<table class="mainPageTable">
@@ -6,14 +12,15 @@
<td style="vertical-align:top">
<table width="100%">
<tr>
- <td>
+ <!--<td>
$i18n.getString( "filter_by_name" ): <input type="text" onkeyup="filterValues( this.value , 1)" style="width:250px"/>
- </td>
+ </td>-->
+ <td>#filterDiv( "inventoryTypeList" )</td>
<td colspan="3" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddInventoryTypeForm.action'" style="width:70px"></td>
</tr>
</table>
- <table class="listTable">
+ <table class="listTable" id="listTable">
<col>
<col width="20">
<col width="20">
@@ -48,6 +55,8 @@
</tbody>
</table>
+ <p></p>
+ #parse( "/dhis-web-commons/paging/paging.vm" )
</td>
<td style="width:20em; padding-left:2em; vertical-align:top">
=== modified file 'local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddCatalogForm.vm'
--- local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddCatalogForm.vm 2012-05-05 11:16:25 +0000
+++ local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddCatalogForm.vm 2012-05-09 07:02:15 +0000
@@ -6,7 +6,9 @@
{validate:{required:true}}
#end
#end
-
+<script type="text/javascript">
+ checkValueIsExist( "name", "validateCatalog.action");
+</script>
<!-- ATTRIBUTES -->
<table>
<tr><td> </td></tr>
=== modified file 'local/in/pom.xml'
--- local/in/pom.xml 2012-04-30 08:30:00 +0000
+++ local/in/pom.xml 2012-05-09 07:02:15 +0000
@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
+ <project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
