dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 751
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2009-09-21 14:58:41 +0700
message:
  Update ReportExcel module
modified:
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importData.vm
  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/reportparams.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/importData.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importData.vm	2009-09-15 09:05:45 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importData.vm	2009-09-21 07:58:41 +0000
@@ -18,7 +18,7 @@
   </tr>
   <tr>
     <td>$i18n.getString( 'template_excel_file' )</td>
-    <td><select type="text" id="reportId" name="reportId" style="min-width:20em; width:100%" #if(!$!fileExcel) disabled #end onChange="javascript: document.getElementById('lastYear').disabled=false; document.getElementById('nextYear').disabled=false; document.getElementById('periodId').disabled=false; document.getElementById('preview').disabled=false; document.getElementById('import').disabled=false;">
+    <td><select type="text" id="reportId" name="reportId" style="min-width:20em; width:100%" #if(!$!fileExcel) disabled #end onChange="javascript: document.getElementById('lastYear').disabled=false; document.getElementById('nextYear').disabled=false; document.getElementById('period').disabled=false; document.getElementById('preview').disabled=false; document.getElementById('import').disabled=false;">
 	  <option value="">$i18n.getString('select')</option>
 	  #foreach($reportExcel in $reportExcels)
 		<option value="$!reportExcel.id">$!encoder.htmlEncode($!reportExcel.name)</option>
@@ -31,7 +31,7 @@
     <td>
 	<input type="button" value="<<" id="lastYear" name="lastYear" onclick="lastYear();" disabled />
 	<input type="button" value=">>" id="nextYear" name="nextYear" onclick="nextYear()" disabled />
-	<select name="periodId" id="periodId" style="min-width:20em; width:100%" type="text" disabled >
+	<select name="period" id="period" style="min-width:20em; width:100%" type="text" disabled >
         	#foreach($period in $periods)
 				<option value='$period.id'>$format.formatPeriod( $period )</option>
 			#end

=== 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-09-21 07:40:48 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js	2009-09-21 07:58:41 +0000
@@ -79,7 +79,7 @@
 	
 	var reportId = document.getElementById('reportId').value;
 	var upload = document.getElementById('uploadFileName').value;
-	var periodId = document.getElementById('periodId').value;
+	var periodId = document.getElementById('period').value;
 	
 	var request = new Request();
 	request.setResponseTypeXML( 'xmlObject' );

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm	2009-09-17 07:12:56 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm	2009-09-21 07:58:41 +0000
@@ -44,7 +44,7 @@
 <br>
 <hr>
 <p>
-<input type="button" value='$i18n.getString( "preview_report" )' onclick="javascript: generic_type = 'preview'; var message = '$!i18n.getString("please_wait")'; validateGenerateReport(message);" #if(!$organisationUnit) disabled #end/>
+<!-- <input type="button" value='$i18n.getString( "preview_report" )' onclick="javascript: generic_type = 'preview'; var message = '$!i18n.getString("please_wait")'; validateGenerateReport(message);" #if(!$organisationUnit) disabled #end/> -->
 <input type="button" value='$i18n.getString( "generate_report" )' onclick="generateReportExcel()" #if(!$organisationUnit) disabled #end/>
 </p>
 <span id="info" style="display:none;top:70px;right:5px;position:fixed;" onclick="hideById(this.id)"></span>