← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5857: local vn - Update.

 

------------------------------------------------------------
revno: 5857
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-03 15:38:42 +0700
message:
  local vn - Update.
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties
  local/vn/dhis-service-spreadsheet-reporting/pom.xml
  local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/impl/DefaultExportReportService.java
  local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/impl/DefaultReportLocationManager.java
  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/resources/META-INF/dhis/beans.xml
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/DefaultJChartDataService.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/GetReportConfigurationAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/SetReportConfigurationAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/dataentrystatus/action/GetDataSetsAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/DataSetCompletedReportFormAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCompletedReportByDataSetAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCompletedReportByPeriodsAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportOrgGroupListingAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportOrgGroupListingAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GetOrganisationUnitGroupListAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/SelectAdvancedExportFormAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/SetupExportItemFormAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/ViewDataOrganizationGroupAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/GetSelectedDataElementsAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/SetupImportItemFormAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/ShowUpdateImportItemFormAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/OpenUpdateOrgUnitGroupForCategoryAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/OpenUpdateOrgUnitGroupAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExpressionUtils.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml
  local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportItems.js
  local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/importItems.js
  local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/exportItems.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-commons/src/main/resources/i18n_global_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2012-01-04 07:00:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2012-02-03 08:38:42 +0000
@@ -135,6 +135,7 @@
 dhis-web-caseentry=Qu\u1ea3n l\u00fd d\u1eef li\u1ec7u c\u00e1 th\u1ec3
 an_exception_occured=C\u00f3 m\u1ed9t l\u1ed7i x\u1ea3y ra trong h\u1ec7 th\u1ed1ng
 format.Weekly.startDate='Tu\u1ea7n' w' '
+format.Weekly.endDate=yyyy
 not_set=Ch\u01b0a thi\u1ebft l\u1eadp
 please_select_period=Vui l\u00f2ng ch\u1ecdn th\u1eddi \u0111i\u1ec3m \!
 format.Monthly.endDate=
@@ -449,5 +450,4 @@
 please_enter_n_words_or_less=Vui l\u00f2ng nh\u1eadp {0} t\u1eeb ho\u1eb7c \u00edt h\u01a1n.
 translation_label_shortname=T\u00ean vi\u1ebft t\u1eaft
 update_user_success=Th\u00f4ng tin c\u1ee7a b\u1ea1n \u0111\u00e3 \u0111\u01b0\u1ee3c th\u00e2y \u0111\u1ed5i
-add_new=Th\u00eam m\u1edbi
-format.Weekly.endDate=yyyy
\ No newline at end of file
+add_new=Th\u00eam m\u1edbi
\ No newline at end of file

=== modified file 'local/vn/dhis-service-spreadsheet-reporting/pom.xml'
--- local/vn/dhis-service-spreadsheet-reporting/pom.xml	2011-12-27 04:13:22 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/pom.xml	2012-02-03 08:38:42 +0000
@@ -29,10 +29,10 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
     </dependency>
-    <dependency>
+    <!--dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-options</artifactId>
-    </dependency>
+    </dependency-->
         
   </dependencies>
   <properties>

=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/impl/DefaultExportReportService.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/impl/DefaultExportReportService.java	2011-11-18 04:24:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/impl/DefaultExportReportService.java	2012-02-03 08:38:42 +0000
@@ -132,16 +132,12 @@
     {
         int id = exportReportStore.addExportReport( report );
 
-        i18nService.addObject( report );
-
         return id;
     }
 
     public void updateExportReport( ExportReport report )
     {
         exportReportStore.updateExportReport( report );
-
-        i18nService.verify( report );
     }
 
     public void deleteExportReport( int id )
@@ -173,7 +169,6 @@
 
     public Collection<ExportReport> getExportReports( User user, boolean superUser, String group )
     {
-
         if ( user == null || superUser )
         {
             return i18n( i18nService, this.getExportReportsByGroup( group ) );
@@ -242,15 +237,11 @@
     public void addExportItem( ExportItem reportItem )
     {
         exportReportStore.addExportItem( reportItem );
-
-        i18nService.addObject( reportItem );
     }
 
     public void updateExportItem( ExportItem reportItem )
     {
         exportReportStore.updateExportItem( reportItem );
-
-        i18nService.verify( reportItem );
     }
 
     public void deleteExportItem( int id )

=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/impl/DefaultReportLocationManager.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/impl/DefaultReportLocationManager.java	2011-08-03 08:38:38 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/impl/DefaultReportLocationManager.java	2012-02-03 08:38:42 +0000
@@ -32,10 +32,10 @@
 
 import org.hisp.dhis.external.location.LocationManager;
 import org.hisp.dhis.external.location.LocationManagerException;
-import org.hisp.dhis.options.SystemSettingManager;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.reportsheet.ExcelContentTypeMap;
 import org.hisp.dhis.reportsheet.ReportLocationManager;
+import org.hisp.dhis.setting.SystemSettingManager;
 
 /**
  * @author Tran Thanh Tri

=== 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	2011-08-03 08:38:38 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/impl/DefaultImportReportService.java	2012-02-03 08:38:42 +0000
@@ -74,8 +74,6 @@
     {
         int id = importReportStore.addImportReport( importReport );
 
-        i18nService.addObject( importReport );
-
         return id;
     }
 
@@ -104,8 +102,6 @@
     public void updateImportReport( ImportReport importReport )
     {
         importReportStore.updateImportReport( importReport );
-
-        i18nService.verify( importReport );
     }
 
     public Collection<ImportReport> getImportReports( OrganisationUnit organisationUnit )
@@ -125,8 +121,6 @@
     {
         int id = importReportStore.addImportItem( excelItem );
 
-        i18nService.addObject( excelItem );
-
         return id;
     }
 
@@ -145,8 +139,6 @@
     public void updateImportItem( ImportItem excelItem )
     {
         importReportStore.updateImportItem( excelItem );
-
-        i18nService.verify( excelItem );
     }
 
     public ImportItem getImportItem( int id )

=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml	2011-11-18 04:24:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml	2012-02-03 08:38:42 +0000
@@ -63,7 +63,7 @@
 		class="org.hisp.dhis.reportsheet.impl.DefaultReportLocationManager"
 		init-method="init">
 		<property name="locationManager" ref="locationManager"/>
-		<property name="systemSettingManager" ref="org.hisp.dhis.options.SystemSettingManager" />
+		<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
 	</bean>
 	
 	<!-- DeletionHandlers -->

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/DefaultJChartDataService.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/DefaultJChartDataService.java	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/jchart/data/DefaultJChartDataService.java	2012-02-03 08:38:42 +0000
@@ -33,6 +33,7 @@
 
 import org.amplecode.quick.StatementManager;
 import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.i18n.I18nFormat;
 import org.hisp.dhis.i18n.I18nManager;
 import org.hisp.dhis.i18n.I18nManagerException;
@@ -40,7 +41,6 @@
 import org.hisp.dhis.jchart.JChartSeries;
 import org.hisp.dhis.jchart.JChartSevice;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
 import org.hisp.dhis.oust.manager.SelectionTreeManager;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.period.PeriodService;
@@ -184,7 +184,7 @@
         List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( selectionTreeManager
             .getSelectedOrganisationUnits() );
 
-        Collections.sort( organisationUnits, new OrganisationUnitNameComparator() );
+        Collections.sort( organisationUnits, IdentifiableObjectNameComparator.INSTANCE );
 
         for ( JChartSeries series : jchart.getSeries() )
         {

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/GetReportConfigurationAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/GetReportConfigurationAction.java	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/GetReportConfigurationAction.java	2012-02-03 08:38:42 +0000
@@ -27,7 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.hisp.dhis.options.SystemSettingManager;
+import org.hisp.dhis.setting.SystemSettingManager;
 
 import com.opensymphony.xwork2.Action;
 
@@ -38,7 +38,7 @@
 
 public class GetReportConfigurationAction
     implements Action
-{   
+{
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------
@@ -53,9 +53,9 @@
     // -------------------------------------------------------------------------
     // Getter and Setter
     // -------------------------------------------------------------------------
-    
-    private String templateDirectory;   
-    
+
+    private String templateDirectory;
+
     public String getTemplateDirectory()
     {
         return templateDirectory;
@@ -64,12 +64,13 @@
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
-    
+
     public String execute()
         throws Exception
     {
-        templateDirectory = (String) systemSettingManager.getSystemSetting( SystemSettingManager.KEY_REPORT_TEMPLATE_DIRECTORY );
-        
+        templateDirectory = (String) systemSettingManager
+            .getSystemSetting( SystemSettingManager.KEY_REPORT_TEMPLATE_DIRECTORY );
+
         return SUCCESS;
     }
 }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/SetReportConfigurationAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/SetReportConfigurationAction.java	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/configuration/action/SetReportConfigurationAction.java	2012-02-03 08:38:42 +0000
@@ -31,8 +31,8 @@
 
 import java.io.File;
 
-import org.hisp.dhis.options.SystemSettingManager;
 import org.hisp.dhis.reportsheet.ReportLocationManager;
+import org.hisp.dhis.setting.SystemSettingManager;
 
 import com.opensymphony.xwork2.Action;
 

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/dataentrystatus/action/GetDataSetsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/dataentrystatus/action/GetDataSetsAction.java	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/dataentrystatus/action/GetDataSetsAction.java	2012-02-03 08:38:42 +0000
@@ -32,9 +32,9 @@
 import java.util.List;
 import java.util.Set;
 
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.dataset.comparator.DataSetNameComparator;
 import org.hisp.dhis.reportsheet.ExportReportService;
 import org.hisp.dhis.reportsheet.status.DataEntryStatus;
 import org.hisp.dhis.user.CurrentUserService;
@@ -137,7 +137,7 @@
             dataSets.retainAll( dataSetUserAuthorityGroups );
         }
 
-        Collections.sort( dataSets, new DataSetNameComparator() );
+        Collections.sort( dataSets, new IdentifiableObjectNameComparator() );
 
         return SUCCESS;
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/DataSetCompletedReportFormAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/DataSetCompletedReportFormAction.java	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/DataSetCompletedReportFormAction.java	2012-02-03 08:38:42 +0000
@@ -32,9 +32,9 @@
 import java.util.List;
 import java.util.Set;
 
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.dataset.comparator.DataSetNameComparator;
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.reportsheet.Bookmark;
 import org.hisp.dhis.reportsheet.BookmarkService;
@@ -139,7 +139,7 @@
             periodTypes.add( dataSet.getPeriodType() );
         }
 
-        Collections.sort( dataSets, new DataSetNameComparator() );
+        Collections.sort( dataSets, new IdentifiableObjectNameComparator() );
 
         return SUCCESS;
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCompletedReportByDataSetAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCompletedReportByDataSetAction.java	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCompletedReportByDataSetAction.java	2012-02-03 08:38:42 +0000
@@ -33,14 +33,13 @@
 import java.util.List;
 import java.util.Map;
 
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.dataset.CompleteDataSetRegistration;
 import org.hisp.dhis.dataset.CompleteDataSetRegistrationService;
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.dataset.comparator.DataSetNameComparator;
 import org.hisp.dhis.i18n.I18nFormat;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
 import org.hisp.dhis.oust.manager.SelectionTreeManager;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.period.PeriodService;
@@ -192,9 +191,9 @@
 
         }
 
-        Collections.sort( dataSets, new DataSetNameComparator() );
+        Collections.sort( dataSets, new IdentifiableObjectNameComparator() );
 
-        Collections.sort( organisationUnits, new OrganisationUnitNameComparator() );
+        Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
 
         return SUCCESS;
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCompletedReportByPeriodsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCompletedReportByPeriodsAction.java	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/datasetcompleted/action/ViewCompletedReportByPeriodsAction.java	2012-02-03 08:38:42 +0000
@@ -34,6 +34,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategory;
 import org.hisp.dhis.dataset.CompleteDataSetRegistration;
@@ -43,7 +44,6 @@
 import org.hisp.dhis.datavalue.DataValue;
 import org.hisp.dhis.datavalue.DataValueService;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
 import org.hisp.dhis.oust.manager.SelectionTreeManager;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.period.PeriodService;
@@ -216,7 +216,7 @@
 
         Collections.sort( periods, new PeriodComparator() );
 
-        Collections.sort( organisationUnits, new OrganisationUnitNameComparator() );
+        Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
 
         return SUCCESS;
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportOrgGroupListingAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportOrgGroupListingAction.java	2011-12-22 07:43:18 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportOrgGroupListingAction.java	2012-02-03 08:38:42 +0000
@@ -35,17 +35,18 @@
 import java.util.Map;
 
 import org.apache.poi.ss.usermodel.Sheet;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
 import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.reportsheet.ExportItem;
 import org.hisp.dhis.reportsheet.ExportReport;
 import org.hisp.dhis.reportsheet.ExportReportOganiztionGroupListing;
 import org.hisp.dhis.reportsheet.exporting.AbstractGenerateExcelReportSupport;
 import org.hisp.dhis.reportsheet.utils.ExcelUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author Tran Thanh Tri
@@ -62,13 +63,9 @@
     // Dependency
     // -------------------------------------------------------------------------
 
+    @Autowired
     private OrganisationUnitService organisationUnitService;
 
-    public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
-    {
-        this.organisationUnitService = organisationUnitService;
-    }
-
     // -------------------------------------------------------------------------
     // Override
     // -------------------------------------------------------------------------
@@ -136,7 +133,7 @@
                     organisationUnits.retainAll( childrens );
                 }
 
-                Collections.sort( organisationUnits, new OrganisationUnitNameComparator() );
+                Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
 
                 int beginChapter = rowBegin;
 

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportOrgGroupListingAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportOrgGroupListingAction.java	2011-11-03 04:26:28 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportOrgGroupListingAction.java	2012-02-03 08:38:42 +0000
@@ -33,13 +33,13 @@
 import java.util.List;
 
 import org.apache.poi.ss.usermodel.Sheet;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
 import org.hisp.dhis.period.Period;
+import org.hisp.dhis.reportsheet.ExportItem;
 import org.hisp.dhis.reportsheet.ExportReport;
-import org.hisp.dhis.reportsheet.ExportItem;
 import org.hisp.dhis.reportsheet.ExportReportOganiztionGroupListing;
 import org.hisp.dhis.reportsheet.exporting.AbstractGenerateExcelReportSupport;
 import org.hisp.dhis.reportsheet.utils.ExcelUtils;
@@ -98,7 +98,7 @@
             List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( organisationUnitGroup
                 .getMembers() );
 
-            Collections.sort( organisationUnits, new OrganisationUnitNameComparator() );
+            Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
 
             this.generateOutPutFile( exportReportInstance, exportItems, organisationUnits, sheet );
 

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GetOrganisationUnitGroupListAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GetOrganisationUnitGroupListAction.java	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GetOrganisationUnitGroupListAction.java	2012-02-03 08:38:42 +0000
@@ -31,9 +31,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
 
 import com.opensymphony.xwork2.ActionSupport;
 
@@ -77,7 +77,7 @@
         organisationUnitGroups = new ArrayList<OrganisationUnitGroup>( organisationUnitGroupService
             .getAllOrganisationUnitGroups() );
 
-        Collections.sort( organisationUnitGroups, new OrganisationUnitGroupNameComparator() );
+        Collections.sort( organisationUnitGroups, new IdentifiableObjectNameComparator() );
 
         return SUCCESS;
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/SelectAdvancedExportFormAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/SelectAdvancedExportFormAction.java	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/SelectAdvancedExportFormAction.java	2012-02-03 08:38:42 +0000
@@ -30,9 +30,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
 import org.hisp.dhis.period.MonthlyPeriodType;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.reportsheet.ExportReportService;
@@ -120,7 +120,7 @@
         organisationUnitGroups = new ArrayList<OrganisationUnitGroup>( organisationUnitGroupService
             .getAllOrganisationUnitGroups() );
 
-        Collections.sort( organisationUnitGroups, new OrganisationUnitGroupNameComparator() );
+        Collections.sort( organisationUnitGroups, new IdentifiableObjectNameComparator() );
 
         return SUCCESS;
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/SetupExportItemFormAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/SetupExportItemFormAction.java	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exportitem/action/SetupExportItemFormAction.java	2012-02-03 08:38:42 +0000
@@ -31,15 +31,14 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.dataelement.DataElementGroup;
 import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator;
 import org.hisp.dhis.indicator.IndicatorGroup;
 import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.comparator.IndicatorGroupNameComparator;
+import org.hisp.dhis.reportsheet.ExportItem;
+import org.hisp.dhis.reportsheet.ExportReport;
 import org.hisp.dhis.reportsheet.ExportReportService;
-import org.hisp.dhis.reportsheet.ExportReport;
-import org.hisp.dhis.reportsheet.ExportItem;
 
 import com.opensymphony.xwork2.Action;
 
@@ -144,11 +143,11 @@
 
         dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
 
-        Collections.sort( dataElementGroups, new DataElementGroupNameComparator() );
+        Collections.sort( dataElementGroups, new IdentifiableObjectNameComparator() );
 
         indicatorGroups = new ArrayList<IndicatorGroup>( indicatorService.getAllIndicatorGroups() );
 
-        Collections.sort( indicatorGroups, new IndicatorGroupNameComparator() );
+        Collections.sort( indicatorGroups, new IdentifiableObjectNameComparator() );
 
         periodTypes = ExportItem.PERIODTYPE.getPeriodTypes();
 

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/ViewDataOrganizationGroupAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/ViewDataOrganizationGroupAction.java	2011-10-25 08:52:49 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/ViewDataOrganizationGroupAction.java	2012-02-03 08:38:42 +0000
@@ -32,9 +32,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
 import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
 import org.hisp.dhis.reportsheet.importing.ViewDataGeneric;
 import org.hisp.dhis.reportsheet.importitem.ImportItem;
@@ -101,7 +101,7 @@
             List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( getOrganisationUnits(
                 organisationUnitGroup, selectedUnit ) );
 
-            Collections.sort( organisationUnits, new OrganisationUnitNameComparator() );
+            Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
 
             row ++;
             

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/GetSelectedDataElementsAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/GetSelectedDataElementsAction.java	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/GetSelectedDataElementsAction.java	2012-02-03 08:38:42 +0000
@@ -29,13 +29,12 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
 
 import com.opensymphony.xwork2.Action;
 
@@ -57,20 +56,6 @@
         this.dataSetService = dataSetService;
     }
 
-    private Comparator<DataElement> dataElementComparator;
-
-    public void setDataElementComparator( Comparator<DataElement> dataElementComparator )
-    {
-        this.dataElementComparator = dataElementComparator;
-    }
-
-    private DisplayPropertyHandler displayPropertyHandler;
-
-    public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
-    {
-        this.displayPropertyHandler = displayPropertyHandler;
-    }
-
     // -------------------------------------------------------------------------
     // Getters & Setters
     // -------------------------------------------------------------------------
@@ -100,9 +85,7 @@
 
         dataElements = new ArrayList<DataElement>( dataSet.getDataElements() );
 
-        Collections.sort( dataElements, dataElementComparator );
-
-        displayPropertyHandler.handle( dataElements );
+        Collections.sort( dataElements, IdentifiableObjectNameComparator.INSTANCE );
 
         return SUCCESS;
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/SetupImportItemFormAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/SetupImportItemFormAction.java	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/SetupImportItemFormAction.java	2012-02-03 08:38:42 +0000
@@ -31,9 +31,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.dataelement.DataElementGroup;
 import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator;
 import org.hisp.dhis.reportsheet.importitem.ImportReport;
 import org.hisp.dhis.reportsheet.importitem.ImportReportService;
 
@@ -102,7 +102,7 @@
 
         dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
 
-        Collections.sort( dataElementGroups, new DataElementGroupNameComparator() );
+        Collections.sort( dataElementGroups, new IdentifiableObjectNameComparator() );
 
         return SUCCESS;
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/ShowUpdateImportItemFormAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/ShowUpdateImportItemFormAction.java	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importitem/action/ShowUpdateImportItemFormAction.java	2012-02-03 08:38:42 +0000
@@ -31,9 +31,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.dataelement.DataElementGroup;
 import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator;
 import org.hisp.dhis.reportsheet.importitem.ImportItem;
 import org.hisp.dhis.reportsheet.importitem.ImportReport;
 import org.hisp.dhis.reportsheet.importitem.ImportReportService;
@@ -119,7 +119,7 @@
 
         dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
 
-        Collections.sort( dataElementGroups, new DataElementGroupNameComparator() );
+        Collections.sort( dataElementGroups, new IdentifiableObjectNameComparator() );
 
         return SUCCESS;
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/OpenUpdateOrgUnitGroupForCategoryAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/OpenUpdateOrgUnitGroupForCategoryAction.java	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importreport/action/OpenUpdateOrgUnitGroupForCategoryAction.java	2012-02-03 08:38:42 +0000
@@ -30,9 +30,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
 import org.hisp.dhis.reportsheet.importitem.ImportReport;
 import org.hisp.dhis.reportsheet.importitem.ImportReportService;
 
@@ -115,7 +115,7 @@
 
         availableOrganisationUnitGroups.removeAll( selectedOrganisationUnitGroups );
 
-        Collections.sort( this.availableOrganisationUnitGroups, new OrganisationUnitGroupNameComparator() );
+        Collections.sort( this.availableOrganisationUnitGroups, new IdentifiableObjectNameComparator() );
 
         return SUCCESS;
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/OpenUpdateOrgUnitGroupAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/OpenUpdateOrgUnitGroupAction.java	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/OpenUpdateOrgUnitGroupAction.java	2012-02-03 08:38:42 +0000
@@ -30,11 +30,11 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
 import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
+import org.hisp.dhis.reportsheet.ExportReportOganiztionGroupListing;
 import org.hisp.dhis.reportsheet.ExportReportService;
-import org.hisp.dhis.reportsheet.ExportReportOganiztionGroupListing;
 
 import com.opensymphony.xwork2.Action;
 
@@ -115,7 +115,7 @@
 
         availableOrganisationUnitGroups.removeAll( selectedOrganisationUnitGroups );
 
-        Collections.sort( this.availableOrganisationUnitGroups, new OrganisationUnitGroupNameComparator() );
+        Collections.sort( this.availableOrganisationUnitGroups, new IdentifiableObjectNameComparator() );
 
         return SUCCESS;
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExpressionUtils.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExpressionUtils.java	2011-10-13 03:03:58 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExpressionUtils.java	2012-02-03 08:38:42 +0000
@@ -168,6 +168,8 @@
     {
         Double aggregatedValue = aggregationService.getAggregatedDataValue( dataElement, optionCombo, startDate,
             endDate, organisationUnit );
+        // aggregatedDataValueService.getAggregatedValue( dataElement,
+        // optionCombo, startDate, endDate, );
 
         if ( aggregatedValue == null )
         {

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml	2011-10-13 03:03:58 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml	2012-02-03 08:38:42 +0000
@@ -475,8 +475,6 @@
 			ref="org.hisp.dhis.indicator.IndicatorService" />
 		<property name="initPOIStylesManager"
 			ref="org.hisp.dhis.reportsheet.preview.manager.InitializePOIStylesManager" />
-		<property name="organisationUnitService"
-			ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
 		<property name="dataValueService"
 			ref="org.hisp.dhis.datavalue.DataValueService" />
 	</bean>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportItems.js'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportItems.js	2011-08-04 08:39:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportItems.js	2012-02-03 08:38:42 +0000
@@ -29,7 +29,22 @@
 
 // ---------------------------------------------------------------------------------
 // Methods
-// ---------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------------	
+
+function toggleAll( elementList, checked ) {
+
+	var list = jQuery( elementList );
+	
+	for ( var i in list )
+	{
+		list[i].checked = checked;
+	}
+}
+
+function exportItemSelect( checked )
+{
+	toggleAll( "input[type=checkbox][name=exportItemCheck]", checked );
+}
 
 function changeItemType()
 {

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/importItems.js'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/importItems.js	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/importItems.js	2012-02-03 08:38:42 +0000
@@ -445,20 +445,4 @@
 	}
 	
 	setMessage( warningMessages );
-}
-
-// ----------------------------------------------------
-// Select Items ALL
-// ----------------------------------------------------
-
-function selectedItemsAll() {
-    
-	var checked = byId('checkAll').checked;
-	
-	var list = document.getElementsByName('importItemChecked');
-	
-	for (var i=0 ;i<list.length; i++)
-	{
-		list.item(i).checked = checked;
-	}
 }
\ No newline at end of file

=== 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	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/exportItems.vm	2012-02-03 08:38:42 +0000
@@ -7,12 +7,6 @@
 		
 	});
 	
-	function exportItemSelect( checked )
-	{
-		if( checked ) checkALL( "input[type=checkbox][name=exportItemCheck]" );
-		else unCheckALL( "input[type=checkbox][name=exportItemCheck]" );
-	}
-	
 	var i18n_copy_successful = '$encoder.jsEscape( $i18n.getString( "copy_successful" ) , "'")';
 	var i18n_copy_items_duplicated = '$encoder.jsEscape( $i18n.getString( "copy_items_duplicated" ) , "'")';
 	var i18n_copy_items = '$encoder.jsEscape( $i18n.getString( "copy_items" ) , "'")';
@@ -81,7 +75,7 @@
 	<tbody id="list">	
 	#foreach($exportItem in $exportItems)
 		<tr id="tr${exportItem.id}">
-			<td align=center><input type="checkbox" exportItemID="$exportItem.id" exportItemName="$exportItem.name" name="exportItemCheck" id="exportItemCheck"/></td>
+			<td align="center"><input type="checkbox" exportItemID="$exportItem.id" exportItemName="$exportItem.name" name="exportItemCheck" id="exportItemCheck"/></td>
 			<td>$encoder.htmlEncode( $exportItem.name )</td>
 			<td>$i18n.getString( $exportItem.itemType )</td>
 			<td>$i18n.getString( $exportItem.periodType )</td>