dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12302
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3747: lcoal vn - Added misssing file
------------------------------------------------------------
revno: 3747
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-05-26 11:39:50 +0700
message:
lcoal vn - Added misssing file
removed:
local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetPeriodsByExcelItemGroupAction.java
added:
local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetPeriodsByImportReportAction.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
=== removed file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetPeriodsByExcelItemGroupAction.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetPeriodsByExcelItemGroupAction.java 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetPeriodsByExcelItemGroupAction.java 1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2004-2010, 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.importing.action;
-
-import java.util.List;
-
-import org.hisp.dhis.period.Period;
-import org.hisp.dhis.reportexcel.action.ActionSupport;
-import org.hisp.dhis.reportexcel.importitem.ExcelItemGroup;
-import org.hisp.dhis.reportexcel.importitem.ImportItemService;
-import org.hisp.dhis.reportexcel.period.generic.PeriodGenericManager;
-
-/**
- * @author Chau Thu Tran
- * @version $Id$
- */
-public class GetPeriodsByExcelItemGroupAction
- extends ActionSupport
-{
-
- // -------------------------------------------------------------------------
- // Dependences
- // -------------------------------------------------------------------------
-
- private PeriodGenericManager periodGenericManager;
-
- public void setPeriodGenericManager( PeriodGenericManager periodGenericManager )
- {
- this.periodGenericManager = periodGenericManager;
- }
-
- private ImportItemService importItemService;
-
- public void setImportItemService( ImportItemService importItemService )
- {
- this.importItemService = importItemService;
- }
-
- // -------------------------------------------------------------------------
- // Input & Output
- // -------------------------------------------------------------------------
-
- private List<Period> periods;
-
- public List<Period> getPeriods()
- {
- return periods;
- }
-
- private String importReportId;
-
- public void setImportReportId( String importReportId )
- {
- this.importReportId = importReportId;
- }
-
- // -------------------------------------------------------------------------
- // Implement Action method
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- if ( importReportId == null || importReportId.equals( "null" ) )
- {
- message = i18n.getString( "there_is_no_excel_item_group" );
-
- return ERROR;
- }
-
- ExcelItemGroup importReport = importItemService.getImportReport( Integer.parseInt( importReportId ) );
-
- periodGenericManager.setPeriodType( importReport.getPeriodType().getName() );
-
- periods = periodGenericManager.getPeriodList();
-
- return SUCCESS;
- }
-}
=== added file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetPeriodsByImportReportAction.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetPeriodsByImportReportAction.java 1970-01-01 00:00:00 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetPeriodsByImportReportAction.java 2011-05-26 04:39:50 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2004-2010, 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.importing.action;
+
+import java.util.List;
+
+import org.hisp.dhis.period.Period;
+import org.hisp.dhis.reportexcel.action.ActionSupport;
+import org.hisp.dhis.reportexcel.importitem.ExcelItemGroup;
+import org.hisp.dhis.reportexcel.importitem.ImportItemService;
+import org.hisp.dhis.reportexcel.period.generic.PeriodGenericManager;
+
+/**
+ * @author Chau Thu Tran
+ * @version $Id$
+ */
+public class GetPeriodsByImportReportAction
+ extends ActionSupport
+{
+
+ // -------------------------------------------------------------------------
+ // Dependences
+ // -------------------------------------------------------------------------
+
+ private PeriodGenericManager periodGenericManager;
+
+ public void setPeriodGenericManager( PeriodGenericManager periodGenericManager )
+ {
+ this.periodGenericManager = periodGenericManager;
+ }
+
+ private ImportItemService importItemService;
+
+ public void setImportItemService( ImportItemService importItemService )
+ {
+ this.importItemService = importItemService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input & Output
+ // -------------------------------------------------------------------------
+
+ private List<Period> periods;
+
+ public List<Period> getPeriods()
+ {
+ return periods;
+ }
+
+ private String importReportId;
+
+ public void setImportReportId( String importReportId )
+ {
+ this.importReportId = importReportId;
+ }
+
+ // -------------------------------------------------------------------------
+ // Implement Action method
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ throws Exception
+ {
+ if ( importReportId == null || importReportId.equals( "null" ) )
+ {
+ message = i18n.getString( "there_is_no_excel_item_group" );
+
+ return ERROR;
+ }
+
+ ExcelItemGroup importReport = importItemService.getImportReport( Integer.parseInt( importReportId ) );
+
+ periodGenericManager.setPeriodType( importReport.getPeriodType().getName() );
+
+ periods = periodGenericManager.getPeriodList();
+
+ return SUCCESS;
+ }
+}
