dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #27055
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13414: PBF Bank User Display
------------------------------------------------------------
revno: 13414
committer: Samta Bajpayee<samta-bajpayee@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-12-24 12:23:11 +0000
message:
PBF Bank User Display
added:
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
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddBankDataAction.java
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteBankDataAction.java
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.java
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/css/ext-all-neptune-debug.css
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/getBankDetails.vm
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/dataElement_combo.js
modified:
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.java
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.java
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/TariffDataValue.java
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/HibernateTariffDataValueStore.java
local/in/dhis-web-maintenance-pbf/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-maintenance-pbf/src/main/resources/struts.xml
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadBankData.vm
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadDataElementsforTariff.vm
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadTariffData.vm
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/status.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-web-maintenance-pbf/bin'
=== added file 'local/in/dhis-web-maintenance-pbf/bin/pom.xml'
--- local/in/dhis-web-maintenance-pbf/bin/pom.xml 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/pom.xml 2013-12-24 12:23:11 +0000
@@ -0,0 +1,66 @@
+<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>
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action'
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/LoadBankDetailsAction.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/NoAction.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.class 2013-12-24 12:23:11 +0000 differ
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api'
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetails.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetailsService.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/BankDetailsStore.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/Lookup.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/LookupService.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/LookupStore.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValue.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValueService.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/api/TariffDataValueStore.class 2013-12-24 12:23:11 +0000 differ
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/bank'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/bank/action'
=== added 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 1970-01-01 00:00:00 +0000 and 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 differ
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl'
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultBankDetailsService.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultLookupService.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/DefaultTariffDataValueService.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateBankDetailsStore.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateLookupStore.class 2013-12-24 12:23:11 +0000 differ
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/java/org/hisp/dhis/pbf/impl/HibernateTariffDataValueStore.class 2013-12-24 12:23:11 +0000 differ
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/META-INF'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/META-INF/dhis'
=== added 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 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/resources/META-INF/dhis/beans.xml 2013-12-24 12:23:11 +0000
@@ -0,0 +1,89 @@
+<?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
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/hibernate'
=== added 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 1970-01-01 00:00:00 +0000
+++ 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
@@ -0,0 +1,23 @@
+<?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>
=== added 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 1970-01-01 00:00:00 +0000
+++ 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
@@ -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.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>
=== added 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 1970-01-01 00:00:00 +0000
+++ 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
@@ -0,0 +1,26 @@
+<?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>
=== added 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 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/resources/org/hisp/dhis/pbf/i18n_module.properties 2013-12-24 12:23:11 +0000
@@ -0,0 +1,3 @@
+pbf_setup = PBF Setup
+dataelement_tariff_management = Tariff Management Dataelement
+pbf_management = PBF Management
\ No newline at end of file
=== added 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 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/resources/struts.xml 2013-12-24 12:23:11 +0000
@@ -0,0 +1,53 @@
+<?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
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/WEB-INF'
=== added 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 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/WEB-INF/web.xml 2013-12-24 12:23:11 +0000
@@ -0,0 +1,59 @@
+<?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>
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf'
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/css'
=== added 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 1970-01-01 00:00:00 +0000
+++ 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
@@ -0,0 +1,1 @@
+@import '../ext-theme-neptune/ext-theme-neptune-all-debug.css';
\ No newline at end of file
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/images'
=== added 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 1970-01-01 00:00:00 +0000 and local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/images/delete.png 2013-12-24 12:23:11 +0000 differ
=== added directory 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/javascript'
=== added file 'local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/javascript/dataElement_combo.js'
=== added 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 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadBankData.vm 2013-12-24 12:23:11 +0000
@@ -0,0 +1,205 @@
+<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
=== added 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 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadDataElementsforTariff.vm 2013-12-24 12:23:11 +0000
@@ -0,0 +1,140 @@
+
+<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
=== added 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 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/loadTariffData.vm 2013-12-24 12:23:11 +0000
@@ -0,0 +1,276 @@
+<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
=== added 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 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/menu.vm 2013-12-24 12:23:11 +0000
@@ -0,0 +1,9 @@
+
+<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>
=== added 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 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/status.vm 2013-12-24 12:23:11 +0000
@@ -0,0 +1,3 @@
+{
+"message":"${message}"
+}
\ No newline at end of file
=== added 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 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/tariffMenu.vm 2013-12-24 12:23:11 +0000
@@ -0,0 +1,2 @@
+
+#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
=== added 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 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/bin/src/main/webapp/dhis-web-maintenance-pbf/welcome.vm 2013-12-24 12:23:11 +0000
@@ -0,0 +1,2 @@
+
+<h3>$i18n.getString( "pbf_management" )</3>
=== added file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddBankDataAction.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddBankDataAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddBankDataAction.java 2013-12-24 12:23:11 +0000
@@ -0,0 +1,115 @@
+package org.hisp.dhis.pbf.action;
+
+import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.pbf.api.BankDetails;
+import org.hisp.dhis.pbf.api.BankDetailsService;
+
+import com.opensymphony.xwork2.Action;
+
+public class AddBankDataAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private BankDetailsService bankDetailsService;
+
+ public void setBankDetailsService(BankDetailsService bankDetailsService) {
+ this.bankDetailsService = bankDetailsService;
+ }
+
+ private OrganisationUnitService organisationUnitService;
+
+ public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+ {
+ this.organisationUnitService = organisationUnitService;
+ }
+
+ private DataSetService dataSetService;
+
+ public void setDataSetService( DataSetService dataSetService )
+ {
+ this.dataSetService = dataSetService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input
+ // -------------------------------------------------------------------------
+
+ private String orgUnitUid;
+
+ public void setOrgUnitUid( String orgUnitUid )
+ {
+ this.orgUnitUid = orgUnitUid;
+ }
+
+ private String dataSetId;
+
+ public void setDataSetId(String dataSetId) {
+ this.dataSetId = dataSetId;
+ }
+
+ private String accountNumber;
+
+ public void setAccountNumber(String accountNumber) {
+ this.accountNumber = accountNumber;
+ }
+
+ private String accountName;
+
+ public void setAccountName(String accountName) {
+ this.accountName = accountName;
+ }
+
+ private String bank;
+
+ public void setBank(String bank) {
+ this.bank = bank;
+ }
+
+ private String branchName;
+
+ public void setBranchName(String branchName) {
+ this.branchName = branchName;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ throws Exception
+ {
+ OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( orgUnitUid );
+
+ DataSet dataSet = dataSetService.getDataSet(Integer.parseInt(dataSetId));
+
+ BankDetails bankDetails = bankDetailsService.getBankDetails(organisationUnit, dataSet);
+
+ if ( bankDetails == null )
+ {
+ bankDetails = new BankDetails();
+ bankDetails.setDataSet(dataSet);
+ bankDetails.setOrganisationUnit(organisationUnit);
+ bankDetails.setAccountName(accountName);
+ bankDetails.setAccountNumber(accountNumber);
+ bankDetails.setBank(bank);
+ bankDetails.setBranchName(branchName);
+ bankDetailsService.addBankDetails(bankDetails);
+ }
+ else
+ {
+ bankDetails.setAccountName(accountName);
+ bankDetails.setAccountNumber(accountNumber);
+ bankDetails.setBank(bank);
+ bankDetails.setBranchName(branchName);
+ bankDetailsService.updateBankDetails(bankDetails);
+ }
+
+ return SUCCESS;
+ }
+}
\ No newline at end of file
=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.java 2013-12-21 05:25:33 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.java 2013-12-24 12:23:11 +0000
@@ -111,6 +111,7 @@
throws Exception
{
SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
+
Date sDate = dateFormat.parse( startDate );
Date eDate = dateFormat.parse( endDate );
=== added file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteBankDataAction.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteBankDataAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteBankDataAction.java 2013-12-24 12:23:11 +0000
@@ -0,0 +1,73 @@
+package org.hisp.dhis.pbf.action;
+
+import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.pbf.api.BankDetails;
+import org.hisp.dhis.pbf.api.BankDetailsService;
+
+import com.opensymphony.xwork2.Action;
+
+public class DeleteBankDataAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private BankDetailsService bankDetailsService;
+
+ public void setBankDetailsService(BankDetailsService bankDetailsService) {
+ this.bankDetailsService = bankDetailsService;
+ }
+
+ private OrganisationUnitService organisationUnitService;
+
+ public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+ {
+ this.organisationUnitService = organisationUnitService;
+ }
+
+ private DataSetService dataSetService;
+
+ public void setDataSetService( DataSetService dataSetService )
+ {
+ this.dataSetService = dataSetService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input
+ // -------------------------------------------------------------------------
+
+ private Integer organisationUnitId;
+
+ private Integer dataSetId;
+
+ public void setOrganisationUnitId( Integer organisationUnitId )
+ {
+ this.organisationUnitId = organisationUnitId;
+ }
+
+ public void setDataSetId( Integer dataSetId )
+ {
+ this.dataSetId = dataSetId;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ throws Exception
+ {
+ DataSet dataSet = dataSetService.getDataSet( dataSetId );
+ OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( organisationUnitId );
+
+ BankDetails bankDetail = bankDetailsService.getBankDetails(organisationUnit, dataSet);
+
+ bankDetailsService.deleteBankDetails(bankDetail);
+
+ return SUCCESS;
+ }
+}
\ No newline at end of file
=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java 2013-12-21 05:25:33 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java 2013-12-24 12:23:11 +0000
@@ -112,10 +112,10 @@
Set<AttributeValue> attrValueSet = new HashSet<AttributeValue>( de.getAttributeValues() );
for ( AttributeValue attValue : attrValueSet )
{
- if ( dataElementList != null && !( dataElementList.contains( "\"" + de.getName() + "\"" ) )
+ if ( dataElementList != null && !( dataElementList.contains( "{\"name\" : \"" + de.getName() + "\"}" ) )
&& attValue.getAttribute().getId() == tariffDataElement.getValue() )
{
- dataElementList.add( "\"" + de.getName() + "\"" );
+ dataElementList.add( "{\"name\" : \"" + de.getName() + "\"}" );
}
}
}
=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.java 2013-12-21 05:25:33 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.java 2013-12-24 12:23:11 +0000
@@ -1,8 +1,11 @@
package org.hisp.dhis.pbf.action;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.dataset.DataSet;
@@ -114,11 +117,17 @@
return dataSets;
}
+ private SimpleDateFormat simpleDateFormat = new SimpleDateFormat( "yyyy-MM-dd" );;
+
+ public SimpleDateFormat getSimpleDateFormat() {
+ return simpleDateFormat;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
- public String execute()
+ public String execute()
{
User curUser = currentUserService.getCurrentUser();
=== added file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.java 2013-12-24 12:23:11 +0000
@@ -0,0 +1,161 @@
+package org.hisp.dhis.pbf.action;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.pbf.api.TariffDataValue;
+import org.hisp.dhis.pbf.api.TariffDataValueService;
+import org.hisp.dhis.user.CurrentUserService;
+
+import com.opensymphony.xwork2.Action;
+
+public class ValidateTariffDataAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private TariffDataValueService tariffDataValueService;
+
+ public void setTariffDataValueService( TariffDataValueService tariffDataValueService )
+ {
+ this.tariffDataValueService = tariffDataValueService;
+ }
+
+ private DataElementService dataElementService;
+
+ public void setDataElementService( DataElementService dataElementService )
+ {
+ this.dataElementService = dataElementService;
+ }
+
+ private OrganisationUnitService organisationUnitService;
+
+ public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+ {
+ this.organisationUnitService = organisationUnitService;
+ }
+
+ private CurrentUserService currentUserService;
+
+ public void setCurrentUserService( CurrentUserService currentUserService )
+ {
+ this.currentUserService = currentUserService;
+ }
+
+ private DataSetService dataSetService;
+
+ public void setDataSetService( DataSetService dataSetService )
+ {
+ this.dataSetService = dataSetService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input
+ // -------------------------------------------------------------------------
+
+ private String pbfType;
+
+ private String startDate;
+
+ private String endDate;
+
+ private String dataElementId;
+
+ private String orgUnitUid;
+
+ public void setDataElementId( String dataElementId )
+ {
+ this.dataElementId = dataElementId;
+ }
+
+ public void setOrgUnitUid( String orgUnitUid )
+ {
+ this.orgUnitUid = orgUnitUid;
+ }
+
+ public void setPbfType( String pbfType )
+ {
+ this.pbfType = pbfType;
+ }
+
+ public void setStartDate( String startDate )
+ {
+ this.startDate = startDate;
+ }
+
+ public void setEndDate( String endDate )
+ {
+ this.endDate = endDate;
+ }
+ public String getPbfType() {
+ return pbfType;
+ }
+
+ public String getStartDate() {
+ return startDate;
+ }
+
+ public String getEndDate() {
+ return endDate;
+ }
+
+ public String getOrgUnitUid() {
+ return orgUnitUid;
+ }
+
+ private String message;
+
+ public String getMessage() {
+ return message;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ throws Exception
+ {
+ System.out.println(startDate);
+ SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
+ Date sDate = dateFormat.parse( startDate );
+ Date eDate = dateFormat.parse( endDate );
+
+ DataElement dataElement = dataElementService.getDataElement( Integer.parseInt( dataElementId ) );
+
+ OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( orgUnitUid );
+
+ DataSet dataSet = dataSetService.getDataSet( Integer.parseInt( pbfType ) );
+
+ List<TariffDataValue> tariffDataValues = new ArrayList<TariffDataValue>( tariffDataValueService.getTariffDataValues(organisationUnit, dataElement));
+ //boolean status = false;
+ for(TariffDataValue tdv : tariffDataValues)
+ {
+ System.out.println(tdv.getDataSet().getId());
+ System.out.println(dataSet.getId());
+ System.out.println(tdv.getStartDate().before(sDate));
+ System.out.println(tdv.getEndDate().after(eDate));
+ if(tdv.getDataSet().getId() == dataSet.getId() && tdv.getStartDate().before(sDate) && tdv.getEndDate().after(eDate) )
+ {
+ message = "true";
+ break;
+ }
+ else
+ {
+ message = "false";
+ }
+ }
+
+ return SUCCESS;
+ }
+}
\ No newline at end of file
=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/TariffDataValue.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/TariffDataValue.java 2013-12-21 05:25:33 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/TariffDataValue.java 2013-12-24 12:23:11 +0000
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.Date;
+import org.hisp.dhis.common.BaseNameableObject;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.organisationunit.OrganisationUnit;
=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/HibernateTariffDataValueStore.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/HibernateTariffDataValueStore.java 2013-12-21 05:25:33 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/HibernateTariffDataValueStore.java 2013-12-24 12:23:11 +0000
@@ -6,6 +6,7 @@
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataset.DataSet;
@@ -99,6 +100,7 @@
Criteria criteria = session.createCriteria( TariffDataValue.class );
criteria.add( Restrictions.eq( "organisationUnit", organisationUnit ) );
criteria.add( Restrictions.eq( "dataElement", dataElement ) );
+ criteria.addOrder(Order.asc("dataSet"));
return criteria.list();
}
=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-maintenance-pbf/src/main/resources/META-INF/dhis/beans.xml 2013-12-21 09:11:48 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/resources/META-INF/dhis/beans.xml 2013-12-24 12:23:11 +0000
@@ -68,6 +68,15 @@
<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">
@@ -77,4 +86,17 @@
<property name="lookupService" ref="org.hisp.dhis.pbf.api.LookupService" />
</bean>
+ <!-- Add Bank Detail -->
+ <bean id="org.hisp.dhis.pbf.action.AddBankDataAction" class="org.hisp.dhis.pbf.action.AddBankDataAction" 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" />
+ </bean>
+
+ <!-- Add Bank Detail -->
+ <bean id="org.hisp.dhis.pbf.action.DeleteBankDataAction" class="org.hisp.dhis.pbf.action.DeleteBankDataAction" 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" />
+ </bean>
</beans>
\ No newline at end of file
=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/resources/struts.xml'
--- local/in/dhis-web-maintenance-pbf/src/main/resources/struts.xml 2013-12-21 09:11:48 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/resources/struts.xml 2013-12-24 12:23:11 +0000
@@ -18,7 +18,8 @@
<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</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>
@@ -34,14 +35,33 @@
<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">
+ <action name="bankDetailsManagement" class="org.hisp.dhis.pbf.action.NoAction">
<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>
+
+ <action name="loadbankDetails" class="org.hisp.dhis.pbf.action.LoadBankDetailsAction">
+ <result name="success" type="velocity">/content.vm</result>
+ <param name="page">/dhis-web-maintenance-pbf/getBankDetails.vm</param>
+ </action>
+ <action name="addBankData" class="org.hisp.dhis.pbf.action.AddBankDataAction">
+ <result name="success" type="velocity-json">/dhis-web-maintenance-pbf/status.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+ <action name="deleteBankData" class="org.hisp.dhis.pbf.action.DeleteBankDataAction">
+ <result name="success" type="velocity-json">/dhis-web-maintenance-pbf/status.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_BANKDATA_UPDATE</param>
+ </action>
</package>
</struts>
\ No newline at end of file
=== added file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/css/ext-all-neptune-debug.css'
--- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/css/ext-all-neptune-debug.css 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/css/ext-all-neptune-debug.css 2013-12-24 12:23:11 +0000
@@ -0,0 +1,1 @@
+@import '../ext-theme-neptune/ext-theme-neptune-all-debug.css';
\ No newline at end of file
=== added file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/getBankDetails.vm'
--- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/getBankDetails.vm 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/getBankDetails.vm 2013-12-24 12:23:11 +0000
@@ -0,0 +1,210 @@
+<script >
+$(function() {
+$("#bankDetails").tablesorter();
+$("#openAddBankDetail").button()
+ .click(function() {
+ $( "#addBankDetail" ).dialog('option', 'title', 'Add Bank Detail');
+ $('#dataSetId option[value=-1]').attr('selected','selected');
+ $("#dataSetId ").removeAttr('disabled');
+ $("#bank").val('');
+ $("#branchName").val('');
+ $("#accountName").val('');
+ $("#accountNumber").val('');
+
+ $( "#addBankDetail" ).dialog( "open" );
+});
+
+
+$( "#addBankDetail" ).dialog({
+ width: 320,
+ autoOpen: false,
+ modal: true,
+ buttons: {
+ "Save": function() {
+
+ var dataValue = {
+ 'dataSetId' : $("#dataSetId").val(),
+ 'bank' : $("#bank").val(),
+ 'branchName' : $("#branchName").val(),
+ 'accountName' : $("#accountName").val(),
+ 'orgUnitUid': $("#orgUnitUid").val(),
+ 'accountNumber' : $("#accountNumber").val()
+ };
+ jQuery.ajax( {
+ url: 'addBankData.action',
+ data: dataValue,
+ dataType: 'json',
+ success: handleSuccess,
+ error: handleError
+ } );
+
+ },
+ Cancel: function() {
+ $( this ).dialog( "close" );
+ }
+ },
+ close: function() {
+ }
+ });
+ function handleSuccess( json )
+ {
+ $('#dataSetId option[value=-1]').attr('selected','selected');
+ $("#dataSetId ").removeAttr('disabled');
+ $("#bank").val('');
+ $("#branchName").val('');
+ $("#accountName").val('');
+ $("#accountNumber").val('');
+
+ loadBankDetails();
+ $( "#addBankDetail" ).dialog( "close" );
+ }
+ function handleError( json )
+ {
+ $('#dataSetId option[value=-1]').attr('selected','selected');
+ $("#dataSetId ").removeAttr('disabled');
+ $("#bank").val('');
+ $("#branchName").val('');
+ $("#accountName").val('');
+ $("#accountNumber").val('');
+ loadBankDetails();
+ $( "#addBankDetail" ).dialog( "close" );
+ }
+});
+
+ function deleteBankData( organisationUnitId, dataSetId)
+ {
+ var dataValue = {
+ 'organisationUnitId' : organisationUnitId ,
+ 'dataSetId' : dataSetId
+ };
+
+ jQuery.ajax( {
+ url: 'deleteBankData.action',
+ data: dataValue,
+ dataType: 'json',
+ success: handleSuccess,
+ error: handleError
+ } );
+ function handleSuccess( json )
+ {
+ loadBankDetails();
+ }
+ function handleError( json )
+ {
+ loadBankDetails();
+ }
+ }
+
+ function editBankData( organisationUnitId, dataSetId, bank, branchName, accountName, accountNumber)
+ {
+ $( "#addBankDetail" ).dialog('option', 'title', 'Edit Bank Detail');
+ $('#dataSetId option[value='+dataSetId+']').attr('selected','selected');
+ $('#dataSetId').attr('disabled','disabled');
+ $('#bank').val(bank);
+ $('#branchName').val(branchName);
+ $('#accountName').val(accountName);
+ $('#accountNumber').val(accountNumber);
+
+ $( "#addBankDetail" ).dialog( "open" );
+ }
+
+function organisationUnitSelected( orgUnits, orgUnitNames )
+{
+ setFieldValue("orgUnit", orgUnitNames[0]);
+ setFieldValue("orgUnitUid", orgUnits[0]);
+ loadBankDetails();
+}
+
+function loadBankDetails()
+{
+ $('#loadBankDetails').load("loadbankDetails.action",
+ {
+ dataElementName : $('#dataElementName').val(),
+ orgUnitUid : $("#orgUnitUid").val()
+ }
+ , function( ){
+ });
+}
+selection.setListenerFunction( organisationUnitSelected );
+</script>
+
+<table style="width:100%" id="bankDetails">
+ <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:deleteBankData('$bankDetails.organisationUnit.id','$bankDetails.dataSet.id')">
+ <img src="images/delete.png" width="17px"/>
+ </a>
+ <a href="javascript:editBankData('$bankDetails.organisationUnit.uid','$bankDetails.dataSet.id','$bankDetails.bank','$bankDetails.branchName','$bankDetails.accountName','$bankDetails.accountNumber')">
+ <img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/>
+ </a>
+ </td>
+ ##end
+ </tr>
+ #end
+ </tbody>
+</table>
+
+<div id="addBankDetail" title="Add New Bank Detail">
+ <table style="width:100%;table-layout:fixed;">
+ <tr >
+ <td style="width:40%;">PBF Type</td>
+ <td style="width:60%;">
+ <select id="dataSetId" 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
=== added file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/dataElement_combo.js'
=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadBankData.vm'
--- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadBankData.vm 2013-12-21 09:11:48 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadBankData.vm 2013-12-24 12:23:11 +0000
@@ -1,205 +1,31 @@
<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" );
- }
+});
+function organisationUnitSelected( orgUnits, orgUnitNames )
+{
+ setFieldValue("orgUnit", orgUnitNames[0]);
+ setFieldValue("orgUnitUid", orgUnits[0]);
+ loadBankDetails();
+}
+
+function loadBankDetails()
+{
+ $('#loadBankDetails').load("loadbankDetails.action",
+ {
+ dataElementName : $('#dataElementName').val(),
+ orgUnitUid : $("#orgUnitUid").val()
+ }
+ , function( ){
+ });
+}
+selection.setListenerFunction( organisationUnitSelected );
</script>
-
+<input type="hidden" name="orgUnitUid" id="orgUnitUid">
+<h3>Bank Detail Management</h3>
<div style="width:100%">
- <input type="button" value="Add New Tariff" style="float:right;" id="openAddTariff"/>
+ Orgainsation Unit: <input type="text" id="orgUnit" name="orgUnit" readonly size="40"/>
+ <input type="button" value="Add New Bank Detail" style="float:right;" id="openAddBankDetail"/>
</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 id="loadBankDetails">
</div>
\ No newline at end of file
=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadDataElementsforTariff.vm'
--- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadDataElementsforTariff.vm 2013-12-11 12:08:01 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadDataElementsforTariff.vm 2013-12-24 12:23:11 +0000
@@ -1,15 +1,53 @@
<script >
$(function() {
-var availableTags = $dataElementList;
-$( "#dataElementName" ).autocomplete({
- source: availableTags,
- select: function( event, ui ) {
- for(var i=0;i<=availableTags.length-1;i++)
- {
- if(availableTags[i] == ui.item.value)
- {
- var dataElementName = ui.item.value;
+ $("#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: 380,
+ 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,
@@ -17,32 +55,17 @@
}
, function( ){
});
- }
- }
-
- }
- });
-});
+ };
function getTariffData()
{
- var availableTags = $dataElementList;
- for(var i=0;i<=availableTags.length-1;i++)
- {
- if(availableTags[i] == $("#dataElementName").val())
- {
- var dataElementName = $("#dataElementName").val();
- $('#loadTariffDetails').load("loadTariffDetails.action",
+ $('#loadTariffDetails').load("loadTariffDetails.action",
{
- dataElementName:dataElementName,
- orgUnitUid:$("#orgUnitUid").val()
+ dataElementName : $('#dataElementName').val(),
+ orgUnitUid : $("#orgUnitUid").val()
}
, function( ){
- });
- }
- }
-
+ });
}
-
function organisationUnitSelected( orgUnits, orgUnitNames )
{
var countryTags = $levelOrgUnitIds;
@@ -62,26 +85,54 @@
{
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">
-<table width="60%">
+<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 >Tariff Setting Authority <input type="text" readonly id="tariff_authority" value="$!tariff_setting_authority"/></td>
+ <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 ><input id="dataElementName" name="dataElementName" onkeyup="getTariffData()" size="55" placeholder="Type the name of dataelement" /> </td>
- <td ><input type="button" id="addDataElement" value="Add DataElement" disabled /></td>
+ <td ><div id="simpleCombo"></div></td>
+ <td ><input type="button" id="addDataElement" value="Add DataElement" disabled/></td>
</tr>
</table>
<br/><br/><br/>
=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadTariffData.vm'
--- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadTariffData.vm 2013-12-21 05:25:33 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadTariffData.vm 2013-12-24 12:23:11 +0000
@@ -1,12 +1,16 @@
<script >
$(function() {
-datePickerValid( 'startDate', true );
-datePickerValid( 'endDate', true );
-
+$("#tariffDetails").tablesorter();
+datePicker( 'startDate');
+datePicker( 'endDate');
$("#openAddTariff").button()
.click(function() {
- $( "#addTariff" ).dialog( "open" );
- $('#pbfType option[value=-1]').attr('selected','selected');
+
+ validateAddTariff();
+
+ $( "#addTariff" ).dialog('option', 'title', 'Add New Tariff');
+ $( "#addTariff" ).dialog( "open" );
+ $('#pbfType option[value=-1]').attr('selected','selected');
$("#pbfType ").removeAttr('disabled');
$("#tariff").val('');
$("#startDate").val('');
@@ -20,64 +24,26 @@
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" );
- }
- },
+ buttons: [
+ {
+ id: "button-save",
+ text: "Save",
+ click: function() {
+ validateTariff();
+ }
+ },
+ {
+ id: "button-cancel",
+ text: "Cancel",
+ click: 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)
@@ -108,9 +74,9 @@
}
function editTariffDataValue( organisationUnitId, dataElementId, dataSetId, startDate, endDate, value )
- {
- $( "#addTariff" ).attr('selected','Edit Tariff')
- $('#pbfType option[value='+organisationUnitGroupId+']').attr('selected','selected');
+ {
+ $( "#addTariff" ).dialog('option', 'title', 'Edit Tariff');
+ $('#pbfType option[value='+dataSetId+']').attr('selected','selected');
$('#pbfType').attr('disabled','disabled');
$('#tariff').val(value);
$('#startDate').val(startDate);
@@ -120,24 +86,127 @@
$( "#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="mainPageTable">
+<table style="width:100%" id="tariffDetails">
<thead >
<tr >
<th >PBF Type</th>
<th >Tariff</th>
<th >Start Date</th>
<th >End Date</th>
- #if( $updateAuthority == 'Yes' )
+ ##if( $updateAuthority == 'Yes' )
<th >Operations</th>
- #end
+ ##end
</tr>
</thead>
<tbody id="list">
@@ -151,9 +220,9 @@
<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 data-sorter="shortDate" data-date-format="yyyymmdd">$simpleDateFormat.format($!tariff.startDate)</td>
+ <td data-sorter="shortDate" data-date-format="yyyymmdd">$simpleDateFormat.format($!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"/>
@@ -162,7 +231,7 @@
<img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/>
</a>
</td>
- #end
+ ##end
</tr>
#end
</tbody>
@@ -171,9 +240,9 @@
<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:40%;">PBF Type <b class="mandatory">*</b> </td>
<td style="width:60%;">
- <select id="pbfType" style="width:100%;">
+ <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>
@@ -182,16 +251,26 @@
</td>
</tr>
<tr >
- <td style="width:40%;">Tariff</td>
- <td style="width:60%;"><input type="text" id="tariff" style="width:100%;"/></td>
- </tr>
- <tr >
- <td style="width:40%;">Start Date</td>
- <td style="width:60%;"><input type="text" id="startDate" style="width:100%;"/></td>
- </tr>
- <tr >
- <td style="width:40%;">End Date</td>
- <td style="width:60%;"><input type="text" id="endDate" style="width:100%;"/></td>
- </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
=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/status.vm'
--- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/status.vm 2013-12-10 12:41:41 +0000
+++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/status.vm 2013-12-24 12:23:11 +0000
@@ -1,7 +1,3 @@
{
-"c":"${statusCode}",
-"curValueDiv":"$!dataValue.value",
-"curCommentDiv":"$!dataValue.comment",
-"curStoredByDiv":"$!dataValue.storedBy",
-"curTimeStampDiv":"$standardDateFormat.format($!dataValue.timestamp)"
+"message":"${message}"
}
\ No newline at end of file
