dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #02804
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 921: Modify Import data Excel
------------------------------------------------------------
revno: 921
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2009-10-29 12:28:04 +0700
message:
Modify Import data Excel
added:
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/action/OpenUpdateOrganisationUnitGroupForCategoryAction.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/dataelementgroup/
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/dataelementgroup/action/
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/dataelementgroup/action/GetDataElementGroupOrderByCategoryAction.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/dataelementgroup/action/SaveDataElementGroupOrderForCategoryAction.java
modified:
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/action/OpenUpdateOrganisationUnitGroupAction.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml
--
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-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/action/OpenUpdateOrganisationUnitGroupAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/action/OpenUpdateOrganisationUnitGroupAction.java 2009-10-29 03:02:42 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/action/OpenUpdateOrganisationUnitGroupAction.java 2009-10-29 05:28:04 +0000
@@ -42,7 +42,7 @@
* @author Chau Thu Tran
* @version $Id$
*/
-public class OpenUpdateOrganisationUnitGroupAction implements Action {
+public class OpenUpdateOrganisationUnitGroupForCategoryAction implements Action {
// -------------------------------------------
// Dependency
// -------------------------------------------
=== added file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/action/OpenUpdateOrganisationUnitGroupForCategoryAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/action/OpenUpdateOrganisationUnitGroupForCategoryAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/action/OpenUpdateOrganisationUnitGroupForCategoryAction.java 2009-10-29 05:28:04 +0000
@@ -0,0 +1,119 @@
+/*
+ * 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.
+ */
+package org.hisp.dhis.reportexcel.excelitemgroup.action;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
+import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
+import org.hisp.dhis.reportexcel.excelitem.ExcelItemGroup;
+import org.hisp.dhis.reportexcel.excelitem.ExcelItemService;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Chau Thu Tran
+ * @version $Id$
+ */
+public class OpenUpdateOrganisationUnitGroupForCategoryAction implements Action {
+ // -------------------------------------------
+ // Dependency
+ // -------------------------------------------
+
+ private ExcelItemService excelItemService;
+
+ private OrganisationUnitGroupService organisationUnitGroupService;
+
+ // -------------------------------------------
+ // Input & Output
+ // -------------------------------------------
+
+ private Integer id;
+
+ private List<OrganisationUnitGroup> availableOrganisationUnitGroups;
+
+ private List<OrganisationUnitGroup> selectedOrganisationUnitGroups;
+
+ private ExcelItemGroup excelItemGroup;
+
+ // -------------------------------------------
+ // Getter & Setter
+ // -------------------------------------------
+
+ public void setExcelItemService(ExcelItemService excelItemService) {
+ this.excelItemService = excelItemService;
+ }
+
+ public List<OrganisationUnitGroup> getSelectedOrganisationUnitGroups() {
+ return selectedOrganisationUnitGroups;
+ }
+
+ public ExcelItemGroup getExcelItemGroup() {
+ return excelItemGroup;
+ }
+
+ public List<OrganisationUnitGroup> getAvailableOrganisationUnitGroups() {
+ return availableOrganisationUnitGroups;
+ }
+
+ public void setOrganisationUnitGroupService(
+ OrganisationUnitGroupService organisationUnitGroupService) {
+ this.organisationUnitGroupService = organisationUnitGroupService;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ // -------------------------------------------
+ // Action implementation
+ // -------------------------------------------
+
+ public String execute() throws Exception {
+
+ this.excelItemGroup = excelItemService.getExcelItemGroup(id);
+
+ this.availableOrganisationUnitGroups = new ArrayList<OrganisationUnitGroup>(
+ this.organisationUnitGroupService
+ .getAllOrganisationUnitGroups());
+
+ this.selectedOrganisationUnitGroups = excelItemGroup
+ .getOrganisationUnitGroups();
+
+ availableOrganisationUnitGroups
+ .removeAll(selectedOrganisationUnitGroups);
+
+ Collections.sort(this.availableOrganisationUnitGroups,
+ new OrganisationUnitGroupNameComparator());
+
+ return SUCCESS;
+ }
+
+}
=== added directory 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/dataelementgroup'
=== added directory 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/dataelementgroup/action'
=== added file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/dataelementgroup/action/GetDataElementGroupOrderByCategoryAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/dataelementgroup/action/GetDataElementGroupOrderByCategoryAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/dataelementgroup/action/GetDataElementGroupOrderByCategoryAction.java 2009-10-29 05:28:04 +0000
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+package org.hisp.dhis.reportexcel.excelitemgroup.dataelementgroup.action;
+
+import org.hisp.dhis.reportexcel.DataElementGroupOrder;
+import org.hisp.dhis.reportexcel.ReportExcelService;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Tran Thanh Tri
+ * @version $Id$
+ */
+public class GetDataElementGroupOrderByCategoryAction
+ implements Action
+{
+ // -------------------------------------------
+ // Dependency
+ // -------------------------------------------
+
+ private ReportExcelService reportService;
+
+ // -------------------------------------------
+ // Input & Output
+ // -------------------------------------------
+
+ private Integer id;
+
+ private DataElementGroupOrder dataElementGroupOrder;
+
+ // -------------------------------------------
+ // Getter & Setter
+ // -------------------------------------------
+
+ public void setReportService( ReportExcelService reportService )
+ {
+ this.reportService = reportService;
+ }
+
+ public DataElementGroupOrder getDataElementGroupOrder()
+ {
+ return dataElementGroupOrder;
+ }
+
+ public void setId( Integer id )
+ {
+ this.id = id;
+ }
+
+ public String execute()
+ throws Exception
+ {
+ dataElementGroupOrder = reportService.getDataElementGroupOrder( id );
+
+ return SUCCESS;
+ }
+
+}
=== added file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/dataelementgroup/action/SaveDataElementGroupOrderForCategoryAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/dataelementgroup/action/SaveDataElementGroupOrderForCategoryAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitemgroup/dataelementgroup/action/SaveDataElementGroupOrderForCategoryAction.java 2009-10-29 05:28:04 +0000
@@ -0,0 +1,130 @@
+/*
+ * 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.
+ */
+package org.hisp.dhis.reportexcel.excelitemgroup.dataelementgroup.action;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.reportexcel.DataElementGroupOrder;
+import org.hisp.dhis.reportexcel.excelitem.ExcelItemGroup;
+import org.hisp.dhis.reportexcel.excelitem.ExcelItemService;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Chau Thu Tran
+ * @version $Id$
+ */
+
+public class SaveDataElementGroupOrderForCategoryAction implements Action {
+
+ // -------------------------------------------
+ // Dependency
+ // -------------------------------------------
+
+ private ExcelItemService excelItemService;
+
+ private DataElementService dataElementService;
+
+ // -------------------------------------------
+ // Input
+ // -------------------------------------------
+
+ private Integer id;
+
+ private String name;
+
+ private String code;
+
+ private List<String> dataElementIds = new ArrayList<String>();
+
+ // -------------------------------------------
+ // Getter & Setter
+ // -------------------------------------------
+
+ public void setDataElementService(DataElementService dataElementService) {
+ this.dataElementService = dataElementService;
+ }
+
+ public void setExcelItemService(ExcelItemService excelItemService) {
+ this.excelItemService = excelItemService;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setDataElementIds(List<String> dataElementIds) {
+ this.dataElementIds = dataElementIds;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String execute() throws Exception {
+ ExcelItemGroup excelItemGroup = (ExcelItemGroup) excelItemService
+ .getExcelItemGroup(id);
+
+ DataElementGroupOrder dataElementGroupOrder = new DataElementGroupOrder();
+ dataElementGroupOrder.setName(name);
+ dataElementGroupOrder.setCode(code);
+
+ List<DataElement> dataElements = new ArrayList<DataElement>();
+
+ for (String id : dataElementIds) {
+
+ DataElement dataElement = dataElementService.getDataElement(Integer
+ .parseInt(id));
+
+ dataElements.add(dataElement);
+ }
+
+ dataElementGroupOrder.setDataElements(dataElements);
+
+ List<DataElementGroupOrder> dataElementGroupOrders = excelItemGroup
+ .getDataElementOrders();
+
+ dataElementGroupOrders.add(dataElementGroupOrder);
+
+ excelItemGroup.setDataElementOrders(dataElementGroupOrders);
+
+ excelItemService.updateExcelItemGroup(excelItemGroup);
+
+ return SUCCESS;
+ }
+}
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml 2009-10-29 05:21:01 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml 2009-10-29 05:28:04 +0000
@@ -814,7 +814,7 @@
<action name="listDataElementGroupOrderByExcelItemGroup"
class="org.hisp.dhis.reportexcel.excelitemgroup.action.GetExcelItemGroupByIdAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm</param>
+ <param name="page">/dhis-web-excel-reporting/organisationUnitGroupListingReport.vm</param>
<param name="menu">/dhis-web-excel-reporting/menu.vm</param>
<param name="javascripts">javascript/ui.core.js,javascript/ui.sortable.js,javascript/dataElementGroup.js,javascript/commons.js</param>
<param name="stylesheets">style/ui.theme.css,style/basic.css</param>
@@ -823,7 +823,7 @@
<action name="openUpdateOrganisationUnitGroupForCategory"
class="org.hisp.dhis.reportexcel.excelitemgroup.action.OpenUpdateOrganisationUnitGroupForCategoryAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-excel-reporting/organisationUnitGroupListingReport.vm</param>
+ <param name="page">/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm</param>
<param name="menu">/dhis-web-excel-reporting/menu.vm</param>
<param name="javascripts">javascript/commons.js</param>
</action>
