dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #04697
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1568: fixed buid error at revision 1559
------------------------------------------------------------
revno: 1568
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-03-08 11:35:44 +0700
message:
fixed buid error at revision 1559
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemGroup.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/DefaultExcelItemService.java
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/hibernate/HibernateExcelItemStore.java
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItemGroup.hbm.xml
dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/DatabaseAutomaticAccessProvider.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetImportingParamsAction.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importDataParams.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/viewAdministrator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupRoleAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
--
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-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemGroup.java 2010-02-23 04:26:05 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemGroup.java 2010-03-08 04:35:44 +0000
@@ -229,7 +229,7 @@
public boolean rowAndColumnIsExist( int sheet, int row, int column )
{
- return getExcelItemBySheetRowColumn( sheet, row, column ) != null;
+ return getExcelItemBySheetRowColumn( sheet, row, column ) != null;
}
public ExcelItem getExcelItemByName( String name )
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemService.java 2009-11-23 17:43:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemService.java 2010-03-08 04:35:44 +0000
@@ -24,7 +24,7 @@
public ExcelItemGroup getExcelItemGroup( int id );
- public Collection<ExcelItemGroup> getExcelItemGroupsByOrganisationUnit( OrganisationUnit organisationUnit );
+ public Collection<ExcelItemGroup> getExcelItemGroups( OrganisationUnit organisationUnit );
// ----------------------------------------------------------------------------
// Excelitem services
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemStore.java 2009-11-23 17:43:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemStore.java 2010-03-08 04:35:44 +0000
@@ -24,7 +24,7 @@
public ExcelItemGroup getExcelItemGroup( int id );
- public Collection<ExcelItemGroup> getExcelItemGroupsByOrganisationUnit( OrganisationUnit organisationUnit );
+ public Collection<ExcelItemGroup> getExcelItemGroups( OrganisationUnit organisationUnit );
// ----------------------------------------------------------------------------
// Excelitem services
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java 2010-02-25 03:10:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java 2010-03-08 04:35:44 +0000
@@ -56,7 +56,7 @@
private Set<DataSet> dataSets = new HashSet<DataSet>();
private Set<ReportExcel> reportExcels = new HashSet<ReportExcel>();
-
+
// -------------------------------------------------------------------------
// hashCode and equals
// -------------------------------------------------------------------------
@@ -163,4 +163,5 @@
{
this.reportExcels = reportExcels;
}
+
}
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/DefaultExcelItemService.java'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/DefaultExcelItemService.java 2010-02-25 12:09:35 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/DefaultExcelItemService.java 2010-03-08 04:35:44 +0000
@@ -87,10 +87,10 @@
excelItemStore.updateExcelItemGroup( excelItemGroup );
}
- public Collection<ExcelItemGroup> getExcelItemGroupsByOrganisationUnit( OrganisationUnit organisationUnit )
+ public Collection<ExcelItemGroup> getExcelItemGroups( OrganisationUnit organisationUnit )
{
- return excelItemStore.getExcelItemGroupsByOrganisationUnit( organisationUnit );
+ return excelItemStore.getExcelItemGroups( organisationUnit );
}
// --------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/hibernate/HibernateExcelItemStore.java'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/hibernate/HibernateExcelItemStore.java 2010-02-25 12:09:35 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/hibernate/HibernateExcelItemStore.java 2010-03-08 04:35:44 +0000
@@ -13,6 +13,7 @@
import org.hisp.dhis.reportexcel.excelitem.ExcelItem;
import org.hisp.dhis.reportexcel.excelitem.ExcelItemGroup;
import org.hisp.dhis.reportexcel.excelitem.ExcelItemStore;
+import org.hisp.dhis.user.User;
/*
* Copyright (c) 2004-2007, University of Oslo
@@ -165,7 +166,7 @@
}
@SuppressWarnings( "unchecked" )
- public Collection<ExcelItemGroup> getExcelItemGroupsByOrganisationUnit( OrganisationUnit organisationUnit )
+ public Collection<ExcelItemGroup> getExcelItemGroups( OrganisationUnit organisationUnit )
{
Session session = sessionFactory.getCurrentSession();
@@ -203,4 +204,5 @@
session.delete( getDataElementGroupOrder( id ) );
}
+
}
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItemGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItemGroup.hbm.xml 2009-11-11 04:15:09 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItemGroup.hbm.xml 2010-03-08 04:35:44 +0000
@@ -15,7 +15,8 @@
<property name="type" />
<many-to-one name="periodType" class="org.hisp.dhis.period.PeriodType"
- lazy="false" column="periodtypeid" not-null="true" foreign-key="fk_excelitemgroup_periodtypeid" />
+ lazy="false" column="periodtypeid" not-null="true"
+ foreign-key="fk_excelitemgroup_periodtypeid" />
<set name="excelItems" lazy="false" cascade="delete">
<key column="excelitemgroupid" />
=== modified file 'dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml 2009-09-26 09:41:54 +0000
+++ dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml 2010-03-08 04:35:44 +0000
@@ -38,6 +38,6 @@
<many-to-many column="reportexcelid" class="org.hisp.dhis.reportexcel.ReportExcel"
foreign-key="fk_reportexcelid" />
</set>
-
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/DatabaseAutomaticAccessProvider.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/DatabaseAutomaticAccessProvider.java 2010-03-04 20:36:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/DatabaseAutomaticAccessProvider.java 2010-03-08 04:35:44 +0000
@@ -74,7 +74,7 @@
userStore.addUser( user );
UserAuthorityGroup userAuthorityGroup = new UserAuthorityGroup();
- userAuthorityGroup.setName( "ALL" );
+ userAuthorityGroup.setName( "Superuser" );
userAuthorityGroup.setAuthorities( new HashSet<String>( getAuthorities() ) );
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetImportingParamsAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetImportingParamsAction.java 2010-03-06 15:36:08 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/GetImportingParamsAction.java 2010-03-08 04:35:44 +0000
@@ -29,8 +29,6 @@
import java.io.File;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -38,9 +36,7 @@
import org.hisp.dhis.reportexcel.action.ActionSupport;
import org.hisp.dhis.reportexcel.excelitem.ExcelItemGroup;
import org.hisp.dhis.reportexcel.excelitem.ExcelItemService;
-import org.hisp.dhis.reportexcel.excelitem.comparator.ExcelItemGroupComparator;
import org.hisp.dhis.reportexcel.state.SelectionManager;
-import org.hisp.dhis.user.CurrentUserService;
/**
* @author Chau Thu Tran
@@ -60,8 +56,6 @@
private SelectionManager selectionManager;
- private CurrentUserService currentUserService;
-
// -------------------------------------------------------------------------
// Inputs && Outputs
// -------------------------------------------------------------------------
@@ -79,11 +73,6 @@
this.selectionManager = selectionManager;
}
- public void setCurrentUserService( CurrentUserService currentUserService )
- {
- this.currentUserService = currentUserService;
- }
-
public void setExcelItemService( ExcelItemService excelItemService )
{
@@ -91,6 +80,11 @@
}
+ public List<ExcelItemGroup> getExcelItemGroups()
+ {
+ return excelItemGroups;
+ }
+
public void setOrganisationUnitSelectionManager( OrganisationUnitSelectionManager organisationUnitSelectionManager )
{
this.organisationUnitSelectionManager = organisationUnitSelectionManager;
@@ -104,6 +98,11 @@
private File fileExcel;
+ public void setFileExcel( File fileExcel )
+ {
+ this.fileExcel = fileExcel;
+ }
+
public File getFileExcel()
{
return fileExcel;
@@ -145,7 +144,7 @@
// Load and sort ExcelItemGroups
// ---------------------------------------------------------------------
- //excelItemGroups = new ArrayList<ExcelItemGroup>( excelItemService.getExcelItemGroups( organisationUnit ) );
+ excelItemGroups = new ArrayList<ExcelItemGroup>( excelItemService.getExcelItemGroups( organisationUnit ) );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml 2010-03-05 08:27:33 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml 2010-03-08 04:35:44 +0000
@@ -1052,6 +1052,8 @@
/dhis-web-excel-reporting/responseSuccess.vm</result>
<result name="error" type="velocity-xml">
/dhis-web-excel-reporting/responseError.vm</result>
+ <result name="input" type="velocity-xml">
+ /dhis-web-excel-reporting/responseSuccess.vm</result>
</action>
<action name="uploadExcelImport"
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importDataParams.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importDataParams.vm 2009-12-04 07:40:29 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importDataParams.vm 2010-03-08 04:35:44 +0000
@@ -3,10 +3,10 @@
<div id="messageUpload">
$i18n.getString( "upload_file" ) $i18n.getString( "success" )<br>$fileExcel.getName()
</div>
- <span id="message" style="top:70px;right:5px;position:fixed;width:200px;z-index:100009" onclick="hideById(this.id);"></span>
#end
-
+ <span id="message" style="top:70px;right:5px;position:fixed;width:200px;z-index:100009" onclick="hideById(this.id);"></span>
+
<table width="62%">
<h2>$i18n.getString('import_data')</h2>
<form name="importingParam" id="importingParam" action="uploadExcelImport.action" method="post" enctype="multipart/form-data">
@@ -14,7 +14,7 @@
<td width="18%" style=" width:25% ">$i18n.getString( 'select_excel_file' )</td>
<td width="82%">
<input type="file" id="upload" name="upload" onChange="enable('uploadButton');">
- <input name="uploadButton" id="uploadButton" type="submit" value="$i18n.getString( 'upload_file' )" disabled />
+ <input name="uploadButton" id="uploadButton" type="button" value="$i18n.getString( 'upload_file' )" onclick="validateUploadExcelImport();" disabled />
</td>
</tr>
</form>
@@ -64,7 +64,6 @@
</tbody>
</table>
</div>
-
<script language="javascript">
#if($!fileExcel && $!organisationUnit)
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js 2009-12-18 06:56:38 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js 2010-03-08 04:35:44 +0000
@@ -297,15 +297,73 @@
request.send( 'nextPeriodsGeneric.action' );
}
-function validateUploadExcelFileImporting() {
-
- if ( (byId("upload").value == "") || (byId("upload").value.length == 0) ) {
-
- hideById("messageUpload");
- setMessage(i18n_warning_upload_is_null);
- return false;
- }
- else {
- return true;
- }
-}
\ No newline at end of file
+function validateUploadExcelImport ( fileName, columnIndex ) {
+
+ var list = byId( 'list' );
+
+ var rows = list.getElementsByTagName( 'tr' );
+
+ for ( var i = 0; i < rows.length; i++ )
+ {
+ var cell = rows[i].getElementsByTagName( 'td' )[columnIndex-1];
+ var value = cell.firstChild.nodeValue;
+
+ if ( value.toLowerCase().indexOf( fileName.toLowerCase() ) != -1 )
+ {
+ // file is existsing
+ return window.confirm( i18n_confirm_override );
+ }
+ }
+
+ // normally upload
+ return true;
+}
+
+function validateUploadExcelImport(){
+
+ $.ajaxFileUpload
+ (
+ {
+ url:'validateUploadExcelImport.action',
+ secureuri:false,
+ fileElementId:'upload',
+ dataType: 'xml',
+ success: function (data, status)
+ {
+ data = data.getElementsByTagName('message')[0];
+ var type = data.getAttribute("type");
+ if(type=='error'){
+ setMessage(data.firstChild.nodeValue);
+ }else{
+ //document.forms['importingParam'].submit();
+ uploadExcelImport();
+ }
+ },
+ error: function (data, status, e)
+ {
+
+ }
+ }
+ );
+ }
+
+ function uploadExcelImport(){
+
+ $.ajaxFileUpload
+ (
+ {
+ url:'uploadExcelImport.action',
+ secureuri:false,
+ fileElementId:'upload',
+ dataType: 'xml',
+ success: function (data, status)
+ {
+ window.location.reload();
+ },
+ error: function (data, status, e)
+ {
+
+ }
+ }
+ );
+ }
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm 2010-02-24 17:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm 2010-03-08 04:35:44 +0000
@@ -325,7 +325,7 @@
<div id="close" style="position:absolute;top:2px;right:2px;cursor: pointer;color:red;" onclick="hideById('copyToExcelItem'); deleteDivEffect();">[x]</div>
<table width="100%">
<tr>
- <td>$i18n.getString('reports')</td>
+ <td>$i18n.getString('excelitem_group')</td>
<td>
<select id="targetExcelItemGroup" name="targetExcelItemGroup" style="max-width:30em;min-width:30em;">
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/viewAdministrator.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/viewAdministrator.vm 2010-03-05 08:27:33 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/viewAdministrator.vm 2010-03-08 04:35:44 +0000
@@ -4,7 +4,7 @@
#introListItem( "getConfiguration.action" "configuration" )
#introListItem( "listReportExcel.action" "reports" )
#introListItem( "listDataEntryStatus.action" "data_status" )
- #introListItem( "listAllExcelTemplates.action" "excel_item" )
+ #introListItem( "listAllExcelItemGroup.action" "excel_item" )
#introListItem( "listAllExcelTemplates.action" "excel_template_management" )
#introListItem( "javascript: cleanUp();" "clean_up" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java 2009-12-21 08:11:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java 2010-03-08 04:35:44 +0000
@@ -37,6 +37,7 @@
import org.hisp.dhis.reportexcel.ReportExcel;
import org.hisp.dhis.reportexcel.ReportExcelService;
import org.hisp.dhis.reportexcel.comparator.ReportExcelNameComparator;
+import org.hisp.dhis.reportexcel.excelitem.ExcelItemGroup;
import org.hisp.dhis.security.authority.SystemAuthoritiesProvider;
import org.hisp.dhis.user.UserAuthorityGroup;
import org.hisp.dhis.user.UserStore;
@@ -81,7 +82,7 @@
{
this.reportExcelService = reportExcelService;
}
-
+
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
@@ -146,6 +147,13 @@
return reportExcels;
}
+ private List<ExcelItemGroup> availableImportExcels;
+
+ public List<ExcelItemGroup> getAvailableImportExcels()
+ {
+ return availableImportExcels;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -154,7 +162,7 @@
throws Exception
{
userAuthorityGroup = userStore.getUserAuthorityGroup( id );
-
+
// ---------------------------------------------------------------------
// DataSets
// ---------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupRoleAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupRoleAction.java 2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupRoleAction.java 2010-03-08 04:35:44 +0000
@@ -39,6 +39,9 @@
import org.hisp.dhis.reportexcel.ReportExcel;
import org.hisp.dhis.reportexcel.ReportExcelService;
import org.hisp.dhis.reportexcel.comparator.ReportExcelNameComparator;
+import org.hisp.dhis.reportexcel.excelitem.ExcelItemGroup;
+import org.hisp.dhis.reportexcel.excelitem.ExcelItemService;
+import org.hisp.dhis.reportexcel.excelitem.comparator.ExcelItemGroupComparator;
import org.hisp.dhis.security.authority.SystemAuthoritiesProvider;
import com.opensymphony.xwork2.Action;
@@ -121,6 +124,13 @@
return availableReportExcels;
}
+ private List<ExcelItemGroup> availableImportExcels;
+
+ public List<ExcelItemGroup> getAvailableImportExcels()
+ {
+ return availableImportExcels;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2010-02-25 04:22:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2010-03-08 04:35:44 +0000
@@ -204,4 +204,5 @@
intro_change_password = Change the password for users.
user_use_group = There are users used this role
can_not_remove_last_super_user = Can not remove the last super user.
-can_not_remove_last_super_user_role = Can not remove the last super user role.
\ No newline at end of file
+can_not_remove_last_super_user_role = Can not remove the last super user role.
+excel_importing = Excel Importing
\ No newline at end of file
