dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #27056
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13415: CCEI: Functionality to have Lookup; work in progress - aggregation query builder
------------------------------------------------------------
revno: 13415
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-12-24 12:32:37 +0000
message:
CCEI: Functionality to have Lookup; work in progress - aggregation query builder
removed:
local/in/dhis-web-maintenance-pbf/bin/
local/in/dhis-web-maintenance-pbf/bin/pom.xml
local/in/dhis-web-maintenance-pbf/bin/src/
local/in/dhis-web-maintenance-pbf/bin/src/main/
local/in/dhis-web-maintenance-pbf/bin/src/main/java/
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/LoadBankDetailsAction.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/NoAction.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetails.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetailsService.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetailsStore.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/Lookup.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/LookupService.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/LookupStore.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValue.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValueService.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValueStore.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/bank/
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/bank/action/
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/bank/action/LoadBankDetailsAction.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultBankDetailsService.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultLookupService.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultTariffDataValueService.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateBankDetailsStore.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateLookupStore.class
local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateTariffDataValueStore.class
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/META-INF/
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/META-INF/dhis/
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate/
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate/BankDetails.hbm.xml
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate/Lookup.hbm.xml
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate/TariffDataValue.hbm.xml
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/i18n_module.properties
local/in/dhis-web-maintenance-pbf/bin/src/main/resources/struts.xml
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/WEB-INF/
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/WEB-INF/web.xml
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/css/
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/css/ext-all-neptune-debug.css
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/images/
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/images/delete.png
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/javascript/
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/javascript/dataElement_combo.js
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadBankData.vm
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadDataElementsforTariff.vm
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadTariffData.vm
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/menu.vm
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/status.vm
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/tariffMenu.vm
local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/welcome.vm
added:
local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/
local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/Lookup.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/LookupService.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/LookupStore.java
local/in/dhis-in-services/dhis-in-service-lookup/
local/in/dhis-in-services/dhis-in-service-lookup/pom.xml
local/in/dhis-in-services/dhis-in-service-lookup/src/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup/DefaultLookupService.java
local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup/hibernate/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup/hibernate/HibernateLookupStore.java
local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/META-INF/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/META-INF/dhis/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/hisp/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/hisp/dhis/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/hisp/dhis/lookup/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/hisp/dhis/lookup/hibernate/
local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/hisp/dhis/lookup/hibernate/Lookup.hbm.xml
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/AggregationQueryListAction.java
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/aggregationQueryList.vm
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/aggregationEngine.js
modified:
local/in/dhis-in-services/pom.xml
local/in/dhis-web-maintenance-ccem/pom.xml
local/in/dhis-web-maintenance-ccem/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-maintenance-ccem/src/main/resources/struts.xml
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/menu.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== added directory 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup'
=== added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/Lookup.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/Lookup.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/Lookup.java 2013-12-24 12:32:37 +0000
@@ -0,0 +1,83 @@
+package org.hisp.dhis.lookup;
+
+import org.hisp.dhis.common.BaseNameableObject;
+
+public class Lookup extends BaseNameableObject
+{
+ public static final String DS_PBF_TYPE = "DS_PBF_TYPE";
+
+ public static final String BANK = "BANK";
+
+ private String type;
+
+ private String value;
+
+ // -------------------------------------------------------------------------
+ // Contructors
+ // -------------------------------------------------------------------------
+
+ public Lookup()
+ {
+
+ }
+
+ // -------------------------------------------------------------------------
+ // hashCode, 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 Lookup) )
+ {
+ return false;
+ }
+
+ final Lookup other = (Lookup) o;
+
+ return name.equals( other.getName() );
+ }
+
+ // -------------------------------------------------------------------------
+ // Getters and setters
+ // -------------------------------------------------------------------------
+
+ public String getType()
+ {
+ return type;
+ }
+
+ public void setType( String type )
+ {
+ this.type = type;
+ }
+
+ public String getValue()
+ {
+ return value;
+ }
+
+ public void setValue( String value )
+ {
+ this.value = value;
+ }
+
+
+
+}
=== added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/LookupService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/LookupService.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/LookupService.java 2013-12-24 12:32:37 +0000
@@ -0,0 +1,27 @@
+package org.hisp.dhis.lookup;
+
+import java.util.Collection;
+
+public interface LookupService
+{
+ String ID = LookupService.class.getName();
+
+ // -------------------------------------------------------------------------
+ // Lookup
+ // -------------------------------------------------------------------------
+
+ int addLookup( Lookup lookup );
+
+ void updateLookup( Lookup lookup );
+
+ void deleteLookup( Lookup lookup );
+
+ Lookup getLookup( int id );
+
+ Lookup getLookupByName( String name );
+
+ Collection<Lookup> getAllLookupsByType( String type );
+
+ Collection<Lookup> getAllLookups();
+
+}
=== added file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/LookupStore.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/LookupStore.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/LookupStore.java 2013-12-24 12:32:37 +0000
@@ -0,0 +1,16 @@
+package org.hisp.dhis.lookup;
+
+import java.util.Collection;
+
+import org.hisp.dhis.common.GenericNameableObjectStore;
+
+public interface LookupStore extends GenericNameableObjectStore<Lookup>
+{
+ String ID = LookupStore.class.getName();
+
+ // -------------------------------------------------------------------------
+ // Lookup
+ // -------------------------------------------------------------------------
+
+ Collection<Lookup> getAllLookupsByType( String type );
+}
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup'
=== added file 'local/in/dhis-in-services/dhis-in-service-lookup/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-lookup/pom.xml 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-services/dhis-in-service-lookup/pom.xml 2013-12-24 12:32:37 +0000
@@ -0,0 +1,50 @@
+<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>
+
+ <parent>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-in-services</artifactId>
+ <version>2.14-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>dhis-in-service-lookup</artifactId>
+ <packaging>jar</packaging>
+ <name>DHIS India Lookup Service</name>
+
+ <dependencies>
+
+ <!-- DHIS -->
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-in-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-support-system</artifactId>
+ </dependency>
+
+ <!-- Other -->
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-math</groupId>
+ <artifactId>commons-math</artifactId>
+ </dependency>
+
+ </dependencies>
+</project>
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src'
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main'
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/java'
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org'
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp'
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis'
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup'
=== added file 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup/DefaultLookupService.java'
--- local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup/DefaultLookupService.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup/DefaultLookupService.java 2013-12-24 12:32:37 +0000
@@ -0,0 +1,68 @@
+package org.hisp.dhis.lookup;
+
+import java.util.Collection;
+
+import org.hisp.dhis.lookup.Lookup;
+import org.hisp.dhis.lookup.LookupService;
+import org.hisp.dhis.lookup.LookupStore;
+
+public class DefaultLookupService implements LookupService
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private LookupStore lookupStore;
+
+ public void setLookupStore( LookupStore lookupStore )
+ {
+ this.lookupStore = lookupStore;
+ }
+
+ // -------------------------------------------------------------------------
+ // Lookup
+ // -------------------------------------------------------------------------
+
+ @Override
+ public int addLookup( Lookup lookup )
+ {
+ return lookupStore.save( lookup );
+ }
+
+ @Override
+ public void updateLookup( Lookup lookup )
+ {
+ lookupStore.update( lookup );
+ }
+
+ @Override
+ public void deleteLookup( Lookup lookup )
+ {
+ lookupStore.delete( lookup );
+ }
+
+ @Override
+ public Lookup getLookup( int id )
+ {
+ return lookupStore.get( id );
+ }
+
+ @Override
+ public Lookup getLookupByName( String name )
+ {
+ return lookupStore.getByName( name );
+ }
+
+ @Override
+ public Collection<Lookup> getAllLookupsByType( String type )
+ {
+ return lookupStore.getAllLookupsByType( type );
+ }
+
+ @Override
+ public Collection<Lookup> getAllLookups()
+ {
+ return lookupStore.getAll( );
+ }
+
+}
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup/hibernate'
=== added file 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup/hibernate/HibernateLookupStore.java'
--- local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup/hibernate/HibernateLookupStore.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup/hibernate/HibernateLookupStore.java 2013-12-24 12:32:37 +0000
@@ -0,0 +1,24 @@
+package org.hisp.dhis.lookup;
+
+import java.util.Collection;
+
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore;
+import org.hisp.dhis.lookup.Lookup;
+import org.hisp.dhis.lookup.LookupStore;
+
+public class HibernateLookupStore extends HibernateIdentifiableObjectStore<Lookup> implements LookupStore
+{
+
+ public Collection<Lookup> getAllLookupsByType( String type )
+ {
+ Session session = sessionFactory.getCurrentSession();
+
+ Criteria criteria = session.createCriteria( Lookup.class );
+ criteria.add( Restrictions.eq( "type", type ) );
+
+ return criteria.list();
+ }
+}
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources'
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/META-INF'
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/META-INF/dhis'
=== added file 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/META-INF/dhis/beans.xml 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/META-INF/dhis/beans.xml 2013-12-24 12:32:37 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
+
+ <!-- Store definitions -->
+ <bean id="org.hisp.dhis.lookup.LookupStore" class="org.hisp.dhis.lookup.HibernateLookupStore">
+ <property name="clazz" value="org.hisp.dhis.lookup.Lookup"/>
+ <property name="sessionFactory" ref="sessionFactory" />
+ </bean>
+
+ <!-- Service definitions -->
+ <bean id="org.hisp.dhis.lookup.LookupService" class="org.hisp.dhis.lookup.DefaultLookupService">
+ <property name="lookupStore" ref="org.hisp.dhis.lookup.LookupStore" />
+ </bean>
+
+</beans>
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org'
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/hisp'
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/hisp/dhis'
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/hisp/dhis/lookup'
=== added directory 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/hisp/dhis/lookup/hibernate'
=== added file 'local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/hisp/dhis/lookup/hibernate/Lookup.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/hisp/dhis/lookup/hibernate/Lookup.hbm.xml 1970-01-01 00:00:00 +0000
+++ local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/hisp/dhis/lookup/hibernate/Lookup.hbm.xml 2013-12-24 12:32:37 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";
+ [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
+ >
+
+<hibernate-mapping>
+
+ <class name="org.hisp.dhis.lookup.Lookup" table="lookup">
+
+ <id name="id" column="lookupid">
+ <generator class="native" />
+ </id>
+
+ &identifiableProperties;
+
+ <property name="name" column="name" not-null="true" unique="true" length="230" />
+
+ <property name="description" type="text" />
+
+ <property name="type" column="type" length="230" />
+
+ <property name="value" column="value" type="text" />
+
+ </class>
+
+</hibernate-mapping>
=== modified file 'local/in/dhis-in-services/pom.xml'
--- local/in/dhis-in-services/pom.xml 2013-12-05 11:55:45 +0000
+++ local/in/dhis-in-services/pom.xml 2013-12-24 12:32:37 +0000
@@ -23,6 +23,7 @@
<!--<module>dhis-service-aggregationengine-default</module>-->
<module>dhis-in-service-configuration</module>
<module>dhis-in-service-coldchain</module>
+ <module>dhis-in-service-lookup</module>
</modules>
<dependencies>
=== modified file 'local/in/dhis-web-maintenance-ccem/pom.xml'
--- local/in/dhis-web-maintenance-ccem/pom.xml 2013-11-27 12:27:57 +0000
+++ local/in/dhis-web-maintenance-ccem/pom.xml 2013-12-24 12:32:37 +0000
@@ -74,6 +74,11 @@
<artifactId>dhis-in-service-coldchain</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-in-service-lookup</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- Other -->
<dependency>
=== added directory 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation'
=== added directory 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action'
=== added file 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/AggregationQueryListAction.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/AggregationQueryListAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/AggregationQueryListAction.java 2013-12-24 12:32:37 +0000
@@ -0,0 +1,45 @@
+package org.hisp.dhis.ccem.aggregation.action;
+
+import java.util.Collection;
+
+import org.hisp.dhis.caseaggregation.CaseAggregationCondition;
+import org.hisp.dhis.caseaggregation.CaseAggregationConditionService;
+
+import com.opensymphony.xwork2.Action;
+
+public class AggregationQueryListAction implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private CaseAggregationConditionService aggregationConditionService;
+
+ public void setAggregationConditionService( CaseAggregationConditionService aggregationConditionService )
+ {
+ this.aggregationConditionService = aggregationConditionService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input/ Output
+ // -------------------------------------------------------------------------
+
+ private Collection<CaseAggregationCondition> aggregationConditions;
+
+ public Collection<CaseAggregationCondition> getAggregationConditions()
+ {
+ return aggregationConditions;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+ public String execute()
+ throws Exception
+ {
+ aggregationConditions = aggregationConditionService.getAllCaseAggregationCondition();
+
+ return SUCCESS;
+ }
+
+}
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-maintenance-ccem/src/main/resources/META-INF/dhis/beans.xml 2013-12-23 12:24:45 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/resources/META-INF/dhis/beans.xml 2013-12-24 12:32:37 +0000
@@ -733,6 +733,12 @@
<property name="dataElementCategoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
</bean>
-
+
+ <!-- Aggregation Engine -->
+ <bean id="org.hisp.dhis.ccem.aggregation.action.AggregationQueryListAction"
+ class="org.hisp.dhis.ccem.aggregation.action.AggregationQueryListAction"
+ scope="prototype">
+ <property name="aggregationConditionService" ref="org.hisp.dhis.caseaggregation.CaseAggregationConditionService" />
+ </bean>
</beans>
\ No newline at end of file
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/resources/struts.xml'
--- local/in/dhis-web-maintenance-ccem/src/main/resources/struts.xml 2013-12-23 12:24:45 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/resources/struts.xml 2013-12-24 12:32:37 +0000
@@ -6,7 +6,6 @@
<include file="dhis-web-commons.xml"/>
<package name="dhis-web-maintenance-ccem" extends="dhis-web-commons" namespace="/dhis-web-maintenance-ccem">
-
<!-- Home page -->
<action name="index" class="org.hisp.dhis.ccem.action.NoAction">
@@ -665,6 +664,22 @@
<param name="menu">/dhis-web-maintenance-ccem/menu.vm</param>
<interceptor-ref name="fileUploadStack"/>
</action>
+
+ <!-- Aggregation Engine -->
+ <action name="aggregationQueryList" class="org.hisp.dhis.ccem.aggregation.action.AggregationQueryListAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-ccem/aggregationQueryList.vm</param>
+ <param name="menu">/dhis-web-maintenance-ccem/menu.vm</param>
+ <param name="javascripts">javascript/aggregationEngine.js</param>
+ </action>
+
+ <action name="addAggregationQueryForm" class="org.hisp.dhis.ccem.aggregation.action.AddAggregationQueryFormAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-ccem/addAggregationQueryForm.vm</param>
+ <param name="menu">/dhis-web-maintenance-ccem/menu.vm</param>
+ <param name="javascripts">javascript/aggregationEngine.js</param>
+ <interceptor-ref name="fileUploadStack"/>
+ </action>
</package>
</struts>
\ No newline at end of file
=== added file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/aggregationQueryList.vm'
--- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/aggregationQueryList.vm 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/aggregationQueryList.vm 2013-12-24 12:32:37 +0000
@@ -0,0 +1,67 @@
+
+<script>
+$(function() {
+ dhis2.contextmenu.makeContextMenu({
+ menuId: 'contextMenu',
+ menuItemActiveClass: 'contextMenuItemActive'
+ });
+});
+</script>
+
+<h3>$i18n.getString( 'patient_aggregation_query_builder_management' ) #openHelp( "patient_aggregation_query_builder" )</h3>
+
+<div id="contextMenu" class="contextMenu">
+ <ul id="contextMenuItems" class="contextMenuItems">
+ <li><a data-target-fn="showUpdateCaseAggregationForm"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
+ <li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i> $i18n.getString( "translation_translate" )</a></li>
+ <li><a data-target-fn="removeCaseAggregation"><i class="fa fa-trash-o"></i> $i18n.getString( "remove" )</a></li>
+ <li><a data-target-fn="showCaseAggregationDetails"><i class="fa fa-info-circle"></i> $i18n.getString( "show_details" )</a></li>
+ </ul>
+</div>
+
+<table class="mainPageTable">
+ <tr>
+ <td style="vertical-align:top">
+ <table width="100%">
+ <tr>
+ <td style="text-align:right">
+ <input type="button" value="$i18n.getString( 'add_new' )" onclick="showAddAggregationForm();" >
+ </td>
+ </tr>
+ </table>
+ <table class="listTable">
+ <col>
+ <thead>
+ <tr>
+ <th>$i18n.getString( "name" )</th>
+ </tr>
+ </thead>
+ <tbody id="list">
+ #foreach( $aggregationCondition in $aggregationConditions )
+ <tr id="tr${aggregationCondition.id}" data-id="$!aggregationCondition.id" data-uid="$!aggregationCondition.uid" data-type="CaseAggregationCondition"
+ data-name="$encoder.htmlEncode( $!aggregationCondition.displayName )"
+ data-can-manage="$security.canManage( $aggregationCondition )"
+ data-can-update="$security.canUpdate( $aggregationCondition )"
+ data-can-delete="$security.canDelete( $aggregationCondition )">
+ <td>$encoder.htmlEncode( $!aggregationCondition.displayName )</td>
+ </tr>
+ #end
+ </tbody>
+ </table>
+ </td>
+
+ <td id="detailsData">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
+ <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
+ </div>
+ <p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+ <p><label class="bold">$i18n.getString( "operator" ):</label><br><span id="operatorField"></span></p>
+ <p><label class="bold">$i18n.getString( "aggregation_data_element" ):</label><br><span id="aggregationDataElementField"></span></p>
+ <p><label class="bold">$i18n.getString( "option_combo" ):</label><br><span id="optionComboField"></span></p>
+ <p><label class="bold">$i18n.getString( "data_element_for_sum_avg_min_max" ):</label><br><span id="deSumField"></span></p>
+ <p><label class="bold">$i18n.getString( "aggregation_expression" ):</label><br><span id="aggregationExpressionField"></span></p>
+ </div>
+ </td>
+ </tr>
+</table>
=== added file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/aggregationEngine.js'
--- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/aggregationEngine.js 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/aggregationEngine.js 2013-12-24 12:32:37 +0000
@@ -0,0 +1,7 @@
+
+
+function showAddAggregationForm()
+{
+ window.location.href = 'showAddAggregationForm.action';
+}
+
=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/menu.vm'
--- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/menu.vm 2013-11-25 07:09:17 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/menu.vm 2013-12-24 12:32:37 +0000
@@ -8,19 +8,26 @@
<li><a href="equipmentTypeList.action">$i18n.getString( "equipmenttype" )</a></li>
</ul>
+<h2>$i18n.getString( "aggregation_builder" )</h2>
+<ul>
+ <li><a href="aggregationQueryList.action">$i18n.getString( "aggregation_query_list" )</a></li>
+</ul>
+
<h2>$i18n.getString( "transfer" )</h2>
<ul>
<li><a href="transferFacilityDataForm.action">$i18n.getString( "transfer_facility_data" )</a></li>
</ul>
-<h2>$i18n.getString( "coldchain_management" )</h2>
-<ul>
- <li><a href="../dhis-web-coldchain/index.action">$i18n.getString( "equipment_manager" )</a></li>
-</ul>
<h2>$i18n.getString( "import_export_data" )</h2>
<ul>
<li><a href="importDataForm.action">$i18n.getString( "import_data" )</a></li>
</ul>
+
+<h2>$i18n.getString( "coldchain_management" )</h2>
+<ul>
+ <li><a href="../dhis-web-coldchain/index.action">$i18n.getString( "equipment_manager" )</a></li>
+</ul>
+
<!--
<h2>$i18n.getString( "ccem_entry" )</h2>
<ul>
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin'
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/pom.xml'
--- local/in/dhis-web-maintenance-pbf/bin/pom.xml 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/pom.xml 1970-01-01 00:00:00 +0000
@@ -1,66 +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>
-
- <parent>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web</artifactId>
- <version>2.14-SNAPSHOT</version>
- </parent>
- <repositories>
- <repository>
- <id>fdvsolution.public</id>
- <url>http://archiva.fdvs.com.ar/repository/public1/</url>
- </repository>
- </repositories>
-
- <artifactId>dhis-web-maintenance-pbf</artifactId>
- <packaging>war</packaging>
- <name>DHIS Maintenance PBF Module</name>
-
- <build>
- <finalName>dhis-web-maintenance-pbf</finalName>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- <!-- DHIS -->
-
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons-resources</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-external</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
-
- </dependencies>
- <properties>
- <rootDir>../../</rootDir>
- </properties>
-</project>
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action'
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/LoadBankDetailsAction.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/LoadBankDetailsAction.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/LoadBankDetailsAction.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/NoAction.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/NoAction.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/NoAction.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.class 1970-01-01 00:00:00 +0000 differ
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api'
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetails.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetails.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetails.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetailsService.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetailsService.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetailsService.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetailsStore.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetailsStore.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetailsStore.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/Lookup.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/Lookup.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/Lookup.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/LookupService.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/LookupService.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/LookupService.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/LookupStore.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/LookupStore.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/LookupStore.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValue.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValue.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValue.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValueService.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValueService.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValueService.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValueStore.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValueStore.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValueStore.class 1970-01-01 00:00:00 +0000 differ
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/bank'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/bank/action'
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/bank/action/LoadBankDetailsAction.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/bank/action/LoadBankDetailsAction.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/bank/action/LoadBankDetailsAction.class 1970-01-01 00:00:00 +0000 differ
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl'
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultBankDetailsService.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultBankDetailsService.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultBankDetailsService.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultLookupService.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultLookupService.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultLookupService.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultTariffDataValueService.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultTariffDataValueService.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultTariffDataValueService.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateBankDetailsStore.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateBankDetailsStore.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateBankDetailsStore.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateLookupStore.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateLookupStore.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateLookupStore.class 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateTariffDataValueStore.class'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateTariffDataValueStore.class 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateTariffDataValueStore.class 1970-01-01 00:00:00 +0000 differ
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/META-INF'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/META-INF/dhis'
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/resources/META-INF/dhis/beans.xml 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/resources/META-INF/dhis/beans.xml 1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
-
- <!-- PBF API -->
-
- <bean id="org.hisp.dhis.pbf.api.TariffDataValueStore" class="org.hisp.dhis.pbf.impl.HibernateTariffDataValueStore">
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
-
- <bean id="org.hisp.dhis.pbf.api.TariffDataValueService" class="org.hisp.dhis.pbf.impl.DefaultTariffDataValueService">
- <property name="tariffDataValueStore" ref="org.hisp.dhis.pbf.api.TariffDataValueStore" />
- </bean>
-
- <bean id="org.hisp.dhis.pbf.api.LookupStore" class="org.hisp.dhis.pbf.impl.HibernateLookupStore">
- <property name="clazz" value="org.hisp.dhis.pbf.api.Lookup"/>
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
-
- <bean id="org.hisp.dhis.pbf.api.LookupService" class="org.hisp.dhis.pbf.impl.DefaultLookupService">
- <property name="lookupStore" ref="org.hisp.dhis.pbf.api.LookupStore" />
- </bean>
-
- <bean id="org.hisp.dhis.pbf.api.BankDetailsStore" class="org.hisp.dhis.pbf.impl.HibernateBankDetailsStore">
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
-
- <bean id="org.hisp.dhis.pbf.api.BankDetailsService" class="org.hisp.dhis.pbf.impl.DefaultBankDetailsService">
- <property name="bankDetailsStore" ref="org.hisp.dhis.pbf.api.BankDetailsStore" />
- </bean>
-
- <!-- Home page -->
- <bean id="org.hisp.dhis.pbf.action.NoAction" class="org.hisp.dhis.pbf.action.NoAction" scope="prototype">
- </bean>
-
- <!-- Data Element for Tariff -->
- <bean id="org.hisp.dhis.pbf.action.GetDataElementforTariffAction" class="org.hisp.dhis.pbf.action.GetDataElementforTariffAction" scope="prototype">
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- </bean>
-
- <!-- Get Tariff Data -->
- <bean id="org.hisp.dhis.pbf.action.LoadTariffDetailsAction" class="org.hisp.dhis.pbf.action.LoadTariffDetailsAction" scope="prototype">
- <property name="tariffDataValueService" ref="org.hisp.dhis.pbf.api.TariffDataValueService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="lookupService" ref="org.hisp.dhis.pbf.api.LookupService" />
- </bean>
-
- <!-- Add Tariff -->
- <bean id="org.hisp.dhis.pbf.action.AddTariffDataAction" class="org.hisp.dhis.pbf.action.AddTariffDataAction" scope="prototype">
- <property name="tariffDataValueService" ref="org.hisp.dhis.pbf.api.TariffDataValueService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- </bean>
-
- <!-- Delete Tariff -->
- <bean id="org.hisp.dhis.pbf.action.DeleteTariffDataAction" class="org.hisp.dhis.pbf.action.DeleteTariffDataAction" scope="prototype">
- <property name="tariffDataValueService" ref="org.hisp.dhis.pbf.api.TariffDataValueService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- </bean>
-
- <!-- Validate Tariff -->
- <bean id="org.hisp.dhis.pbf.action.ValidateTariffDataAction" class="org.hisp.dhis.pbf.action.ValidateTariffDataAction" scope="prototype">
- <property name="tariffDataValueService" ref="org.hisp.dhis.pbf.api.TariffDataValueService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- </bean>
-
- <!-- Load Bank Details -->
- <bean id="org.hisp.dhis.pbf.action.LoadBankDetailsAction" class="org.hisp.dhis.pbf.action.LoadBankDetailsAction" scope="prototype">
- <property name="bankDetailsService" ref="org.hisp.dhis.pbf.api.BankDetailsService" />
- <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
- <property name="lookupService" ref="org.hisp.dhis.pbf.api.LookupService" />
- </bean>
-
-</beans>
\ No newline at end of file
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate'
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate/BankDetails.hbm.xml'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate/BankDetails.hbm.xml 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate/BankDetails.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
-
-<hibernate-mapping>
- <class name="org.hisp.dhis.pbf.api.BankDetails" table="bankdetails">
-
- <composite-id>
- <key-many-to-one name="organisationUnit" class="org.hisp.dhis.organisationunit.OrganisationUnit" column="organisationunitid" foreign-key="fk_bankdetails_organisationunitid" />
- <key-many-to-one name="dataSet" class="org.hisp.dhis.dataset.DataSet" column="datasetid" foreign-key="fk_bankdetails_datasetid" />
- </composite-id>
-
- <property name="bank" column="bank" length="100" />
-
- <property name="branchName" column="branch" length="100" />
-
- <property name="accountName" column="accountname" length="100" />
-
- <property name="accountNumber" column="accountnumber" length="100" />
-
- </class>
-</hibernate-mapping>
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate/Lookup.hbm.xml'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate/Lookup.hbm.xml 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate/Lookup.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";
- [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
- >
-
-<hibernate-mapping>
-
- <class name="org.hisp.dhis.pbf.api.Lookup" table="lookup">
-
- <id name="id" column="lookupid">
- <generator class="native" />
- </id>
-
- &identifiableProperties;
-
- <property name="name" column="name" not-null="true" unique="true" length="230" />
-
- <property name="description" type="text" />
-
- <property name="type" column="type" length="230" />
-
- <property name="value" column="value" type="text" />
-
- </class>
-
-</hibernate-mapping>
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate/TariffDataValue.hbm.xml'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate/TariffDataValue.hbm.xml 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate/TariffDataValue.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
-
-<hibernate-mapping>
- <class name="org.hisp.dhis.pbf.api.TariffDataValue" table="tariffdatavalue">
-
- <composite-id>
- <key-many-to-one name="organisationUnit" class="org.hisp.dhis.organisationunit.OrganisationUnit" column="organisationunitid" foreign-key="fk_tariffdatavalue_organisationunitid" />
- <key-many-to-one name="dataSet" class="org.hisp.dhis.dataset.DataSet" column="datasetid" foreign-key="fk_tariffdatavalue_datasetid" />
- <key-many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" column="dataelementid" foreign-key="fk_tariffdatavalue_dataelementid" />
- <key-property name="startDate" column="startdate" />
- <key-property name="endDate" column="enddate" />
- </composite-id>
-
- <property name="value" />
-
- <property name="storedBy" column="storedby" length="100" />
-
- <property name="timestamp" column="lastupdated" type="timestamp" />
-
- <property name="comment" length="360" />
-
- </class>
-</hibernate-mapping>
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/i18n_module.properties'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/i18n_module.properties 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/i18n_module.properties 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-pbf_setup = PBF Setup
-dataelement_tariff_management = Tariff Management Dataelement
-pbf_management = PBF Management
\ No newline at end of file
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/struts.xml'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/resources/struts.xml 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/resources/struts.xml 1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts PUBLIC
-"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-"http://struts.apache.org/dtds/struts-2.0.dtd";>
-<struts>
-
- <include file="dhis-web-commons.xml"/>
-
- <package name="dhis-web-maintenance-pbf" extends="dhis-web-commons" namespace="/dhis-web-maintenance-pbf">
-
- <!-- Home page -->
- <action name="index" class="org.hisp.dhis.pbf.action.NoAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-pbf/welcome.vm</param>
- <param name="menu">/dhis-web-maintenance-pbf/menu.vm</param>
- </action>
- <action name="dataElementTariffManagement" class="org.hisp.dhis.pbf.action.GetDataElementforTariffAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-pbf/loadDataElementsforTariff.vm</param>
- <param name="menu">/dhis-web-maintenance-pbf/tariffMenu.vm</param>
- <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,../dhis-web-commons/javascripts/ext/ext-all.js,javascript/dataElement_combo.js</param>
- <param name="stylesheets">../dhis-web-commons/javascripts/ext/resources/css/ext-all-gray.css</param>
- </action>
- <action name="loadTariffDetails" class="org.hisp.dhis.pbf.action.LoadTariffDetailsAction">
- <result name="success" type="velocity">/content.vm</result>
- <param name="page">/dhis-web-maintenance-pbf/loadTariffData.vm</param>
- </action>
- <action name="addTariffData" class="org.hisp.dhis.pbf.action.AddTariffDataAction">
- <result name="success" type="velocity-json">/dhis-web-maintenance-pbf/status.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
- <action name="deleteTariffData" class="org.hisp.dhis.pbf.action.DeleteTariffDataAction">
- <result name="success" type="velocity-json">/dhis-web-maintenance-pbf/status.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_TARIFFDATAVALUE_UPDATE</param>
- </action>
-
- <action name="validateTariffData" class="org.hisp.dhis.pbf.action.ValidateTariffDataAction">
- <result name="success" type="velocity-json">/dhis-web-maintenance-pbf/status.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <!-- Load Bank Details -->
- <action name="bankDetailsManagement" class="org.hisp.dhis.pbf.action.LoadBankDetailsAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-pbf/loadBankData.vm</param>
- <param name="menu">/dhis-web-maintenance-pbf/tariffMenu.vm</param>
- <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js</param>
- </action>
-
- </package>
-
-</struts>
\ No newline at end of file
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/WEB-INF'
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/WEB-INF/web.xml'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/WEB-INF/web.xml 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/WEB-INF/web.xml 1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
-<web-app>
-
- <display-name>DHIS Maintenance PBF</display-name>
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>classpath*:/META-INF/dhis/beans.xml</param-value>
- </context-param>
- <context-param>
- <param-name>automaticAccessType</param-name>
- <param-value>ghostAdmin</param-value>
- </context-param>
- <filter>
- <filter-name>RedirectFilter</filter-name>
- <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class>
- <init-param>
- <param-name>redirectPath</param-name>
- <param-value>dhis-web-maintenance-pbf/index.action</param-value>
- </init-param>
- </filter>
- <filter>
- <filter-name>OpenSessionInViewFilter</filter-name>
- <filter-class>org.springframework.orm.hibernate4.support.OpenSessionInViewFilter</filter-class>
- </filter>
- <filter>
- <filter-name>springSecurityFilterChain</filter-name>
- <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
- </filter>
- <filter>
- <filter-name>Struts</filter-name>
- <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>RedirectFilter</filter-name>
- <url-pattern>/</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>OpenSessionInViewFilter</filter-name>
- <url-pattern>*.action</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>springSecurityFilterChain</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>Struts</filter-name>
- <url-pattern>*.action</url-pattern>
- </filter-mapping>
-
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
- <listener>
- <listener-class>org.hisp.dhis.system.startup.StartupListener</listener-class>
- </listener>
-
-</web-app>
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf'
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/css'
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/css/ext-all-neptune-debug.css'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/css/ext-all-neptune-debug.css 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/css/ext-all-neptune-debug.css 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-@import '../ext-theme-neptune/ext-theme-neptune-all-debug.css';
\ No newline at end of file
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/images'
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/images/delete.png'
Binary files local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/images/delete.png 2013-12-24 12:23:11 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/images/delete.png 1970-01-01 00:00:00 +0000 differ
=== removed directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/javascript'
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/javascript/dataElement_combo.js'
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadBankData.vm'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadBankData.vm 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadBankData.vm 1970-01-01 00:00:00 +0000
@@ -1,205 +0,0 @@
-<script >
-$(function() {
-
-$("#openAddTariff").button()
- .click(function() {
- $( "#addTariff" ).dialog( "open" );
- $('#pbfType option[value=-1]').attr('selected','selected');
- $('#bank option[value=-1]').attr('selected','selected');
- $("#branchName").val('');
- $("#accountName").val('');
- $("#accountNumber").val('');
-});
-
-
-$( "#addTariff" ).dialog({
- width: 320,
- autoOpen: false,
- modal: true,
- buttons: {
- "Save": function() {
- var date1 = Date.parse($("#startDate").val());
- var date2 = Date.parse($("#endDate").val());
- if (date1 > date2) {
- alert ("Please enter correct date");
- }
- else{
- var dataValue = {
- 'pbfType' : $("#pbfType").val(),
- 'tariff' : $("#tariff").val(),
- 'startDate' : $("#startDate").val(),
- 'endDate' : $("#endDate").val(),
- 'orgUnitUid': $("#orgUnitUid").val(),
- 'dataElementId' : $("#dataElementId").val()
- };
- jQuery.ajax( {
- url: 'addTariffData.action',
- data: dataValue,
- dataType: 'json',
- success: handleSuccess,
- error: handleError
- } );
- }
-
- },
- Cancel: function() {
- $( this ).dialog( "close" );
- }
- },
- close: function() {
- }
- });
- function handleSuccess( json )
- {
- $('#pbfType option[value=-1]').attr('selected','selected');
- $("#pbfType ").removeAttr('disabled');
- $("#tariff").val('');
- $("#startDate").val('');
- $("#startDate ").removeAttr('disabled');
- $("#endDate").val('');
- $("#endDate ").removeAttr('disabled');
-
- getTariffData();
- $( "#addTariff" ).dialog( "close" );
- }
- function handleError( json )
- {
- $('#pbfType option[value=-1]').attr('selected','selected');
- $("#pbfType ").removeAttr('disabled');
- $("#tariff").val('');
- $("#startDate").val('');
- $("#startDate ").removeAttr('disabled');
- $("#endDate").val('');
- $("#endDate ").removeAttr('disabled');
- getTariffData();
- $( "#addTariff" ).dialog( "close" );
- }
-});
-
- function deleteTariffDataValue( organisationUnitId, dataElementId, dataSetId, startDate, endDate)
- {
- var dataValue = {
- 'organisationUnitId' : organisationUnitId ,
- 'dataElementId' : dataElementId,
- 'dataSetId' : dataSetId,
- 'startDate' : startDate,
- 'endDate' : endDate
- };
-
- jQuery.ajax( {
- url: 'deleteTariffData.action',
- data: dataValue,
- dataType: 'json',
- success: handleSuccess,
- error: handleError
- } );
- function handleSuccess( json )
- {
- getTariffData();
- }
- function handleError( json )
- {
- getTariffData();
- }
- }
-
- function editTariffDataValue( organisationUnitId, dataElementId, dataSetId, startDate, endDate, value )
- {
- $( "#addTariff" ).attr('selected','Edit Tariff')
- $('#pbfType option[value='+organisationUnitGroupId+']').attr('selected','selected');
- $('#pbfType').attr('disabled','disabled');
- $('#tariff').val(value);
- $('#startDate').val(startDate);
- $('#startDate').attr('disabled','disabled');
- $('#endDate').val(endDate);
- $('#endDate').attr('disabled','disabled');
-
- $( "#addTariff" ).dialog( "open" );
- }
-</script>
-
-<div style="width:100%">
- <input type="button" value="Add New Tariff" style="float:right;" id="openAddTariff"/>
-</div>
-<br/><br/>
-
-<table style="width:100%" class="mainPageTable">
- <thead >
- <tr >
- <th >PBF Type</th>
- <th >Bank</th>
- <th >Branch Name</th>
- <th >Account Name</th>
- <th >Account Number</th>
- #if( $updateAuthority == 'Yes' )
- <th >Operations</th>
- #end
- </tr>
- </thead>
- <tbody id="list">
- #set( $mark = false )
- #foreach( $bankDetails in $bankDetailsList )
- #if( $mark )
- #set( $mark = false )
- #else
- #set( $mark = true )
- #end
- <tr #if( $mark ) bgcolor = "#FFFFFF" #else bgcolor="#E0ECF8" #end>
- <td >$!bankDetails.dataSet.name</td>
- <td >$!bankDetails.bank</td>
- <td >$!bankDetails.branchName</td>
- <td >$!bankDetails.accountName</td>
- <td >$!bankDetails.accountNumber</td>
- #if($updateAuthority == 'Yes')
- <td>
- <a href="javascript:deleteTariffDataValue('$tariff.organisationUnit.id','$tariff.dataElement.id','$tariff.dataSet.id','$tariff.startDate','$tariff.endDate')">
- <img src="images/delete.png" width="17px"/>
- </a>
- <a href="javascript:editTariffDataValue('$tariff.organisationUnit.id','$tariff.dataElement.id','$tariff.dataSet.id','$tariff.startDate','$tariff.endDate','$tariff.value')">
- <img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/>
- </a>
- </td>
- #end
- </tr>
- #end
- </tbody>
-</table>
-
-<div id="addTariff" title="Add New Tariff">
- <table style="width:100%;table-layout:fixed;">
- <tr >
- <td style="width:40%;">PBF Type</td>
- <td style="width:60%;">
- <select id="pbfType" style="width:100%;">
- <option value="-1">Select PBF Type</option>
- #foreach( $dataSet in $dataSets )
- <option value="$dataSet.id">$dataSet.name</option>
- #end
- </select>
- </td>
- </tr>
- <tr >
- <td style="width:40%;">Bank</td>
- <td style="width:60%;">
- <select id="bank" style="width:100%;">
- <option value="-1">Select Bank</option>
- #foreach( $bank in $banks )
- <option value="$bank">$bank</option>
- #end
- </select>
- </td>
- </tr>
- <tr >
- <td style="width:40%;">Branch Name</td>
- <td style="width:60%;"><input type="text" id="branchName" style="width:100%;"/></td>
- </tr>
- <tr >
- <td style="width:40%;">Account Name</td>
- <td style="width:60%;"><input type="text" id="accountName" style="width:100%;"/></td>
- </tr>
- <tr >
- <td style="width:40%;">Account Number</td>
- <td style="width:60%;"><input type="text" id="accountNumber" style="width:100%;"/></td>
- </tr>
- </table>
-</div>
\ No newline at end of file
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadDataElementsforTariff.vm'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadDataElementsforTariff.vm 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadDataElementsforTariff.vm 1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
-
-<script >
-$(function() {
- $("#addDataElement").button();
-});
-Ext.require([
- 'Ext.form.field.ComboBox',
- 'Ext.form.FieldSet',
- 'Ext.data.*'
-]);
-
-// Define the model for a State
-Ext.define('State', {
- extend: 'Ext.data.Model',
- fields: [
- {type: 'string', name: 'name'}
- ]
-});
-
-// The data for all states
-var states = $dataElementList;
-
-
-function createStore() {
- // The data store holding the states; shared by each of the ComboBox examples below
- return Ext.create('Ext.data.Store', {
- autoDestroy: true,
- model: 'State',
- data: states
- });
-}
-Ext.onReady(function() {
- Ext.tip.QuickTipManager.init();
- // Simple ComboBox using the data store
- var simpleCombo = Ext.create('Ext.form.field.ComboBox', {
- fieldLabel: 'Select DataElement',
- renderTo: 'simpleCombo',
- displayField: 'name',
- width: 360,
- labelWidth: 120,
- store: createStore(),
- queryMode: 'local',
- typeAhead: true,
- listeners: {select: changeOwner}
- });
-
-});
-var changeOwner = function(combo, record, index) {
- var dataElementName = combo.getValue();
- $('#dataElementName').val(dataElementName);
- $('#loadTariffDetails').load("loadTariffDetails.action",
- {
- dataElementName:dataElementName,
- orgUnitUid:$("#orgUnitUid").val()
- }
- , function( ){
- });
- };
-function getTariffData()
-{
- $('#loadTariffDetails').load("loadTariffDetails.action",
- {
- dataElementName : $('#dataElementName').val(),
- orgUnitUid : $("#orgUnitUid").val()
- }
- , function( ){
- });
-}
-function organisationUnitSelected( orgUnits, orgUnitNames )
-{
- var countryTags = $levelOrgUnitIds;
- var bValue = false;
- for(var i=0;i<=countryTags.length-1;i++)
- {
- if(countryTags[i] == orgUnits[0] )
- {
- bValue = true;
- }
- }
- if(bValue == false)
- {
- alert('Please Select Correct level OrgUnit');
- }
- else
- {
- setFieldValue("orgUnit", orgUnitNames[0]);
- setFieldValue("orgUnitUid", orgUnits[0]);
- if($('#dataElementName').val() != '')
- {
- getTariffData();
- }
- }
-
-}
-
-selection.setListenerFunction( organisationUnitSelected );
-</script>
-<style >
- #tariffSetting {
- width: 280px;
- height: 50px;
- margin: 10px 10px 10px 10px;
- float:right;
- padding: 10px 10px 10px 10px ;
- font: 1.6em bold;
- background: #ccc;
- box-shadow: 2px 2px 2px rgba(0,0,0,0.5),
- inset 8px 10px 10px rgba(255,255,255,0.75);
- -webkit-box-shadow: 2px 2px 2px rgba(0,0,0,0.5),
- inset 8px 10px 10px rgba(255,255,255,0.75);
- -moz-box-shadow: 2px 2px 2px rgba(0,0,0,0.5),
- inset 8px 10px 10px rgba(255,255,255,0.75);
- }
-</style>
-<div width="100%">
- <div id="tariffSetting">
- Tariff Setting Authority : $!tariff_setting_authority
- </div>
-</div>
-<h3>Data Element Tariff Management</h3>
-<br/>
-<input type="hidden" name="orgUnitUid" id="orgUnitUid">
-<input type="hidden" name="dataElementName" id="dataElementName" value="">
-<table width="50%">
- <tr>
- <td >Orgainsation Unit: <input type="text" id="orgUnit" name="orgUnit" readonly size="40"/></td>
- <td > </td>
- </tr>
- <tr >
- <td > </td>
- <td > </td>
- </tr>
- <tr>
- <td ><div id="simpleCombo"></div></td>
- <td ><input type="button" id="addDataElement" value="Add DataElement" disabled/></td>
- </tr>
-</table>
-<br/><br/><br/>
-<div id="loadTariffDetails" style="width:80%"></div>
-
\ No newline at end of file
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadTariffData.vm'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadTariffData.vm 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadTariffData.vm 1970-01-01 00:00:00 +0000
@@ -1,276 +0,0 @@
-<script >
-$(function() {
-
-datePicker( 'startDate');
-datePicker( 'endDate');
-$("#openAddTariff").button()
- .click(function() {
-
- validateAddTariff();
-
-
- $( "#addTariff" ).dialog( "open" );
- $('#pbfType option[value=-1]').attr('selected','selected');
- $("#pbfType ").removeAttr('disabled');
- $("#tariff").val('');
- $("#startDate").val('');
- $("#startDate ").removeAttr('disabled');
- $("#endDate").val('');
- $("#endDate ").removeAttr('disabled');
-});
-
-
-$( "#addTariff" ).dialog({
- width: 320,
- autoOpen: false,
- modal: true,
- buttons: [
- {
- id: "button-save",
- text: "Save",
- click: function() {
- validateTariff();
- }
- },
- {
- id: "button-cancel",
- text: "Cancel",
- click: function() {
- $(this).dialog("close");
- }
- }
- ],
- close: function() {
- }
- });
-
-});
-
- function deleteTariffDataValue( organisationUnitId, dataElementId, dataSetId, startDate, endDate)
- {
- var dataValue = {
- 'organisationUnitId' : organisationUnitId ,
- 'dataElementId' : dataElementId,
- 'dataSetId' : dataSetId,
- 'startDate' : startDate,
- 'endDate' : endDate
- };
-
- jQuery.ajax( {
- url: 'deleteTariffData.action',
- data: dataValue,
- dataType: 'json',
- success: handleSuccess,
- error: handleError
- } );
- function handleSuccess( json )
- {
- getTariffData();
- }
- function handleError( json )
- {
- getTariffData();
- }
- }
-
- function editTariffDataValue( organisationUnitId, dataElementId, dataSetId, startDate, endDate, value )
- {
- $( "#addTariff" ).attr('selected','Edit Tariff')
- $('#pbfType option[value='+organisationUnitGroupId+']').attr('selected','selected');
- $('#pbfType').attr('disabled','disabled');
- $('#tariff').val(value);
- $('#startDate').val(startDate);
- $('#startDate').attr('disabled','disabled');
- $('#endDate').val(endDate);
- $('#endDate').attr('disabled','disabled');
-
- $( "#addTariff" ).dialog( "open" );
- }
- function validateTariff()
- {
- var bValue = false;
- var date1 = Date.parse($("#startDate").val());
- var date2 = Date.parse($("#endDate").val());
-
- if (date1 > date2)
- {
- alert ("Please enter correct date");
- }
- else
- {
- var dataValue = {
- 'pbfType' : $("#pbfType").val(),
- 'startDate' : $("#startDate").val(),
- 'endDate' : $("#endDate").val(),
- 'orgUnitUid': $("#orgUnitUid").val(),
- 'dataElementId' : $("#dataElementId").val()
- };
- jQuery.ajax( {
- url: 'validateTariffData.action',
- data: dataValue,
- dataType: 'json',
- success: handleSuccess,
- error: handleError
- } );
-
-
- }
- return bValue;
- }
- function handleSuccess( json )
- {
- if(json.message == "true")
- {
- alert("Tariff value of this pbf type exist between this range");
- bValue = true;
- }
- else
- {
- var dataValue = {
- 'pbfType' : $("#pbfType").val(),
- 'tariff' : $("#tariff").val(),
- 'startDate' : $("#startDate").val(),
- 'endDate' : $("#endDate").val(),
- 'orgUnitUid': $("#orgUnitUid").val(),
- 'dataElementId' : $("#dataElementId").val()
- };
- jQuery.ajax( {
- url: 'addTariffData.action',
- data: dataValue,
- dataType: 'json',
- success: addTariffSuccess,
- error: addTariffError
- } );
- }
- }
- function handleError( json )
- {
- }
-
- function addTariffSuccess( json )
- {
- $('#pbfType option[value=-1]').attr('selected','selected');
- $("#pbfType ").removeAttr('disabled');
- $("#tariff").val('');
- $("#startDate").val('');
- $("#startDate ").removeAttr('disabled');
- $("#endDate").val('');
- $("#endDate ").removeAttr('disabled');
-
- getTariffData();
- $( "#addTariff" ).dialog( "close" );
- }
- function addTariffError( json )
- {
- $('#pbfType option[value=-1]').attr('selected','selected');
- $("#pbfType ").removeAttr('disabled');
- $("#tariff").val('');
- $("#startDate").val('');
- $("#startDate ").removeAttr('disabled');
- $("#endDate").val('');
- $("#endDate ").removeAttr('disabled');
- getTariffData();
- $( "#addTariff" ).dialog( "close" );
- }
- function validateAddTariff()
- {
- if($("#pbfType ").val() != '-1' && $("#tariff").val() != "" && $("#startDate").val() != "" && $("#endDate").val() != "")
- {
- $("#button-save").button( "option", "disabled", false ).removeClass("ui-state-disabled");
- }
- else
- {
- $("#button-save").button( "option", "disabled", true ).addClass("ui-state-disabled");
- }
- }
-</script>
-<style >
- .mandatory
- {
- color:red;
- font-size: 1.5em;
- }
-</style>
-<div style="width:100%">
- <input type="button" value="Add New Tariff" style="float:right;" id="openAddTariff"/>
-</div>
-<br/><br/>
-<input type="hidden" id="dataElementId" name="dataElementId" value="$!selecteddataElement.id"/>
-
-<table style="width:100%" class="x-grid-table">
- <thead >
- <tr >
- <th >PBF Type</th>
- <th >Tariff</th>
- <th >Start Date</th>
- <th >End Date</th>
- #if( $updateAuthority == 'Yes' )
- <th >Operations</th>
- #end
- </tr>
- </thead>
- <tbody id="list">
- #set( $mark = false )
- #foreach( $tariff in $tariffList )
- #if( $mark )
- #set( $mark = false )
- #else
- #set( $mark = true )
- #end
- <tr #if( $mark ) bgcolor = "#FFFFFF" #else bgcolor="#E0ECF8" #end>
- <td >$!tariff.dataSet.name</td>
- <td >$!tariff.value</td>
- <td >$!tariff.startDate</td>
- <td >$!tariff.endDate</td>
- #if($updateAuthority == 'Yes')
- <td>
- <a href="javascript:deleteTariffDataValue('$tariff.organisationUnit.id','$tariff.dataElement.id','$tariff.dataSet.id','$tariff.startDate','$tariff.endDate')">
- <img src="images/delete.png" width="17px"/>
- </a>
- <a href="javascript:editTariffDataValue('$tariff.organisationUnit.id','$tariff.dataElement.id','$tariff.dataSet.id','$tariff.startDate','$tariff.endDate','$tariff.value')">
- <img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/>
- </a>
- </td>
- #end
- </tr>
- #end
- </tbody>
-</table>
-
-<div id="addTariff" title="Add New Tariff">
- <table style="width:100%;table-layout:fixed;">
- <tr >
- <td style="width:40%;">PBF Type <b class="mandatory">*</b> </td>
- <td style="width:60%;">
- <select id="pbfType" style="width:100%;" onchange="validateAddTariff()">
- <option value="-1">Select PBF Type</option>
- #foreach( $dataSet in $dataSets )
- <option value="$dataSet.id">$dataSet.name</option>
- #end
- </select>
- </td>
- </tr>
- <tr >
- <td colspan="2"> </td>
- </tr>
- <tr >
- <td style="width:40%;">Tariff <b class="mandatory">*</b> </td>
- <td style="width:60%;"><input type="text" id="tariff" style="width:100%;" value="" onblur="validateAddTariff()" /></td>
- </tr>
- <tr >
- <td colspan="2"> </td>
- </tr>
- <tr >
- <td style="width:40%;">Start Date <b class="mandatory">*</b> </td>
- <td style="width:60%;"><input type="text" id="startDate" style="width:100%;" value="" onblur="validateAddTariff()" /></td>
- </tr>
- <tr >
- <td colspan="2"> </td>
- </tr>
- <tr >
- <td style="width:40%;">End Date <b class="mandatory">*</b> </td>
- <td style="width:60%;"><input type="text" id="endDate" style="width:100%;" value="" onblur="validateAddTariff()" /></td>
- </tr>
-
- </table>
-</div>
\ No newline at end of file
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/menu.vm'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/menu.vm 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/menu.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-
-<h2>$i18n.getString( "pbf_setup" )</h2>
-<ul>
- <li><a href="pbfDataEntry.action">$i18n.getString( "dataentry" )</a></li>
-
- <li><a href="dataElementTariffManagement.action">$i18n.getString( "dataelement_tariff_management" )</a></li>
-
- <li><a href="bankDetailsManagement.action">$i18n.getString( "bank_details_management" )</a></li>
-</ul>
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/status.vm'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/status.vm 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/status.vm 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-{
-"message":"${message}"
-}
\ No newline at end of file
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/tariffMenu.vm'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/tariffMenu.vm 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/tariffMenu.vm 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-
-#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
=== removed file 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/welcome.vm'
--- local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/welcome.vm 2013-12-24 12:23:11 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/welcome.vm 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-
-<h3>$i18n.getString( "pbf_management" )</3>
