dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1163
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2009-12-04 14:40:29 +0700
message:
  Fix bug: Excel-reporing module - Validated upload file for Import module.
modified:
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/addDataStatus.vm
  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/importDataParams.vm
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.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 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/addDataStatus.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/addDataStatus.vm	2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/addDataStatus.vm	2009-12-04 07:40:29 +0000
@@ -1,3 +1,4 @@
+<h2>$i18n.getString( "add" ) $i18n.getString( "dataset_completed_report" )</h2>
 <table>
 	<tr>
 		<td>$i18n.getString( 'dataset' )</td>

=== 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-12-04 05:00:32 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm	2009-12-04 07:40:29 +0000
@@ -1,5 +1,4 @@
-<h2>$i18n.getString("list_of_excel_items")</h2>
-<h4><font color="green">$!encoder.htmlEncode($!excelItemGroup.name)</font></h4>
+<h2>$!encoder.htmlEncode($!excelItemGroup.name)</h2>
 <table width="100%">
 <tr>
 <td>

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importDataParams.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importDataParams.vm	2009-11-13 10:28:52 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importDataParams.vm	2009-12-04 07:40:29 +0000
@@ -7,14 +7,14 @@
 
 #end
    
- <table width="50%">
+ <table width="62%">
 <h2>$i18n.getString('import_data')</h2>
 <form name="importingParam" id="importingParam" action="uploadExcelImport.action" method="post" enctype="multipart/form-data">   
   <tr>
      <td width="18%" style=" width:25% ">$i18n.getString( 'select_excel_file' )</td>
       <td width="82%">
-          <input type="file" id="upload" name="upload" >
-          <input name="submit" type="submit" value="$i18n.getString( 'upload_file' )" />    
+          <input type="file" id="upload" name="upload" onChange="enable('uploadButton');">
+          <input name="uploadButton" id="uploadButton" type="submit" value="$i18n.getString( 'upload_file' )" disabled />    
 	  </td>   
   </tr>
   </form>

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.vm	2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.vm	2009-12-04 07:40:29 +0000
@@ -1,3 +1,5 @@
+<h2>$i18n.getString( "edit" ) $i18n.getString( "dataset_completed_report" )</h2>
+
 <table>
 	<tr>
 		<td>$i18n.getString( 'dataset' )</td>