=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/ImportReport.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/ImportReport.java	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/ImportReport.java	2012-03-29 10:05:35 +0000
@@ -27,11 +27,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
 import org.hisp.dhis.period.PeriodType;
@@ -43,17 +43,10 @@
  */
 
 public class ImportReport
-    implements Serializable
+    extends BaseIdentifiableObject
 {
-    /**
-     * 
-     */
     private static final long serialVersionUID = 1L;
 
-    private int id;
-
-    private String name;
-
     private String type;
 
     private Set<ImportItem> importItems;

=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/impl/DefaultImportReportService.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/impl/DefaultImportReportService.java	2012-02-03 08:38:42 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/impl/DefaultImportReportService.java	2012-03-29 10:05:35 +0000
@@ -96,7 +96,7 @@
 
     public ImportReport getImportReport( String name )
     {
-        return importReportStore.getImportReport( name );
+        return i18n( i18nService, importReportStore.getImportReport( name ) );
     }
 
     public void updateImportReport( ImportReport importReport )
@@ -133,7 +133,7 @@
 
     public Collection<ImportItem> getAllImportItem()
     {
-        return i18n( i18nService, importReportStore.getAllImportItem() );
+        return importReportStore.getAllImportItem();
     }
 
     public void updateImportItem( ImportItem excelItem )
@@ -143,7 +143,7 @@
 
     public ImportItem getImportItem( int id )
     {
-        return i18n( i18nService, importReportStore.getImportItem( id ) );
+        return importReportStore.getImportItem( id );
     }
 
     public ImportItem getImportItem( String name )

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/advancedReport.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/advancedReport.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/advancedReport.vm	2012-03-29 10:05:35 +0000
@@ -38,7 +38,7 @@
 	  <td>$i18n.getString('choose_orgunit_group')<em title="$i18n.getString( 'required' )" class="required">*</em> </td>
 	  <td><select id="availableOrgunitGroups" name="availableOrgunitGroups" style="width:20em" >
 	  	#foreach($organisationUnitGroup in $organisationUnitGroups)
-		<option value="$organisationUnitGroup.id">$organisationUnitGroup.name</option>
+		<option value="$organisationUnitGroup.id">$organisationUnitGroup.displayName</option>
 		#end
       </select></td>
   </tr>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/dataSetCompletedByDataSets.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/dataSetCompletedByDataSets.vm	2012-03-06 08:33:14 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/dataSetCompletedByDataSets.vm	2012-03-29 10:05:35 +0000
@@ -3,7 +3,7 @@
 		<tr>
 			<th></th>
 		#foreach( $d in $dataSets )
-			<th>$!encoder.htmlEncode( $d.name )</th>
+			<th>$!encoder.htmlEncode( $d.displayName )</th>
 		#end
 		</tr>
 	</thead>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/dataSetCompletedByPeriods.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/dataSetCompletedByPeriods.vm	2012-03-06 08:33:14 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/dataSetCompletedByPeriods.vm	2012-03-29 10:05:35 +0000
@@ -1,4 +1,4 @@
-<h3>$encoder.htmlEncode( $dataSet.name )</h3>
+<h3>$encoder.htmlEncode( $dataSet.displayName )</h3>
 <table class="listTable" id="listTable">	
 	<thead>
 		<tr>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/dataSetCompleteds.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/dataSetCompleteds.vm	2012-03-06 08:33:14 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/dataSetCompleteds.vm	2012-03-29 10:05:35 +0000
@@ -23,7 +23,7 @@
 					<select style="width:300px" id="dataSetId" name="dataSetId" onchange="getPeriodsAndOrganisationUnit( this.value );">
 					<option value="">$i18n.getString( "select" )</option>
 					#foreach( $dataSet in $dataSets )
-						<option value="$dataSet.id">$!encoder.htmlEncode( $dataSet.name )</option>
+						<option value="$dataSet.id">$!encoder.htmlEncode( $dataSet.displayName )</option>
 					#end
 					</select>
 				</td>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/dataStatusShow.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/dataStatusShow.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/dataStatusShow.vm	2012-03-29 10:05:35 +0000
@@ -6,9 +6,9 @@
 		<th></th>		
 	</tr>
 	#set( $mark = false )
-	#foreach($ds in $dataStatus)
+	#foreach($ds in $!dataStatus)
 		<tr #alternate( $mark )>
-			<td width="200px"><h3>$ds.dataSet.name</h3></td>
+			<td width="200px"><h3>$!ds.dataSet.displayName</h3></td>
 			<td>	
 				<table width="100%" style="background-color:#000000;" cellpadding="2" cellspacing="1">	
 					#foreach($ds_ in $maps.get($ds.dataSet))

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/exportReportUserRoles.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/exportReportUserRoles.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/exportReportUserRoles.vm	2012-03-29 10:05:35 +0000
@@ -7,7 +7,7 @@
 		<th colspan=3>$i18n.getString( "export_report" )</th>
 	</tr>
 	<tr>
-		<td colspan=3>$encoder.htmlEncode( $exportReport.name )</td>
+		<td colspan=3>$encoder.htmlEncode( $exportReport.displayName )</td>
 	</tr>
 	<tr>
 		<th>$i18n.getString( "available" )</th>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/addImportItem.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/addImportItem.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/addImportItem.vm	2012-03-29 10:05:35 +0000
@@ -18,8 +18,8 @@
 			<th colspan='2'>$i18n.getString('import_report')</th>
 		</tr>
 		<tr>
-			<td>$i18n.getString('name')</td>
-			<td>:$importReport.name</td>
+			<td>$i18n.getString( 'name' ):</td>
+			<td>$importReport.displayName</td>
 		</tr>
 		<tr>
 			<td>$i18n.getString('import_type')</td>
@@ -72,9 +72,9 @@
 	
 	var dataElementGroups = new Object();
 	#foreach( $dataElementGroup in $dataElementGroups )
-		dataElementGroups['$dataElementGroup.id'] = '$encoder.jsEscape( $dataElementGroup.name, "'" )';
+		dataElementGroups['$dataElementGroup.id'] = '$encoder.jsEscape( $dataElementGroup.displayName, "'" )';
 	#end
 
-	var no_item = '$encoder.jsEscape( $i18n.getString("no_item"), "'" )';
+	var no_item = '$encoder.jsEscape( $i18n.getString( "no_item" ), "'" )';
 	
 </script>
\ No newline at end of file

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/associateOrgunitGroup.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/associateOrgunitGroup.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/associateOrgunitGroup.vm	2012-03-29 10:05:35 +0000
@@ -20,7 +20,7 @@
 		<td>
 			<select multiple size="13" id="availableGroups" name="availableGroups" style="width:100%" ondblclick="moveSelectedById( 'availableGroups', 'selectedOrganisationUnitGroups' )">
 				#foreach ( $group in $availableOrganisationUnitGroups )
-    				<option value="$group.id">$group.name</option>
+    				<option value="$group.id">$group.displayName</option>
     			#end
 			</select>
 		</td>
@@ -33,7 +33,7 @@
 		<td>
 			<select multiple size="13" id="selectedOrganisationUnitGroups" name="selectedOrganisationUnitGroups" style="width:100%" ondblclick="moveSelectedById( 'selectedOrganisationUnitGroups', 'availableGroups' )">
 				#foreach ( $group in $selectedOrganisationUnitGroups )
-					<option value="$group.id">$group.name</option>
+					<option value="$group.id">$group.displayName</option>
     			#end
 			</select>
 		</td>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/importItems.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/importItems.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/importItems.vm	2012-03-29 10:05:35 +0000
@@ -26,7 +26,7 @@
 
 <input type="hidden" id="importReportId" value="$!importReport.id"/>
 <input type="hidden" id="importReportType" value="$!importReport.type"/>
-<h2>$!encoder.htmlEncode($!importReport.name)</h2>
+<h2>$!encoder.htmlEncode($!importReport.displayName)</h2>
 <table width="100%">
 	<tr>
 		<td>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/importReports.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/importReports.vm	2011-08-03 08:38:38 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/importReports.vm	2012-03-29 10:05:35 +0000
@@ -24,13 +24,13 @@
 	<tbody id="list">
 	#foreach($importReport in $importReports)
 		<tr id="tr${importReport.id}">
-			<td>$encoder.htmlEncode( $importReport.name )</td>
+			<td>$encoder.htmlEncode( $importReport.displayName )</td>
 			<td>$i18n.getString($importReport.type)</td>
 			<td>$encoder.htmlEncode( $importReport.periodType.name )</td>
 			<td align="left">
 				<a href="openImportReportAssociations.action?importReportId=$importReport.id" title="$i18n.getString( 'associations' )"><img src="../images/assign.png" alt="$i18n.getString( 'associations' )"/></a>
 				<a href="updateImportReportForm.action?id=$importReport.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
-				<a href="javascript:removeItem($importReport.id, '$importReport.name','$i18n.getString( 'confirm_delete' )', 'deleteImportReport.action');" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
+				<a href="javascript:removeItem($importReport.id, '$importReport.displayName','$i18n.getString( 'confirm_delete' )', 'deleteImportReport.action');" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
 			</td>
 			<td>
 				<a href="listImportItems.action?importReportId=$importReport.id" title="$i18n.getString( 'import_item' )"><img src="../images/add_section.png" alt="$i18n.getString( 'import_item' )"/></a>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/sortDataElements.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/sortDataElements.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/sortDataElements.vm	2012-03-29 10:05:35 +0000
@@ -4,8 +4,8 @@
 	<tr>
 		<td>
 			<select id="sortdataElement" name="sortdataElement" multiple size="10">	
-				#foreach( $dataElement in $dataElementGroupOrder.dataElements)
-					<option value="$dataElement.id">$dataElement.name</option>
+				#foreach( $dataElement in $!dataElementGroupOrder.dataElements)
+					<option value="$dataElement.id">$dataElement.displayName</option>
 				#end
 			</select>
 		

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/updateImportItem.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/updateImportItem.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/updateImportItem.vm	2012-03-29 10:05:35 +0000
@@ -20,11 +20,11 @@
 		</tr>
 		<tr>
 			<td>$i18n.getString('name')</td>
-			<td>:$importReport.name</td>
+			<td>:$importReport.displayName</td>
 		</tr>
 		<tr>
-			<td>$i18n.getString('import_type')</td>
-			<td>:$importReport.type</td>
+			<td>$i18n.getString( 'import_type' ):</td>
+			<td>$importReport.type</td>
 		</tr>
 		<tr>
 			<td colspan="2" height="20px"></td>
@@ -73,7 +73,7 @@
 	
 	var dataElementGroups = new Object();
 	#foreach( $dataElementGroup in $dataElementGroups )
-		dataElementGroups['$dataElementGroup.id'] = '$encoder.jsEscape( $dataElementGroup.name, "'" )';
+		dataElementGroups['$dataElementGroup.id'] = '$encoder.jsEscape( $dataElementGroup.displayName, "'" )';
 	#end
 
 	var no_item = '$encoder.jsEscape( $i18n.getString("no_item"), "'" )';

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/updateImportReport.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/updateImportReport.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/import/updateImportReport.vm	2012-03-29 10:05:35 +0000
@@ -11,7 +11,7 @@
 <table>
 	<tr>
 		<td><label>$i18n.getString('name')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><input type="text" id="name" name="name"  style="width:20em" class="{validate:{required:true,minlength:2,maxlength:160}}" value="$importReport.name"/></td>
+		<td><input type="text" id="name" name="name"  style="width:20em" class="{validate:{required:true,minlength:2,maxlength:160}}" value="$importReport.displayName"/></td>
 	</tr>
 	<tr>
 		<td><label>$i18n.getString('import_type')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/importDataParams.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/importDataParams.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/importDataParams.vm	2012-03-29 10:05:35 +0000
@@ -22,7 +22,7 @@
 		<td>
 			<select type="text" id="importReportId" name="importReportId" #if(!$!fileExcel || !$!organisationUnit) disabled #end style="min-width:20em;" onchange="getPeriodsByImportReport(this.value)">					
 			#foreach($importReport in $importReports)
-				<option value="$!importReport.id">$!encoder.htmlEncode($!importReport.name)</option>
+				<option value="$!importReport.id">$!encoder.htmlEncode( $!importReport.displayName )</option>
 			#end
 			</select>
 		</td>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonDataElementCategoryOptionCombos.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonDataElementCategoryOptionCombos.vm	2012-02-28 08:50:46 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonDataElementCategoryOptionCombos.vm	2012-03-29 10:05:35 +0000
@@ -3,7 +3,7 @@
 #foreach( $de in $dataElementCategoryOptionCombos )
   {
     "id": $!{de.id},
-    "name": "$!encoder.jsEncode( ${de.name} )"   
+    "name": "$!encoder.jsEncode( ${de.displayName} )"   
   }#if( $velocityCount < $size ),#end    
 #end
 ] }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonDataElementGroupOrder.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonDataElementGroupOrder.vm	2011-12-13 07:46:57 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonDataElementGroupOrder.vm	2012-03-29 10:05:35 +0000
@@ -7,10 +7,10 @@
 	"memberCount": "${size}",
 	
 	"dataElements": [
-	#foreach( $de in $dataElementGroupOrder.dataElements )
+	#foreach( $de in $!dataElementGroupOrder.dataElements )
 	{
 	  "id": "${de.id}",
-	  "name": "$!encoder.jsonEncode( ${de.name} )"
+	  "name": "$!encoder.jsonEncode( ${de.displayName} )"
 	}#if( $velocityCount < $size ),#end
 	#end
 	]

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonExportGroups.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonExportGroups.vm	2012-02-28 08:50:46 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonExportGroups.vm	2012-03-29 10:05:35 +0000
@@ -1,6 +1,10 @@
 #set( $size = $groups.size() )
 #foreach($g in $groups)
 [
-	{"id":"$!encoder.jsEncode( ${g} )", "label": "$!encoder.jsEncode( ${g} )", "value":"$!encoder.jsEncode( ${g} )"}#if( $velocityCount < $size ),#end
+  {
+    "id" : "$!encoder.jsonEncode( ${g} )",
+    "label" : "$!encoder.jsonEncode( ${g} )",
+    "value" : "$!encoder.jsonEncode( ${g} )"
+  }#if( $velocityCount < $size ),#end
 ]
 #end
\ No newline at end of file

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonExportReports.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonExportReports.vm	2011-10-13 03:03:58 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonExportReports.vm	2012-03-29 10:05:35 +0000
@@ -5,7 +5,7 @@
   #foreach( $exportReport in $exportReports )
   {
     "id": "${exportReport.id}",
-    "name": "$!encoder.jsonEncode( ${exportReport.name} )",
+    "name": "$!encoder.jsonEncode( ${exportReport.displayName} )",
     "flag": "$!idMap.contains( $!{exportReport.id} )"
   }#if( $velocityCount < $size ),#end
   #end

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportReport.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportReport.vm	2012-02-28 08:50:46 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportReport.vm	2012-03-29 10:05:35 +0000
@@ -1,7 +1,7 @@
 { "importReport":
   {
 	"id": "${report.id}",
-	"name": "$!encoder.jsonEncode( $!{report.name} )",
+	"name": "$!encoder.jsonEncode( $!{report.displayName} )",
 	"type": "${report.type}",
 	"periodType": "${report.periodType.name}",
 	"excelTemplateFile": "${report.excelTemplateFile}"

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportReports.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportReports.vm	2012-02-28 08:50:46 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/jsonImportReports.vm	2012-03-29 10:05:35 +0000
@@ -4,7 +4,7 @@
   #foreach( $importReport in $importReports )
   {
     "id": "${importReport.id}",
-	"name": "$!encoder.jsonEncode( $!{importReport.name} )",
+	"name": "$!encoder.jsonEncode( $!{importReport.displayName} )",
 	"type": "${importReport.type}",
 	"periodType": "${importReport.periodType.name}",
 	"excelTemplateFile": "${importReport.excelTemplateFile}"

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/listDataElementGroupOrder.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/listDataElementGroupOrder.vm	2011-12-13 07:46:57 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/listDataElementGroupOrder.vm	2012-03-29 10:05:35 +0000
@@ -1,5 +1,5 @@
 <h3>$i18n.getString( 'dataelement_groups' )</h3>
-<h4><font color="green">$!encoder.htmlEncode( $!report.name )</font></h4>
+<h4><font color="green">$!encoder.htmlEncode( $!report.displayName )</font></h4>
 
 <table width="800px">
 	<tr>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/listDataStatus.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/listDataStatus.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/listDataStatus.vm	2012-03-29 10:05:35 +0000
@@ -20,9 +20,9 @@
 	</thead>
 	<tbody id="list">
 	#set( $mark = false )
-	#foreach($ds in $dataStatus)
+	#foreach($ds in $!dataStatus)
 		<tr #alternate( $mark )>
-			<td>$ds.dataSet.name</td>
+			<td>$!ds.dataSet.displayName</td>
 			<td id="td${ds.id}">
 				<input type="checkbox" #if($ds.makeDefault) checked="true" #end value="$ds.makeDefault" onchange="updateDefault( $ds.id, $ds.makeDefault )"/>
 			</td>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/organisationUnitAtLevels.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/organisationUnitAtLevels.vm	2012-02-28 08:50:46 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/organisationUnitAtLevels.vm	2012-03-29 10:05:35 +0000
@@ -4,7 +4,7 @@
 	});
 </script>
 
-<h3>$encoder.htmlEncode($exportReport.name)</h3>
+<h3>$!encoder.htmlEncode( $exportReport.displayName )</h3>
 
 <table width="100%">
 	<tr>
@@ -30,7 +30,7 @@
 			
 			<tr #alternate( $mark )>
 				<td>
-					$encoder.htmlEncode($orgUnitGroup.name)
+					$encoder.htmlEncode( $orgUnitGroup.displayName )
 				</td>
 				<td>
 					<select id="selectedLevel" onchange="updateOrganisationUnitGroupAtLevel($exportReport.id, $orgUnitGroup.id, this)" >						

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/organisationUnitGroupListingReport.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/organisationUnitGroupListingReport.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/organisationUnitGroupListingReport.vm	2012-03-29 10:05:35 +0000
@@ -20,7 +20,7 @@
 		<td>
 			<select multiple size="13" id="availableGroups" name="availableGroups" style="width:100%" ondblclick="moveSelectedById( 'availableGroups', 'selectedGroups' )">
 				#foreach ( $group in $availableOrganisationUnitGroups )
-    				<option value="$group.id">$group.name</option>
+    				<option value="$group.id">$group.displayName</option>
     			#end
 			</select>
 		</td>
@@ -33,7 +33,7 @@
 		<td>
 			<select multiple size="13" id="selectedGroups" name="selectedOrganisationUnitGroups" style="width:100%" ondblclick="moveSelectedById( 'selectedGroups', 'availableGroups' )">
 				#foreach ( $group in $selectedOrganisationUnitGroups )
-					<option value="$group.id">$group.name</option>
+					<option value="$group.id">$group.displayName</option>
     			#end
 			</select>
 		</td>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/periodcolumns.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/periodcolumns.vm	2012-02-28 08:50:46 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/periodcolumns.vm	2012-03-29 10:05:35 +0000
@@ -1,1 +1,1 @@
-<script>

	jQuery(document).ready(function(){
		datePickerInRange( 'startdate' , 'enddate' );	
		tableSorter( 'listTable' );
		
		validation( 'periodColumnForm', function( form ){ 
			form.action = getFieldValue('action');
			form.submit();
		});
		
		periodColumnDialog = setUpDialog( 'periodColumn', i18n_expression, 410, 210 );
	});
	
	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' ) , "'")';
	var i18n_expression = '$encoder.jsEscape( $i18n.getString( "expression" ) , "'")';
	var periodColumnDialog = null;
</script>

<h3>$!encoder.htmlEncode($!report.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 $report.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($report.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">	
<form id="periodColumnForm" method="POST">
<input type="hidden" id="action" value=""/>
<input type="hidden" name="id" id="id"/>
<input type="hidden" value="$!report.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="closeDialog( periodColumnDialog )"/>
			</td>
		</tr>		
	</table>
</form>
</div>

<script>
	
	// ---------------------------------------------------------------------------
	// Dialog
	// ---------------------------------------------------------------------------

	function setUpDialog( elementId, title, width, height )
	{
		var dialog = jQuery( '#'+elementId ).dialog({
			title: title,
			modal: true,
			autoOpen: false,
			minWidth: width,
			minHeight: height,
			width: width,
			height: height
		});
		
		return dialog;
	}

	function openDialog( _dialog )
	{
		_dialog.dialog( 'open' );
	}

	function closeDialog( _dialog )
	{
		_dialog.dialog( 'close' );
	}
	
	function openAddPeriodColumn()
	{
		setFieldValue( "action", "savePeriodColumn.action" );
		openDialog( periodColumnDialog );
	}
		
	function openUpdatePeriodColumn( id )
	{
		jQuery.postJSON( "getPeriodColumn.action", { id: id }, function( json )
		{	
			byId("startdate").value = json.startdate;
			byId("enddate").value = json.enddate;
			byId("periodType").value = json.periodType;
			byId("column").value = json.column;
			byId("id").value = json.id;

			setFieldValue( 'action', 'updatePeriodColumn.action' );
			
			openDialog( periodColumnDialog );
		} );
	}

	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
+<script>

	jQuery(document).ready(function(){
		datePickerInRange( 'startdate' , 'enddate' );	
		tableSorter( 'listTable' );
		
		validation( 'periodColumnForm', function( form ){ 
			form.action = getFieldValue('action');
			form.submit();
		});
		
		periodColumnDialog = setUpDialog( 'periodColumn', i18n_expression, 410, 210 );
	});
	
	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' ) , "'")';
	var i18n_expression = '$encoder.jsEscape( $i18n.getString( "expression" ) , "'")';
	var periodColumnDialog = null;
</script>

<h3>$!encoder.htmlEncode( $!report.displayName )</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 $report.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($report.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">	
<form id="periodColumnForm" method="POST">
<input type="hidden" id="action" value=""/>
<input type="hidden" name="id" id="id"/>
<input type="hidden" value="$!report.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="closeDialog( periodColumnDialog )"/>
			</td>
		</tr>		
	</table>
</form>
</div>

<script>
	
	// ---------------------------------------------------------------------------
	// Dialog
	// ---------------------------------------------------------------------------

	function setUpDialog( elementId, title, width, height )
	{
		var dialog = jQuery( '#'+elementId ).dialog({
			title: title,
			modal: true,
			autoOpen: false,
			minWidth: width,
			minHeight: height,
			width: width,
			height: height
		});
		
		return dialog;
	}

	function openDialog( _dialog )
	{
		_dialog.dialog( 'open' );
	}

	function closeDialog( _dialog )
	{
		_dialog.dialog( 'close' );
	}
	
	function openAddPeriodColumn()
	{
		setFieldValue( "action", "savePeriodColumn.action" );
		openDialog( periodColumnDialog );
	}
		
	function openUpdatePeriodColumn( id )
	{
		jQuery.postJSON( "getPeriodColumn.action", { id: id }, function( json )
		{	
			byId("startdate").value = json.startdate;
			byId("enddate").value = json.enddate;
			byId("periodType").value = json.periodType;
			byId("column").value = json.column;
			byId("id").value = json.id;

			setFieldValue( 'action', 'updatePeriodColumn.action' );
			
			openDialog( periodColumnDialog );
		} );
	}

	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-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/addExportItemForm.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/addExportItemForm.vm	2011-12-22 07:43:18 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/addExportItemForm.vm	2012-03-29 10:05:35 +0000
@@ -19,7 +19,7 @@
 		</tr>
 		<tr>
 			<td><label>$i18n.getString('name')</label></td>
-			<td>: $!encoder.htmlEncode($!exportReport.name)</td>
+			<td>: $!encoder.htmlEncode( $!exportReport.displayName )</td>
 		</tr>
 		<tr>
 			<td><label>$i18n.getString('export_report_type')</label></td>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/exportItems.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/exportItems.vm	2012-03-16 07:09:48 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/exportItems.vm	2012-03-29 10:05:35 +0000
@@ -25,7 +25,7 @@
 
 <input type="hidden" id="exportReportType" value="$!exportReport.getReportType()"/>
 
-<h3>$!encoder.htmlEncode($!exportReport.name)</h3>
+<h3>$!encoder.htmlEncode( $!exportReport.displayName )</h3>
 
 <table width="100%">
 	<tr style="vertical-align:bottom;">

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/exportReports.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/exportReports.vm	2011-08-03 08:38:38 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/exportReports.vm	2012-03-29 10:05:35 +0000
@@ -24,7 +24,7 @@
 	#foreach( $exportReport in $exportReports )
 	#set( $exist = $templateMap.get( $exportReport.excelTemplateFile ) )
 		<tr id="tr${exportReport.id}">
-			<td>$encoder.htmlEncode( $exportReport.name )</td>
+			<td>$!encoder.htmlEncode( $exportReport.displayName )</td>
 			<td>$i18n.getString( $exportReport.reportType )</td>
 			<td>
 				#if( $exist )
@@ -37,7 +37,7 @@
 				<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( '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:removeItem( $exportReport.id, '$exportReport.displayName', '$i18n.getString( 'confirm_delete' )', 'deleteExportReport.action');" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></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-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/updateExportItemForm.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/updateExportItemForm.vm	2011-12-22 07:43:18 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/updateExportItemForm.vm	2012-03-29 10:05:35 +0000
@@ -20,8 +20,8 @@
 			<th colspan="2">$i18n.getString( 'export_report' )</th>
 		</tr>
 		<tr>
-			<td><label>$i18n.getString('name')</label></td>
-			<td>: $!encoder.htmlEncode( $!exportReport.name )</td>
+			<td><label>$i18n.getString('name')</label>: </td>
+			<td>$!encoder.htmlEncode( $!exportReport.displayName )</td>
 		</tr>
 		<tr>
 			<td><label>$i18n.getString('report_type')</label></td>
@@ -35,7 +35,7 @@
 		</tr>
 		<tr>
 			<td><label>$i18n.getString('name')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" id="name" name="name" value="$!encoder.htmlEncode($exportItem.name)" style="width:20em" class="{validate:{required:true}}"/></td>
+			<td><input type="text" id="name" name="name" value="$!encoder.htmlEncode( $exportItem.name )" style="width:20em" class="{validate:{required:true}}"/></td>
 		</tr>		
 		<tr>
 			<td><label>$i18n.getString('item_type')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/updateExportReportForm.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/updateExportReportForm.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/updateExportReportForm.vm	2012-03-29 10:05:35 +0000
@@ -32,7 +32,7 @@
 	<table>
 		<tr>
 			<td><label for="name">$i18n.getString('name')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" name="name" id="name" value="$encoder.htmlEncode( $exportReport.name )" style="width:20em" class="{validate:{required:true,minlength:2,maxlength:160}}"/></td>
+			<td><input type="text" name="name" id="name" value="$!encoder.htmlEncode( $exportReport.displayName )" style="width:20em" class="{validate:{required:true,minlength:2,maxlength:160}}"/></td>
 		</tr>
 		<tr>
 			<td><label>$i18n.getString('excel_template')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseDataElementGroup.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseDataElementGroup.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/responseDataElementGroup.vm	2012-03-29 10:05:35 +0000
@@ -2,7 +2,7 @@
 <dataElementGroup>
   <dataElements>
     #foreach( $dataElement in $dataElements )
-      <dataElement id="$dataElement.id">$encoder.xmlEncode( $dataElement.name )</dataElement>
+      <dataElement id="$dataElement.id">$encoder.xmlEncode( $dataElement.displayName )</dataElement>
     #end
   </dataElements>
 </dataElementGroup>
\ No newline at end of file

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/sortDataElements.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/sortDataElements.vm	2011-08-03 08:38:38 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/sortDataElements.vm	2012-03-29 10:05:35 +0000
@@ -12,8 +12,8 @@
 	<tr>		
 		<td>
 			<select multiple size="30" id="availableList" name="availableList" style="min-width:300px;" ondblclick="moveSelectedById( 'availableList', 'selectedList' )">
-				#foreach( $dataElement in $dataElementGroupOrder.dataElements)
-    				<option value="$dataElement.id">$dataElement.name</option>
+				#foreach( $dataElement in $!dataElementGroupOrder.dataElements)
+    				<option value="$dataElement.id">$dataElement.displayName</option>
     			#end
 			</select>
 		</td>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/sortDataElementsForCategory.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/sortDataElementsForCategory.vm	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/sortDataElementsForCategory.vm	2012-03-29 10:05:35 +0000
@@ -4,8 +4,8 @@
 	<tr>
 		<td>
 			<select id="sortdataElement" name="sortdataElement" multiple size="10">	
-				#foreach( $dataElement in $dataElementGroupOrder.dataElements)
-					<option value="$dataElement.id">$dataElement.name</option>
+				#foreach( $dataElement in $!dataElementGroupOrder.dataElements)
+					<option value="$dataElement.id">$dataElement.displayName</option>
 				#end
 			</select>