dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2908
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-02-24 13:35:20 +0700
message:
  Deactivated the excel reporting in some places.
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
  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/pom.xml


--
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-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2011-02-17 20:35:09 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2011-02-24 06:35:20 +0000
@@ -462,13 +462,13 @@
 				<ref bean="I18nIndicatorGroupSet" />
 				<ref bean="I18nDataSet" />
 				<ref bean="I18nOrganisationUnit" />
-				<ref bean="I18nReportExcelNormal" />
+				<!--ref bean="I18nReportExcelNormal" />
 				<ref bean="I18nReportExcelCategory" />
 				<ref bean="I18nReportExcelOganiztionGroupListing" />
 				<ref bean="I18nReportExcelPeriodColumnListing" />
 				<ref bean="I18nReportExcelItem" />
 				<ref bean="I18nExcelItemGroup" />
-				<ref bean="I18nExcelItem" />
+				<ref bean="I18nExcelItem"/ -->
 				<ref bean="I18nSection" />
 			</list>
 		</property>
@@ -924,7 +924,7 @@
 		</property>
 	</bean>
 
-	<bean id="I18nReportExcelNormal" class="org.hisp.dhis.i18n.I18nObject">
+	<!--bean id="I18nReportExcelNormal" class="org.hisp.dhis.i18n.I18nObject">
 		<property name="className" value="ReportExcelNormal" />
 		<property name="propertyNames">
 			<list>
@@ -1090,7 +1090,7 @@
 				</entry>
 			</map>
 		</property>
-	</bean>
+	</bean-->
 
 	<bean id="I18nSection" class="org.hisp.dhis.i18n.I18nObject">
 		<property name="className" value="Section" />

=== 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	2010-12-30 09:13:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java	2011-02-24 06:35:20 +0000
@@ -34,8 +34,6 @@
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dataset.DataSetService;
 import org.hisp.dhis.dataset.comparator.DataSetNameComparator;
-import org.hisp.dhis.reportexcel.ReportExcel;
-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.UserService;
@@ -124,27 +122,6 @@
         return roleAuthorities;
     }
 
-    private List<ReportExcel> availableReportExcels;
-
-    public List<ReportExcel> getAvailableReportExcels()
-    {
-        return availableReportExcels;
-    }
-
-    private List<ReportExcel> reportExcels;
-
-    public List<ReportExcel> getReportExcels()
-    {
-        return reportExcels;
-    }
-
-    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/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	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupRoleAction.java	2011-02-24 06:35:20 +0000
@@ -36,8 +36,6 @@
 import org.hisp.dhis.dataset.DataSetService;
 import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
 import org.hisp.dhis.report.Report;
-import org.hisp.dhis.reportexcel.ReportExcel;
-import org.hisp.dhis.reportexcel.excelitem.ExcelItemGroup;
 import org.hisp.dhis.security.authority.SystemAuthoritiesProvider;
 
 import com.opensymphony.xwork2.Action;
@@ -106,20 +104,6 @@
         return availableAuthorities;
     }
 
-    private List<ReportExcel> availableReportExcels;
-
-    public List<ReportExcel> getAvailableReportExcels()
-    {
-        return availableReportExcels;
-    }
-
-    private List<ExcelItemGroup> availableImportExcels;
-
-    public List<ExcelItemGroup> getAvailableImportExcels()
-    {
-        return availableImportExcels;
-    }
-
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2011-02-03 10:36:33 +0000
+++ dhis-2/pom.xml	2011-02-24 06:35:20 +0000
@@ -203,11 +203,11 @@
         <artifactId>dhis-service-patient</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
+      <!--dependency>
         <groupId>org.hisp.dhis</groupId>
         <artifactId>dhis-service-excel-reporting</artifactId>
         <version>${project.version}</version>
-      </dependency>
+      </dependency-->
       <dependency>
         <groupId>org.hisp.dhis</groupId>
         <artifactId>dhis-service-administration</artifactId>