dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6912
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-05-11 15:58:29 +0700
message:
  (local/vn) Sort datasets by name.
added:
  local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/dataset/DataSetNameComparator.java
modified:
  local/vn/dhis-web-dataentry-hospital/src/main/java/org/hisp/dhis/de/action/LoadDataSetsAction.java


--
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

=== added file 'local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/dataset/DataSetNameComparator.java'
--- local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/dataset/DataSetNameComparator.java	1970-01-01 00:00:00 +0000
+++ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/dataset/DataSetNameComparator.java	2012-05-11 08:58:29 +0000
@@ -0,0 +1,43 @@
+package org.hisp.dhis.dataset;
+
+/*
+ * Copyright (c) 2004-2012, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.util.Comparator;
+
+/**
+ * @author Chau Thu Tran
+ */
+public class DataSetNameComparator
+    implements Comparator<DataSet>
+{
+    @Override
+    public int compare( DataSet o0, DataSet o1 )
+    {
+        return o0.getName().compareToIgnoreCase( o1.getName() );
+    }
+}

=== modified file 'local/vn/dhis-web-dataentry-hospital/src/main/java/org/hisp/dhis/de/action/LoadDataSetsAction.java'
--- local/vn/dhis-web-dataentry-hospital/src/main/java/org/hisp/dhis/de/action/LoadDataSetsAction.java	2012-05-11 08:28:02 +0000
+++ local/vn/dhis-web-dataentry-hospital/src/main/java/org/hisp/dhis/de/action/LoadDataSetsAction.java	2012-05-11 08:58:29 +0000
@@ -27,10 +27,14 @@
 
 package org.hisp.dhis.de.action;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 
 import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.dataset.DataSetNameComparator;
 import org.hisp.dhis.dataset.DataSetService;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
@@ -76,7 +80,7 @@
     // Output
     // -------------------------------------------------------------------------
 
-    private Collection<DataSet> dataSets = new HashSet<DataSet>();
+    private List<DataSet> dataSets = new ArrayList<DataSet>();
 
     public Collection<DataSet> getDataSets()
     {
@@ -93,15 +97,18 @@
 
         sources.add( selectionManager.getSelectedOrganisationUnit() );
 
-        dataSets = dataSetService.getDataSetsBySources( sources );
+        Collection<DataSet> _dataSets = dataSetService.getDataSetsBySources( sources );
         
         Collection<UserAuthorityGroup> authorityGroups = currentUserService.getCurrentUser().getUserCredentials().getUserAuthorityGroups();
         
         for( UserAuthorityGroup UserAuthorityGroup : authorityGroups )
         {
-            dataSets.retainAll( UserAuthorityGroup.getDataSets() );
+            _dataSets.retainAll( UserAuthorityGroup.getDataSets() );
         }
 
+        dataSets.addAll( _dataSets );
+        Collections.sort( dataSets, new DataSetNameComparator() );
+        
         return SUCCESS;
     }