dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #29973
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15200: local/in RBF work in progress
------------------------------------------------------------
revno: 15200
committer: Mithilesh Kumar Thakur <mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-05-09 06:53:05 +0100
message:
local/in RBF work in progress
added:
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/AddQualityScorePaymentAction.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/AddQualityScorePaymentFormAction.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/DeleteQualityScorePaymentAction.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/GetQualityScorePaymentAction.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/GetQualityScorePaymentList.java
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/addqualityScorePaymentForm.vm
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/addQualityScorePayment.js
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/qualityScorePayment.js
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/jsonQualityScorePaymentDetails.vm
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/qualityScorePaymentList.vm
modified:
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultQualityScorePaymentService.java
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernateQualityScorePaymentStore.java
local/in/dhis-web-maintenance-rbf/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/i18n_module.properties
local/in/dhis-web-maintenance-rbf/src/main/resources/struts.xml
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/menu.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultQualityScorePaymentService.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultQualityScorePaymentService.java 2014-05-08 11:03:37 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultQualityScorePaymentService.java 2014-05-09 05:53:05 +0000
@@ -5,7 +5,9 @@
import org.hisp.dhis.rbf.api.QualityScorePayment;
import org.hisp.dhis.rbf.api.QualityScorePaymentService;
import org.hisp.dhis.rbf.api.QualityScorePaymentStore;
+import org.springframework.transaction.annotation.Transactional;
+@Transactional
public class DefaultQualityScorePaymentService implements QualityScorePaymentService
{
=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernateQualityScorePaymentStore.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernateQualityScorePaymentStore.java 2014-05-08 11:03:37 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernateQualityScorePaymentStore.java 2014-05-09 05:53:05 +0000
@@ -66,6 +66,7 @@
return (QualityScorePayment) criteria.uniqueResult();
}
+ @SuppressWarnings( "unchecked" )
@Override
public Collection<QualityScorePayment> getAllQualityScorePayments()
{
=== added directory 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment'
=== added directory 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action'
=== added file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/AddQualityScorePaymentAction.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/AddQualityScorePaymentAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/AddQualityScorePaymentAction.java 2014-05-09 05:53:05 +0000
@@ -0,0 +1,67 @@
+package org.hisp.dhis.rbf.qualityscorepayment.action;
+
+import org.hisp.dhis.rbf.api.QualityScorePayment;
+import org.hisp.dhis.rbf.api.QualityScorePaymentService;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Mithilesh Kumar Thakur
+ */
+public class AddQualityScorePaymentAction implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private QualityScorePaymentService qualityScorePaymentService;
+
+ public void setQualityScorePaymentService( QualityScorePaymentService qualityScorePaymentService )
+ {
+ this.qualityScorePaymentService = qualityScorePaymentService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input & output
+ // -------------------------------------------------------------------------
+
+ private String startRange;
+
+ public void setStartRange( String startRange )
+ {
+ this.startRange = startRange;
+ }
+
+ private String endRange;
+
+ public void setEndRange( String endRange )
+ {
+ this.endRange = endRange;
+ }
+
+ private String addQualityPayment;
+
+ public void setAddQualityPayment( String addQualityPayment )
+ {
+ this.addQualityPayment = addQualityPayment;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action
+ // -------------------------------------------------------------------------
+
+ public String execute() throws Exception
+ {
+
+ QualityScorePayment qualityScorePayment = new QualityScorePayment();
+
+ qualityScorePayment.setStartRange( Double.parseDouble( startRange ) );
+ qualityScorePayment.setEndRange( Double.parseDouble( endRange ) );
+ qualityScorePayment.setAddQtyPayment( Double.parseDouble( addQualityPayment ) );
+
+ qualityScorePaymentService.addQualityScorePayment( qualityScorePayment );
+
+ return SUCCESS;
+ }
+
+}
=== added file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/AddQualityScorePaymentFormAction.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/AddQualityScorePaymentFormAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/AddQualityScorePaymentFormAction.java 2014-05-09 05:53:05 +0000
@@ -0,0 +1,21 @@
+package org.hisp.dhis.rbf.qualityscorepayment.action;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Mithilesh Kumar Thakur
+ */
+public class AddQualityScorePaymentFormAction implements Action
+{
+
+ // -------------------------------------------------------------------------
+ // Action Implementation
+ // -------------------------------------------------------------------------
+
+ public String execute() throws Exception
+ {
+
+ return SUCCESS;
+ }
+
+}
=== added file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/DeleteQualityScorePaymentAction.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/DeleteQualityScorePaymentAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/DeleteQualityScorePaymentAction.java 2014-05-09 05:53:05 +0000
@@ -0,0 +1,89 @@
+package org.hisp.dhis.rbf.qualityscorepayment.action;
+
+import org.hisp.dhis.common.DeleteNotAllowedException;
+import org.hisp.dhis.i18n.I18n;
+import org.hisp.dhis.rbf.api.QualityScorePayment;
+import org.hisp.dhis.rbf.api.QualityScorePaymentService;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Mithilesh Kumar Thakur
+ */
+public class DeleteQualityScorePaymentAction implements Action
+{
+
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private QualityScorePaymentService qualityScorePaymentService;
+
+ public void setQualityScorePaymentService( QualityScorePaymentService qualityScorePaymentService )
+ {
+ this.qualityScorePaymentService = qualityScorePaymentService;
+ }
+
+
+ // -------------------------------------------------------------------------
+ // Getters & setters
+ // -------------------------------------------------------------------------
+
+ private Integer id;
+
+ public void setId( Integer id )
+ {
+ this.id = id;
+ }
+
+ // -------------------------------------------------------------------------
+ // I18n
+ // -------------------------------------------------------------------------
+
+ private I18n i18n;
+
+ public void setI18n( I18n i18n )
+ {
+ this.i18n = i18n;
+ }
+
+ // -------------------------------------------------------------------------
+ // Output
+ // -------------------------------------------------------------------------
+
+ private String message;
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action
+ // -------------------------------------------------------------------------
+
+ public String execute() throws Exception
+ {
+ //System.out.println( "Inside Delete Action : " + id );
+ try
+ {
+ QualityScorePayment qualityScorePayment = qualityScorePaymentService.getQualityScorePayment( id );
+
+ qualityScorePaymentService.deleteQualityScorePayment( qualityScorePayment );
+
+ message = i18n.getString( "delete_success" );
+ }
+ catch ( DeleteNotAllowedException ex )
+ {
+ if ( ex.getErrorCode().equals( DeleteNotAllowedException.ERROR_ASSOCIATED_BY_OTHER_OBJECTS ) )
+ {
+ message = i18n.getString( "object_not_deleted_associated_by_objects" ) + " " + ex.getMessage();
+
+ return ERROR;
+ }
+ }
+
+ return SUCCESS;
+ }
+}
+
=== added file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/GetQualityScorePaymentAction.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/GetQualityScorePaymentAction.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/GetQualityScorePaymentAction.java 2014-05-09 05:53:05 +0000
@@ -0,0 +1,66 @@
+package org.hisp.dhis.rbf.qualityscorepayment.action;
+
+import org.hisp.dhis.rbf.api.Lookup;
+import org.hisp.dhis.rbf.api.LookupService;
+import org.hisp.dhis.rbf.api.QualityScorePayment;
+import org.hisp.dhis.rbf.api.QualityScorePaymentService;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Mithilesh Kumar Thakur
+ */
+public class GetQualityScorePaymentAction implements Action
+{
+
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private QualityScorePaymentService qualityScorePaymentService;
+
+ public void setQualityScorePaymentService( QualityScorePaymentService qualityScorePaymentService )
+ {
+ this.qualityScorePaymentService = qualityScorePaymentService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input
+ // -------------------------------------------------------------------------
+
+ private Integer id;
+
+ public void setId( Integer id )
+ {
+ this.id = id;
+ }
+
+ // -------------------------------------------------------------------------
+ // Output
+ // -------------------------------------------------------------------------
+
+ private QualityScorePayment qualityscorepayment;
+
+ public QualityScorePayment getQualityscorepayment()
+ {
+ return qualityscorepayment;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute() throws Exception
+ {
+
+ qualityscorepayment = qualityScorePaymentService.getQualityScorePayment( id );
+
+ System.out.println( qualityscorepayment.getStartRange() );
+ System.out.println( qualityscorepayment.getEndRange() );
+ System.out.println( qualityscorepayment.getAddQtyPayment() );
+
+ return SUCCESS;
+ }
+
+}
+
=== added file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/GetQualityScorePaymentList.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/GetQualityScorePaymentList.java 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/GetQualityScorePaymentList.java 2014-05-09 05:53:05 +0000
@@ -0,0 +1,89 @@
+package org.hisp.dhis.rbf.qualityscorepayment.action;
+
+import static org.apache.commons.lang.StringUtils.isNotBlank;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.hisp.dhis.paging.ActionPagingSupport;
+import org.hisp.dhis.rbf.api.Lookup;
+import org.hisp.dhis.rbf.api.LookupService;
+import org.hisp.dhis.rbf.api.QualityScorePayment;
+import org.hisp.dhis.rbf.api.QualityScorePaymentService;
+
+/**
+ * @author Mithilesh Kumar Thakur
+ */
+
+public class GetQualityScorePaymentList extends ActionPagingSupport<QualityScorePayment>
+{
+
+ // -------------------------------------------------------------------------
+ // Dependency
+ // -------------------------------------------------------------------------
+
+ private QualityScorePaymentService qualityScorePaymentService;
+
+ public void setQualityScorePaymentService( QualityScorePaymentService qualityScorePaymentService )
+ {
+ this.qualityScorePaymentService = qualityScorePaymentService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input & Output
+ // -------------------------------------------------------------------------
+
+ private List<QualityScorePayment> qualityScorePayments;
+
+ public List<QualityScorePayment> getQualityScorePayments()
+ {
+ return qualityScorePayments;
+ }
+
+ private String key;
+
+ public String getKey()
+ {
+ return key;
+ }
+
+ public void setKey( String key )
+ {
+ this.key = key;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action Implementation
+ // -------------------------------------------------------------------------
+
+
+ public String execute() throws Exception
+ {
+ qualityScorePayments = new ArrayList<QualityScorePayment>( qualityScorePaymentService.getAllQualityScorePayments() );
+
+ /*
+ for( QualityScorePayment qualityScorePayment : qualityScorePayments )
+ {
+ System.out.println( qualityScorePayment );
+ }
+ */
+
+
+
+ /*
+ if ( isNotBlank( key ) )
+ {
+ qualityScorePaymentService.searchLookupByName( qualityScorePayments, key );
+ }
+
+ this.paging = createPaging( qualityScorePayments.size() );
+ qualityScorePayments = getBlockElement( qualityScorePayments, paging.getStartPos(), paging.getPageSize() );
+ */
+
+ //Collections.sort( qualityScorePayments );
+
+ return SUCCESS;
+
+ }
+}
=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-maintenance-rbf/src/main/resources/META-INF/dhis/beans.xml 2014-05-08 11:03:37 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/resources/META-INF/dhis/beans.xml 2014-05-09 05:53:05 +0000
@@ -376,6 +376,46 @@
<property name="aggregationConditionService" ref="org.hisp.dhis.caseaggregation.CaseAggregationConditionService" />
</bean>
+
+
+ <!-- Quality Score Payment -->
+
+ <bean id="org.hisp.dhis.rbf.qualityscorepayment.action.GetQualityScorePaymentList"
+ class="org.hisp.dhis.rbf.qualityscorepayment.action.GetQualityScorePaymentList"
+ scope="prototype">
+ <property name="qualityScorePaymentService" ref="org.hisp.dhis.rbf.api.QualityScorePaymentService" />
+ </bean>
+
+ <!-- Add Quality Score Payment Form -->
+ <bean id="org.hisp.dhis.rbf.qualityscorepayment.action.AddQualityScorePaymentFormAction"
+ class="org.hisp.dhis.rbf.qualityscorepayment.action.AddQualityScorePaymentFormAction"
+ scope="prototype">
+ </bean>
+
+ <!-- Add Quality Score Payment -->
+ <bean id="org.hisp.dhis.rbf.qualityscorepayment.action.AddQualityScorePaymentAction"
+ class="org.hisp.dhis.rbf.qualityscorepayment.action.AddQualityScorePaymentAction"
+ scope="prototype">
+ <property name="qualityScorePaymentService" ref="org.hisp.dhis.rbf.api.QualityScorePaymentService" />
+ </bean>
+
+ <!-- Delete Quality Score Payment -->
+ <bean id="org.hisp.dhis.rbf.qualityscorepayment.action.DeleteQualityScorePaymentAction"
+ class="org.hisp.dhis.rbf.qualityscorepayment.action.DeleteQualityScorePaymentAction"
+ scope="prototype">
+ <property name="qualityScorePaymentService" ref="org.hisp.dhis.rbf.api.QualityScorePaymentService" />
+ </bean>
+
+
+ <!-- Show Details -->
+ <bean id="org.hisp.dhis.rbf.qualityscorepayment.action.GetQualityScorePaymentAction"
+ class="org.hisp.dhis.rbf.qualityscorepayment.action.GetQualityScorePaymentAction"
+ scope="prototype">
+ <property name="qualityScorePaymentService" ref="org.hisp.dhis.rbf.api.QualityScorePaymentService" />
+ </bean>
+
+
+
<!-- Get All Lookups -->
<bean id="org.hisp.dhis.rbf.lookup.action.GetAllLookupsAction"
=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/i18n_module.properties'
--- local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/i18n_module.properties 2014-04-26 11:27:06 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/i18n_module.properties 2014-05-09 05:53:05 +0000
@@ -67,3 +67,15 @@
lookup_details = Lookup Details
confirm_delete_lookup = Are you sure you want to delete lookup?
value = Value
+
+
+quality_score_payment = Quality Score Payment
+quality_score_payment_management = Quality Score Payment Management
+confirm_delete_quality_score_payment = Are you sure you want to delete Quality Score Payment
+
+stare_range = Start Range
+end_range = End Range
+additional_quality_payment = Additional Quality Payment
+
+add_quality_score_payment_details = Add Quality Score Payment Details
+quality_score_payment_details = Quality Score Payment Details
\ No newline at end of file
=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/resources/struts.xml'
--- local/in/dhis-web-maintenance-rbf/src/main/resources/struts.xml 2014-05-08 11:03:37 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/resources/struts.xml 2014-05-09 05:53:05 +0000
@@ -279,6 +279,49 @@
<param name="onExceptionReturn">plainTextError</param>
</action>
+ <!-- Quality Score Payment -->
+
+ <!-- Get All Quality Score Payment -->
+ <action name="qualityScorePaymentList" class="org.hisp.dhis.rbf.qualityscorepayment.action.GetQualityScorePaymentList">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-rbf/qualityScorePaymentList.vm</param>
+ <param name="javascripts">javascript/qualityScorePayment.js</param>
+ <param name="menu">/dhis-web-maintenance-rbf/menu.vm</param>
+ </action>
+
+
+ <!-- Add Quality Score Payment Form -->
+ <action name="addQualityScorePaymentForm" class="org.hisp.dhis.rbf.qualityscorepayment.action.AddQualityScorePaymentFormAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-rbf/addqualityScorePaymentForm.vm</param>
+ <param name="javascripts">javascript/qualityScorePayment.js</param>
+ <param name="anyAuthorities">F_QUALITY_SCORE_PAYMENT_ADD</param>
+ </action>
+
+ <!-- Add Quality Score Payment -->
+ <action name="addQualityScorePayment" class="org.hisp.dhis.rbf.qualityscorepayment.action.AddQualityScorePaymentAction">
+ <result name="success" type="redirect">qualityScorePaymentList.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
+ <param name="anyAuthorities">F_QUALITY_SCORE_PAYMENT_ADD</param>
+ </action>
+
+ <!-- Delete Quality Score Payment -->
+ <action name="delQualityScorePayment" class="org.hisp.dhis.rbf.qualityscorepayment.action.DeleteQualityScorePaymentAction">
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_QUALITY_SCORE_PAYMENT_DELETE</param>
+ </action>
+
+ <!-- Show Details -->
+ <action name="getQualityScorePayment" class="org.hisp.dhis.rbf.qualityscorepayment.action.GetQualityScorePaymentAction">
+ <result name="success" type="velocity-json"> /dhis-web-maintenance-rbf/jsonQualityScorePaymentDetails.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
+
+
+
+
<!-- Lookup -->
<!-- Get All Lookups -->
@@ -339,6 +382,23 @@
</action>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<!-- Reports -->
<action name="PBFInvoiceReportForm" class="org.hisp.dhis.rbf.report.action.PBFInvoiceReportFormAction">
<result name="success" type="velocity">/main.vm</result>
=== added file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/addqualityScorePaymentForm.vm'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/addqualityScorePaymentForm.vm 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/addqualityScorePaymentForm.vm 2014-05-09 05:53:05 +0000
@@ -0,0 +1,60 @@
+<script type="text/javascript" src="javascript/addQualityScorePayment.js"></script>
+<script>
+
+ jQuery(document).ready( function(){
+
+ currentDiv = 'addQualityScorePaymentForm';
+ isSubmit = true;
+
+ jQuery("#addQualityScorePaymentForm").validate({
+ meta:"validate"
+ ,errorElement:"span"
+ ,submitHandler: function(form)
+ {
+ if( isSubmit )
+ {
+
+ }
+ }
+ });
+ });
+
+</script>
+
+<h3>$i18n.getString( "add_quality_score_payment_details" )</h3>
+
+<form id="addQualityScorePaymentForm" name="addQualityScorePaymentForm" action="addQualityScorePayment.action" method="post" class="inputForm">
+ <table style="width: 600px">
+ <col style="width: 400px">
+ <col>
+ <thead>
+ <tr>
+ <th colspan="2">$i18n.getString( "quality_score_payment_details" )</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><label>$i18n.getString( "stare_range" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="startRange" name="startRange" class="{validate:{required:true}}"></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "end_range" )</label></td>
+ <td><input type="text" id="endRange" name="endRange" class="{validate:{required:true}}"></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "additional_quality_payment" )</label></td>
+ <td><input type="text" id="addQualityPayment" name="addQualityPayment"></td>
+ </tr>
+
+ <tr>
+ <td colspan="3">
+ <input type="submit" value="$i18n.getString( 'save' )" style="width:120px" />
+ <input type="button" onclick="dhis2.commons.redirectCurrentPage( 'qualityScorePaymentList.action' )" value="$i18n.getString( 'cancel' )" style="width:120px" />
+ </td>
+ </tr>
+
+ </tbody>
+ </table>
+</form>
=== added file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/addQualityScorePayment.js'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/addQualityScorePayment.js 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/addQualityScorePayment.js 2014-05-09 05:53:05 +0000
@@ -0,0 +1,12 @@
+jQuery(document).ready(function() {
+ validation2('addQualityScorePaymentForm', function(form) {
+ form.submit();
+ },
+ function(){
+
+ isSubmit = true;
+
+ });
+
+
+});
=== added file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/qualityScorePayment.js'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/qualityScorePayment.js 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/qualityScorePayment.js 2014-05-09 05:53:05 +0000
@@ -0,0 +1,38 @@
+
+// ----------------------------------------------------------------------
+// Edit Quality Score Payment
+// ---------------------------- ------------------------------------------
+
+function editQualityScorePaymentForm(context)
+{
+ location.href = 'editQualityScorePaymentForm.action?scoreId=' + context.id;
+}
+
+//-----------------------------------------------------------------------------
+// Quality Score Payment details
+//-----------------------------------------------------------------------------
+
+function showQualityScorePaymentDetails(context)
+{
+
+ jQuery.getJSON('getQualityScorePayment.action', {
+ id : context.id
+ }, function(json) {
+ setInnerHTML('stateRangeField', json.qualityscorepayment.startRange);
+ setInnerHTML('endRangeField', json.qualityscorepayment.endRange);
+ setInnerHTML('additionalPaymentField', json.qualityscorepayment.addQtyPayment);
+
+ showDetails();
+ });
+}
+
+
+//-----------------------------------------------------------------------------
+// Delete Quality Score Payment
+//-----------------------------------------------------------------------------
+
+function removeQualityScorePayment(context) {
+
+ removeItem( context.id, context.name, i18n_confirm_delete,
+ 'delQualityScorePayment.action');
+}
=== added file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/jsonQualityScorePaymentDetails.vm'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/jsonQualityScorePaymentDetails.vm 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/jsonQualityScorePaymentDetails.vm 2014-05-09 05:53:05 +0000
@@ -0,0 +1,8 @@
+{ "qualityscorepayment":
+ {
+ "id": "$!{qualityscorepayment.id}",
+ "startRange": "$!{qualityscorepayment.startRange}",
+ "endRange": "$!{qualityscorepayment.endRange}",
+ "addQtyPayment": "$!{qualityscorepayment.addQtyPayment}"
+ }
+}
\ No newline at end of file
=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/menu.vm'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/menu.vm 2014-04-26 11:27:06 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/menu.vm 2014-05-09 05:53:05 +0000
@@ -12,6 +12,14 @@
<li><a href="bankDetailsManagement.action">$i18n.getString( "bank_details_management" )</a></li>
</ul>
+<h2>$i18n.getString( "quality_score_payment" )</h2>
+<ul>
+ <li><a href="qualityScorePaymentList.action">$i18n.getString( "quality_score_payment" )</a></li>
+</ul>
+
+
+
+
<h2>$i18n.getString( "aggregation_builder" )</h2>
<ul>
<li><a href="aggregationQueryList.action">$i18n.getString( "aggregation_query_list" )</a></li>
=== added file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/qualityScorePaymentList.vm'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/qualityScorePaymentList.vm 1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/qualityScorePaymentList.vm 2014-05-09 05:53:05 +0000
@@ -0,0 +1,87 @@
+#sharingDialog()
+
+<script type="text/javascript">
+ jQuery(document).ready(function(){
+ tableSorter( 'qualityScorePaymentList' );
+
+ dhis2.contextmenu.makeContextMenu({
+ menuId: 'contextMenu',
+ menuItemActiveClass: 'contextMenuItemActive'
+ });
+ });
+
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_quality_score_payment" ) , "'" )';
+</script>
+
+<h3>$i18n.getString( "quality_score_payment_management" ) #openHelp("lookup")</h3>
+
+<div id="contextMenu" class="contextMenu">
+ <ul id="contextMenuItems" class="contextMenuItems">
+ <li><a data-target-fn="editQualityScorePaymentForm"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
+ <li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i> $i18n.getString( "translation_translate" )</a></li>
+ <li><a data-target-fn="removeQualityScorePayment"><i class="fa fa-trash-o"></i> $i18n.getString( "remove" )</a></li>
+ <li><a data-target-fn="showQualityScorePaymentDetails"><i class="fa fa-info-circle"></i> $i18n.getString( "show_details" )</a></li>
+ </ul>
+</div>
+
+
+<table class="mainPageTable" >
+ <tr>
+ <td style="vertical-align:top">
+ <table width="100%">
+ <tr>
+ <!--<td>#filterDiv( "qualityScorePaymentList")</td>-->
+ <td style="text-align:right">
+ <input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='addQualityScorePaymentForm.action'" >
+ </td>
+ </tr>
+ </table>
+ <table class="listTable" id="qualityScorePaymentList" >
+ <col>
+ <thead>
+ <tr>
+ <th>$i18n.getString( "stare_range" )</th>
+ <th>$i18n.getString( "end_range" )</th>
+ <th>$i18n.getString( "additional_quality_payment" )</th>
+ </tr>
+ </thead>
+ <tbody id="list">
+ #foreach( $qualityScorePayment in $qualityScorePayments )
+ <tr id="tr${qualityScorePayment.id}"
+ data-id="$!qualityScorePayment.id"
+ data-type="qualityScorePayment"
+ data-name="$encoder.htmlEncode( $!qualityScorePayment.getStartRange() )"
+ data-can-manage="$security.canManage( $qualityScorePayment )"
+ data-can-update="$security.canUpdate( $qualityScorePayment )"
+ data-can-delete="$security.canDelete( $qualityScorePayment )">
+ <td>$encoder.htmlEncode( $!qualityScorePayment.getStartRange() )</td>
+ <td>$encoder.htmlEncode( $!qualityScorePayment.getEndRange() )</td>
+ <td>$encoder.htmlEncode( $!qualityScorePayment.getAddQtyPayment() )</td>
+ </tr>
+ #end
+ </tbody>
+ </table>
+ <p></p>
+ ##parse( "/dhis-web-commons/paging/paging.vm" )
+ </td>
+ <td id="detailsData">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
+ <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
+ </div>
+ <p><label>$i18n.getString( "stare_range" ):</label><br/><span id="stateRangeField"></span></p>
+ <p><label>$i18n.getString( "end_range" ):</label><br/><span id="endRangeField"></span></p>
+ <p><label>$i18n.getString( "additional_quality_payment" ):</label><br/><span id="additionalPaymentField"></span></p>
+
+ </div>
+
+ <div id="warningArea">
+ <div id="hideDetailsArea">
+ <a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
+ </td>
+ </tr>
+</table>
