dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4017
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-06-24 14:04:01 +0700
message:
  local vn - Fixed bug validation on adding/updating an import item
modified:
  local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/DefaultImportItemService.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/ValidationExportItemAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/ValidateImportItemAction.java
  local/vn/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 'local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/DefaultImportItemService.java'
--- local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/DefaultImportItemService.java	2011-05-24 07:48:23 +0000
+++ local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/DefaultImportItemService.java	2011-06-24 07:04:01 +0000
@@ -64,7 +64,7 @@
     }
 
     // -------------------------------------------------------------------------
-    // Excelitem group Services
+    // Import Report Services
     // -------------------------------------------------------------------------
 
     public int addImportReport( ExcelItemGroup importReport )

=== modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/ValidationExportItemAction.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/ValidationExportItemAction.java	2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/exportitem/action/ValidationExportItemAction.java	2011-06-24 07:04:01 +0000
@@ -96,7 +96,7 @@
         this.sheetNo = sheetNo;
     }
 
-    // -------------------------------------------
+    // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
 

=== modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/ValidateImportItemAction.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/ValidateImportItemAction.java	2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/ValidateImportItemAction.java	2011-06-24 07:04:01 +0000
@@ -27,7 +27,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.hisp.dhis.i18n.I18n;
 import org.hisp.dhis.reportexcel.action.ActionSupport;
 import org.hisp.dhis.reportexcel.importitem.ExcelItem;
 import org.hisp.dhis.reportexcel.importitem.ImportItemService;
@@ -59,19 +58,10 @@
 
     private Integer id;
 
-    private String message;
-
-    private I18n i18n;
-
     // -------------------------------------------------------------------------
     // Setters
     // -------------------------------------------------------------------------
 
-    public String getMessage()
-    {
-        return message;
-    }
-
     public void setId( Integer id )
     {
         this.id = id;

=== modified file 'local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml'
--- local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml	2011-06-17 03:05:12 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml	2011-06-24 07:04:01 +0000
@@ -904,7 +904,7 @@
 		<action name="addImportItem"
 			class="org.hisp.dhis.reportexcel.importitem.action.AddImportItemAction">			
 			<result name="success" type="redirect">
-				listImportItems.action?importReport=${importReport}</result>
+				listImportItems.action?importReportId=${importReportId}</result>
 		</action>
 
 		<action name="deleteImportItem"
@@ -956,7 +956,7 @@
 		<action name="updateImportItem"
 			class="org.hisp.dhis.reportexcel.importitem.action.UpdateImportItemAction">
 			<result name="success" type="redirect">
-				listImportItems.action?importReport=${importReport}</result>
+				listImportItems.action?importReportId=${importReportId}</result>
 		</action>
 
 		<action name="validateImportItem"
@@ -1298,7 +1298,7 @@
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-excel-reporting/chart/drawJChartParams.vm</param>
 			<param name="menu">/dhis-web-excel-reporting/menu.vm</param>
-			<param name="javascripts">				
+			<param name="javascripts">
 				chart/js/highcharts.js,
 				chart/js/modules/exporting.js
 			</param>