dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14618
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-04-02 18:07:27 +0200
message:
  Unused code
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js


--
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 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm	2014-04-02 15:49:34 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm	2014-04-02 16:07:27 +0000
@@ -81,11 +81,6 @@
 <!-- Organisation unit -->
 
 <div class="inputSection">
-<label>$i18n.getString( "use_data_for_selected_unit_only" )</label>
-<input type="checkbox" id="selectedUnitOnly" name="selectedUnitOnly" value="true">
-</div>
-
-<div class="inputSection">
 <label>$i18n.getString( "report_organisation_unit" )</label><br>
 <div id="selectionTree" style="width:328px; height:200px; overflow:auto; border:1px solid #ccc; margin-bottom: 8px;"></div>
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js	2014-04-02 15:49:34 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js	2014-04-02 16:07:27 +0000
@@ -19,7 +19,6 @@
 	
     var dataSetReport = {
         ds: ds,
-        cc: dhis2.dsr.metaData.dataSets[ds].categoryCombo,
         periodType: $( "#periodType" ).val(),
         pe: $( "#periodId" ).val(),
         ou: selectionTreeSelection.getSelectedUid()[0],
@@ -300,17 +299,6 @@
         "&pe=" + dataSetReport.pe +
         "&ou=" + dataSetReport.ou;
 
-    if ( dataSetReport.cc && dataSetReport.cp && dataSetReport.cp.length > 0 ) {
-        url += "&cc=" + dataSetReport.cc;
-        url += "&cp=";
-
-        $.each( dataSetReport.cp, function( idx, item ) {
-            url += item + ";";
-        } );
-
-        url = url.slice( 0, -1 );
-    }
-
     return url;
 }
 
@@ -324,17 +312,6 @@
         "&pe=" + dataSetReport.pe +
         "&ou=" + dataSetReport.ou;
 
-    if ( dataSetReport.cc && dataSetReport.cp && dataSetReport.cp.length > 0 ) {
-        url += "&cc=" + dataSetReport.cc;
-        url += "&cp=";
-
-        $.each( dataSetReport.cp, function( idx, item ) {
-            url += item + ";";
-        } );
-
-        url = url.slice( 0, -1 );
-    }
-
     return url;
 }