=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/action/ListExcelItemAction.java' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/action/ListExcelItemAction.java 2009-10-27 06:05:22 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/action/ListExcelItemAction.java 2009-12-04 05:00:32 +0000 @@ -36,6 +36,7 @@ import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator; import org.hisp.dhis.reportexcel.excelitem.ExcelItem; +import org.hisp.dhis.reportexcel.excelitem.ExcelItemGroup; import org.hisp.dhis.reportexcel.excelitem.ExcelItemService; import com.opensymphony.xwork2.Action; @@ -44,63 +45,80 @@ * @author Chau Thu Tran * @version $Id$ */ -public class ListExcelItemAction implements Action { - - // ------------------------------------------------------------- - // Dependency - // ------------------------------------------------------------- - - private ExcelItemService excelItemService; - - private DataElementService dataElementService; - - // ------------------------------------------------------------- - // Input && Output - // ------------------------------------------------------------- - - private Collection excelItems; - - private List dataElementGroups; - - private int excelItemGroupId; - - // ------------------------------------------------------------- - // Getters and Setters - // ------------------------------------------------------------- - - public Collection getExcelItems() { - return excelItems; - } - - public void setExcelItemService(ExcelItemService excelItemService) { - this.excelItemService = excelItemService; - } - - public List getDataElementGroups() { - return dataElementGroups; - } - - public void setDataElementService(DataElementService dataElementService) { - this.dataElementService = dataElementService; - } - - public void setExcelItemGroupId(int excelItemGroupId) { - this.excelItemGroupId = excelItemGroupId; - } - - // ------------------------------------------------------------- - // Action implementation - // ------------------------------------------------------------- - - public String execute() throws Exception { - - excelItems = excelItemService.getExcelItemGroup(excelItemGroupId) - .getExcelItems(); - - dataElementGroups = new ArrayList( dataElementService.getAllDataElementGroups() ); +public class ListExcelItemAction + implements Action +{ + + // ------------------------------------------------------------- + // Dependency + // ------------------------------------------------------------- + + private ExcelItemService excelItemService; + + private DataElementService dataElementService; + + // ------------------------------------------------------------- + // Input && Output + // ------------------------------------------------------------- + + private int excelItemGroupId; + + private ExcelItemGroup excelItemGroup; + + private Collection excelItems; + + private List dataElementGroups; + + // ------------------------------------------------------------- + // Getters and Setters + // ------------------------------------------------------------- + + public Collection getExcelItems() + { + return excelItems; + } + + public void setExcelItemService( ExcelItemService excelItemService ) + { + this.excelItemService = excelItemService; + } + + public List getDataElementGroups() + { + return dataElementGroups; + } + + public void setDataElementService( DataElementService dataElementService ) + { + this.dataElementService = dataElementService; + } + + public void setExcelItemGroupId( int excelItemGroupId ) + { + this.excelItemGroupId = excelItemGroupId; + } + + public ExcelItemGroup getExcelItemGroup() + { + return excelItemGroup; + } + + // ------------------------------------------------------------- + // Action implementation + // ------------------------------------------------------------- + + public String execute() + throws Exception + { + excelItemGroup = excelItemService.getExcelItemGroup( excelItemGroupId ); + + excelItems = excelItemService.getExcelItemGroup( excelItemGroupId ).getExcelItems(); + + dataElementGroups = new ArrayList( dataElementService.getAllDataElementGroups() ); Collections.sort( dataElementGroups, new DataElementGroupNameComparator() ); - - return SUCCESS; - } + + return SUCCESS; + } + } === modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties 2009-12-03 08:35:53 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties 2009-12-04 05:00:32 +0000 @@ -100,8 +100,6 @@ formulaexcel = Excel Formula icd_code = ICD codes serial = Serial -jumping_step = Jumping Step -rename = Rename template_excel_file = Template excel file import = Import data dhis-web-chr-form = Child Health Records @@ -121,7 +119,6 @@ available_dataelementgroups = Available Data Element Groups selected_dataelementgroups = Selected Data Element Groups success = success -selected_dataelementgroups = Selected Data Element Groups view_by = View by preview = Preview code = Code @@ -145,10 +142,9 @@ bookmark = Bookmark generate_advanced_report = Generate advanced report choose_orgunit_group = Organisation group -generate_advanced_report = Generate advanced report report_ready_exist = Report ready exist upload_file_first = Upload file first ! -please_enter_sheet_no = Please enter sheet no +please_enter_sheet_no = Please enter 'Sheet No' please_enter_group_name = Please enter group name excel_item = Excel items type = Type @@ -171,4 +167,6 @@ not_null = not null choose_orgUnit = Not choose organisation yet choose_period = Not choose period yet -choose_dataelement = Not choose dataelement yet \ No newline at end of file +choose_dataelement = Not choose dataelement yet +warning_upload_is_null = Please choose your excel file to upload ! +list_of_excel_items = List of excel items \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties 2009-11-30 04:26:38 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties 2009-12-04 05:00:32 +0000 @@ -98,8 +98,6 @@ filters = B\u1ed9 l\u1ecdc element_optioncombo = Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u k\u1ebft h\u1ee3p v\u1edbi c\u00e1c t\u00f9y ch\u1ecdn k\u1ebft h\u1ee3p icd_code = M\u00e3 ICD -jumping_step = B\u01b0\u1edbc nh\u1ea3y -rename = \u0110\u1ed5i t\u00ean choose_category_combo = Ch\u1ecdn Lo\u1ea1i t\u1eadp h\u1ee3p k\u1ebft h\u1ee3p quaterly = H\u00e0ng qu\u00fd six_monthly = H\u00e0ng 6 th\u00e1ng @@ -139,10 +137,9 @@ update_sorted_dataelement = C\u1eadp nh\u1eadt th\u1ee9 t\u1ef1 dataelement_name = T\u00ean ph\u1ea7n t\u1eed d\u1eef li\u1ec7u dataelement_code = M\u00e3 ph\u1ea7n t\u1eed d\u1eef li\u1ec7u -available_dataelementgroups = Nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u +available_dataelementgroups = Nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u c\u00f3 s\u1eb5n selected_dataelementgroups = Nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn success = th\u00e0nh c\u00f4ng -selected_dataelementgroups = Nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn preview = Xem tr\u01b0\u1edbc gi\u00e1 tr\u1ecb code = M\u00e3 s\u1ed1 update_order = C\u1eadp nh\u1eadt th\u1ee9 t\u1ef1 @@ -156,7 +153,6 @@ selected_data_elements = Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn filter = L\u1ecdc category_option_combo = Category option combo list -all = ALL available_periods = Th\u1eddi \u0111i\u1ec3m hi\u1ec7n c\u00f3 selected_periods = Th\u1eddi \u0111i\u1ec3m \u0111\u01b0\u1ee3c ch\u1ecdn generate = Xu\u1ea5t b\u00e1o c\u00e1o @@ -165,10 +161,8 @@ report_ready_exist = B\u00e1o c\u00e1o n\u00e0y \u0111\u00e3 t\u1ed3n t\u1ea1i upload_file_first = Upload t\u1eadp tin tr\u01b0\u1edbc ! choose_excelItem = Xin ch\u1ecdn c\u00e1c gi\u00e1 tr\u1ecb c\u1ea7n import -please_enter_sheet_no = Vui l\u00f2ng nh\u1eadp sheet no +please_enter_sheet_no = Vui l\u00f2ng nh\u1eadp 'Sheet No' please_enter_group_name = Vui l\u00f2ng nh\u1eadp t\u00ean nh\u00f3m -upload_file_first = Upload t\u1eadp tin tr\u01b0\u1edbc ! -choose_excelItem = Xin ch\u1ecdn c\u00e1c gi\u00e1 tr\u1ecb c\u1ea7n import copy_items_duplicated = ReportItem b\u1ecb tr\u00f9ng l\u1eb7p, kh\u00f4ng th\u1ec3 sao ch\u00e9p ! copy_successful = Sao ch\u00e9p th\u00e0nh c\u00f4ng ! filter_by_name = T\u00ecm theo t\u00ean @@ -179,3 +173,5 @@ period_type = Lo\u1ea1i th\u1eddi \u0111i\u1ec3m import_data = Import d\u1eef li\u1ec7u select_report = [Ch\u1ecdn b\u00e1o c\u00e1o] +warning_upload_is_null = Xin vui l\u00f2ng ch\u1ecdn file excel c\u1ea7n upload ! +list_of_excel_items = Danh s\u00e1ch c\u00e1c excel item \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataStatusShow.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataStatusShow.vm 2009-10-19 03:34:36 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataStatusShow.vm 2009-12-04 05:00:32 +0000 @@ -1,3 +1,5 @@ +

$i18n.getString( "dataset_completed_report" )

+ === modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm 2009-11-11 05:46:50 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm 2009-12-04 05:00:32 +0000 @@ -1,4 +1,5 @@ -

$!encoder.htmlEncode($!excelitemGroup.name)

+

$i18n.getString("list_of_excel_items")

+

$!encoder.htmlEncode($!excelItemGroup.name)

$i18n.getString( 'dataset' )
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js 2009-12-03 08:35:53 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js 2009-12-04 05:00:32 +0000 @@ -289,4 +289,17 @@ request.setResponseTypeXML( 'xmlObject' ); request.setCallbackSuccess( responseListPeriodReceived ); request.send( 'nextPeriodsGeneric.action' ); +} + +function validateUploadExcelFileImporting() { + + if ( (byId("upload").value == "") || (byId("upload").value.length == 0) ) { + + hideById("messageUpload"); + setMessage(i18n_warning_upload_is_null); + return false; + } + else { + return true; + } } \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm 2009-11-09 07:34:00 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm 2009-12-04 05:00:32 +0000 @@ -1,6 +1,6 @@

$i18n.getString('dataelement_groups')

-

$excelItemGroup.name

+

$!encoder.htmlEncode($!excelItemGroup.name)