dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14571
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-03-31 16:28:29 +0200
message:
  Data set report, ambiguous variable naming fixed
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GetDataSetReportOptionsAction.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.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 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java	2014-03-30 04:37:39 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java	2014-03-31 14:28:29 +0000
@@ -155,10 +155,8 @@
                 attributeOptionCombo == null ? null : attributeOptionCombo.getCategoryOptions() );
     }
 
-    public DataApprovalStatus getDataApprovalStatus( DataSet dataSet, Period period,
-                                                     OrganisationUnit organisationUnit,
-                                                     CategoryOptionGroup categoryOptionGroup,
-                                                     Set<DataElementCategoryOption> dataElementCategoryOptions )
+    public DataApprovalStatus getDataApprovalStatus( DataSet dataSet, Period period, OrganisationUnit organisationUnit,
+        CategoryOptionGroup categoryOptionGroup, Set<DataElementCategoryOption> dataElementCategoryOptions )
     {
         DataApprovalSelection dataApprovalSelection = new DataApprovalSelection( dataSet, period, organisationUnit,
                 categoryOptionGroup, dataElementCategoryOptions,
@@ -168,16 +166,15 @@
         return dataApprovalSelection.getDataApprovalStatus();
     }
 
-    public DataApprovalPermissions getDataApprovalPermissions( DataSet dataSet, Period period, OrganisationUnit organisationUnit, DataElementCategoryOptionCombo attributeOptionCombo )
+    public DataApprovalPermissions getDataApprovalPermissions( DataSet dataSet, Period period, 
+        OrganisationUnit organisationUnit, DataElementCategoryOptionCombo attributeOptionCombo )
     {
         return getDataApprovalPermissions( dataSet, period, organisationUnit, null,
                 attributeOptionCombo == null ? null : attributeOptionCombo.getCategoryOptions() );
     }
 
     public DataApprovalPermissions getDataApprovalPermissions( DataSet dataSet, Period period,
-                                                     OrganisationUnit organisationUnit,
-                                                     CategoryOptionGroup categoryOptionGroup,
-                                                     Set<DataElementCategoryOption> dataElementCategoryOptions )
+        OrganisationUnit organisationUnit, CategoryOptionGroup categoryOptionGroup, Set<DataElementCategoryOption> dataElementCategoryOptions )
     {
         DataApprovalStatus status = getDataApprovalStatus( dataSet, period,
                 organisationUnit, categoryOptionGroup, dataElementCategoryOptions );

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GetDataSetReportOptionsAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GetDataSetReportOptionsAction.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GetDataSetReportOptionsAction.java	2014-03-31 14:28:29 +0000
@@ -183,11 +183,11 @@
         return categoryCombos;
     }
 
-    private List<OrganisationUnitGroupSet> groupSets;
+    private List<OrganisationUnitGroupSet> organisationUnitGroupSets;
 
-    public List<OrganisationUnitGroupSet> getGroupSets()
+    public List<OrganisationUnitGroupSet> getOrganisationUnitGroupSets()
     {
-        return groupSets;
+        return organisationUnitGroupSets;
     }
 
     // -------------------------------------------------------------------------
@@ -218,11 +218,10 @@
         defaultCategoryCombo = categoryService.getDefaultDataElementCategoryCombo();
         
         categoryCombos = new ArrayList<DataElementCategoryCombo>( categoryService.getAttributeCategoryCombos() );
-        
-        groupSets = new ArrayList<OrganisationUnitGroupSet>( organisationUnitGroupService.getAllOrganisationUnitGroupSets() );
+        organisationUnitGroupSets = new ArrayList<OrganisationUnitGroupSet>( organisationUnitGroupService.getAllOrganisationUnitGroupSets() );
 
         Collections.sort( categoryCombos, IdentifiableObjectNameComparator.INSTANCE );
-        Collections.sort( groupSets, IdentifiableObjectNameComparator.INSTANCE );
+        Collections.sort( organisationUnitGroupSets, IdentifiableObjectNameComparator.INSTANCE );
         
         return SUCCESS;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2014-03-28 01:53:11 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2014-03-31 14:28:29 +0000
@@ -141,7 +141,7 @@
 <!-- Org unit group sets -->
 
 <div id="advancedOptions" style="display:none">
-#foreach( $groupSet in $groupSets )
+#foreach( $groupSet in $organisationUnitGroupSets )
 <select class="dimension" data-uid="${groupSet.uid}" style="width:330px" class="advanced">
     <option value="">[ $i18n.getString( "select" ) $encoder.htmlEncode( $groupSet.name ) / $i18n.getString( "view_all" ) ]</option>
     #foreach( $group in $groupSet.organisationUnitGroups )