dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #00885
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 267: dhis-web-maintenance-dataset: resolved blueprint dataset-assign-orgunit-children
------------------------------------------------------------
revno: 267
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Thu 2009-04-30 17:36:22 +0200
message:
dhis-web-maintenance-dataset: resolved blueprint dataset-assign-orgunit-children
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/GetNumberOfLevelsAction.java
added:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/SelectOrganisationUnitGroupAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UnselectOrganisationUnitGroupAction.java
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/GetDataSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/SelectLevelAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/SetupAssociationsTreeAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UnselectLevelAction.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/xwork.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/associations.js
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/GetDataSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/GetDataSetAction.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/GetDataSetAction.java 2009-04-30 15:36:22 +0000
@@ -39,6 +39,11 @@
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
+import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
import com.opensymphony.xwork.Action;
@@ -49,16 +54,6 @@
public class GetDataSetAction
implements Action
{
- private int dataSetId;
-
- private DataSet dataSet;
-
- private List<DataElement> dataSetDataElements;
-
- private DataEntryForm dataEntryForm;
-
- private DataElementCategoryCombo categoryCombo;
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -91,9 +86,25 @@
this.dataEntryFormService = dataEntryFormService;
}
- // -------------------------------------------------------------------------
- // Getters & Setters
- // -------------------------------------------------------------------------
+ private OrganisationUnitService organisationUnitService;
+
+ public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+ {
+ this.organisationUnitService = organisationUnitService;
+ }
+
+ private OrganisationUnitGroupService organisationUnitGroupService;
+
+ public void setOrganisationUnitGroupService( OrganisationUnitGroupService organisationUnitGroupService )
+ {
+ this.organisationUnitGroupService = organisationUnitGroupService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input & output
+ // -------------------------------------------------------------------------
+
+ private int dataSetId;
public int getDataSetId()
{
@@ -105,26 +116,72 @@
this.dataSetId = dataSetId;
}
+ private DataSet dataSet;
+
public DataSet getDataSet()
{
return dataSet;
}
+ private List<DataElement> dataSetDataElements;
+
public List<DataElement> getDataSetDataElements()
{
return dataSetDataElements;
}
+ private DataEntryForm dataEntryForm;
+
public DataEntryForm getDataEntryForm()
{
return dataEntryForm;
}
+ private DataElementCategoryCombo categoryCombo;
+
public DataElementCategoryCombo getCategoryCombo()
{
return categoryCombo;
}
+ private List<OrganisationUnitLevel> levels;
+
+ public List<OrganisationUnitLevel> getLevels()
+ {
+ return levels;
+ }
+
+ private List<OrganisationUnitGroup> groups;
+
+ public List<OrganisationUnitGroup> getGroups()
+ {
+ return groups;
+ }
+
+ private Integer level;
+
+ public Integer getLevel()
+ {
+ return level;
+ }
+
+ public void setLevel( Integer level )
+ {
+ this.level = level;
+ }
+
+ private Integer organisationUnitGroupId;
+
+ public Integer getOrganisationUnitGroupId()
+ {
+ return organisationUnitGroupId;
+ }
+
+ public void setOrganisationUnitGroupId( Integer organisationUnitGroupId )
+ {
+ this.organisationUnitGroupId = organisationUnitGroupId;
+ }
+
// -------------------------------------------------------------------------
// Action
// -------------------------------------------------------------------------
@@ -142,6 +199,12 @@
dataEntryForm = dataEntryFormService.getDataEntryFormByDataSet( dataSet );
+ levels = organisationUnitService.getOrganisationUnitLevels();
+
+ groups = new ArrayList<OrganisationUnitGroup>( organisationUnitGroupService.getAllOrganisationUnitGroups() );
+
+ Collections.sort( groups, new OrganisationUnitGroupNameComparator() );
+
return SUCCESS;
}
}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/GetNumberOfLevelsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/GetNumberOfLevelsAction.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/GetNumberOfLevelsAction.java 1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-package org.hisp.dhis.dataset.action;
-
-/*
- * Copyright (c) 2004-2007, 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.List;
-
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-
-import com.opensymphony.xwork.ActionSupport;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class GetNumberOfLevelsAction
- extends ActionSupport
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private OrganisationUnitService organisationUnitService;
-
- public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
- {
- this.organisationUnitService = organisationUnitService;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private List<OrganisationUnitLevel> levels;
-
- public List<OrganisationUnitLevel> getLevels()
- {
- return levels;
- }
-
- // -------------------------------------------------------------------------
- // ActionSupport implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- levels = organisationUnitService.getOrganisationUnitLevels();
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/SelectLevelAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/SelectLevelAction.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/SelectLevelAction.java 2009-04-30 15:36:22 +0000
@@ -60,23 +60,17 @@
private Integer level;
+ public Integer getLevel()
+ {
+ return level;
+ }
+
public void setLevel( Integer level )
{
this.level = level;
}
// -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private Integer selectLevel;
-
- public Integer getSelectLevel()
- {
- return selectLevel;
- }
-
- // -------------------------------------------------------------------------
// Action
// -------------------------------------------------------------------------
@@ -94,8 +88,6 @@
selectionTreeManager.setSelectedOrganisationUnits( selectedUnits );
- selectLevel = level;
-
return SUCCESS;
}
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/SelectOrganisationUnitGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/SelectOrganisationUnitGroupAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/SelectOrganisationUnitGroupAction.java 2009-04-30 15:36:22 +0000
@@ -0,0 +1,99 @@
+package org.hisp.dhis.dataset.action;
+
+/*
+ * Copyright (c) 2004-2007, 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.Collection;
+
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
+import org.hisp.dhis.oust.manager.SelectionTreeManager;
+
+import com.opensymphony.xwork.Action;
+
+/**
+ * @author Lars Helge Overland
+ * @version $Id$
+ */
+public class SelectOrganisationUnitGroupAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private SelectionTreeManager selectionTreeManager;
+
+ public void setSelectionTreeManager( SelectionTreeManager selectionTreeManager )
+ {
+ this.selectionTreeManager = selectionTreeManager;
+ }
+
+ private OrganisationUnitGroupService organisationUnitGroupService;
+
+ public void setOrganisationUnitGroupService( OrganisationUnitGroupService organisationUnitGroupService )
+ {
+ this.organisationUnitGroupService = organisationUnitGroupService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input & output
+ // -------------------------------------------------------------------------
+
+ private Integer organisationUnitGroupId;
+
+ public Integer getOrganisationUnitGroupId()
+ {
+ return organisationUnitGroupId;
+ }
+
+ public void setOrganisationUnitGroupId( Integer organisationUnitGroupId )
+ {
+ this.organisationUnitGroupId = organisationUnitGroupId;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ {
+ OrganisationUnitGroup group = organisationUnitGroupService.getOrganisationUnitGroup( organisationUnitGroupId );
+
+ if ( group != null )
+ {
+ Collection<OrganisationUnit> units = selectionTreeManager.getSelectedOrganisationUnits();
+
+ units.addAll( group.getMembers() );
+
+ selectionTreeManager.setSelectedOrganisationUnits( units );
+ }
+
+ return SUCCESS;
+ }
+}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/SetupAssociationsTreeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/SetupAssociationsTreeAction.java 2009-03-11 11:21:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/SetupAssociationsTreeAction.java 2009-04-30 15:36:22 +0000
@@ -46,10 +46,6 @@
public class SetupAssociationsTreeAction
implements Action
{
- private int dataSetId;
-
- private DataSet dataSet;
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -67,26 +63,30 @@
{
this.dataSetService = dataSetService;
}
-
+
// -------------------------------------------------------------------------
// Getters & Setters
// -------------------------------------------------------------------------
+
+ private int dataSetId;
+
+ public int getDataSetId()
+ {
+ return dataSetId;
+ }
public void setDataSetId( int dataSetId )
{
this.dataSetId = dataSetId;
}
-
- public int getDataSetId()
- {
- return dataSetId;
- }
-
+
+ private DataSet dataSet;
+
public DataSet getDataSet()
{
return dataSet;
}
-
+
// -------------------------------------------------------------------------
// Execute
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UnselectLevelAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UnselectLevelAction.java 2009-03-11 11:21:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UnselectLevelAction.java 2009-04-30 15:36:22 +0000
@@ -60,23 +60,17 @@
private Integer level;
+ public Integer getLevel()
+ {
+ return level;
+ }
+
public void setLevel( Integer level )
{
this.level = level;
}
// -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private Integer selectLevel;
-
- public Integer getSelectLevel()
- {
- return selectLevel;
- }
-
- // -------------------------------------------------------------------------
// Action
// -------------------------------------------------------------------------
@@ -94,8 +88,6 @@
selectionTreeManager.setSelectedOrganisationUnits( selectedUnits );
- selectLevel = level;
-
return SUCCESS;
}
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UnselectOrganisationUnitGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UnselectOrganisationUnitGroupAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UnselectOrganisationUnitGroupAction.java 2009-04-30 15:36:22 +0000
@@ -0,0 +1,99 @@
+package org.hisp.dhis.dataset.action;
+
+/*
+ * Copyright (c) 2004-2007, 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.Collection;
+
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
+import org.hisp.dhis.oust.manager.SelectionTreeManager;
+
+import com.opensymphony.xwork.Action;
+
+/**
+ * @author Lars Helge Overland
+ * @version $Id$
+ */
+public class UnselectOrganisationUnitGroupAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private SelectionTreeManager selectionTreeManager;
+
+ public void setSelectionTreeManager( SelectionTreeManager selectionTreeManager )
+ {
+ this.selectionTreeManager = selectionTreeManager;
+ }
+
+ private OrganisationUnitGroupService organisationUnitGroupService;
+
+ public void setOrganisationUnitGroupService( OrganisationUnitGroupService organisationUnitGroupService )
+ {
+ this.organisationUnitGroupService = organisationUnitGroupService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input & output
+ // -------------------------------------------------------------------------
+
+ private Integer organisationUnitGroupId;
+
+ public Integer getOrganisationUnitGroupId()
+ {
+ return organisationUnitGroupId;
+ }
+
+ public void setOrganisationUnitGroupId( Integer organisationUnitGroupId )
+ {
+ this.organisationUnitGroupId = organisationUnitGroupId;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ {
+ OrganisationUnitGroup group = organisationUnitGroupService.getOrganisationUnitGroup( organisationUnitGroupId );
+
+ if ( group != null )
+ {
+ Collection<OrganisationUnit> units = selectionTreeManager.getSelectedOrganisationUnits();
+
+ units.removeAll( group.getMembers() );
+
+ selectionTreeManager.setSelectedOrganisationUnits( units );
+ }
+
+ return SUCCESS;
+ }
+}
=== 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 2009-03-11 11:21:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2009-04-30 15:36:22 +0000
@@ -128,6 +128,28 @@
</property>
</bean>
+ <bean id="org.hisp.dhis.dataset.action.SelectOrganisationUnitGroupAction"
+ class="org.hisp.dhis.dataset.action.SelectOrganisationUnitGroupAction"
+ scope="prototype">
+ <property name="selectionTreeManager">
+ <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager"/>
+ </property>
+ <property name="organisationUnitGroupService">
+ <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.UnselectOrganisationUnitGroupAction"
+ class="org.hisp.dhis.dataset.action.UnselectOrganisationUnitGroupAction"
+ scope="prototype">
+ <property name="selectionTreeManager">
+ <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager"/>
+ </property>
+ <property name="organisationUnitGroupService">
+ <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
+ </property>
+ </bean>
+
<!-- Validation -->
<bean id="org.hisp.dhis.dataset.action.ValidateDataSetAction"
@@ -234,6 +256,12 @@
<property name="dataEntryFormService">
<ref bean="org.hisp.dhis.dataset.DataEntryFormService"/>
</property>
+ <property name="organisationUnitService">
+ <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ </property>
+ <property name="organisationUnitGroupService">
+ <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
+ </property>
</bean>
<bean id="org.hisp.dhis.dataset.action.DelDataSetAction"
=== 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 2009-03-23 19:20:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2009-04-30 15:36:22 +0000
@@ -83,3 +83,6 @@
cancel = Cancel
design_data_entry_form = Design data entry form
view_section_management = View section management
+select_all_in_group = Select all in group
+unselect_all_in_group = Unselect all in group
+unselect_all = Unselect all
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/xwork.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/xwork.xml 2009-03-07 13:10:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/xwork.xml 2009-04-30 15:36:22 +0000
@@ -16,7 +16,7 @@
</action>
<!-- Section -->
-
+
<action name="section" class="org.hisp.dhis.dataset.action.section.SectionListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-dataset/sectionList.vm</param>
@@ -207,17 +207,8 @@
<!-- DataSet association -->
<action name="defineDataSetAssociationsForm"
- class="org.hisp.dhis.dataset.action.GetNumberOfLevelsAction">
- <result name="success" type="chain">defineDataSetAssociationsFormChain</result>
- <param name="requiredAuthorities">F_DATASET_UPDATE</param>
- </action>
-
- <action name="defineDataSetAssociationsFormChain"
class="org.hisp.dhis.dataset.action.SetupAssociationsTreeAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/dataSetAssociations.vm</param>
- <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/dataElementsList.js,javascript/associations.js</param>
- <interceptor-ref name="transactionStack"/>
+ <result name="success" type="chain">getDataSetAssociationOptions</result>
<param name="requiredAuthorities">F_DATASET_UPDATE</param>
</action>
@@ -230,29 +221,35 @@
<action name="selectLevel"
class="org.hisp.dhis.dataset.action.SelectLevelAction">
- <result name="success" type="chain">getNumberOfLevelsSelectLevelChain</result>
+ <result name="success" type="chain">getDataSetAssociationOptions</result>
<param name="requiredAuthorities">F_DATASET_UPDATE</param>
</action>
<action name="unselectLevel"
class="org.hisp.dhis.dataset.action.UnselectLevelAction">
- <result name="success" type="chain">getNumberOfLevelsSelectLevelChain</result>
+ <result name="success" type="chain">getDataSetAssociationOptions</result>
<param name="requiredAuthorities">F_DATASET_UPDATE</param>
</action>
<action name="unselectAll"
class="org.hisp.dhis.dataset.action.UnselectAllAction">
- <result name="success" type="chain">getNumberOfLevelsSelectLevelChain</result>
- <param name="requiredAuthorities">F_DATASET_UPDATE</param>
- </action>
-
- <action name="getNumberOfLevelsSelectLevelChain"
- class="org.hisp.dhis.dataset.action.GetNumberOfLevelsAction">
- <result name="success" type="chain">getDataSetSelectLevelChain</result>
- <param name="requiredAuthorities">F_DATASET_UPDATE</param>
- </action>
-
- <action name="getDataSetSelectLevelChain"
+ <result name="success" type="chain">getDataSetAssociationOptions</result>
+ <param name="requiredAuthorities">F_DATASET_UPDATE</param>
+ </action>
+
+ <action name="selectOrganisationUnitGroup"
+ class="org.hisp.dhis.dataset.action.SelectOrganisationUnitGroupAction">
+ <result name="success" type="chain">getDataSetAssociationOptions</result>
+ <param name="requiredAuthorities">F_DATASET_UPDATE</param>
+ </action>
+
+ <action name="unselectOrganisationUnitGroup"
+ class="org.hisp.dhis.dataset.action.UnselectOrganisationUnitGroupAction">
+ <result name="success" type="chain">getDataSetAssociationOptions</result>
+ <param name="requiredAuthorities">F_DATASET_UPDATE</param>
+ </action>
+
+ <action name="getDataSetAssociationOptions"
class="org.hisp.dhis.dataset.action.GetDataSetAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-dataset/dataSetAssociations.vm</param>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm 2009-04-30 15:36:22 +0000
@@ -10,16 +10,27 @@
<table id="selectionTable">
<tr>
<td>
- <input type="button" value="$i18n.getString( "remove_all" )" onclick="window.location.href='unselectAll.action?dataSetId=$dataSetId'" style="width:12em">
- <input type="button" value="$i18n.getString( "select_all_at_level" )" onclick="selectAllAtLevel( $dataSetId )" style="width:12em">
+ <input type="button" value="$i18n.getString( "select_all_at_level" )" onclick="selectAllAtLevel( $dataSetId )" style="width:12em">
<select id="levelList" name="levelList" style="width:12em">
- #foreach( $level in $levels )
- <option value="$level.level" #if ( $selectLevel == $level.level )selected="selcted"#end>$encoder.htmlEncode( $level.name )</option>
+ #foreach( $lev in $levels )
+ <option value="$lev.level" #if ( $level == $lev.level )selected="selected"#end>$encoder.htmlEncode( $lev.name )</option>
#end
</select>
<input type="button" value="$i18n.getString( "unselect_all_at_level" )" onclick="unselectAllAtLevel( $dataSetId )" style="width:12em">
+ <input type="button" value="$i18n.getString( "unselect_all" )" onclick="window.location.href='unselectAll.action?dataSetId=$dataSetId'" style="width:12em">
</td>
</tr>
+ <tr>
+ <td>
+ <input type="button" value="$i18n.getString( "select_all_in_group" )" onclick="selectGroup( $dataSetId )" style="width:12em">
+ <select id="groupList" name="groupList" style="width:12em">
+ #foreach ( $group in $groups )
+ <option value="$group.id" #if ( $organisationUnitGroupId == $group.id )selected="selected"#end>$encoder.htmlEncode( $group.name )</option>
+ #end
+ </select>
+ <input type="button" value="$i18n.getString( "unselect_all_in_group" )" onclick="unselectGroup( $dataSetId )" style="width:12em">
+ </td>
+ </tr>
<tr>
<td>
<div id="selectionTree" style="width:50em;height:30em;overflow:auto;border:1px solid #cccccc"></div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/associations.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/associations.js 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/associations.js 2009-04-30 15:36:22 +0000
@@ -3,20 +3,34 @@
function selectAllAtLevel( dataSetId )
{
- var list = document.getElementById( 'levelList' );
-
- var level = list.options[ list.selectedIndex ].value;
-
- window.location.href = 'selectLevel.action?level=' + level + '&dataSetId=' + dataSetId;
+ var level = getListValue( 'levelList' );
+ var groupId = getListValue( 'groupList' );
+
+ window.location.href = 'selectLevel.action?level=' + level + '&organisationUnitGroupId=' + groupId + '&dataSetId=' + dataSetId;
}
function unselectAllAtLevel( dataSetId )
{
- var list = document.getElementById( 'levelList' );
-
- var level = list.options[ list.selectedIndex ].value;
-
- window.location.href = 'unselectLevel.action?level=' + level + '&dataSetId=' + dataSetId;
+ var level = getListValue( 'levelList' );
+ var groupId = getListValue( 'groupList' );
+
+ window.location.href = 'unselectLevel.action?level=' + level + '&organisationUnitGroupId=' + groupId + '&dataSetId=' + dataSetId;
+}
+
+function selectGroup( dataSetId )
+{
+ var level = getListValue( 'levelList' );
+ var groupId = getListValue( 'groupList' );
+
+ window.location.href = 'selectOrganisationUnitGroup.action?level=' + level + '&organisationUnitGroupId=' + groupId + '&dataSetId=' + dataSetId;
+}
+
+function unselectGroup( dataSetId )
+{
+ var level = getListValue( 'levelList' );
+ var groupId = getListValue( 'groupList' );
+
+ window.location.href = 'unselectOrganisationUnitGroup.action?level=' + level + '&organisationUnitGroupId=' + groupId + '&dataSetId=' + dataSetId;
}
function treeClicked()
--
Trunk
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.
