dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1607
committer: hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-03-10 17:28:44 +0700
message:
  Excel Template Management - Recovered the validated renaming function and requirement for confirming to update excel reporting system.
modified:
  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_vi_VN.properties
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/exceltemplate.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties


--
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/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	2010-03-05 08:27:33 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties	2010-03-10 10:28:44 +0000
@@ -207,11 +207,11 @@
 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 !
-free						= Free
-intro_configuration         = Set a path to the directory where the excel template files are stored.
-intro_reports 				= Create reports and its items and to assign the organisation units or the organisation unit groups to the reports.
-intro_data_status			= View the data entry status to know about data  entered, reports finished or not finished yet with data entry.
-intro_clean_up				= Clean files from temporary directory.
-intro_excel_item			= Create template from Excel file in order to import data into database.
-intro_excel_template_management = Manage Template Excel files.
+template_using              = File is using
+template_pending            = File is pending 
+intro_configuration         = Set the path to the directory only store files excel template. For example: C:\ABC
+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_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_excel_item            = Create, update, delete and view the elements for importing data from excel files. This excel items closer to report 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.  

=== 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	2010-03-04 08:29:37 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties	2010-03-10 10:28:44 +0000
@@ -203,5 +203,11 @@
 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 ?
-ready_in_use				= File n\u00e0y \u0111ang \u0111\u01b0\u1ee3c d\u00f9ng, kh\u00f4ng th\u1ec3 x\u00f3a \u0111\u01b0\u1ee3c.
-free						= Ch\u01b0a \u0111\u01b0\u1ee3c d\u00f9ng.
\ No newline at end of file
+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 ch\u1ec9 t\u1edbi thu m\u1ee5c l\u01b0u tr\u1eef c\u00e1c t\u1eadp tin excel m\u1eabu. V\u00ed d\u1ee5: C:\ABC
+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.  
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm	2010-03-08 16:36:21 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm	2010-03-10 10:28:44 +0000
@@ -33,12 +33,19 @@
 		</tr>
 	</thead>
 	<tbody id="list">	
-	#foreach($templateFileName in $mapTemplateFiles.keySet())
+	#foreach( $templateFileName in $mapTemplateFiles.keySet() )
+		#set( $value = $mapTemplateFiles.get($templateFileName) )
 		<tr #id="tr${templateFileName}" >
 			<td>$encoder.htmlEncode( $templateFileName )</td>
-			<td>#if($encoder.htmlEncode( $mapTemplateFiles.get($templateFileName) )=='true') $i18n.getString( 'ready_in_use' ) #else $i18n.getString( 'free' ) #end</td>			
+			<td axis='$value'>
+				#if( $encoder.htmlEncode( $value ) == 'true' )
+					$i18n.getString( 'template_using' ) 
+				#else
+					$i18n.getString( 'template_pending' ) 
+				#end
+			</td>			
 			<td align="left">
-				#if($encoder.htmlEncode( $mapTemplateFiles.get($templateFileName) )=='false')
+				#if( $encoder.htmlEncode( $value ) == 'false' )
 				<a href="javascript:deleteExcelTemplate('$templateFileName');" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
 				#end
 				<a href="javascript:mode = 'edit'; openEditExcelTemplate( '$templateFileName' );" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/exceltemplate.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/exceltemplate.js	2010-03-09 08:30:08 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/exceltemplate.js	2010-03-10 10:28:44 +0000
@@ -107,7 +107,7 @@
         var cell = rows[i].getElementsByTagName( 'td' )[keyColumnIndex-1];
         var value = cell.firstChild.nodeValue;
 		cell = rows[i].getElementsByTagName( 'td' )[statusColumnIndex-1];
-        var statusFile = cell.firstChild.nodeValue;
+        var statusFile = cell.axis;
 		
         if ( (value.toLowerCase() == curTemplateName.toLowerCase()) && (statusFile == "true") )
         {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties	2010-03-10 06:35:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties	2010-03-10 10:28:44 +0000
@@ -69,4 +69,7 @@
 move_all                        = Chuy\u1ec3n to\u00e0n b\u1ed9
 remove_all                      = H\u1ee7y b\u1ecf to\u00e0n b\u1ed9
 move_selected                   = Di chuy\u1ec3n l\u1ef1a ch\u1ecdn
-remove_selected                 = H\u1ee7y b\u1ecf l\u1ef1a ch\u1ecdn
\ No newline at end of file
+remove_selected                 = H\u1ee7y b\u1ecf l\u1ef1a ch\u1ecdn
+dataset_assignment_editor       = Hi\u1ec7u ch\u1ec9nh g\u1eafn k\u1ebft t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+intro_dataset                   = T\u1ea1o m\u1edbi, c\u1eadp nh\u1eadt, xem v\u00e0 x\u00f3a c\u00e1c t\u1eadp d\u1eef li\u1ec7u. T\u1eadp d\u1eef li\u1ec7u l\u00e0 m\u1ed9t t\u1eadp h\u1ee3p ch\u1ee9a c\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u c\u00f3 gi\u00e1 tr\u1ecb. Trang n\u00e0y c\u0169ng cho ph\u00e9p b\u1ea1n t\u1ef1 thi\u1ebft k\u1ebf giao di\u1ec7n nh\u1eadp li\u1ec7u c\u00f9ng v\u1edbi c\u00e1c danh s\u00e1ch t\u00f9y ch\u1ecdn.
+intro_dataset_section           = T\u1ea1o m\u1edbi, c\u1eadp nh\u1eadt, xem v\u00e0 x\u00f3a c\u00e1c section c\u1ee7a t\u1eadp h\u1ee3p d\u1eef li\u1ec7u. C\u00e1c Section c\u00f3 th\u1ec3 \u0111\u01b0\u1ee3c th\u00eam v\u00e0o c\u00e1c t\u1eadp d\u1eef li\u1ec7u gi\u00fap ch\u00fang d\u1ec5 hi\u1ec3u h\u01a1n.
\ No newline at end of file