dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12326
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3763: local vn - Fixed bug and renaming...
------------------------------------------------------------
revno: 3763
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-05-27 11:45:31 +0700
message:
local vn - Fixed bug and renaming...
modified:
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/resources/org/hisp/dhis/reportexcel/i18n_module.properties
local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties
local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/exportReportUserRoles.vm
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/preview.js
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitGroupListingReport.vm
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/periodcolumns.vm
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/addExportReportForm.vm
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/exportReports.vm
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/updateExportReportForm.vm
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseExportReports.vm
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.vm
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/viewAdministrator.vm
--
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-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 2011-05-26 04:39:50 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetPeriodsByImportReportAction.java 2011-05-27 04:45:31 +0000
@@ -87,7 +87,7 @@
{
if ( importReportId == null || importReportId.equals( "null" ) )
{
- message = i18n.getString( "there_is_no_excel_item_group" );
+ message = i18n.getString( "there_is_no_import_report" );
return ERROR;
}
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties'
--- local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties 2011-05-27 04:45:31 +0000
@@ -2,29 +2,27 @@
reports = List of report
row = Row
column = Column
-add_report = Add Report
-update_report = Update Report
excel_template = Excel Template
-report_type = Report Type
+export_report_type = Export Report Type
PERIOD_COLUMN_LISTING = Period Column Listing
ORGANIZATION_GROUP_LISTING = Organization Unit Listing
NORMAL = Normal
CATEGORY = Category
-report_items = Report Items
+export_items = Export Items
period_postion_row = Period Position Row
period_postion_column = Period Position Column
organisation_position_row = Organisation Position Row
organisation_position_column= Organisation Position Column
-name_is_null = Please enter name !
-excel_is_null = Please enter excel template !
-name_ready_exist = Name Ready Exist !
-confirm_delete = Are you sure you want to delete this?
+name_is_null = Please enter name \!
+excel_is_null = Please enter excel template \!
+name_ready_exist = Name Ready Exist \!
+confirm_delete = Are you sure you want to delete this\?
item_type = Item Type
period_type = Period Type
update = Update
report_design = Report Design
-report = Report
-report_item = Report Item
+export_report = Export Report
+export_item = Export Item
selected_month = Selected Month
last_3_month = Last 3 Month
so_far_this_year = So Far This year
@@ -32,19 +30,19 @@
element_optioncombo = Element with OptionCombo
expression = Expression
indicator = Indicator
-expression_is_null = Please enter expression!
-row_is_null = Please enter row number !
-column_is_null = Please enter column number !
+expression_is_null = Please enter expression \!
+row_is_null = Please enter row number \!
+column_is_null = Please enter column number \!
listing = Listing
normal = Normal
period = Period
organisation = Organisation
generate_report = Generate Report
preview_report = Preview Report
-please_wait = Please waiting for process !
-organisationunit_is_null = Please select organisation unit !
-period_is_null = Please select period !
-report_is_null = Please select report !
+please_wait = Please waiting for process \!
+organisationunit_is_null = Please select organisation unit \!
+period_is_null = Please select period \!
+report_is_null = Please select report \!
formula = Formula
left_brackets = Left Brackets
right_brackets = Right Brackets
@@ -75,7 +73,8 @@
selected_user_roles = Selected user roles
administration = Administration
select_report = Select report
-data_status = Data Entry Status
+data_status = Data Entry Status
+data_status_management = Data Entry Status Management
make_default = Make as default
completed = Completed
entried = Entried
@@ -127,16 +126,16 @@
generate_advanced_report = Generate advanced report
choose_orgunit_group = Organisation group
report_ready_exist = Report ready exist
-upload_file_first = Upload file first !
+upload_file_first = Upload file first \!
please_enter_sheet_no = Please enter 'Sheet No'
please_enter_group_name = Please enter group name
import_item = Excel items
associations = Associations
sheetNo = Sheet
-choose_excelItem = Please choose excel items
+choose_import_tem = Please choose import items
copy_items_duplicated = Warning! Cannot copy the duplicated item(s)
-copy_successful = Copy successful !
-copy_selected_item_to_import_item = Copy to excel item
+copy_successful = Copy successful \!
+copy_selected_item_to_import_item = Copy export item to import item
import_report = Import Report
copy_items = Copy items
filter_by_name = Filter by name
@@ -154,8 +153,8 @@
choose_report = Not choose report yet
choose_excel_group = Not choose excel group yet
choose_dataelement = Not choose dataelement yet
-warning_upload_is_null = Please choose your excel file to upload !
-list_of_import_items = List of excel items
+warning_upload_is_null = Please choose your excel file to upload \!
+list_of_import_items = List of import items
selected_dataelements = Selected Data Elements
available_dataelements = Available Data Elements
value_rounded = This value maybe have been rounded
@@ -164,11 +163,11 @@
no_item = Don't have any items chosen
excel_template_management = Excel Template Management
file_exists = File is existing
-confirm_override = Do you sure want to override this file?
-upload_successful = Uploading is success !
-override_successful = Overriding is success !
+confirm_override = Do you sure want to override this file\?
+upload_successful = Uploading is success \!
+override_successful = Overriding is success \!
cannot_write_file_being_used = Unable to write to this file as being used by another program
-filename_wellformed = How to get a well-formed name of file?
+filename_wellformed = How to get a well-formed name of file\?
length_filename_min5_max30 = Length of file's name is at least 5 and at most 30
use_only_letters_numbers_dot_only = Please enter Letters, Numbers for file's name and Dot for extension only
file_used_system = This file is being used in the system
@@ -179,20 +178,20 @@
template_status = Template status
use_only_letters_numbers_dot_only = Please enter Letters, Numbers for file's name and Dot for extension only
cell_exist = Exist one cell same sheet, row and column with this.
-update_successful = Updating is success !
+update_successful = Updating is success \!
cell_exist = Exist one cell same sheet, row and column with this.
download = Download
upload_file_null = Upload file null
file_type_not_supported = File type not supported
association_roles = Association roles
file_type_not_supported = File type not supported
-override_confirm = File is exist. Do you want to override ?
-ready_in_use = File is ready in use. Can not delete !
+override_confirm = File is exist. Do you want to override \?
+ready_in_use = File is ready in use. Can not delete \!
intro_configuration = Set the path to the directory only store excel template files on server.\nNotes\: This is a relative path.\nFor example\: \\templatefiles for Windows or /templatefiles for Linux.
-intro_reports = Create, update, view and delete the excel report. A report excel containing many report items. Excel report can in a variety of different reports. Excel report for assignment to one or more units or group units and options list.
+intro_export_reports = Create, update, view and delete the excel report. A report excel containing many report items. Excel report can in a variety of different reports. Excel report for assignment to one or more units or group units and options list.
intro_data_status = This function is used to view the status input of data (Data is entered or not done or any missing one, etc. ..).
intro_clean_up = This feature allows users to delete the temporary files generated during the generating report or previewing report.
-intro_import_item = Create, update, delete and view the elements for importing data from excel files. This excel items closer to report items.
+intro_import_reports = Create, update, delete and view the elements for importing data from excel files. This import items closer to export items.
intro_excel_template_management = Upload, rename, search, download and delete the file extension .xls or .xlsx. Users can identify which files are used and unused files to. Automatically, allowing to update excel reporting system when file names which are used to be changed.
translation_translate = Translate
template_using = File is using
@@ -200,7 +199,7 @@
expression_not_well_formed = Expression is not well formed
basic = Basic
advanced = Advanced
-update_reportexcel_userrole = User role
+assign_exportreport_userrole= Assign user role for export report
expression_not_well_formed = Expression is not well formed
print = Print template...
chart = Chart
@@ -217,10 +216,10 @@
full_style_chart = Full Style Chart
organisation_chart = Organisation Unit Chart
bookmark_chart = Bookmarked Charts
-dataset_is_null = Please selecte dataset !
+dataset_is_null = Please selecte dataset \!
bookmark_success = Bookmarked
description = Description
-description_is_null = Please enter description !
+description_is_null = Please enter description \!
bookmark_chart = Bookmarked Charts
specify_report = Please specify a report
specify_template_directory = Please specify template directory
@@ -272,5 +271,8 @@
access_denied_to_folder = Access denied to folder on server
access_denied_to_file = Access denied to file on server
template_folder_is_not_empty= Warning\! The old template directory of system is not empty.\nWould you like to move its children to the new one before it deleted ?
-config_path_invalid = Invalid configuration\! Only Alphabetic, Numbers, Undercore, Middlecore and Space alow.
-there_is_no_excel_item_group= There is no Excel item group in system
\ No newline at end of file
+config_path_invalid = Invalid configuration\! Only Alphabetic, Numbers, Undercore, Middlecore and Space alow\.
+there_is_no_import_report = There is no Import Report/Import Item in system
+export_reports = Export Reports
+generate_export_report = Generate export report
+set_organisationunit_group_level = Set up Organisation unit group level
\ No newline at end of file
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties'
--- local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties 2011-05-11 08:13:37 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties 2011-05-27 04:45:31 +0000
@@ -1,6 +1,6 @@
i18n_date_format = dd-mm-yy
reports = Danh s\u00e1ch b\u00e1o c\u00e1o
-report_type = Ki\u1ec3u b\u00e1o c\u00e1o
+export_report_type = Ki\u1ec3u b\u00e1o c\u00e1o
row = D\u00f2ng
column = C\u1ed9t
add_report = Th\u00eam b\u00e1o c\u00e1o
@@ -10,37 +10,37 @@
ORGANIZATION_GROUP_LISTING = Li\u1ec7t k\u1ec7 \u0111\u01a1n v\u1ecb theo \u0111\u00f2ng
NORMAL = B\u00ecnh th\u01b0\u1eddng
CATEGORY = K\u1ebft h\u1ee3p ph\u1ea7n t\u1eed d\u1eef li\u1ec7u - Option Combo
-report_items = Danh s\u00e1ch ph\u1ea7n t\u1eed b\u00e1o c\u00e1o
+export_items = Danh s\u00e1ch ph\u1ea7n t\u1eed b\u00e1o c\u00e1o
period_postion_row = V\u1ecb tr\u00ed \u00f4 th\u1eddi \u0111i\u1ec3m (d\u00f2ng)
period_postion_column = V\u1ecb tr\u00ed \u00f4 th\u1eddi \u0111i\u1ec3m (c\u1ed9t)
organisation_position_row = V\u1ecb tr\u00ed \u00f4 \u0111\u01a1n v\u1ecb (d\u00f2ng)
organisation_position_column= V\u1ecb tr\u00ed \u00f4 \u0111\u01a1n v\u1ecb (c\u1ed9t)
-name_is_null = Vui l\u00f2ng nh\u1eadp t\u00ean !
-excel_is_null = Vui l\u00f2ng nh\u1eadp \u0111\u01b0\u1eddng d\u1eabn m\u1eabu b\u00e1o c\u00e1o !
-name_ready_exist = T\u00ean n\u00e0y \u0111\u00e3 t\u1ed3n t\u1ea1i !
-confirm_delete = C\u00f3 ch\u1eafc l\u00e0 b\u1ea1n mu\u1ed1n x\u00f3a kh\u00f4ng ?
+name_is_null = Vui l\u00f2ng nh\u1eadp t\u00ean \!
+excel_is_null = Vui l\u00f2ng nh\u1eadp \u0111\u01b0\u1eddng d\u1eabn m\u1eabu b\u00e1o c\u00e1o \!
+name_ready_exist = T\u00ean n\u00e0y \u0111\u00e3 t\u1ed3n t\u1ea1i \!
+confirm_delete = C\u00f3 ch\u1eafc l\u00e0 b\u1ea1n mu\u1ed1n x\u00f3a kh\u00f4ng \?
item_type = Ki\u1ec3u ph\u1ea7n t\u1eed
period_type = Ki\u1ec3u th\u1eddi \u0111i\u1ec3m
report_design = Thi\u1ebft k\u1ebf b\u00e1o c\u00e1o
-report = B\u00e1o c\u00e1o
-report_item = Ph\u1ea7n t\u1eed b\u00e1o c\u00e1o
+export_report = B\u00e1o c\u00e1o
+export_item = Ph\u1ea7n t\u1eed b\u00e1o c\u00e1o
selected_month = D\u1eef li\u1ec7u c\u1ee7a th\u00e1ng \u0111\u01b0\u1ee3c ch\u1ecdn
last_3_month = D\u1eef li\u1ec7u c\u1ee7a 3 th\u00e1ng g\u1ea7n nh\u1ea5t \u0111\u1ebfn th\u1eddi \u0111i\u1ec3m \u0111\u01b0\u1ee3c ch\u1ecdn
so_far_this_year = D\u1eef li\u1ec7u t\u1eeb \u0111\u1ea7u n\u0103m \u0111\u1ebfn th\u00e1ng \u0111\u01b0\u1ee3c ch\u1ecdn
calculation = T\u00ednh to\u00e1n \u0111\u01b0\u1ee3c
expression = Bi\u1ec3u th\u1ee9c
indicator = Ch\u1ec9 s\u1ed1
-expression_is_null = Vui l\u00f2ng nh\u1eadp bi\u1ec3u th\u1ee9c !
-row_is_null = Vui l\u00f2ng nh\u1eadp v\u1ecb tr\u00ed d\u00f2ng !
-column_is_null = Vui l\u00f2ng nh\u1eadp vi tr\u00ed c\u1ed9t !
+expression_is_null = Vui l\u00f2ng nh\u1eadp bi\u1ec3u th\u1ee9c \!
+row_is_null = Vui l\u00f2ng nh\u1eadp v\u1ecb tr\u00ed d\u00f2ng \!
+column_is_null = Vui l\u00f2ng nh\u1eadp vi tr\u00ed c\u1ed9t \!
period = Th\u1eddi \u0111i\u1ec3m
organisation = \u0110\u01a1n v\u1ecb
generate_report = Xu\u1ea5t b\u00e1o c\u00e1o
preview_report = Xem tr\u01b0\u1edbc b\u00e1o c\u00e1o
-please_wait = Vui l\u00f2ng ch\u1edd \u0111\u1ee3i trong gi\u00e2y l\u00e1t !
-organisationunit_is_null = Vui l\u00f2ng ch\u1ecdn \u0111\u01a1n v\u1ecb !
-period_is_null = Vui l\u00f2ng ch\u1ecdn th\u1eddi \u0111i\u1ec3m !
-report_is_null = Vui l\u00f2ng ch\u1ecdn m\u1eabu b\u00e1o c\u00e1o !
+please_wait = Vui l\u00f2ng ch\u1edd \u0111\u1ee3i trong gi\u00e2y l\u00e1t \!
+organisationunit_is_null = Vui l\u00f2ng ch\u1ecdn \u0111\u01a1n v\u1ecb \!
+period_is_null = Vui l\u00f2ng ch\u1ecdn th\u1eddi \u0111i\u1ec3m \!
+report_is_null = Vui l\u00f2ng ch\u1ecdn m\u1eabu b\u00e1o c\u00e1o \!
formula = C\u00f4ng th\u1ee9c
left_brackets = M\u1edf ngo\u1eb7c
right_brackets = \u0110\u00f3ng ngo\u1eb7c
@@ -102,6 +102,7 @@
upload_file = T\u1ea3i l\u00ean
view = Xem b\u00e1o c\u00e1o
data_status = T\u00ecnh tr\u1ea1ng nh\u1eadp li\u1ec7u
+data_status_management = Qu\u1ea3n l\u00fd t\u00ecnh tr\u1ea1ng nh\u1eadp li\u1ec7u
make_default = M\u1eb7c \u0111\u1ecbnh
completed = \u0110\u00e3 n\u1ed9p
entried = \u0110\u00e3 nh\u1eadp
@@ -142,19 +143,19 @@
generate_advanced_report = B\u00e1o c\u00e1o theo nh\u00f3m \u0111\u01a1n v\u1ecb
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
+choose_import_item = 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_group_name = Vui l\u00f2ng nh\u1eadp t\u00ean nh\u00f3m
-copy_items_duplicated = Item b\u1ecb tr\u00f9ng l\u1eb7p, kh\u00f4ng th\u1ec3 sao ch\u00e9p !
-copy_successful = Sao ch\u00e9p th\u00e0nh c\u00f4ng !
-copy_selected_item_to_excel_item = Sao ch\u00e9p report item cho excel item
-excelitem_group = Nh\u00f3m excel item
-copy_items = Sao ch\u00e9p item
+copy_items_duplicated = Item b\u1ecb tr\u00f9ng l\u1eb7p, kh\u00f4ng th\u1ec3 sao ch\u00e9p \!
+copy_successful = Sao ch\u00e9p th\u00e0nh c\u00f4ng \!
+copy_selected_item_to_import_item = Sao ch\u00e9p export item cho import item
+improt_report = B\u00e1o c\u00e1o Nh\u1eadp
+copy_items = Sao ch\u00e9p ph\u1ea7n t\u1eed excel
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
+warning_upload_is_null = Xin vui l\u00f2ng ch\u1ecdn file excel c\u1ea7n upload \!
+list_of_import_items = Danh s\u00e1ch c\u00e1c ph\u1ea7n t\u1eed import
selected_dataelements = Ph\u1ea7n t\u1eed c\u00f3 s\u1eb5n
available_dataelements = Ph\u1ea7n t\u1eed \u0111\u01b0\u1ee3c ch\u1ecdn
value_rounded = Gi\u00e1 tr\u1ecb n\u00e0y c\u00f3 th\u1ec3 \u0111\u00e3 \u0111\u01b0\u1ee3c l\u00e0m tr\u00f2n
@@ -163,40 +164,40 @@
choose_excel_group = Ch\u01b0a ch\u1ecdn nh\u00f3m
choose_report = Ch\u01b0a ch\u1ecdn b\u00e1o c\u00e1o
excel_template_management = Qu\u1ea3n l\u00fd c\u00e1c t\u1eadp tin excel m\u1eabu
-confirm_override = B\u1ea1n c\u00f3 mu\u1ed1n ghi \u0111\u00e8 l\u00ean t\u1eadp tin \u0111\u00e3 c\u00f3?
-file_exists = T\u1eadp tin excel n\u00e0y \u0111ang t\u1ed3n t\u1ea1i !
-upload_successful = T\u1ea3i t\u1eadp tin th\u00e0nh c\u00f4ng!
+confirm_override = B\u1ea1n c\u00f3 mu\u1ed1n ghi \u0111\u00e8 l\u00ean t\u1eadp tin \u0111\u00e3 c\u00f3\?
+file_exists = T\u1eadp tin excel n\u00e0y \u0111ang t\u1ed3n t\u1ea1i \!
+upload_successful = T\u1ea3i t\u1eadp tin th\u00e0nh c\u00f4ng\!
override_successful = T\u1eadp tin n\u00e0y \u0111\u00e3 \u0111\u01b0\u1ee3c ghi \u0111\u00e8!
cannot_write_file_being_used = Kh\u00f4ng th\u1ec3 ghi l\u00ean t\u1eadp tin n\u00e0y v\u00ec \u0111ang \u0111\u01b0\u1ee3c s\u1eed d\u1ee5ng b\u1edfi m\u1ed9t ch\u01b0\u01a1ng tr\u00ecnh kh\u00e1c
filename_wellformed = L\u00e0m c\u00e1ch n\u00e0o \u0111\u1ec3 c\u00f3 t\u00ean t\u1eadp tin h\u1ee3p l\u1ec7?
length_filename_min5_max30 = \u0110\u1ed9 d\u00e0i c\u1ee7a t\u00ean t\u1eadp tin t\u1ed1i thi\u1ec3u l\u00e0 5 v\u00e0 t\u1ed1i \u0111a l\u00e0 30
use_only_letters_numbers_dot_only = Ch\u1ec9 nh\u1eadp K\u00fd t\u1ef1, S\u1ed1 cho t\u00ean t\u1eadp tin v\u00e0 D\u1ea5u ch\u1ea5m(.) cho ph\u1ea7n \u0111u\u00f4i m\u1edf r\u1ed9ng
file_used_system = T\u1eadp tin n\u00e0y \u0111ang \u0111\u01b0\u1ee3c s\u1eed d\u1ee5ng trong H\u1ec7 th\u1ed1ng
-confirm_rename = B\u1ea1n c\u00f3 mu\u1ed1n \u0111\u1ed5i t\u00ean n\u00f3 kh\u00f4ng?
+confirm_rename = B\u1ea1n c\u00f3 mu\u1ed1n \u0111\u1ed5i t\u00ean n\u00f3 kh\u00f4ng\?
rename_successful = T\u00ean t\u1eadp tin \u0111\u00e3 \u0111\u1ed5i
-confirm_update_system = B\u1ea1n c\u00f3 mu\u1ed1n c\u1eadp nh\u1eadt l\u1ea1i H\u1ec7 th\u1ed1ng b\u00e1o c\u00e1o?
+confirm_update_system = B\u1ea1n c\u00f3 mu\u1ed1n c\u1eadp nh\u1eadt l\u1ea1i H\u1ec7 th\u1ed1ng b\u00e1o c\u00e1o\?
rename_failed = \u0110\u1ed5i t\u00ean kh\u00f4ng th\u00e0nh c\u00f4ng
template_status = T\u00ecnh tr\u1ea1ng t\u1eadp tin
length_filename_min5_max30 = \u0110\u1ed9 d\u00e0i c\u1ee7a t\u00ean t\u1eadp tin t\u1ed1i thi\u1ec3u l\u00e0 5 v\u00e0 t\u1ed1i \u0111a l\u00e0 30
use_only_letters_numbers_dot_only = Ch\u1ec9 nh\u1eadp K\u00fd t\u1ef1, S\u1ed1 cho t\u00ean t\u1eadp tin v\u00e0 D\u1ea5u ch\u1ea5m(.) cho ph\u1ea7n \u0111u\u00f4i m\u1edf r\u1ed9ng
cell_exist = \u0110\u00e3 t\u1ed3n t\u1ea1i m\u1ed9t excel item c\u00f3 c\u00f9ng d\u00f2ng, c\u1ed9t v\u00e0 sheet.
-update_successful = C\u1eadp nh\u1eadt th\u00e0nh c\u00f4ng !
+update_successful = C\u1eadp nh\u1eadt th\u00e0nh c\u00f4ng \!
download = T\u1ea3i v\u1ec1
-override_confirm = File template n\u00e0y \u0111\u00e3 t\u1ed3n t\u1ea1i. B\u1ea1n c\u00f3 mu\u1ed1n ghi \u0111\u00e8 hay ko ?
+override_confirm = File template n\u00e0y \u0111\u00e3 t\u1ed3n t\u1ea1i. B\u1ea1n c\u00f3 mu\u1ed1n ghi \u0111\u00e8 hay ko \?
template_using = \u0110ANG s\u1eed d\u1ee5ng t\u1eadp tin n\u00e0y
template_pending = CH\u01afA s\u1eed d\u1ee5ng t\u1eadp tin n\u00e0y
-intro_configuration = Thi\u1ebft l\u1eadp \u0111\u01b0\u1eddng d\u1eabn tr\u1ecf t\u1edbi th\u01b0 m\u1ee5c l\u01b0u tr\u1eef c\u00e1c t\u1eadp tin m\u1eabu tr\u00ean m\u00e1y ch\u1ee7.\nCh\u00fa \u00fd: \u0110\u00e2y l\u00e0 \u0111\u01b0\u1eddng d\u1eabn t\u01b0\u01a1ng \u0111\u1ed1i.\nV\u00ed d\u1ee5: \\templatefiles d\u00e0nh cho Windows ho\u1eb7c /templatefiles cho Linux.
-intro_reports = T\u1ea1o m\u1edbi, c\u1eadp nh\u1eadt, xem v\u00e0 x\u00f3a c\u00e1c B\u00e1o c\u00e1o excel. M\u1ed9t b\u00e1o c\u00e1o excel ch\u1ee9a nhi\u1ec1u ph\u1ea7n t\u1eed excel. B\u00e1o c\u00e1o excel c\u00f3 th\u1ec3 thu\u1ed9c nhi\u1ec1u lo\u1ea1i b\u00e1o c\u00e1o kh\u00e1c nhau. Cho ph\u00e9p g\u00e1n b\u00e1o c\u00e1o excel cho m\u1ed9t hay nhi\u1ec1u \u0111\u01a1n v\u1ecb ho\u1eb7c nh\u00f3m \u0111\u01a1n v\u1ecb v\u00e0 m\u1ed9t s\u1ed1 t\u00f9y ch\u1ecdn kh\u00e1c.
-intro_data_status = Ch\u1ee9c n\u0103ng n\u00e0y d\u00f9ng \u0111\u1ec3 xem tr\u1ea1ng th\u00e1i nh\u1eadp d\u1eef li\u1ec7u (D\u1eef li\u1ec7u \u0111\u01b0\u1ee3c nh\u1eadp xong hay ch\u01b0a ho\u1eb7c s\u1ed1 li\u1ec7u n\u00e0o c\u00f2n thi\u1ebfu v.v...).
-intro_clean_up = Ch\u1ee9c n\u0103ng n\u00e0y cho ph\u00e9p ng\u01b0\u1eddi d\u00f9ng x\u00f3a c\u00e1c t\u1eadp tin t\u1ea1m sinh ra trong qu\u00e1 tr\u00ecnh sinh b\u00e1o c\u00e1o ho\u1eb7c xem tr\u01b0\u1edbc b\u00e1o c\u00e1o.
-intro_excel_item = T\u1ea1o m\u1edbi, c\u1eadp nh\u1eadt, xem v\u00e0o x\u00f3a c\u00e1c ph\u1ea7n t\u1eed excel cho qu\u00e1 tr\u00ecnh import d\u1eef li\u1ec7u t\u1eeb t\u1eadp tin excel. Ph\u1ea7n t\u1eed excel n\u00e0y c\u00f3 ch\u1ee9c n\u0103ng g\u1ea7n gi\u1ed1ng v\u1edbi ph\u1ea7n t\u1eed excel trong m\u1ed9t b\u00e1o c\u00e1o excel.
-intro_excel_template_management = T\u1ea3i ,\u0111\u1ed5i t\u00ean, t\u00ecm ki\u1ebfm, t\u1ea3i v\u1ec1 v\u00e0 x\u00f3a c\u00e1c t\u1eadp tin c\u00f3 \u0111u\u00f4i m\u1edf r\u1ed9ng .xls ho\u1eb7c .xlsx. Ng\u01b0\u1eddi d\u00f9ng c\u00f3 th\u1ec3 nh\u1eadn bi\u1ebft t\u1eadp tin n\u00e0o \u0111ang \u0111\u01b0\u1ee3c s\u1eed d\u1ee5ng v\u00e0 t\u1eadp tin n\u00e0o ch\u01b0a d\u00f9ng \u0111\u1ebfn. Cho ph\u00e9p t\u1ef1 \u0111\u1ed9ng c\u1eadp nh\u1eadt l\u1ea1i h\u1ec7 th\u1ed1ng b\u00e1o c\u00e1o excel khi t\u00ean t\u1eadp tin \u0111ang s\u1eed d\u1ee5ng thay \u0111\u1ed5i.
+intro_configuration = Thi\u1ebft l\u1eadp \u0111\u01b0\u1eddng d\u1eabn tr\u1ecf t\u1edbi th\u01b0 m\u1ee5c l\u01b0u tr\u1eef c\u00e1c t\u1eadp tin m\u1eabu tr\u00ean m\u00e1y ch\u1ee7.\nCh\u00fa \u00fd: \u0110\u00e2y l\u00e0 \u0111\u01b0\u1eddng d\u1eabn t\u01b0\u01a1ng \u0111\u1ed1i.\nV\u00ed d\u1ee5: \\templatefiles d\u00e0nh cho Windows ho\u1eb7c /templatefiles cho Linux\.
+intro_export_reports = T\u1ea1o m\u1edbi, c\u1eadp nh\u1eadt, xem v\u00e0 x\u00f3a c\u00e1c B\u00e1o c\u00e1o excel. M\u1ed9t b\u00e1o c\u00e1o excel ch\u1ee9a nhi\u1ec1u ph\u1ea7n t\u1eed excel\. B\u00e1o c\u00e1o excel c\u00f3 th\u1ec3 thu\u1ed9c nhi\u1ec1u lo\u1ea1i b\u00e1o c\u00e1o kh\u00e1c nhau\. Cho ph\u00e9p g\u00e1n b\u00e1o c\u00e1o excel cho m\u1ed9t hay nhi\u1ec1u \u0111\u01a1n v\u1ecb ho\u1eb7c nh\u00f3m \u0111\u01a1n v\u1ecb v\u00e0 m\u1ed9t s\u1ed1 t\u00f9y ch\u1ecdn kh\u00e1c\.
+intro_data_status = Ch\u1ee9c n\u0103ng n\u00e0y d\u00f9ng \u0111\u1ec3 xem tr\u1ea1ng th\u00e1i nh\u1eadp d\u1eef li\u1ec7u (D\u1eef li\u1ec7u \u0111\u01b0\u1ee3c nh\u1eadp xong hay ch\u01b0a ho\u1eb7c s\u1ed1 li\u1ec7u n\u00e0o c\u00f2n thi\u1ebfu v\.v\.\.\.)\.
+intro_clean_up = Ch\u1ee9c n\u0103ng n\u00e0y cho ph\u00e9p ng\u01b0\u1eddi d\u00f9ng x\u00f3a c\u00e1c t\u1eadp tin t\u1ea1m sinh ra trong qu\u00e1 tr\u00ecnh sinh b\u00e1o c\u00e1o ho\u1eb7c xem tr\u01b0\u1edbc b\u00e1o c\u00e1o\.
+intro_import_report = T\u1ea1o m\u1edbi, c\u1eadp nh\u1eadt, xem v\u00e0o x\u00f3a c\u00e1c ph\u1ea7n t\u1eed excel cho qu\u00e1 tr\u00ecnh import d\u1eef li\u1ec7u t\u1eeb t\u1eadp tin excel\. Ph\u1ea7n t\u1eed import excel n\u00e0y c\u00f3 ch\u1ee9c n\u0103ng g\u1ea7n gi\u1ed1ng v\u1edbi ph\u1ea7n t\u1eed export excel\.
+intro_excel_template_management = T\u1ea3i, \u0111\u1ed5i t\u00ean, t\u00ecm ki\u1ebfm, t\u1ea3i v\u1ec1 v\u00e0 x\u00f3a c\u00e1c t\u1eadp tin c\u00f3 \u0111u\u00f4i m\u1edf r\u1ed9ng .xls ho\u1eb7c .xlsx\. Ng\u01b0\u1eddi d\u00f9ng c\u00f3 th\u1ec3 nh\u1eadn bi\u1ebft t\u1eadp tin n\u00e0o \u0111ang \u0111\u01b0\u1ee3c s\u1eed d\u1ee5ng v\u00e0 t\u1eadp tin n\u00e0o ch\u01b0a d\u00f9ng \u0111\u1ebfn. Cho ph\u00e9p t\u1ef1 \u0111\u1ed9ng c\u1eadp nh\u1eadt l\u1ea1i h\u1ec7 th\u1ed1ng b\u00e1o c\u00e1o excel khi t\u00ean t\u1eadp tin \u0111ang s\u1eed d\u1ee5ng thay \u0111\u1ed5i\.
basic = C\u01a1 b\u1ea3n
advanced = N\u00e2ng cao
-update_reportexcel_userrole = G\u00e1n quy\u1ec1n truy xu\u1ea5t tr\u00ean b\u00e1o c\u00e1o
+assign_exportreport_userrole= Assign user role for export report
available = Hi\u1ec7n c\u00f3
selected = \u0110\u01b0\u1ee3c ch\u1ecdn
-print = In th\u1eed..
+print = In th\u1eed...
chart = Bi\u1ec3u \u0111\u1ed3
de_in_chart = Bi\u1ec3u \u0111\u1ed3 theo ph\u1ea7n t\u1eed d\u1eef li\u1ec7u/ch\u1ec9 s\u1ed1
axis_x = Tr\u1ee5c ho\u00e0nh (x)
@@ -214,15 +215,15 @@
bookmark_success = \u0110\u00e1nh d\u1ea5u th\u00e0nh c\u00f4ng
bookmark = \u0110\u00e1nh d\u1ea5u
description = Description
-description_is_null = Please enter description !
+description_is_null = Please enter description \!
report_excel_item = Ph\u1ea7n t\u1eed b\u00e1o c\u00e1o
name_ready_exist_in_sheet = Ph\u1ea7n t\u1eed b\u00e1o c\u00e1o v\u1edbi t\u00ean nh\u01b0 tr\u00ean \u0111\u00e3 t\u1ed3n t\u1ea1i trong sheet n\u00e0y
add_report_excel_item = Th\u00eam ph\u1ea7n t\u1eed b\u00e1o c\u00e1o
please_enter_row_and_column_first = Vui l\u00f2ng nh\u1eadp c\u1ed9t & d\u00f2ng tr\u01b0\u1edbc
report_excel = B\u00e1o c\u00e1o excel
-update_report_excel_item = Ch\u1ec9nh S\u1eeda Ph\u1ea7n T\u1eed B\u00e1o C\u00e1o
+update_report_import_item = Ch\u1ec9nh s\u1eeda ph\u1ea7n t\u1eed b\u00e1o c\u00e1o Nh\u1eadp
excel_importing = Excel Importing
-import_item = Import Item
+import_item = Ph\u1ea7n t\u1eed Nh\u1eadp
selected_indicators = Ch\u1ec9 s\u1ed1 \u0111ang ch\u1ecdn
available_indicators = Ch\u1ec9 s\u1ed1 hi\u1ec7n c\u00f3
color_selection = Ch\u1ecdn m\u00e0u bi\u1ec3u \u0111\u1ed3
@@ -264,5 +265,8 @@
access_denied_to_folder = Ba\u0323n kh\u00f4ng \u0111u\u0309 quy\u00ea\u0300n truy c\u00e2\u0323p va\u0300o th\u01b0 mu\u0323c tr\u00ean ma\u0301y chu\u0309
access_denied_to_file = Truy c\u1eadp b\u1ecb t\u1eeb ch\u1ed1i \u0111\u00ea\u0301n t\u1eadp tin tr\u00ean m\u00e1y ch\u1ee7
template_folder_is_not_empty= C\u1ea3nh b\u00e1o! Th\u01b0 m\u1ee5c c\u0169 c\u1ee7a h\u1ec7 th\u1ed1ng hi\u1ec7n \u0111ang ch\u1ee9a c\u00e1c t\u1eadp tin excel m\u1eabu.\nB\u1ea1n c\u00f3 mu\u1ed1n di chuy\u1ec3n ch\u00fang qua th\u01b0 m\u1ee5c m\u1edbi tr\u01b0\u1edbc khi n\u00f3 b\u1ecb x\u00f3a \?
-config_path_invalid = C\u1ea5u h\u00ecnh kh\u00f4ng h\u1ee3p l\u1ec7\! Ch\u1ec9 cho ph\u00e9p nh\u1eadp ch\u1eef c\u00e1i, ch\u1eef s\u1ed1, k\u00fd t\u1ef1 g\u1ea1ch d\u01b0\u1edbi, g\u1ea1ch ngang v\u00e0 kho\u1ea3ng tr\u1eafng.
-there_is_no_excel_item_group= Ch\u01b0a c\u00f3 nh\u00f3m ph\u1ea7n t\u1eed import d\u1eef li\u1ec7u n\u00e0o \u0111\u01b0\u1ee3c t\u1ea1o trong h\u1ec7 th\u1ed1ng
\ No newline at end of file
+config_path_invalid = C\u1ea5u h\u00ecnh kh\u00f4ng h\u1ee3p l\u1ec7\! Ch\u1ec9 cho ph\u00e9p nh\u1eadp ch\u1eef c\u00e1i, ch\u1eef s\u1ed1, k\u00fd t\u1ef1 g\u1ea1ch d\u01b0\u1edbi, g\u1ea1ch ngang v\u00e0 kho\u1ea3ng tr\u1eafng\.
+there_is_no_import_report = Ch\u01b0a c\u00f3 nh\u00f3m ph\u1ea7n t\u1eed import d\u1eef li\u1ec7u n\u00e0o \u0111\u01b0\u1ee3c t\u1ea1o trong h\u1ec7 th\u1ed1ng
+export_reports = B\u00e1o c\u00e1o Xu\u1ea5t
+generate_export_report = Xu\u1ea5t b\u00e1o c\u00e1o
+set_organisationunit_group_level = Thi\u1ebft l\u1eadp c\u1ea5p hi\u1ec3n th\u1ecb cho nh\u00f3m \u0111\u01a1n v\u1ecb
\ No newline at end of file
=== 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-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml 2011-05-27 04:45:31 +0000
@@ -429,6 +429,7 @@
<param name="stylesheets">style/previewStyle.css</param>
<param name="javascripts">
../dhis-web-commons/ouwt/ouwt.js,
+ ../dhis-web-commons/javascripts/jQuery/jquery.jqprint.0.3.js,
javascript/export.js,
javascript/preview.js
</param>
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/exportReportUserRoles.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/exportReportUserRoles.vm 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/exportReportUserRoles.vm 2011-05-27 04:45:31 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "update_exportreport_userrole" )</h3>
+<h3>$i18n.getString( "assign_exportreport_userrole" )</h3>
<form name="userRole" action="updateExportReportUserRole.action" method="POST" onsubmit="selectAllById( 'selectedList' );">
<input type="hidden" name="id" value="$exportReport.id"/>
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/preview.js'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/preview.js 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/preview.js 2011-05-27 04:45:31 +0000
@@ -32,13 +32,13 @@
function previewExportReportReceived( parentElement )
{
- var aKey = new Array();
- var aMerged = new Array();
+ var aKey = new Array();
+ var aMerged = new Array();
var cells = parentElement.getElementsByTagName( 'cell' );
for (var i = 0 ; i < cells.length ; i ++)
{
- aKey[i] = cells[i].getAttribute( 'iKey' );
+ aKey[i] = cells[i].getAttribute( 'iKey' );
aMerged[i] = cells[i].firstChild.nodeValue;
}
@@ -146,7 +146,6 @@
function printExportReport()
{
- var tab = jQuery('#tabs').tabs().data('selected.tabs');
-
+ var tab = jQuery('#tabs').tabs('option', 'selected');
jQuery( "#tabs-" + tab ).jqprint();
}
\ No newline at end of file
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm 2011-05-27 04:45:31 +0000
@@ -5,7 +5,7 @@
<tr>
<td colspan=2>
<input type="button" onclick="openAddDataElementGroupOrder()" value="$i18n.getString('add')" style="width:100px"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location='listExportReport.action'" style="width:100px">
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location='listAllExportReport.action'" style="width:100px">
</td>
<td width="100px">
<input type="button" value="$i18n.getString( 'update_order' )" onclick="updateDataElementGroupOrder()" style="width:150px">
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm 2011-05-16 06:30:16 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm 2011-05-27 04:45:31 +0000
@@ -2,11 +2,11 @@
<h2><a href="selectExportReportParam.action">$i18n.getString( "generate_report" ) </a></h2>
<ul>
+ <li><a href="viewDataEntryStatus.action">$i18n.getString( "data_status" )</a></li>
<li><a href="selectExportReportParam.action">$i18n.getString( "generate_report" ) </a></li>
<!--
<li><a href="viewJCharts.action">$i18n.getString( "chart" ) </a></li>
<li><a href="selectAdvancedExportForm.action">$i18n.getString( "generate_advanced_report" ) </a></li>
- <li><a href="viewDataEntryStatus.action">$i18n.getString( "data_status" )</a></li>
<li><a href="dataSetCompletedReports.action">$i18n.getString( "dataset_completed_report" ) </a></li>
-->
<li><a href="getImportingParams.action">$i18n.getString( "import" ) </a></li>
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitGroupListingReport.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitGroupListingReport.vm 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitGroupListingReport.vm 2011-05-27 04:45:31 +0000
@@ -47,7 +47,7 @@
<tr>
<td colspan=4>
<input type="button" value="$i18n.getString( 'ok')" onclick="submitForm()"/>
- <input type="button" value="$i18n.getString( 'cancel')" onclick="window.location='listExportReport.action'"/>
+ <input type="button" value="$i18n.getString( 'cancel')" onclick="window.location='listAllExportReport.action'"/>
</td>
</tr>
</table>
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/periodcolumns.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/periodcolumns.vm 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/periodcolumns.vm 2011-05-27 04:45:31 +0000
@@ -1,1 +1,1 @@
-<h3>$!encoder.htmlEncode($!exportReport.name)</h3>
<table width="100%">
<tr style="vertical-align:bottom;">
<td>
$i18n.getString( "filter_by_name" ): <input type="text" onkeyup="filterValues(this.value, 1)" style="width:300px"/>
</td>
<td align="right">
<input type="button" onclick="openAddPeriodColumn()" value="$i18n.getString('add')" style="width:150px"/><br>
<input type="button" onclick="window.location='listExportReport.action'" value="$i18n.getString('cancel')" style="width:150px"/><br>
</td>
</tr>
</table>
<table width="100%" id="listTable" class="listTable">
<thead>
<tr>
<th>$i18n.getString('start_date')</th>
<th>$i18n.getString('end_date')</th>
<th>$i18n.getString('period_type')</th>
<th>$i18n.getString('column')</th>
<th width="70px" class="{sorter: false}">$i18n.getString('operations')</th>
</tr>
</thead>
<tbody id="list">
#set( $mark = false )
#foreach($periodColumn in $exportReport.periodColumns)
<tr #alternate( $mark )>
<td>$format.formatDate($periodColumn.startdate)</td>
<td>$format.formatDate($periodColumn.enddate)</td>
<td>$i18n.getString( $periodColumn.periodType )</td>
<td>$periodColumn.column</td>
<td align="center">
<a href="javascript:deletePeriodColumn($exportReport.id, $periodColumn.id );" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
<a href="javascript:openUpdatePeriodColumn( $periodColumn.id );" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
</td>
</tr>
#if( $mark )
#set( $mark = false )
#else
#set( $mark = true )
#end
#end
</tbody>
</table>
<div id="periodColumn" style="padding:10px;display:none">
<form id="periodColumnForm" method="POST">
<input type="hidden" id="action" value=""/>
<input type="hidden" name="id" id="id"/>
<input type="hidden" value="$!exportReport.id" name="exportReportId"/>
<table width="100%">
<tr>
<td><label>$i18n.getString('period_type')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select type="text" id="periodType" name="periodType" style="min-width:20em">
<option value='selected_month'>$i18n.getString('selected_month')</option>
<option value='last_3_month'>$i18n.getString('last_3_month')</option>
<option value='last_6_month'>$i18n.getString('last_6_month')</option>
<option value='so_far_this_year'>$i18n.getString('so_far_this_year')</option>
<option value='quaterly'>$i18n.getString('quaterly')</option>
<option value='6_month'>$i18n.getString('six_monthly')</option>
<option value='yealy'>$i18n.getString('yearly')</option>
</select>
</td>
</tr>
<tr>
<td>$i18n.getString('start_date')</td>
<td>
<input id="startdate" name="startdate" type="text" readonly="readonly" /><em title="$i18n.getString( 'required' )" class="required">*</em>
</td>
</tr>
<tr>
<td>$i18n.getString('end_date')</td>
<td>
<input id="enddate" name="enddate" type="text" readonly="readonly"/><em title="$i18n.getString( 'required' )" class="required">*</em>
</td>
</tr>
<tr>
<td>$i18n.getString('column')</td>
<td>
<input id="column" name="column" type="text" class="{validate:{required:true, number:true}}"/><em title="$i18n.getString( 'required' )" class="required">*</em>
</td>
</tr>
<tr style="height:50px">
<td></td>
<td>
<input type="submit" id="action" value="$i18n.getString('save')" style="width:100px"/>
<input type="button" value="$i18n.getString('cancel')" style="width:100px" onclick="hidePopWindowById('periodColumn')"/>
</td>
</tr>
</table>
</form>
</div>
<script>
var i18n_startdate_null = "$encoder.jsEscape($i18n.getString( 'startdate_null' ) , "'")";
var i18n_enddate_null = "$encoder.jsEscape($i18n.getString( 'enddate_null' ) , "'")";
var i18n_column_is_null = "$encoder.jsEscape($i18n.getString( 'column_is_null' ) , "'")";
var i18n_confirm_delete = '$encoder.jsEscape($i18n.getString( 'confirm_delete' ) , "'")';
jQuery(document).ready(function(){
datePickerInRange( 'startdate' , 'enddate' );
tableSorter( 'listTable' );
validation( 'periodColumnForm', function( form ){
form.action = getFieldValue('action');
form.submit();
} );
});
function openAddPeriodColumn()
{
setFieldValue( "action", "savePeriodColumn.action" );
showPopupWindowById( 'periodColumn', 400, 170 );
}
function openUpdatePeriodColumn( id )
{
var request = new Request();
request.setResponseTypeXML( 'xmlObject' );
request.setCallbackSuccess( openUpdatePeriodColumnCompleted );
request.send( "getPeriodColumn.action?id=" + id );
}
function openUpdatePeriodColumnCompleted( xmlObject )
{
var id = xmlObject.getElementsByTagName("id")[0].firstChild.nodeValue;
var startdate = xmlObject.getElementsByTagName("startdate")[0].firstChild.nodeValue;
var enddate = xmlObject.getElementsByTagName("enddate")[0].firstChild.nodeValue;
var periodType = xmlObject.getElementsByTagName("periodType")[0].firstChild.nodeValue;
var column = xmlObject.getElementsByTagName("column")[0].firstChild.nodeValue;
byId("startdate").value = startdate;
byId("enddate").value = enddate;
byId("periodType").value = periodType;
byId("column").value = column;
byId("id").value = id;
setFieldValue('action', 'updatePeriodColumn.action' );
showPopupWindowById( 'periodColumn', 400, 170 );
}
function deletePeriodColumn( exportReportId, periodColumnId )
{
if(window.confirm(i18n_confirm_delete)){
window.location="deletePeriodColumn.action?exportReportId=" + exportReportId + "&id=" + periodColumnId;
}
}
</script>
\ No newline at end of file
+<h3>$!encoder.htmlEncode($!exportReport.name)</h3>
<table width="100%">
<tr style="vertical-align:bottom;">
<td>
$i18n.getString( "filter_by_name" ): <input type="text" onkeyup="filterValues(this.value, 1)" style="width:300px"/>
</td>
<td align="right">
<input type="button" onclick="openAddPeriodColumn()" value="$i18n.getString('add')" style="width:150px"/><br>
<input type="button" onclick="window.location='listAllExportReport.action'" value="$i18n.getString('cancel')" style="width:150px"/><br>
</td>
</tr>
</table>
<table width="100%" id="listTable" class="listTable">
<thead>
<tr>
<th>$i18n.getString('start_date')</th>
<th>$i18n.getString('end_date')</th>
<th>$i18n.getString('period_type')</th>
<th>$i18n.getString('column')</th>
<th width="70px" class="{sorter: false}">$i18n.getString('operations')</th>
</tr>
</thead>
<tbody id="list">
#set( $mark = false )
#foreach($periodColumn in $exportReport.periodColumns)
<tr #alternate( $mark )>
<td>$format.formatDate($periodColumn.startdate)</td>
<td>$format.formatDate($periodColumn.enddate)</td>
<td>$i18n.getString( $periodColumn.periodType )</td>
<td>$periodColumn.column</td>
<td align="center">
<a href="javascript:deletePeriodColumn($exportReport.id, $periodColumn.id );" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
<a href="javascript:openUpdatePeriodColumn( $periodColumn.id );" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
</td>
</tr>
#if( $mark )
#set( $mark = false )
#else
#set( $mark = true )
#end
#end
</tbody>
</table>
<div id="periodColumn" style="padding:10px;display:none">
<form id="periodColumnForm" method="POST">
<input type="hidden" id="action" value=""/>
<input type="hidden" name="id" id="id"/>
<input type="hidden" value="$!exportReport.id" name="exportReportId"/>
<table width="100%">
<tr>
<td><label>$i18n.getString('period_type')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select type="text" id="periodType" name="periodType" style="min-width:20em">
<option value='selected_month'>$i18n.getString('selected_month')</option>
<option value='last_3_month'>$i18n.getString('last_3_month')</option>
<option value='last_6_month'>$i18n.getString('last_6_month')</option>
<option value='so_far_this_year'>$i18n.getString('so_far_this_year')</option>
<option value='quaterly'>$i18n.getString('quaterly')</option>
<option value='6_month'>$i18n.getString('six_monthly')</option>
<option value='yealy'>$i18n.getString('yearly')</option>
</select>
</td>
</tr>
<tr>
<td>$i18n.getString('start_date')</td>
<td>
<input id="startdate" name="startdate" type="text" readonly="readonly" /><em title="$i18n.getString( 'required' )" class="required">*</em>
</td>
</tr>
<tr>
<td>$i18n.getString('end_date')</td>
<td>
<input id="enddate" name="enddate" type="text" readonly="readonly"/><em title="$i18n.getString( 'required' )" class="required">*</em>
</td>
</tr>
<tr>
<td>$i18n.getString('column')</td>
<td>
<input id="column" name="column" type="text" class="{validate:{required:true, number:true}}"/><em title="$i18n.getString( 'required' )" class="required">*</em>
</td>
</tr>
<tr style="height:50px">
<td></td>
<td>
<input type="submit" id="action" value="$i18n.getString('save')" style="width:100px"/>
<input type="button" value="$i18n.getString('cancel')" style="width:100px" onclick="hidePopWindowById('periodColumn')"/>
</td>
</tr>
</table>
</form>
</div>
<script>
var i18n_startdate_null = "$encoder.jsEscape($i18n.getString( 'startdate_null' ) , "'")";
var i18n_enddate_null = "$encoder.jsEscape($i18n.getString( 'enddate_null' ) , "'")";
var i18n_column_is_null = "$encoder.jsEscape($i18n.getString( 'column_is_null' ) , "'")";
var i18n_confirm_delete = '$encoder.jsEscape($i18n.getString( 'confirm_delete' ) , "'")';
jQuery(document).ready(function(){
datePickerInRange( 'startdate' , 'enddate' );
tableSorter( 'listTable' );
validation( 'periodColumnForm', function( form ){
form.action = getFieldValue('action');
form.submit();
} );
});
function openAddPeriodColumn()
{
setFieldValue( "action", "savePeriodColumn.action" );
showPopupWindowById( 'periodColumn', 400, 170 );
}
function openUpdatePeriodColumn( id )
{
var request = new Request();
request.setResponseTypeXML( 'xmlObject' );
request.setCallbackSuccess( openUpdatePeriodColumnCompleted );
request.send( "getPeriodColumn.action?id=" + id );
}
function openUpdatePeriodColumnCompleted( xmlObject )
{
var id = xmlObject.getElementsByTagName("id")[0].firstChild.nodeValue;
var startdate = xmlObject.getElementsByTagName("startdate")[0].firstChild.nodeValue;
var enddate = xmlObject.getElementsByTagName("enddate")[0].firstChild.nodeValue;
var periodType = xmlObject.getElementsByTagName("periodType")[0].firstChild.nodeValue;
var column = xmlObject.getElementsByTagName("column")[0].firstChild.nodeValue;
byId("startdate").value = startdate;
byId("enddate").value = enddate;
byId("periodType").value = periodType;
byId("column").value = column;
byId("id").value = id;
setFieldValue('action', 'updatePeriodColumn.action' );
showPopupWindowById( 'periodColumn', 400, 170 );
}
function deletePeriodColumn( exportReportId, periodColumnId )
{
if(window.confirm(i18n_confirm_delete)){
window.location="deletePeriodColumn.action?exportReportId=" + exportReportId + "&id=" + periodColumnId;
}
}
</script>
\ No newline at end of file
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/addExportReportForm.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/addExportReportForm.vm 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/addExportReportForm.vm 2011-05-27 04:45:31 +0000
@@ -36,7 +36,7 @@
<tr>
<td><label>$i18n.getString('excel_template')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select name="excel" style="min-width:20em">
+ <select name="excel" style="min-width:20em" class="{validate:{required:true}}">
#foreach($templateFileName in $mapTemplateFiles.keySet())
<option value="$encoder.htmlEncode( $templateFileName )">$encoder.htmlEncode( $templateFileName )</option>
#end
@@ -44,9 +44,9 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString('report_type')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label>$i18n.getString('export_report_type')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select name="reportType" style="min-width:20em">
+ <select name="exportReportType" style="min-width:20em">
<option value='NORMAL'>$i18n.getString('NORMAL')</option>
<option value='CATEGORY'>$i18n.getString('CATEGORY')</option>
<option value='PERIOD_COLUMN_LISTING'>$i18n.getString('PERIOD_COLUMN_LISTING')</option>
@@ -55,7 +55,7 @@
</td>
</tr>
<tr>
- <td><label>$i18n.getString('group')</label></td>
+ <td><label>$i18n.getString('group')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="group" name="group" style="width:20em" class="{validate:{required:true,minlength:2,maxlength:160}}"/></td>
<td>
<tr>
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/exportReports.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/exportReports.vm 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/exportReports.vm 2011-05-27 04:45:31 +0000
@@ -16,7 +16,7 @@
<th>$i18n.getString('name')</th>
<th>$i18n.getString('report_type')</th>
<th>$i18n.getString('excel_template')</th>
- <th width="150px" class="{sorter: false}">$i18n.getString('basic')</th>
+ <th width="120px" class="{sorter: false}">$i18n.getString('basic')</th>
<th width="100px" class="{sorter: false}">$i18n.getString('advanced')</th>
</tr>
</thead>
@@ -30,10 +30,10 @@
</td>
<td align="left">
<a href="openDefineAssociationsForm.action?exportReportId=$exportReport.id" title="$i18n.getString( 'define_associations' )"><img src="../images/assign.png" alt="$i18n.getString( 'define_associations' )"/></a>
- <a href="openExportReportUserRole.action?id=$exportReport.id" title="$i18n.getString( 'update_exportreport_userrole' )"><img src="images/user_32.png" alt="$i18n.getString( 'update_exportreport_userrole' )"/></a>
+ <a href="openExportReportUserRole.action?id=$exportReport.id" title="$i18n.getString( 'assign_exportreport_userrole' )"><img src="images/user_32.png" alt="$i18n.getString( 'update_exportreport_userrole' )"/></a>
<a href="updateExportReportForm.action?id=$exportReport.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
<a href="javascript:removeItem( $exportReport.id, '$exportReport.name', '$i18n.getString( 'confirm_delete' )', 'deleteExportReport.action');" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
- <a href="javascript:translate( '$exportReport.getClass().getSimpleName()', '$exportReport.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
+ <!--a href="javascript:translate( '$exportReport.getClass().getSimpleName()', '$exportReport.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a-->
</td>
<td>
<a href="listExportItemAction.action?exportReportId=$exportReport.id" title="$i18n.getString( 'export_item' )"><img src="../images/add_section.png" alt="$i18n.getString( 'export_item' )"/></a>
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/updateExportReportForm.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/updateExportReportForm.vm 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/report/updateExportReportForm.vm 2011-05-27 04:45:31 +0000
@@ -37,27 +37,21 @@
<tr>
<td><label>$i18n.getString('excel_template')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select name="excel" style="min-width:20em">
- #foreach($templateFileName in $mapTemplateFiles.keySet())
- #if( $exportReport.excelTemplateFile==$templateFileName)
- <option value="$encoder.htmlEncode( $templateFileName )" selected="selected" >$encoder.htmlEncode( $templateFileName )</option>
- #else
- <option value="$encoder.htmlEncode( $templateFileName )" >$encoder.htmlEncode( $templateFileName )</option>
- #end
+ <select name="excel" style="min-width:20em" class="{validate:{required:true}}">
+ #foreach($templateFileName in $mapTemplateFiles.keySet())
+ <option value="$encoder.htmlEncode( $templateFileName )" #if( $exportReport.excelTemplateFile==$templateFileName) selected="selected" #end>
+ $encoder.htmlEncode( $templateFileName )
+ </option>
#end
</select>
</td>
</tr>
<tr>
- <td><label>$i18n.getString('report_type')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label>$i18n.getString('export_report_type')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
- <select name="reportType" style="min-width:20em" disabled=true>
+ <select name="exportReportType" style="min-width:20em" disabled="true">
#foreach( $type in $reportTypes )
- #if( $exportReport.getReportType()==$type)
- <option value='$type' selected="selected">$i18n.getString($type)</option>
- #else
- <option value='$type'>$i18n.getString($type)</option>
- #end
+ <option value='$type' #if( $exportReport.getReportType()==$type) selected="selected" #end>$i18n.getString($type)</option>
#end
</select>
</td>
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseExportReports.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseExportReports.vm 2011-05-18 09:23:52 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseExportReports.vm 2011-05-27 04:45:31 +0000
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<reports>
+<exportReports>
<organisationUnit>$!encoder.xmlEncode($organisationUnit.name)</organisationUnit>
- #foreach($report in $reports)
- <report>
- <id>$report.id</id>
- <name>$!encoder.xmlEncode($report.name)</name>
- </report>
+ #foreach($exportReport in $exportReports)
+ <exportReport>
+ <id>$exportReport.id</id>
+ <name>$!encoder.xmlEncode($exportReport.name)</name>
+ </exportReport>
#end
-</reports>
\ No newline at end of file
+</exportReports>
\ No newline at end of file
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.vm 2010-07-08 02:45:26 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.vm 2011-05-27 04:45:31 +0000
@@ -1,12 +1,9 @@
-<h3>$i18n.getString( "edit" ) $i18n.getString( "dataset_completed_report" )</h3>
+<h3>$i18n.getString( "edit" ) $i18n.getString( "data_status" )</h3>
<table>
<tr>
<td>$i18n.getString( 'dataset' )</td>
- <td>
- <select id="dataSetId" name="dataSetId">
- </select>
- </td>
+ <td><select id="dataSetId" name="dataSetId"></select></td>
</tr>
<tr>
<td>$i18n.getString( 'make_default' )</td>
@@ -17,7 +14,7 @@
<td> </td>
</tr>
<tr>
- <td colspan=2 align=center>
+ <td colspan="2" align="center">
<input type="button" value="$i18n.getString( 'ok' )" style="width:100px" onclick="updateDataStatus()"/>
<input type="button" value="$i18n.getString( 'cancel' )" style="width:100px" onclick="window.location = 'listDataEntryStatus.action'"/>
</td>
@@ -48,7 +45,5 @@
dataSets.options.add(option,null);
}
-
-
}
</script>
\ No newline at end of file
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/viewAdministrator.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/viewAdministrator.vm 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/viewAdministrator.vm 2011-05-27 04:45:31 +0000
@@ -2,12 +2,12 @@
<ul id="introList">
#introListImgItem( "getConfiguration.action" "configuration" "systemsettings")
- #introListImgItem( "listAllExportReport.action" "export_reports" "pivottable")
- #introListImgItem( "jcharts.action" "chart" "jchart")
- #introListImgItem( "listDataEntryStatus.action" "data_status" "validationcriteria")
- #introListImgItem( "listAllImportReport.action" "import_item" "program" )
- #introListImgItem( "listAllExcelTemplates.action" "excel_template_management" , "excel")
+ #introListImgItem( "listAllExportReport.action" "export_reports" "export")
+ #introListImgItem( "listAllImportReport.action" "import_reports" "import" )
+ #introListImgItem( "listDataEntryStatus.action" "data_status_management" "validationcriteria")
+ #introListImgItem( "listAllExcelTemplates.action" "excel_template_management" "excel")
#introListImgItem( "javascript: cleanUp();" "clean_up" "clean-up")
+ <!--#introListImgItem( "jcharts.action" "chart" "jchart")-->
</ul>
<script>
function go(action){
