dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #04737
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1586: Renamed headings on dataset assignment editor/multidataset
------------------------------------------------------------
revno: 1586
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-03-08 18:41:13 +0100
message:
Renamed headings on dataset assignment editor/multidataset
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/assign/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/assign/multidataset/
added:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/editor/
renamed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/assign/multidataset/SaveAssignMultiDataSetForOrgunitAction.java => dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/editor/SaveAssignMultiDataSetForOrgunitAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/assign/multidataset/ShowAssignMultiDataSetForOrgunitAction.java => dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/editor/ShowAssignMultiDataSetForOrgunitAction.java
modified:
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/compulsory/GetCompulsoryDataElementsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/menu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/editor/SaveAssignMultiDataSetForOrgunitAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/editor/ShowAssignMultiDataSetForOrgunitAction.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.
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java 2010-03-08 14:50:40 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java 2010-03-08 17:41:13 +0000
@@ -120,8 +120,6 @@
"GROUP BY sourceid ) AS completed " +
"WHERE completed.no = " + compulsoryElements;
- System.out.println( sql );
-
return statementManager.getHolder().queryForInteger( sql );
}
}
=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/assign'
=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/assign/multidataset'
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/compulsory/GetCompulsoryDataElementsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/compulsory/GetCompulsoryDataElementsAction.java 2010-02-02 13:21:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/compulsory/GetCompulsoryDataElementsAction.java 2010-03-08 17:41:13 +0000
@@ -28,6 +28,8 @@
*/
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import org.hisp.dhis.dataelement.DataElement;
@@ -52,6 +54,13 @@
{
this.dataSetService = dataSetService;
}
+
+ private Comparator<DataElement> dataElementComparator;
+
+ public void setDataElementComparator( Comparator<DataElement> dataElementComparator )
+ {
+ this.dataElementComparator = dataElementComparator;
+ }
// -------------------------------------------------------------------------
// Input
@@ -100,6 +109,9 @@
availableDataElements = new ArrayList<DataElement>( dataSet.getDataElements() );
availableDataElements.removeAll( selectedDataElements );
+ Collections.sort( availableDataElements, dataElementComparator );
+ Collections.sort( selectedDataElements, dataElementComparator );
+
return SUCCESS;
}
}
=== added directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/editor'
=== renamed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/assign/multidataset/SaveAssignMultiDataSetForOrgunitAction.java' => 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/editor/SaveAssignMultiDataSetForOrgunitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/assign/multidataset/SaveAssignMultiDataSetForOrgunitAction.java 2010-03-04 09:44:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/editor/SaveAssignMultiDataSetForOrgunitAction.java 2010-03-08 17:41:13 +0000
@@ -1,4 +1,4 @@
-package org.hisp.dhis.dataset.action.assign.multidataset;
+package org.hisp.dhis.dataset.action.editor;
/*
* Copyright (c) 2004-2007, University of Oslo
@@ -46,7 +46,6 @@
public class SaveAssignMultiDataSetForOrgunitAction
implements Action
{
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -131,5 +130,4 @@
getUnitsInTheTree( root.getChildren(), unitsInTheTree );
}
}
-
}
=== renamed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/assign/multidataset/ShowAssignMultiDataSetForOrgunitAction.java' => 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/editor/ShowAssignMultiDataSetForOrgunitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/assign/multidataset/ShowAssignMultiDataSetForOrgunitAction.java 2010-03-03 04:33:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/editor/ShowAssignMultiDataSetForOrgunitAction.java 2010-03-08 17:41:13 +0000
@@ -1,4 +1,4 @@
-package org.hisp.dhis.dataset.action.assign.multidataset;
+package org.hisp.dhis.dataset.action.editor;
/*
* Copyright (c) 2004-2007, University of Oslo
@@ -50,9 +50,6 @@
public class ShowAssignMultiDataSetForOrgunitAction
extends ActionSupport
{
- /**
- *
- */
private static final long serialVersionUID = 1L;
// -------------------------------------------------------------------------
@@ -129,10 +126,9 @@
public String execute()
{
-
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ // ---------------------------------------------------------------------
// Get list of datasets
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ // ---------------------------------------------------------------------
availableDataSets = new ArrayList<DataSet>( dataSetService.getAllDataSets() );
@@ -140,9 +136,9 @@
displayPropertyHandler.handle( availableDataSets );
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ // ---------------------------------------------------------------------
// Setup the association tree
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ // ---------------------------------------------------------------------
levels = new ArrayList<OrganisationUnitLevel>( organisationUnitService.getOrganisationUnitLevels() );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2010-03-04 09:44:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2010-03-08 17:41:13 +0000
@@ -391,8 +391,8 @@
</property>
</bean>
- <bean id="org.hisp.dhis.dataset.action.assign.multidataset.ShowAssignMultiDataSetForOrgunitAction"
- class="org.hisp.dhis.dataset.action.assign.multidataset.ShowAssignMultiDataSetForOrgunitAction"
+ <bean id="org.hisp.dhis.dataset.action.editor.ShowAssignMultiDataSetForOrgunitAction"
+ class="org.hisp.dhis.dataset.action.editor.ShowAssignMultiDataSetForOrgunitAction"
scope="prototype">
<property name="dataSetService">
<ref bean="org.hisp.dhis.dataset.DataSetService"/>
@@ -405,8 +405,8 @@
</property>
</bean>
- <bean id="org.hisp.dhis.dataset.action.assign.multidataset.SaveAssignMultiDataSetForOrgunitAction"
- class="org.hisp.dhis.dataset.action.assign.multidataset.SaveAssignMultiDataSetForOrgunitAction"
+ <bean id="org.hisp.dhis.dataset.action.editor.SaveAssignMultiDataSetForOrgunitAction"
+ class="org.hisp.dhis.dataset.action.editor.SaveAssignMultiDataSetForOrgunitAction"
scope="prototype">
<property name="dataSetService">
<ref bean="org.hisp.dhis.dataset.DataSetService"/>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2010-03-04 09:44:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2010-03-08 17:41:13 +0000
@@ -111,4 +111,5 @@
available_datasets = Available DataSets
selected_datasets = Selected DataSets
intro_assign_multidataset = Assign Multi-DataSets to organisation unit. Multi-DataSet is a collection of data sets. This page allow you to assign one or many data set(s) to one or many organisation unit(s).
-orgunit_tree = Organisation Unit Tree
\ No newline at end of file
+orgunit_tree = Organisation Unit Tree
+dataset_assignment_editor = Dataset Assignment Editor
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2010-03-04 09:44:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2010-03-08 17:41:13 +0000
@@ -317,8 +317,10 @@
<result name="success" type="redirect">dataSet.action</result>
</action>
+ <!-- Editor -->
+
<action name="showAssignMultiDataSetForOrgunitForm"
- class="org.hisp.dhis.dataset.action.assign.multidataset.ShowAssignMultiDataSetForOrgunitAction">
+ class="org.hisp.dhis.dataset.action.editor.ShowAssignMultiDataSetForOrgunitAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm</param>
<param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
@@ -326,7 +328,7 @@
</action>
<action name="saveAssignMultiDataSetForOrgunit"
- class="org.hisp.dhis.dataset.action.assign.multidataset.SaveAssignMultiDataSetForOrgunitAction">
+ class="org.hisp.dhis.dataset.action.editor.SaveAssignMultiDataSetForOrgunitAction">
<result name="success" type="redirect">index.action</result>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/menu.vm 2010-03-04 09:44:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/menu.vm 2010-03-08 17:41:13 +0000
@@ -3,5 +3,5 @@
<ul>
<li><a href="dataSet.action">$i18n.getString( "dataset" ) </a></li>
<li><a href="section.action">$i18n.getString( "dataset_section" ) </a></li>
- <li><a href="showAssignMultiDataSetForOrgunitForm.action">$i18n.getString( "assign_multidataset" ) </a></li>
+ <li><a href="showAssignMultiDataSetForOrgunitForm.action">$i18n.getString( "dataset_assignment_editor" ) </a></li>
</ul>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm 2010-03-04 09:44:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm 2010-03-08 17:41:13 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "assign_multidataset_manage" )</h3>
+<h3>$i18n.getString( "dataset_assignment_editor" )</h3>
<form id="assignMultiDataSetForm" action="saveAssignMultiDataSetForOrgunit.action" method="post" onsubmit="selectAllById('selectedDataSets')">
