dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #34050
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17465: design changes
------------------------------------------------------------
revno: 17465
committer: itsganesh1238@xxxxxxxxx
branch nick: dhis2
timestamp: Fri 2014-11-14 15:56:48 +0530
message:
design changes
modified:
local/in/dhis-web-maintenance-rbf/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-maintenance-rbf/src/main/resources/struts.xml
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/partner.js
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/partnerForm.vm
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/welcome.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/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-maintenance-rbf/src/main/resources/META-INF/dhis/beans.xml 2014-11-14 10:23:57 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/resources/META-INF/dhis/beans.xml 2014-11-14 10:26:48 +0000
@@ -801,6 +801,13 @@
<!-- Partner Form -->
+
+ <bean id="org.hisp.dhis.rbf.partner.action.PartnerFundManagement"
+ class="org.hisp.dhis.rbf.partner.action.PartnerFundManagement"
+ scope="prototype">
+ </bean>
+
+
<bean id="org.hisp.dhis.rbf.partner.action.PartnerFormAction"
class="org.hisp.dhis.rbf.partner.action.PartnerFormAction"
scope="prototype">
=== 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-11-12 09:32:10 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/resources/struts.xml 2014-11-14 10:26:48 +0000
@@ -650,8 +650,13 @@
<!-- PBF Reports -->
<action name="partnerForm" class="org.hisp.dhis.rbf.partner.action.PartnerFormAction">
- <result name="success" type="velocity">/main.vm</result>
+ <result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-maintenance-rbf/partnerForm.vm</param>
+ </action>
+
+ <action name="partnerFundManagementForm" class="org.hisp.dhis.rbf.partner.action.PartnerFundManagement">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-rbf/partnerFundManagement.vm</param>
<param name="javascripts">javascript/partner.js</param>
<param name="menu">/dhis-web-maintenance-rbf/menu.vm</param>
<param name="requiredAuthorities">F_PBF_PARTNER</param>
@@ -673,14 +678,5 @@
</action>
-
-
-
-
-
-
-
-
-
</package>
</struts>
\ No newline at end of file
=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/partner.js'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/partner.js 2014-10-24 11:05:35 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/partner.js 2014-11-14 10:26:48 +0000
@@ -42,8 +42,8 @@
var dataElementId = document.getElementById("dataElementId");
clearList( dataElementId );
- var periodId = document.getElementById("periodId");
- clearList( periodId );
+ //var periodId = document.getElementById("periodId");
+ //clearList( periodId );
var dataElementList = data.getElementsByTagName("dataelement");
@@ -61,7 +61,7 @@
dataElementId.add(option, null);
}
- var periodList = data.getElementsByTagName("period");
+ /*var periodList = data.getElementsByTagName("period");
periodId.options[0] = new Option( "Select", "-1" , false, false);
@@ -75,7 +75,7 @@
option.text = name;
option.title = name;
periodId.add(option, null);
- }
+ } */
}
=== 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-10-29 08:07:54 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/menu.vm 2014-11-14 10:26:48 +0000
@@ -1,8 +1,6 @@
-
<h2>$i18n.getString( "pbf_setup" )</h2>
+
<ul>
-
-
#if( $auth.hasAccess( "dhis-web-maintenance-rbf", "pbfDataEntry") )
<li><a href="pbfDataEntry.action">$i18n.getString( "pbf_dataentry" )</a></li>
@@ -21,7 +19,7 @@
#end
#if( $auth.hasAccess( "dhis-web-maintenance-rbf", "partnerForm") )
- <li><a href="partnerForm.action">$i18n.getString( "partner_management" )</a></li>
+ <li><a href="partnerFundManagementForm.action">$i18n.getString( "partner_management" )</a></li>
#end
#if( $auth.hasAccess( "dhis-web-maintenance-rbf", "bankDetailsManagement") )
=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerForm.vm'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerForm.vm 2014-10-24 11:05:35 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerForm.vm 2014-11-14 10:26:48 +0000
@@ -1,95 +1,113 @@
<script type="text/javascript">
-function formValidations()
-{
- //alert("validation");
-
- /*
- var startPeriodList = document.getElementById("dataSetId");
- var startPeriodIndex = startPeriodList.selectedIndex;
-
- if( startPeriodList.options[startPeriodIndex].value == null || startPeriodList.options[startPeriodIndex].value== "-1" )
- {
- showWarningMessage( "Please Select Period" );
- //alert("Please Select Period");
- return false;
+ function formValidations()
+ {
+ //alert("validation");
+
+ /*
+ var startPeriodList = document.getElementById("dataSetId");
+ var startPeriodIndex = startPeriodList.selectedIndex;
+
+ if( startPeriodList.options[startPeriodIndex].value == null || startPeriodList.options[startPeriodIndex].value== "-1" )
+ {
+ showWarningMessage( "Please Select Period" );
+ //alert("Please Select Period");
+ return false;
+ }
+ */
+
+ var dataSetId = $( '#dataSetId' ).val();
+ var optionSetId = $( '#optionSetId' ).val();
+ var dataElementId = $( '#dataElementId' ).val();
+// var periodId = $( '#periodId' ).val();
+
+ if ( dataSetId == "-1" )
+ {
+ showWarningMessage( "Please Select DataSet" );
+
+ return false;
+ }
+
+ else if( optionSetId == "-1" )
+ {
+ showWarningMessage( "Please Select Partner" );
+ return false;
+ }
+
+ else if( dataElementId == "-1" )
+ {
+ showWarningMessage( "Please Select DataElement" );
+ return false;
+ }
+ else if( $("#startDate").val() == "" )
+ {
+ showWarningMessage( "Please Select Start Date" );
+ return false;
+ }
+ else if( $("#endDate").val() == "" )
+ {
+ showWarningMessage( "Please Select End Date" );
+ return false;
+ }
+
+
+ /* else if( periodId == "-1" )
+ {
+ showWarningMessage( "Please Select Period" );
+ return false;
+ }
+ */
+ return true;
}
- */
-
- var dataSetId = $( '#dataSetId' ).val();
- var optionSetId = $( '#optionSetId' ).val();
- var dataElementId = $( '#dataElementId' ).val();
- var periodId = $( '#periodId' ).val();
-
- if ( dataSetId == "-1" )
- {
- showWarningMessage( "Please Select DataSet" );
-
- return false;
- }
-
- else if( optionSetId == "-1" )
- {
- showWarningMessage( "Please Select Partner" );
- return false;
- }
-
- else if( dataElementId == "-1" )
- {
- showWarningMessage( "Please Select DataElement" );
- return false;
- }
-
- else if( periodId == "-1" )
- {
- showWarningMessage( "Please Select Period" );
- return false;
- }
- return true;
-}
</script>
+
<h3>$i18n.getString( "partner_management" )</h3>
<form id="partnerForm" name="partnerForm" action="partnerFormResult.action" method="post" onsubmit="return formValidations()" >
-
-<table>
- <tr>
- <td><label for="dataSetId">$i18n.getString( "dataSet" )</label></td>
- <td><select id="dataSetId" name="dataSetId" style="width:220px" onchange="loadDataElementAndPeriod()" >
- <option value="-1">[$i18n.getString( "select" )]</option>
- #foreach( $dataSet in $dataSets )
- <option value="$dataSet.id">$encoder.htmlEncode( $dataSet.name )</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr>
- <td><label for="partner">$i18n.getString( "partner" )</label></td>
- <td><select id="optionSetId" name="optionSetId" style="width:220px" >
- <option value="-1">[$i18n.getString( "select" )]</option>
- #foreach( $option in $options )
- <option value="$option.id">$encoder.htmlEncode( $option.name )</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "dataElement" )</label></td>
- <td>
- <select id="dataElementId" name = "dataElementId" style="width:220px" >
- <option value="-1">[$i18n.getString( "select" )]</option>
- </select>
- </td>
- </tr>
-
+
+ <table>
+ <tr>
+ <td><label for="dataSetId">$i18n.getString( "dataSet" )</label></td>
+ <td>
+ <!-- <select id="dataSetId" name="dataSetId" style="width:220px" onchange="loadDataElementAndPeriod()" >
+ <option value="-1">[$i18n.getString( "select" )]</option>
+ #foreach( $dataSet in $dataSets )
+ <option value="$dataSet.id">$encoder.htmlEncode( $dataSet.name )</option>
+ #end
+ </select> -->
+ <input type="text" name="dataset" value="$dataSetName" readonly>
+ </td>
+ </tr>
+
+ <tr>
+ <td><label for="partner">$i18n.getString( "partner" )</label></td>
+ <td>
+ <!-- <select id="optionSetId" name="optionSetId" style="width:220px" >
+ <option value="-1">[$i18n.getString( "select" )]</option>
+ #foreach( $option in $options )
+ <option value="$option.id">$encoder.htmlEncode( $option.name )</option>
+ #end
+ </select> -->
+ <input type="text" name="partner" value="$partenrName" readonly>
+ </td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "dataElement" )</label></td>
+ <td>
+ <!-- <select id="dataElementId" name = "dataElementId" style="width:220px" >
+ <option value="-1">[$i18n.getString( "select" )]</option>
+ </select> -->
+ <input type="text" name="dataElement" value="$dataElementName" readonly>
+ </td>
+ </tr>
+ <!--
<tr>
<td><label>$i18n.getString( "period" )</label></td>
<td>
@@ -97,25 +115,41 @@
<option value="-1">[$i18n.getString( "select" )]</option>
</select>
</td>
- </tr>
-
-
-</table>
-
-
-
-
-<table id="selectionTable">
- <tr>
- <td>
- #organisationUnitSelectionTree( false, true, false )
- </td>
- </tr>
- <tr>
- <td>
- <input type="submit" id="saveButton" value="$i18n.getString( 'save' )" style="width:10em"/>
- </td>
- </tr>
-</table>
+ </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%;" name = "startDate" />
+ <script type="text/javascript">
+ datePicker( 'startDate' );
+ </script>
+ </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%;" name = "endDate" />
+ <script type="text/javascript">
+ datePicker( 'endDate' );
+ </script>
+ </td>
+ </tr>
+
+
+ </table>
+
+
+ <table id="selectionTable">
+ <tr>
+ <td>
+ #organisationUnitSelectionTree( false, true, false )
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <input type="submit" id="saveButton" value="$i18n.getString( 'save' )" style="width:10em"/>
+ </td>
+ </tr>
+ </table>
</form>
=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/welcome.vm'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/welcome.vm 2014-04-26 11:27:06 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/welcome.vm 2014-11-14 10:26:48 +0000
@@ -1,2 +1,57 @@
-<h3>$i18n.getString( "pbf_management" )</3>
+<h3>$i18n.getString( "pbf_management" )</h3>
+
+<ul class="introList">
+ <!-- action name, Text Title, image id -->
+
+ #if( $auth.hasAccess( "dhis-web-maintenance-rbf", "pbfDataEntry") )
+ #introListImgItem( "pbfDataEntry.action" "pbf_dataentry" "dataelement" )
+ #end
+
+ #if( $auth.hasAccess( "dhis-web-maintenance-rbf", "qualityScoreDataEntry") )
+ #introListImgItem( "qualityScoreDataEntry.action" "quality_score_entry" "dataelement" )
+ #end
+
+ #if( $auth.hasAccess( "dhis-web-maintenance-rbf", "qualityMaxDataEntry") )
+ #introListImgItem( "qualityMaxDataEntry.action" "quality_max_entry" "dataelement" )
+ #end
+
+ #if( $auth.hasAccess( "dhis-web-maintenance-rbf", "dataElementTariffManagement") )
+ #introListImgItem( "dataElementTariffManagement.action" "dataelement_tariff_target_management" "groupset" )
+ #end
+
+ #if( $auth.hasAccess( "dhis-web-maintenance-rbf", "partnerForm") )
+ #introListImgItem( "partnerForm.action" "partner_management" "category" )
+ #end
+
+ #if( $auth.hasAccess( "dhis-web-maintenance-rbf", "bankDetailsManagement") )
+ #introListImgItem( "bankDetailsManagement.action" "bank_details_management" "category" )
+ #end
+
+ #if( $auth.hasAccess( "dhis-web-maintenance-rbf", "utilizationRuleManagement") )
+ #introListImgItem( "utilizationRuleManagement.action" "utilization_rule_management" "category" )
+ #end
+
+ #if( $auth.hasAccess( "dhis-web-maintenance-rbf", "qualityScorePaymentList") )
+ #introListImgItem( "qualityScorePaymentList.action" "quality_score_payment" "category" )
+ #end
+
+ #if( $auth.hasAccess( "dhis-web-maintenance-rbf", "aggregationQueryList") )
+ #introListImgItem( "aggregationQueryList.action" "aggregation_query_list" "sqlview" )
+ #introListImgItem( "runAggregationQueryForm.action" "manual_aggregation" "scheduling" )
+ #end
+
+ #if( $auth.hasAccess( "dhis-web-maintenance-rbf", "reportManagement") )
+ #introListImgItem( "reportManagement.action" "Report Management" "indicator" )
+ #introListImgItem( "pbfReportForm.action" "pbf_report" "reporttable" )
+ #end
+
+ #if( $auth.hasAccess( "dhis-web-maintenance-rbf", "getAllLookups") )
+ #introListImgItem( "getAllLookups.action" "Lookup" "search" )
+ #end
+ #if( $auth.hasAccess( "dhis-web-maintenance-rbf", "getPaymentAdjustmentDetail") )
+ #introListImgItem( "getPaymentAdjustmentDetail.action" "payment_adjustment" "sqlview" )
+ #end
+
+
+</ul>
\ No newline at end of file
