=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm	2012-05-17 09:03:46 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm.vm	2012-06-07 07:59:17 +0000
@@ -1,4 +1,5 @@
 <script type="text/javascript">
+
 	jQuery(document).ready(function()
 	{
 		currentOrgunitName = "$!organisationUnit.name";
@@ -19,13 +20,13 @@
 <div id="exportReportDiv" class="inputCriteria" style="width:680px;height:350px;">
 <table>	
 	<tr>
-		<td><label class='bold'>$i18n.getString('organisation')<em title="$i18n.getString( 'required' )" class="required">*</em></label>
+		<td><label class='bold'>$i18n.getString( 'organisation' )<em title="$i18n.getString( 'required' )" class="required">*</em></label>
 		<span id="selectedOrganisationUnit"></span>
 		</td>
     </tr>
 	<tr>
-		<td><label class='bold'>$i18n.getString('group')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><label class='bold'>$i18n.getString('period_type')</label></td>
+		<td><label class='bold'>$i18n.getString( 'group' )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><label class='bold'>$i18n.getString( 'period_type' )</label></td>
 	</tr>
 	<tr>
 		<td>
@@ -46,11 +47,11 @@
 		</td>
     </tr>
 	<tr>
-		<td><label class='bold'>$i18n.getString('export_multi')</label>&nbsp;&nbsp;<input type="checkbox" id="exportTypeCB" onchange="changeExportType( this );"/></td>
+		<td><label class='bold'>$i18n.getString( 'export_multi' )</label>&nbsp;&nbsp;<input type="checkbox" id="exportTypeCB" onchange="changeExportType( this );"/></td>
 	</tr>
 	<tr>
-		<td><label class='bold'>$i18n.getString('export_reports')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><label class='bold'>$i18n.getString('period')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><label class='bold'>$i18n.getString( 'export_reports' )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><label class='bold'>$i18n.getString( 'period' )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 	</tr>
 	<tr>
 		<td>
@@ -75,7 +76,7 @@
 <hr/>
 
 <p>
-	<input type="button" id="previewButton" value="$i18n.getString( 'preview_report' )" onclick="validatePreviewReport();" style="width:150px"/>
+	<input type="button" id="previewButton" value='$i18n.getString( "preview_report" )' onclick="validatePreviewReport();" style="width:150px"/>
 	<input type="button" id="generateExportReport" value='$i18n.getString( "generate_export_report" )' onclick="validateGenerateReport();" style="width:150px"/>
 	<input type="button" id="printExcelReportButton" value='$i18n.getString("print")' onclick='printExportReport()' style="width:150px"/>
 </p>

=== added file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm_originalGUI.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm_originalGUI.vm	1970-01-01 00:00:00 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/generateReportForm_originalGUI.vm	2012-06-07 07:59:17 +0000
@@ -0,0 +1,57 @@
+<script type="text/javascript">
+
+	jQuery(document).ready(function()
+	{
+		currentOrgunitName = "$!organisationUnit.name";
+		getExportReportsByGroup( currentOrgunitName );
+	});
+
+	var i18n_select_period = '$encoder.jsEscape( $i18n.getString( "select_period" ) , "'")';
+	var i18n_value_rounded = '$encoder.jsEscape( $i18n.getString("value_rounded"), "'" )';
+	var i18n_specify_export_report = '$encoder.jsEscape( $i18n.getString("specify_export_report"), "'" )';
+</script>
+
+<h3>$i18n.getString( "generate_export_report" ) #openHelp( "excelReportingExportReport" )</h3>
+
+<div class="inputCriteria" style="width:485px;height:93px;">
+<table>	
+	<tr>
+		<td><label>$i18n.getString( 'organisation' )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td><span id="selectedOrganisationUnit"></span></td>
+    </tr>
+	<tr>
+		<td><label>$i18n.getString( 'group' )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td >
+			<select type="text" id="group" name="group" style="width:300px" onchange="getExportReportsByGroup( currentOrgunitName )" >
+				#foreach($group in $groups)
+					<option value='$group' #if( $group == $exportReportGroup ) selected="selected" #end>$encoder.htmlEncode( $group )</option>				
+				#end
+			</select>
+		</td>
+    </tr>
+	<tr>
+		<td><label>$i18n.getString( 'export_reports' )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td>
+			<select type="text" id="exportReport" name="exportReport" style="width:300px" onchange="reportSelected()"></select>
+		</td>
+    </tr>
+	<tr>
+		<td><label>$i18n.getString( 'period' )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+		<td>
+			<select type="text" id="selectedPeriodId" name="selectedPeriodId" style="width:220px"></select>
+			<input type="button" value="&lt;&lt;" onclick="getPreviousPeriod()" id="lastPeriod"/>
+			<input type="button" value="&gt;&gt;" onclick="getNextPeriod()" id="nextPeriod"/>
+		</td>
+    </tr>
+</table>
+</div>
+
+<hr/>
+
+<p>
+	<input type="button" id="previewButton" value='$i18n.getString( "preview_report" )' onclick="validatePreviewReport();" style="width:150px"/>
+	<input type="button" id="generateExportReport" value='$i18n.getString( "generate_export_report" )' onclick="validateGenerateReport();" style="width:150px"/>
+	<input type="button" id="printExcelReportButton" value='$i18n.getString( "print" )' onclick='printExportReport()' style="width:150px"/>
+</p>
+
+<div id="previewDiv"></div>
\ No newline at end of file