dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17475
committer: itsganesh1238@xxxxxxxxx
branch nick: dhis2
timestamp: Sat 2014-11-15 11:07:54 +0530
message:
  partner page updation
modified:
  local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/PartnerFormAction.java
  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/partnerFundManagement.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/partner/action/PartnerFormAction.java'
--- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/PartnerFormAction.java	2014-11-05 06:31:00 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/PartnerFormAction.java	2014-11-15 05:37:54 +0000
@@ -37,16 +37,37 @@
     // -------------------------------------------------------------------------
     // Input & Output
     // -------------------------------------------------------------------------
- 
+
+    private Integer dataSetId;
+
+    public void setDataSetId( Integer dataSetId )
+    {
+        this.dataSetId = dataSetId;
+    }
+
+    private Integer optionSetId;
+
+    public void setOptionSetId( Integer optionSetId )
+    {
+        this.optionSetId = optionSetId;
+    }
+
+    private Integer dataElementId;
+
+    public void setDataElementId( Integer dataElementId )
+    {
+        this.dataElementId = dataElementId;
+    }
+
     private List<DataSet> dataSets = new ArrayList<DataSet>();
 
     public List<DataSet> getDataSets()
     {
         return dataSets;
     }
-    
+
     private List<Option> options = new ArrayList<Option>();
-    
+
     public List<Option> getOptions()
     {
         return options;

=== 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-11-14 10:26:48 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerForm.vm	2014-11-15 05:37:54 +0000
@@ -81,7 +81,7 @@
                     <option value="$dataSet.id">$encoder.htmlEncode( $dataSet.name )</option>
                 #end
             </select> -->
-            <input type="text" name="dataset" value="$dataSetName" readonly>
+            <input type="text" id="dataSetId" name="dataSetId" value="$dataSetName" readonly>
             </td>
         </tr>
 
@@ -94,7 +94,7 @@
                     <option value="$option.id">$encoder.htmlEncode( $option.name )</option>
                 #end
             </select> -->
-                <input type="text" name="partner" value="$partenrName" readonly>
+                <input type="text" id="optionSetId" name="optionSetId" value="$partnerName" readonly>
             </td>
         </tr>
 
@@ -104,7 +104,7 @@
               <!--  <select id="dataElementId" name = "dataElementId" style="width:220px" >
                     <option value="-1">[$i18n.getString( "select" )]</option>
                 </select> -->
-                <input type="text" name="dataElement" value="$dataElementName" readonly>
+                <input type="text"  id="dataElementId" name="dataElementId" value="$dataElementName" readonly>
             </td>
         </tr>
         <!--
@@ -135,10 +135,8 @@
             </td>
         </tr>
 
-
     </table>
 
-
     <table id="selectionTable">
         <tr>
             <td>

=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerFundManagement.vm'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerFundManagement.vm	2014-11-14 10:31:06 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerFundManagement.vm	2014-11-15 05:37:54 +0000
@@ -9,24 +9,28 @@
     {
         jQuery('#addPeriod').dialog('destroy').remove();
 
-        var dataSetId = document.getElementById('dataSetId');
+		var dataSetId = $( "#dataSetId" ).val();
+       	var partnerId = $( "#optionSetId" ).val();
+ 		var dataElementId = $( "#dataElementId" ).val();
+ 		
+       /* var dataSetId = document.getElementById('dataSetId');
         var dataSetName =  dataSetId.options[ dataSetId.selectedIndex ].text;
 
         var partnerId = document.getElementById('optionSetId');
         var partnerName =  partnerId.options[ partnerId.selectedIndex ].text;
 
         var dataElementId = document.getElementById('dataElementId');
-        var dataElementName = dataElementId.options[ dataElementId.selectedIndex ].text;
-
-
-        jQuery('<div id="addPeriod">' ).load( 'partnerForm.action').dialog({
+        var dataElementName = dataElementId.options[ dataElementId.selectedIndex ].text;*/
+
+
+        jQuery('<div id="addPeriod">' ).load( 'partnerForm.action?dataSetId='+ dataSetId + "&partnerId=" + partnerId + "&dataElementId=" + dataElementId).dialog({
             title: 'Add New Period',
             maximize: true,
             closable: true,
             modal:true,
             overlay:{background:'#000000', opacity:0.1},
             width: 600,
-            height: 450
+            height: 600
         });
 
         //validateAddTariff();