dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15836
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5850: update methods and spring version in local/in
------------------------------------------------------------
revno: 5850
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-02-02 15:26:51 +0530
message:
update methods and spring version in local/in
modified:
local/in/dhis-in-services/dhis-in-service-configuration/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-in-services/dhis-in-service-dataentrystatus/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml
local/in/dhis-in-services/dhis-in-service-dbmanager/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml
local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/DefaultLineListService.java
local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/DefaultLineListDataElementMappingService.java
local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-in-services/dhis-in-service-reports/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/ReceiveImportPageAction.java
local/in/dhis-mobile/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/aa/action/GenerateAnnualAnalyserFormAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/DashBoardHomePageAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/ExportIndicatorToExcelAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/ExportSurveyDataToExcelAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/ExportToExcelAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsForTabularAnalysisAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsGroupAndDataSetAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetIndicatorsAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/IDSPOutbreakAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentsResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusDataSetWiseResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusFormAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction_Test.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusFormAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateLastUpdatedDataSetResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateSummaryDataStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateValidationStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateDataStatusMobileFormAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateGroupWiseMobileDataStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateLastUpdatedMobileDataSetResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateMobileDataStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GeneratePercentageDataStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateSummaryMobileDataStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateValidationMobileStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseFormAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntryStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntrySummaryStatusResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/GenerateGraphicalAnalyserDataElementsFormAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/GenerateGraphicalAnalyserFormAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/IndicatorwiseGAFormAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateChartDataAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/mchart/action/MotionChartResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterFormAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterResultAction.java
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ta/action/GenerateTabularAnalysisFormAction.java
local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/tabularAnalysisFront.vm
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/autoagg/action/AutoLLDataAggregationAction.java
local/in/dhis-web-dataentry-linelisting/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/select.vm
local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/style/dhis-web-dataentry-national.css
local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/GetDataElementsAction.java
local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-linelisting-in/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/TwentyPoint/action/GenerateTwentyPointReportsResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetDataElementsAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/advanced/action/GenerateAdvancedReportResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/action/GenerateAggregationReportAnalyserResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/benificiaryinfo/action/BenificiaryInfoReportsResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/csreview/action/GenerateCSReviewReportResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/datasetlock/action/GenerateDataSetLockReportResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ed/action/EDReportFormAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ed/action/EDReportResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/feedback/action/GenerateFeedbackReportAnalyserResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GenerateGradingReportResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GenerateImmChildGradingReportAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GenerateSelChildGradingReportAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GradingAbstractionResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/idsp/action/GenerateIDSPReportAnalyserResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/leprosy/action/LeprosyReportResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/linelisting/action/GenerateLinelistingWebPortalReportAnalyserResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/malarya/action/GenerateMalaryaReportResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/md/action/GenerateMDReportAnalyserResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/GenerateMetaDataReportResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/nbits/action/NBITSReportResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/orgunitgroupsetreport/action/GenerateOrgunitGroupsetReportsResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/physical/action/GeneratePhysicalReportResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/portal/action/PortalReportsResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ranking/action/GenerateRankingReportResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateColdChainReportAnalyserResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateRoutineReportAnalyserResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserResultAction.java
local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DataElementGroupListAction.java
local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DeTargetAddFormAction.java
local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/FormAction.java
local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GenerateTargetAction.java
local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetDataElementsAction.java
local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetDeTargetAction.java
local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/FormAction.java
local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/IndicatorGroupListAction.java
local/in/dhis-web-survey/src/main/resources/META-INF/dhis/beans.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 'local/in/dhis-in-services/dhis-in-service-configuration/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-configuration/src/main/resources/META-INF/dhis/beans.xml 2010-06-20 07:27:46 +0000
+++ local/in/dhis-in-services/dhis-in-service-configuration/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
<!-- Store definitions -->
=== modified file 'local/in/dhis-in-services/dhis-in-service-dataentrystatus/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-dataentrystatus/src/main/resources/META-INF/dhis/beans.xml 2011-06-15 05:50:55 +0000
+++ local/in/dhis-in-services/dhis-in-service-dataentrystatus/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
<!-- DataEntryStatus Store definitions -->
=== modified file 'local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml 2012-01-10 10:35:10 +0000
+++ local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml 2012-02-02 09:56:51 +0000
@@ -38,12 +38,12 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-support-system</artifactId>
</dependency>
-
+<!--
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-options</artifactId>
</dependency>
-
+-->
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-dbmanager/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-dbmanager/src/main/resources/META-INF/dhis/beans.xml 2010-08-14 05:19:02 +0000
+++ local/in/dhis-in-services/dhis-in-service-dbmanager/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:aop="http://www.springframework.org/schema/aop";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd";>
<!-- Store definitions -->
=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml 2012-01-10 10:35:10 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml 2012-02-02 09:56:51 +0000
@@ -38,10 +38,12 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-support-system</artifactId>
</dependency>
+<!--
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-options</artifactId>
- </dependency>
+ </dependency>
+-->
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/DefaultLineListService.java'
--- local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/DefaultLineListService.java 2011-04-27 17:15:13 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/DefaultLineListService.java 2012-02-02 09:56:51 +0000
@@ -42,7 +42,8 @@
{
int id = lineListStore.addLineListGroup( lineListGroup );
- i18nService.addObject( lineListGroup );
+ //i18nService.addObject( lineListGroup );
+
return id;
}
@@ -143,7 +144,7 @@
int id = lineListStore.addLineListElement( lineListElement );
- i18nService.addObject( lineListElement );
+ //i18nService.addObject( lineListElement );
return id;
@@ -200,7 +201,7 @@
{
int id = lineListStore.addLineListOption( lineListOption );
- i18nService.addObject( lineListOption );
+ //i18nService.addObject( lineListOption );
return id;
}
=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/DefaultLineListDataElementMappingService.java'
--- local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/DefaultLineListDataElementMappingService.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/DefaultLineListDataElementMappingService.java 2012-02-02 09:56:51 +0000
@@ -74,7 +74,7 @@
{
int id = lineListDataElementMappingStore.addLineListDataElementMapping( lineListDataElementMapping );
- i18nService.addObject( lineListDataElementMapping );
+ //i18nService.addObject( lineListDataElementMapping );
return id;
}
=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/META-INF/dhis/beans.xml 2010-10-20 06:14:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:aop="http://www.springframework.org/schema/aop";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd";>
<!-- Store definitions -->
@@ -15,12 +15,12 @@
ref="org.hisp.dhis.period.PeriodStore"/>
</bean>
- <!-- 12/10/2010 start-->
+
<bean id="org.hisp.dhis.linelisting.linelistdataelementmapping.LineListDataElementMappingStore"
class="org.hisp.dhis.linelisting.linelistdataelementmapping.hibernate.HibernateLineListDataElementMappingStore">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
- <!-- 12/10/2010 end-->
+
=== modified file 'local/in/dhis-in-services/dhis-in-service-reports/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-reports/src/main/resources/META-INF/dhis/beans.xml 2011-09-03 05:48:23 +0000
+++ local/in/dhis-in-services/dhis-in-service-reports/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
<!-- Store definitions -->
=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/META-INF/dhis/beans.xml 2011-01-14 08:56:27 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
<!-- Survey Store definitions -->
=== modified file 'local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml 2011-09-03 11:14:13 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
<!-- Service definitions -->
<bean id="org.hisp.dhis.mobile.SmsService"
=== modified file 'local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/ReceiveImportPageAction.java'
--- local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/ReceiveImportPageAction.java 2011-04-15 11:41:30 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/ReceiveImportPageAction.java 2012-02-02 09:56:51 +0000
@@ -27,15 +27,14 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.opensymphony.xwork2.Action;
import java.io.File;
-import java.io.FilenameFilter;
import java.util.List;
-import org.apache.commons.io.FileUtils;
+
import org.hisp.dhis.mobile.SmsService;
-import org.hisp.dhis.mobile.XMLFilter;
import org.hisp.dhis.mobile.api.MobileImportService;
+import com.opensymphony.xwork2.Action;
+
public class ReceiveImportPageAction implements Action
{
=== modified file 'local/in/dhis-mobile/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-mobile/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml 2011-07-07 11:56:37 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
<bean id="org.hisp.dhis.mobile.action.MobileHomePageAction"
class="org.hisp.dhis.mobile.action.MobileHomePageAction"
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/aa/action/GenerateAnnualAnalyserFormAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/aa/action/GenerateAnnualAnalyserFormAction.java 2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/aa/action/GenerateAnnualAnalyserFormAction.java 2012-02-02 09:56:51 +0000
@@ -35,17 +35,15 @@
import java.util.Iterator;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementNameComparator;
import org.hisp.dhis.dataset.Section;
import org.hisp.dhis.dataset.SectionService;
import org.hisp.dhis.dataset.comparator.SectionOrderComparator;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.comparator.IndicatorGroupNameComparator;
-import org.hisp.dhis.indicator.comparator.IndicatorNameComparator;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.period.Period;
@@ -256,7 +254,7 @@
//dataElementGroups = new ArrayList<DataElementGroup>(dataElementService.getAllDataElementGroups());
- Collections.sort( dataElements, new DataElementNameComparator() );
+ Collections.sort( dataElements, new IdentifiableObjectNameComparator() );
//Collections.sort( dataElementGroups, new DataElementGroupNameComparator() );
@@ -265,8 +263,8 @@
indicators = new ArrayList<Indicator>(indicatorService.getAllIndicators());
indicatorGroups = new ArrayList<IndicatorGroup>(indicatorService.getAllIndicatorGroups());
- Collections.sort( indicators, new IndicatorNameComparator() );
- Collections.sort( indicatorGroups, new IndicatorGroupNameComparator() );
+ Collections.sort( indicators, new IdentifiableObjectNameComparator() );
+ Collections.sort( indicatorGroups, new IdentifiableObjectNameComparator() );
/* Yearly Periods */
PeriodType yearlyPeriodType = PeriodType.getPeriodTypeByName( "Yearly" );
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/DashBoardHomePageAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/DashBoardHomePageAction.java 2011-11-03 06:07:39 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/DashBoardHomePageAction.java 2012-02-02 09:56:51 +0000
@@ -43,12 +43,12 @@
import org.amplecode.quick.StatementManager;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.MonthlyPeriodType;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
@@ -306,7 +306,7 @@
{
rootOrgUnitName = orgUnit.getName() + ", ";
List<OrganisationUnit> tempOuList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( tempOuList, new OrganisationUnitNameComparator() );
+ Collections.sort( tempOuList, new IdentifiableObjectNameComparator() );
immChildrenList.addAll( tempOuList );
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/ExportIndicatorToExcelAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/ExportIndicatorToExcelAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/ExportIndicatorToExcelAction.java 2012-02-02 09:56:51 +0000
@@ -51,7 +51,6 @@
import jxl.write.WritableWorkbook;
import org.apache.struts2.ServletActionContext;
-import org.hisp.dhis.config.ConfigurationService;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.expression.ExpressionService;
import org.hisp.dhis.indicator.Indicator;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/ExportSurveyDataToExcelAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/ExportSurveyDataToExcelAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/ExportSurveyDataToExcelAction.java 2012-02-02 09:56:51 +0000
@@ -53,7 +53,6 @@
import jxl.write.WritableWorkbook;
import org.apache.struts2.ServletActionContext;
-import org.hisp.dhis.config.ConfigurationService;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.expression.ExpressionService;
import org.hisp.dhis.indicator.Indicator;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/ExportToExcelAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/ExportToExcelAction.java 2011-06-28 10:02:15 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/ExportToExcelAction.java 2012-02-02 09:56:51 +0000
@@ -26,7 +26,6 @@
import jxl.write.WritableWorkbook;
import org.apache.struts2.ServletActionContext;
-import org.hisp.dhis.config.ConfigurationService;
import org.hisp.dhis.config.Configuration_IN;
import com.keypoint.PngEncoder;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsAction.java 2012-01-10 10:35:10 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsAction.java 2012-02-02 09:56:51 +0000
@@ -40,7 +40,7 @@
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.dataset.Section;
import org.hisp.dhis.dataset.SectionService;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
+//import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
import com.opensymphony.xwork2.Action;
@@ -91,13 +91,14 @@
// -------------------------------------------------------------------------
// DisplayPropertyHandler
// -------------------------------------------------------------------------
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
// -------------------------------------------------------------------------
// Input & output
// -------------------------------------------------------------------------
@@ -194,7 +195,7 @@
System.out.println(" dataElements size = "+dataElements.size());
Collections.sort( dataElements, dataElementComparator );
- displayPropertyHandler.handle( dataElements );
+ //displayPropertyHandler.handle( dataElements );
if ( deOptionValue != null )
{
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsForTabularAnalysisAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsForTabularAnalysisAction.java 2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsForTabularAnalysisAction.java 2012-02-02 09:56:51 +0000
@@ -13,7 +13,6 @@
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.dataset.Section;
import org.hisp.dhis.dataset.SectionService;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
import com.opensymphony.xwork2.Action;
@@ -60,13 +59,14 @@
// -------------------------------------------------------------------------
// DisplayPropertyHandler
// -------------------------------------------------------------------------
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
// -------------------------------------------------------------------------
// Input & output
// -------------------------------------------------------------------------
@@ -160,7 +160,7 @@
Collections.sort( dataElements, dataElementComparator );
- displayPropertyHandler.handle( dataElements );
+ //displayPropertyHandler.handle( dataElements );
if ( deOptionValue != null )
{
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsGroupAndDataSetAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsGroupAndDataSetAction.java 2010-12-08 07:24:10 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetDataElementsGroupAndDataSetAction.java 2012-02-02 09:56:51 +0000
@@ -32,12 +32,11 @@
import java.util.Iterator;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator;
import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
import com.opensymphony.xwork2.Action;
@@ -72,14 +71,14 @@
// DisplayPropertyHandler
// -------------------------------------------------------------------------
- @SuppressWarnings("unused")
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
// -------------------------------------------------------------------------
// Input & output
// -------------------------------------------------------------------------
@@ -150,7 +149,7 @@
}
}
- Collections.sort( applicableDataElementGroups, new DataElementGroupNameComparator() );
+ Collections.sort( applicableDataElementGroups, new IdentifiableObjectNameComparator() );
return applicableDataElementGroups;
}
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetIndicatorsAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetIndicatorsAction.java 2010-12-29 07:47:36 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetIndicatorsAction.java 2012-02-02 09:56:51 +0000
@@ -37,7 +37,6 @@
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
import org.hisp.dhis.survey.Survey;
import org.hisp.dhis.survey.SurveyService;
@@ -84,14 +83,14 @@
// -------------------------------------------------------------------------
// DisplayPropertyHandler
// -------------------------------------------------------------------------
-
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
// -------------------------------------------------------------------------
// Input & output
// -------------------------------------------------------------------------
@@ -184,7 +183,7 @@
Collections.sort( indicators, indicatorComparator );
- displayPropertyHandler.handle( indicators );
+ //displayPropertyHandler.handle( indicators );
return SUCCESS;
}
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/IDSPOutbreakAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/IDSPOutbreakAction.java 2011-12-03 07:44:11 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/IDSPOutbreakAction.java 2012-02-02 09:56:51 +0000
@@ -5,31 +5,24 @@
import java.io.File;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.Collections;
-import java.util.Date;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.amplecode.quick.StatementManager;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
-import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
-import org.hisp.dhis.period.WeeklyPeriodType;
import org.hisp.dhis.program.Program;
import org.hisp.dhis.program.ProgramService;
import org.hisp.dhis.user.CurrentUserService;
@@ -338,7 +331,7 @@
{
rootOrgUnitName = orgUnit.getName() + ", ";
List<OrganisationUnit> tempOuList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( tempOuList, new OrganisationUnitNameComparator() );
+ Collections.sort( tempOuList, new IdentifiableObjectNameComparator() );
immChildrenList.addAll( tempOuList );
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentResultAction.java 2011-12-03 07:44:11 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentResultAction.java 2012-02-02 09:56:51 +0000
@@ -9,6 +9,7 @@
import java.util.Map;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
@@ -20,8 +21,6 @@
import org.hisp.dhis.datavalue.DataValueService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -316,7 +315,8 @@
.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ //Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
}
}
@@ -328,7 +328,8 @@
{
o = organisationUnitService.getOrganisationUnit( Integer.parseInt( orgUnitIterator.next() ) );
orgUnitList.add( o );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ // Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
}
}
@@ -423,7 +424,8 @@
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ //Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentsResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentsResultAction.java 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentsResultAction.java 2012-02-02 09:56:51 +0000
@@ -13,6 +13,7 @@
import java.util.Map;
import java.util.Set;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataset.DataSet;
@@ -22,7 +23,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -293,7 +293,8 @@
if(oug != null)
{
List<OrganisationUnit> tempOUList = new ArrayList<OrganisationUnit>(oug.getMembers());
- Collections.sort( tempOUList, new OrganisationUnitShortNameComparator() );
+ //Collections.sort( tempOUList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( tempOUList, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( tempOUList );
}
@@ -301,7 +302,8 @@
if(oug != null)
{
List<OrganisationUnit> tempOUList = new ArrayList<OrganisationUnit>(oug.getMembers());
- Collections.sort( tempOUList, new OrganisationUnitShortNameComparator() );
+ //Collections.sort( tempOUList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( tempOUList, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( tempOUList );
}
}
@@ -315,7 +317,8 @@
OrganisationUnit o = organisationUnitService.getOrganisationUnit( Integer.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ //Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
}
}
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusDataSetWiseResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusDataSetWiseResultAction.java 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusDataSetWiseResultAction.java 2012-02-02 09:56:51 +0000
@@ -15,16 +15,16 @@
import jxl.format.Colour;
import jxl.write.WritableCellFormat;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
+import org.hisp.dhis.constant.Constant;
+import org.hisp.dhis.constant.ConstantService;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
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 org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -79,6 +79,15 @@
{
this.dashBoardService = dashBoardService;
}
+
+ private ConstantService constantService;
+
+ public void setConstantService( ConstantService constantService )
+ {
+ this.constantService = constantService;
+ }
+
+ private List<Constant> constants;
// ---------------------------------------------------------------
// Input Parameters
// ---------------------------------------------------------------
@@ -136,14 +145,14 @@
{
return orgUnitList;
}
-
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
private Collection<Period> periodList;
public Collection<Period> getPeriodList()
@@ -250,6 +259,9 @@
{
this.ouMaporgChildCount = ouMaporgChildCount;
}
+
+ Double constValue = 0.0;
+ String constName = "";
// ---------------------------------------------------------------
// Action Implementation
// ---------------------------------------------------------------
@@ -259,8 +271,23 @@
System.out.println( "DataSet Wise Data Status Generation Start Time is : " + new Date() );
// Intialization
+
periodNameList = new ArrayList<String>();
//dataViewName = "";
+
+ constants = new ArrayList<Constant>( constantService.getAllConstants());
+
+ for( Constant constant : constants )
+ {
+ //String name = constant.getName();
+ //Double value = constant.getValue();
+ if( constant.getName().equalsIgnoreCase( "temp" ))
+ {
+ constName = constant.getName();
+ constValue = constant.getValue();
+ break;
+ }
+ }
ouMapForChildDSAssociation = new HashMap<OrganisationUnit, Integer>();
ouMapForColor = new HashMap<OrganisationUnit, Integer>();
orgUnitCount = 0;
@@ -309,7 +336,8 @@
.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ //Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
}
}
@@ -321,8 +349,9 @@
{
o = organisationUnitService.getOrganisationUnit( Integer.parseInt( orgUnitIterator.next() ) );
orgUnitList.add( o );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
- displayPropertyHandler.handle( orgUnitList );
+ //Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
+ //displayPropertyHandler.handle( orgUnitList );
}
}
@@ -493,7 +522,8 @@
dataStatusPercentatge = Math.round( dataStatusPercentatge * Math.pow( 10, 0 ) )
/ Math.pow( 10, 0 );
- if ( dataStatusPercentatge >= 5.0 )
+ // if ( dataStatusPercentatge >= 5.0 )
+ if ( dataStatusPercentatge >= constValue )
{
dataStatusCount += 1;
}
@@ -539,8 +569,8 @@
dataStatusPercentatge = 100;
dataStatusPercentatge = Math.round( dataStatusPercentatge * Math.pow( 10, 0 ) ) / Math.pow( 10, 0 );
-
- if ( dataStatusPercentatge >= 5.0 )
+ //if ( dataStatusPercentatge >= 5.0 )
+ if ( dataStatusPercentatge >= constValue )
{
dsSummaryResults.add( 1 );
}
@@ -630,7 +660,8 @@
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
+ //Collections.sort( children, new OrganisationUnitNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusFormAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusFormAction.java 2010-12-08 07:24:10 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusFormAction.java 2012-02-02 09:56:51 +0000
@@ -6,9 +6,9 @@
import java.util.Iterator;
import java.util.List;
+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.Period;
import org.hisp.dhis.period.PeriodService;
@@ -91,7 +91,7 @@
}
}
- Collections.sort( dataSetList, new DataSetNameComparator() );
+ Collections.sort( dataSetList, new IdentifiableObjectNameComparator() );
/* Monthly Periods */
//monthlyPeriods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( new MonthlyPeriodType() ) );
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction.java 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction.java 2012-02-02 09:56:51 +0000
@@ -12,16 +12,14 @@
import java.util.UUID;
import org.hibernate.SessionFactory;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
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 org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -89,14 +87,14 @@
{
this.dashBoardService = dashBoardService;
}
-
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
@SuppressWarnings( "unused" )
private Comparator<OrganisationUnit> orgUnitComparator;
@@ -426,7 +424,7 @@
.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
}
}
@@ -438,8 +436,8 @@
{
o = organisationUnitService.getOrganisationUnit( Integer.parseInt( orgUnitIterator.next() ) );
orgUnitList.add( o );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
- displayPropertyHandler.handle( orgUnitList );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
+ //displayPropertyHandler.handle( orgUnitList );
}
}
@@ -795,7 +793,7 @@
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction_Test.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction_Test.java 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction_Test.java 2012-02-02 09:56:51 +0000
@@ -12,18 +12,16 @@
import org.hibernate.SessionFactory;
import org.hisp.dhis.common.ServiceProvider;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.completeness.DataSetCompletenessResult;
import org.hisp.dhis.completeness.DataSetCompletenessService;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
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 org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -90,14 +88,14 @@
{
this.dashBoardService = dashBoardService;
}
-
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
@SuppressWarnings("unused")
private Comparator<OrganisationUnit> orgUnitComparator;
@@ -105,7 +103,7 @@
{
this.orgUnitComparator = orgUnitComparator;
}
-
+ @SuppressWarnings("unused")
private ServiceProvider<DataSetCompletenessService> serviceProvider;
public void setServiceProvider( ServiceProvider<DataSetCompletenessService> serviceProvider )
@@ -425,7 +423,7 @@
.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
}
}
@@ -437,8 +435,8 @@
{
o = organisationUnitService.getOrganisationUnit( Integer.parseInt( orgUnitIterator.next() ) );
orgUnitList.add( o );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
- displayPropertyHandler.handle( orgUnitList );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
+ //displayPropertyHandler.handle( orgUnitList );
}
}
@@ -848,7 +846,7 @@
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusFormAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusFormAction.java 2010-12-08 07:24:10 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusFormAction.java 2012-02-02 09:56:51 +0000
@@ -5,9 +5,9 @@
import java.util.Collections;
import java.util.List;
+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.Period;
import org.hisp.dhis.period.PeriodService;
@@ -62,7 +62,7 @@
dataSetList = new ArrayList<DataSet>( dataSetService.getAllDataSets() );
- Collections.sort( dataSetList, new DataSetNameComparator() );
+ Collections.sort( dataSetList, new IdentifiableObjectNameComparator() );
/* Monthly Periods */
//monthlyPeriods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( new MonthlyPeriodType() ) );
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java 2011-12-26 07:49:43 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java 2012-02-02 09:56:51 +0000
@@ -12,6 +12,7 @@
import java.util.UUID;
import org.hibernate.SessionFactory;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
@@ -20,12 +21,9 @@
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.dataset.Section;
import org.hisp.dhis.dataset.comparator.SectionOrderComparator;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -109,12 +107,14 @@
}
@SuppressWarnings("unused")
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
+ */
/*
private SectionService sectionService;
@@ -448,7 +448,7 @@
.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
}
}
@@ -885,7 +885,8 @@
List<OrganisationUnit> orgUnitTree = new ArrayList<OrganisationUnit>();
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ //Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateLastUpdatedDataSetResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateLastUpdatedDataSetResultAction.java 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateLastUpdatedDataSetResultAction.java 2012-02-02 09:56:51 +0000
@@ -39,16 +39,14 @@
import java.util.Set;
import org.hibernate.SessionFactory;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
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 org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -131,14 +129,14 @@
{
this.dashBoardService = dashBoardService;
}
-
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
private UserStore userStore;
public void setUserStore( UserStore userStore )
@@ -438,7 +436,7 @@
.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
}
}
@@ -450,8 +448,8 @@
{
o = organisationUnitService.getOrganisationUnit( Integer.parseInt( orgUnitIterator.next() ) );
orgUnitList.add( o );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
- displayPropertyHandler.handle( orgUnitList );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
+ //displayPropertyHandler.handle( orgUnitList );
}
}
@@ -727,7 +725,7 @@
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateSummaryDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateSummaryDataStatusResultAction.java 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateSummaryDataStatusResultAction.java 2012-02-02 09:56:51 +0000
@@ -14,6 +14,9 @@
import java.util.Set;
import java.util.UUID;
+import org.hisp.dhis.constant.Constant;
+import org.hisp.dhis.constant.ConstantService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataset.DataSet;
@@ -21,8 +24,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -82,6 +83,15 @@
{
this.dashBoardService = dashBoardService;
}
+
+ private ConstantService constantService;
+
+ public void setConstantService( ConstantService constantService )
+ {
+ this.constantService = constantService;
+ }
+
+ private List<Constant> constants;
// ---------------------------------------------------------------
// Output Parameters
@@ -281,6 +291,8 @@
Map<String, Double> tempOuMapResult;
+ Double constValue = 0.0;
+ String constName = "";
// ---------------------------------------------------------------
// Action Implementation
// ---------------------------------------------------------------
@@ -291,6 +303,21 @@
dataViewName = "";
// Intialization
+
+ constants = new ArrayList<Constant>( constantService.getAllConstants());
+
+ for( Constant constant : constants )
+ {
+ //String name = constant.getName();
+ //Double value = constant.getValue();
+ if( constant.getName().equalsIgnoreCase( "temp" ))
+ {
+ constName = constant.getName();
+ constValue = constant.getValue();
+ break;
+ }
+ }
+ System.out.println( "------Constant Name is : ---- " + constName + ",------ Constant Value is : " + constValue );
tempOuMapResult = new HashMap<String, Double>();
ouMapForChildDSAssociation = new HashMap<OrganisationUnit, Integer>();
ouMapForColor = new HashMap<OrganisationUnit, Integer>();
@@ -340,7 +367,7 @@
OrganisationUnit o = organisationUnitService.getOrganisationUnit( Integer.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
}
}
@@ -526,8 +553,8 @@
{
dataStatusPercentatge = tempDataStatusCount;
}
-
- if ( dataStatusPercentatge >= 5.0 )
+ //if ( dataStatusPercentatge >= 5.0 )
+ if ( dataStatusPercentatge >= constValue )
{
dataStatusCount += 1;
}
@@ -575,8 +602,8 @@
dataStatusPercentatge = 100;
dataStatusPercentatge = Math.round( dataStatusPercentatge * Math.pow( 10, 0 ) ) / Math.pow( 10, 0 );
-
- if ( dataStatusPercentatge >= 5.0 )
+ //if ( dataStatusPercentatge >= 5.0 )
+ if ( dataStatusPercentatge >= constValue )
{
dsSummaryResults.add( 1 );
}
@@ -726,7 +753,7 @@
List<OrganisationUnit> orgUnitTree = new ArrayList<OrganisationUnit>();
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateValidationStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateValidationStatusResultAction.java 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateValidationStatusResultAction.java 2012-02-02 09:56:51 +0000
@@ -37,6 +37,7 @@
import java.util.Map;
import java.util.Set;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataset.CompleteDataSetRegistration;
@@ -46,8 +47,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -355,7 +354,8 @@
OrganisationUnit o = organisationUnitService.getOrganisationUnit( Integer
.parseInt( (String) orgUnitIterator.next() ) );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ //Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
orgUnitList.add( 0, o );
}
@@ -552,7 +552,8 @@
List<OrganisationUnit> orgUnitTree = new ArrayList<OrganisationUnit>();
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ //Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator<OrganisationUnit> childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateDataStatusMobileFormAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateDataStatusMobileFormAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateDataStatusMobileFormAction.java 2012-02-02 09:56:51 +0000
@@ -32,9 +32,9 @@
import java.util.Iterator;
import java.util.List;
+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.Period;
import com.opensymphony.xwork2.Action;
@@ -128,7 +128,8 @@
}
}
- Collections.sort( dataSetList, new DataSetNameComparator() );
+ //Collections.sort( dataSetList, new DataSetNameComparator() );
+ Collections.sort( dataSetList, new IdentifiableObjectNameComparator() );
System.out.println("Size of DataSet List is : " + dataSetList.size());
/* Monthly Periods */
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateGroupWiseMobileDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateGroupWiseMobileDataStatusResultAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateGroupWiseMobileDataStatusResultAction.java 2012-02-02 09:56:51 +0000
@@ -38,6 +38,7 @@
import java.util.UUID;
import org.hibernate.SessionFactory;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
@@ -46,12 +47,9 @@
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.dataset.Section;
import org.hisp.dhis.dataset.comparator.SectionOrderComparator;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -139,13 +137,14 @@
this.dashBoardService = dashBoardService;
}
- @SuppressWarnings("unused")
- private DisplayPropertyHandler displayPropertyHandler;
+ /*
+ private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
+ */
/*
private UserStore userStore;
@@ -464,7 +463,8 @@
.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ //Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
}
}
@@ -901,7 +901,8 @@
List<OrganisationUnit> orgUnitTree = new ArrayList<OrganisationUnit>();
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ // Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateLastUpdatedMobileDataSetResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateLastUpdatedMobileDataSetResultAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateLastUpdatedMobileDataSetResultAction.java 2012-02-02 09:56:51 +0000
@@ -38,16 +38,14 @@
import java.util.Set;
import org.hibernate.SessionFactory;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
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 org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -130,14 +128,14 @@
{
this.dashBoardService = dashBoardService;
}
-
+/*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+*/
private UserStore userStore;
public void setUserStore( UserStore userStore )
@@ -455,7 +453,7 @@
.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
}
}
@@ -467,8 +465,8 @@
{
o = organisationUnitService.getOrganisationUnit( Integer.parseInt( orgUnitIterator.next() ) );
orgUnitList.add( o );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
- displayPropertyHandler.handle( orgUnitList );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
+ //displayPropertyHandler.handle( orgUnitList );
}
}
@@ -762,7 +760,7 @@
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateMobileDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateMobileDataStatusResultAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateMobileDataStatusResultAction.java 2012-02-02 09:56:51 +0000
@@ -44,16 +44,14 @@
import javax.xml.parsers.DocumentBuilderFactory;
import org.hibernate.SessionFactory;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
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 org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -135,14 +133,14 @@
{
this.dashBoardService = dashBoardService;
}
-
+/*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
@SuppressWarnings("unused")
private Comparator<OrganisationUnit> orgUnitComparator;
@@ -150,7 +148,7 @@
{
this.orgUnitComparator = orgUnitComparator;
}
-
+ @SuppressWarnings("unused")
private UserStore userStore;
public void setUserStore( UserStore userStore )
@@ -479,7 +477,7 @@
.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
}
}
@@ -491,8 +489,8 @@
{
o = organisationUnitService.getOrganisationUnit( Integer.parseInt( orgUnitIterator.next() ) );
orgUnitList.add( o );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
- displayPropertyHandler.handle( orgUnitList );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
+ //displayPropertyHandler.handle( orgUnitList );
}
}
@@ -878,7 +876,7 @@
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GeneratePercentageDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GeneratePercentageDataStatusResultAction.java 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GeneratePercentageDataStatusResultAction.java 2012-02-02 09:56:51 +0000
@@ -13,16 +13,14 @@
import java.util.UUID;
import org.hibernate.SessionFactory;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
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 org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -92,14 +90,14 @@
{
this.dashBoardService = dashBoardService;
}
-
+/*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+*/
@SuppressWarnings("unused")
private Comparator<OrganisationUnit> orgUnitComparator;
@@ -434,7 +432,8 @@
.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ //Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
}
}
@@ -446,8 +445,9 @@
{
o = organisationUnitService.getOrganisationUnit( Integer.parseInt( orgUnitIterator.next() ) );
orgUnitList.add( o );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
- displayPropertyHandler.handle( orgUnitList );
+ //Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
+ // displayPropertyHandler.handle( orgUnitList );
}
}
@@ -746,7 +746,8 @@
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ //Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateSummaryMobileDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateSummaryMobileDataStatusResultAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateSummaryMobileDataStatusResultAction.java 2012-02-02 09:56:51 +0000
@@ -38,16 +38,14 @@
import java.util.UUID;
import org.hibernate.SessionFactory;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
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 org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -123,14 +121,15 @@
this.dashBoardService = dashBoardService;
}
- @SuppressWarnings("unused")
- private DisplayPropertyHandler displayPropertyHandler;
+ /*
+ private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
+ @SuppressWarnings("unused")
private UserStore userStore;
public void setUserStore( UserStore userStore )
@@ -423,7 +422,7 @@
OrganisationUnit o = organisationUnitService.getOrganisationUnit( Integer
.parseInt( (String) orgUnitIterator.next() ) );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
orgUnitList.add( 0, o );
}
@@ -807,7 +806,7 @@
List<OrganisationUnit> orgUnitTree = new ArrayList<OrganisationUnit>();
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateValidationMobileStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateValidationMobileStatusResultAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateValidationMobileStatusResultAction.java 2012-02-02 09:56:51 +0000
@@ -36,6 +36,7 @@
import java.util.Map;
import java.util.Set;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataset.CompleteDataSetRegistration;
@@ -45,8 +46,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -111,7 +110,7 @@
{
this.registrationService = registrationService;
}
-
+ @SuppressWarnings( "unused" )
private UserStore userStore;
public void setUserStore( UserStore userStore )
@@ -381,7 +380,7 @@
OrganisationUnit o = organisationUnitService.getOrganisationUnit( Integer
.parseInt( (String) orgUnitIterator.next() ) );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
orgUnitList.add( 0, o );
}
@@ -610,7 +609,7 @@
List<OrganisationUnit> orgUnitTree = new ArrayList<OrganisationUnit>();
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseFormAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseFormAction.java 2010-12-08 07:24:10 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseFormAction.java 2012-02-02 09:56:51 +0000
@@ -33,9 +33,9 @@
import java.util.Iterator;
import java.util.List;
+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.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
@@ -176,7 +176,7 @@
}
}
}
- Collections.sort( dataSetList, new DataSetNameComparator() );
+ Collections.sort( dataSetList, new IdentifiableObjectNameComparator() );
// Collection<OrganisationUnit> rootUnits = selectionTreeManager.getRootOrganisationUnits();
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseResultAction.java 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseResultAction.java 2012-02-02 09:56:51 +0000
@@ -36,17 +36,16 @@
import java.util.Map;
import java.util.Set;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
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 org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
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.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -118,14 +117,14 @@
{
this.dashBoardService = dashBoardService;
}
-
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
// ---------------------------------------------------------------
// Output Parameters
// ---------------------------------------------------------------
@@ -419,8 +418,8 @@
orgUnitList = new ArrayList<OrganisationUnit>();
orgUnits = new ArrayList<OrganisationUnit>( selectedOrgUnitGroup.getMembers() );
orgUnits.retainAll( orgUnitList1 );
- Collections.sort( orgUnits, new OrganisationUnitNameComparator() );
- displayPropertyHandler.handle( orgUnits );
+ Collections.sort( orgUnits, new IdentifiableObjectNameComparator() );
+ //displayPropertyHandler.handle( orgUnits );
Iterator<OrganisationUnit> orgUnitsIterator = orgUnits.iterator();
while ( orgUnitsIterator.hasNext() )
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntryStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntryStatusResultAction.java 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntryStatusResultAction.java 2012-02-02 09:56:51 +0000
@@ -9,15 +9,14 @@
import java.util.List;
import java.util.Map;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
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 org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -71,14 +70,14 @@
{
this.dataSetService = dataSetService;
}
-
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
// ---------------------------------------------------------------
// Input/Output Parameters
// ---------------------------------------------------------------
@@ -348,7 +347,7 @@
OrganisationUnit o = organisationUnitService.getOrganisationUnit( Integer.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
}
}
@@ -361,8 +360,8 @@
o = organisationUnitService.getOrganisationUnit( Integer.parseInt( orgUnitIterator.next() ) );
orgUnitList.add( o );
}
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
- displayPropertyHandler.handle( orgUnitList );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
+ //displayPropertyHandler.handle( orgUnitList );
}
Iterator<OrganisationUnit> ouIt = orgUnitList.iterator();
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntrySummaryStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntrySummaryStatusResultAction.java 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntrySummaryStatusResultAction.java 2012-02-02 09:56:51 +0000
@@ -14,14 +14,13 @@
import java.util.Map;
import java.util.Set;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.DashBoardService;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -68,14 +67,14 @@
{
return organisationUnitService;
}
-
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
private JdbcTemplate jdbcTemplate;
public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
@@ -352,7 +351,7 @@
OrganisationUnit o = organisationUnitService.getOrganisationUnit( Integer.parseInt( (String) orgUnitIterator.next() ) );
orgUnitList.add( o );
List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>( o.getChildren() );
- Collections.sort( organisationUnits, new OrganisationUnitShortNameComparator() );
+ Collections.sort( organisationUnits, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( organisationUnits );
//for Map
@@ -381,8 +380,8 @@
//childOrgUnitsByComma = getCommaDelimitedString( childOrgUnitTreeIds );
}
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
- displayPropertyHandler.handle( orgUnitList );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
+ //displayPropertyHandler.handle( orgUnitList );
}
Iterator<OrganisationUnit> ouIt = orgUnitList.iterator();
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/GenerateGraphicalAnalyserDataElementsFormAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/GenerateGraphicalAnalyserDataElementsFormAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/GenerateGraphicalAnalyserDataElementsFormAction.java 2012-02-02 09:56:51 +0000
@@ -34,11 +34,10 @@
import java.util.Iterator;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator;
-import org.hisp.dhis.dataelement.comparator.DataElementNameComparator;
import org.hisp.dhis.dataset.Section;
import org.hisp.dhis.dataset.SectionService;
import org.hisp.dhis.dataset.comparator.SectionOrderComparator;
@@ -270,8 +269,8 @@
dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
- Collections.sort( dataElements, new DataElementNameComparator() );
- Collections.sort( dataElementGroups, new DataElementGroupNameComparator() );
+ Collections.sort( dataElements, new IdentifiableObjectNameComparator() );
+ Collections.sort( dataElementGroups, new IdentifiableObjectNameComparator() );
/* Periods Type */
periodTypes = new ArrayList<PeriodType>( periodService.getAllPeriodTypes() );
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/GenerateGraphicalAnalyserFormAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/GenerateGraphicalAnalyserFormAction.java 2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/GenerateGraphicalAnalyserFormAction.java 2012-02-02 09:56:51 +0000
@@ -36,6 +36,7 @@
import java.util.Iterator;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataset.Section;
@@ -44,7 +45,6 @@
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.comparator.IndicatorGroupNameComparator;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
@@ -235,7 +235,7 @@
indicatorGroups = new ArrayList<IndicatorGroup>(indicatorService.getAllIndicatorGroups());
//Collections.sort(indicators, new IndicatorNameComparator());
- Collections.sort(indicatorGroups, new IndicatorGroupNameComparator());
+ Collections.sort(indicatorGroups, new IdentifiableObjectNameComparator());
/* Monthly Periods */
monthlyPeriods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( new MonthlyPeriodType() ) );
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/IndicatorwiseGAFormAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/IndicatorwiseGAFormAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/IndicatorwiseGAFormAction.java 2012-02-02 09:56:51 +0000
@@ -33,11 +33,10 @@
import java.util.Iterator;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.comparator.IndicatorGroupNameComparator;
-import org.hisp.dhis.indicator.comparator.IndicatorNameComparator;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.period.DailyPeriodType;
@@ -205,8 +204,8 @@
/* DataElements and Groups */
indicators = new ArrayList<Indicator>( indicatorService.getAllIndicators());
indicatorGroups = new ArrayList<IndicatorGroup>( indicatorService.getAllIndicatorGroups()) ;
- Collections.sort( indicators, new IndicatorNameComparator() );
- Collections.sort( indicatorGroups, new IndicatorGroupNameComparator() );
+ Collections.sort( indicators, new IdentifiableObjectNameComparator() );
+ Collections.sort( indicatorGroups, new IdentifiableObjectNameComparator() );
System.out.println( "--Size of Indicators is--" + indicators.size() + ",----Size of Indicators Group is is-- " + indicatorGroups.size() );
/* Periods Type */
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateChartDataAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateChartDataAction.java 2011-03-01 09:39:28 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateChartDataAction.java 2012-02-02 09:56:51 +0000
@@ -46,6 +46,7 @@
import org.hisp.dhis.aggregation.AggregationService;
import org.hisp.dhis.caseaggregation.CaseAggregationCondition;
import org.hisp.dhis.caseaggregation.CaseAggregationConditionService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.SurveyData;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
@@ -57,12 +58,10 @@
import org.hisp.dhis.datavalue.DataValueService;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.MonthlyPeriodType;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
@@ -180,14 +179,14 @@
// DisplayPropertyHandler
// -------------------------------------------------------------------------
- @SuppressWarnings( "unused" )
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
// --------------------------------------------------------------------------
// Parameters
// --------------------------------------------------------------------------
@@ -1133,7 +1132,7 @@
OrganisationUnitGroup oug = organisationUnitGroupService.getOrganisationUnitGroup( Integer
.parseInt( tmp ) );
List<OrganisationUnit> tempOUList = new ArrayList<OrganisationUnit>( oug.getMembers() );
- Collections.sort( tempOUList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( tempOUList, new IdentifiableObjectNameComparator() );
childOrgUnitList.addAll( tempOUList );
}
}
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownResultAction.java 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownResultAction.java 2012-02-02 09:56:51 +0000
@@ -32,6 +32,7 @@
import org.amplecode.quick.StatementManager;
import org.hisp.dhis.caseaggregation.CaseAggregationCondition;
import org.hisp.dhis.caseaggregation.CaseAggregationConditionService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.ConfigurationService;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
@@ -41,7 +42,6 @@
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.patient.PatientAttribute;
import org.hisp.dhis.patient.PatientAttributeService;
@@ -502,7 +502,7 @@
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/mchart/action/MotionChartResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/mchart/action/MotionChartResultAction.java 2010-12-29 16:17:28 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/mchart/action/MotionChartResultAction.java 2012-02-02 09:56:51 +0000
@@ -9,6 +9,7 @@
import org.amplecode.quick.StatementManager;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataanalyser.util.MotionChart;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -22,7 +23,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -226,7 +226,7 @@
OrganisationUnitGroup oug = organisationUnitGroupService.getOrganisationUnitGroup( Integer
.parseInt( tmp ) );
List<OrganisationUnit> tempOUList = new ArrayList<OrganisationUnit>( oug.getMembers() );
- Collections.sort( tempOUList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( tempOUList, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( tempOUList );
}
}
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterFormAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterFormAction.java 2011-05-18 11:12:17 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterFormAction.java 2012-02-02 09:56:51 +0000
@@ -35,11 +35,12 @@
import java.util.Iterator;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.dataset.comparator.DataSetNameComparator;
+//import org.hisp.dhis.dataset.comparator.DataSetNameComparator;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
@@ -169,7 +170,8 @@
}
}
- Collections.sort( dataSetList, new DataSetNameComparator() );
+ //Collections.sort( dataSetList, new DataSetNameComparator() );
+ Collections.sort( dataSetList, new IdentifiableObjectNameComparator() );
return SUCCESS;
}
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterResultAction.java 2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterResultAction.java 2012-02-02 09:56:51 +0000
@@ -12,6 +12,7 @@
import org.amplecode.quick.StatementManager;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -22,7 +23,6 @@
import org.hisp.dhis.datavalue.DataValueService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -602,7 +602,7 @@
}
//System.out.println("periods size is " + size );
- Collections.sort( ouHavingNullValues, new OrganisationUnitNameComparator() );
+ Collections.sort( ouHavingNullValues, new IdentifiableObjectNameComparator() );
Collections.sort( periods, new PeriodComparator() );
Collections.sort( periods, new PeriodTypeComparator() );
statementManager.destroy();
@@ -620,7 +620,7 @@
ouChildCountMap.put( orgUnit, children.size() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator<OrganisationUnit> childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ta/action/GenerateTabularAnalysisFormAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ta/action/GenerateTabularAnalysisFormAction.java 2011-10-24 11:27:50 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ta/action/GenerateTabularAnalysisFormAction.java 2012-02-02 09:56:51 +0000
@@ -35,17 +35,15 @@
import java.util.Iterator;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementNameComparator;
import org.hisp.dhis.dataset.Section;
import org.hisp.dhis.dataset.SectionService;
import org.hisp.dhis.dataset.comparator.SectionOrderComparator;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.comparator.IndicatorGroupNameComparator;
-import org.hisp.dhis.indicator.comparator.IndicatorNameComparator;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
@@ -277,14 +275,14 @@
Collections.sort( sections, new SectionOrderComparator() );
- Collections.sort( dataElements, new DataElementNameComparator() );
+ Collections.sort( dataElements, new IdentifiableObjectNameComparator() );
//Collections.sort( dataElementGroups, new DataElementGroupNameComparator() );
/* Indicators and Groups */
indicators = new ArrayList<Indicator>( indicatorService.getAllIndicators() );
indicatorGroups = new ArrayList<IndicatorGroup>( indicatorService.getAllIndicatorGroups() );
- Collections.sort( indicators, new IndicatorNameComparator() );
- Collections.sort( indicatorGroups, new IndicatorGroupNameComparator() );
+ Collections.sort( indicators, new IdentifiableObjectNameComparator() );
+ Collections.sort( indicatorGroups, new IdentifiableObjectNameComparator() );
/* Monthly Periods */
periodTypes = new ArrayList<PeriodType>( periodService.getAllPeriodTypes() );
=== modified file 'local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml 2011-12-26 07:49:43 +0000
+++ local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -2,8 +2,8 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
-
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
+<!-- Home Page -->
<bean id="org.hisp.dhis.dataanalyser.action.DashBoardHomePageAction"
class="org.hisp.dhis.dataanalyser.action.DashBoardHomePageAction"
scope="prototype">
@@ -671,6 +671,7 @@
<ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
</property>
<property name="jdbcTemplate" ref="jdbcTemplate"/>
+ <property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
</bean>
@@ -860,6 +861,7 @@
<property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ <property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
<property name="jdbcTemplate" ref="jdbcTemplate"/>
</bean>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js 2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js 2012-02-02 09:56:51 +0000
@@ -252,7 +252,22 @@
if ( dataSetSectionId != null )
{
- $.post("getDataElementsForTA.action",
+
+ document.getElementById( "availableDataElementsFilter" ).value = "";
+ document.getElementById( "availableDataElementsFilter" ).disabled = true;
+
+ if ( dataSetSectionId == 0 )
+ {
+ document.getElementById( "availableDataElementsFilter" ).value = "";
+ document.getElementById( "availableDataElementsFilter" ).disabled = false;
+ }
+ else
+ {
+ document.getElementById( "availableDataElementsFilter" ).value = "";
+ document.getElementById( "availableDataElementsFilter" ).disabled = true;
+ }
+
+ $.post("getDataElementsForTA.action",
{
id:dataSetSectionId,
deOptionValue:deOptionValue
@@ -297,7 +312,20 @@
if ( indicatorGroupId != null )
{
- $.post("getIndicators.action",
+ if ( indicatorGroupId != 0 )
+ {
+ //alert( indicatorGroupId );
+ document.getElementById( "availableIndicatorsFilter" ).value = "";
+ document.getElementById( "availableIndicatorsFilter" ).disabled = true;
+ //return false;
+ }
+ else
+ {
+ document.getElementById( "availableIndicatorsFilter" ).value = "";
+ document.getElementById( "availableIndicatorsFilter" ).disabled = false;
+ }
+
+ $.post("getIndicators.action",
{
id:indicatorGroupId
},
@@ -766,3 +794,70 @@
var o = document.getElementById('overlay');
o.style.visibility = 'hidden';
}
+
+//filter available indicators list
+function filterAvailableIndicators()
+{
+ var filter = document.getElementById( 'availableIndicatorsFilter' ).value;
+ var list = document.getElementById( 'availableIndicators' );
+
+ list.options.length = 0;
+
+ var selIndListId = document.getElementById( 'selectedServices' );
+ var selIndLength = selIndListId.options.length;
+
+ for ( var id in availableIndicators )
+ {
+ //alert( "id : " + id );
+ var value = availableIndicators[id];
+
+ var flag = 1;
+ for( var i =0 ; i<selIndLength; i++ )
+ {
+ //alert( selIndListId.options[i].text );
+ //alert( selIndListId.options[i].value );
+ if( id == selIndListId.options[i].value )
+ {
+ flag =2;
+ //alert("aaaa");
+ break;
+ }
+ }
+ if ( value.toLowerCase().indexOf( filter.toLowerCase() ) != -1 && (flag == 1) )
+ {
+ list.add( new Option( value, id ), null );
+ }
+ //alert( flag );
+ }
+}
+//filter available data elements list
+function filterAvailableDataElements()
+{
+ var filter = document.getElementById( 'availableDataElementsFilter' ).value;
+ var list = document.getElementById( 'availableDataElements' );
+
+ list.options.length = 0;
+
+ var selDeListId = document.getElementById( 'selectedServices' );
+ var selDeLength = selDeListId.options.length;
+
+ for ( var id in availableDataElements )
+ {
+ var value = availableDataElements[id];
+
+ var flag = 1;
+ for( var i =0 ; i<selDeLength; i++ )
+ {
+ if( id == selDeListId.options[i].value )
+ {
+ flag =2;
+ //alert("aaaa");
+ break;
+ }
+ }
+ if ( value.toLowerCase().indexOf( filter.toLowerCase() ) != -1 && (flag == 1) )
+ {
+ list.add( new Option( value, id ), null );
+ }
+ }
+}
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/tabularAnalysisFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/tabularAnalysisFront.vm 2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/tabularAnalysisFront.vm 2012-02-02 09:56:51 +0000
@@ -143,7 +143,11 @@
<td class="NormalB"> </td>
<td class="NormalB"> </td>
</tr>
-
+ <tr>
+ <td class="NormalB">$i18n.getString( "filter" ): <input type="text" id="availableDataElementsFilter" onkeyup="filterAvailableDataElements()" style="min-width:26em"></td>
+ <td class="NormalB"> </td>
+ <td class="NormalB"> </td>
+ </tr>
<tr>
<td class="NormalB">$i18n.getString( "ga_available_delist" )<br>
<select multiple size="5" id="availableDataElements" name="availableDataElements" style="width:350px; height:85px" ondblclick="moveSelectedById( 'availableDataElements', 'selectedServices' )">
@@ -190,9 +194,8 @@
</td>
<td class="NormalB"> </td>
</tr>
-
<tr>
- <td class="NormalB"> </td>
+ <td class="NormalB"><br>$i18n.getString( "filter" ): <input type="text" id="availableIndicatorsFilter" onkeyup="filterAvailableIndicators()" style="min-width:26em"></td>
<td class="NormalB"> </td>
</tr>
@@ -319,4 +322,21 @@
<script>
getPeriods();
+</script>
+
+<script type="text/javascript">
+
+ var availableDataElements = new Object();
+ #foreach ( $availableDataElement in $dataElements )
+ availableDataElements['$availableDataElement.id'] = '$encoder.jsEscape( $availableDataElement.name, "'" )';
+ #end
+
+</script>
+<script type="text/javascript">
+
+ var availableIndicators = new Object();
+ #foreach ( $availableIndicator in $indicators )
+ availableIndicators['$availableIndicator.id'] = '$encoder.jsEscape( $availableIndicator.name, "'" )';
+ #end
+
</script>
\ No newline at end of file
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java 2011-10-24 11:27:50 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java 2012-02-02 09:56:51 +0000
@@ -38,6 +38,7 @@
import java.util.Map;
import java.util.Set;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -49,7 +50,6 @@
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.dataset.Section;
import org.hisp.dhis.dataset.SectionService;
-import org.hisp.dhis.dataset.comparator.DataSetNameComparator;
import org.hisp.dhis.datavalue.DataValue;
import org.hisp.dhis.den.api.LLDataSets;
import org.hisp.dhis.den.api.LLDataValue;
@@ -124,6 +124,10 @@
this.selectedStateManager = selectedStateManager;
}
+ public SelectedStateManager getSelectedStateManager()
+ {
+ return selectedStateManager;
+ }
private DataSetLockService dataSetLockService;
public void setDataSetLockService( DataSetLockService dataSetLockService)
@@ -522,7 +526,7 @@
}
}
- Collections.sort( dataSets, new DataSetNameComparator() );
+ Collections.sort( dataSets, new IdentifiableObjectNameComparator() );
// ---------------------------------------------------------------------
// Validate selected DataSet
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java 2011-10-14 13:44:18 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java 2012-02-02 09:56:51 +0000
@@ -36,6 +36,7 @@
import java.util.List;
import java.util.Set;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategory;
import org.hisp.dhis.dataentryform.DataEntryForm;
@@ -43,7 +44,6 @@
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.dataset.Section;
import org.hisp.dhis.dataset.SectionService;
-import org.hisp.dhis.dataset.comparator.DataSetNameComparator;
import org.hisp.dhis.den.api.LLDataSets;
import org.hisp.dhis.den.state.SelectedStateManager;
import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -311,7 +311,7 @@
}
}
- Collections.sort( dataSets, new DataSetNameComparator() );
+ Collections.sort( dataSets, new IdentifiableObjectNameComparator() );
// ---------------------------------------------------------------------
// Validate selected DataSet
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/autoagg/action/AutoLLDataAggregationAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/autoagg/action/AutoLLDataAggregationAction.java 2010-06-15 11:26:37 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/autoagg/action/AutoLLDataAggregationAction.java 2012-02-02 09:56:51 +0000
@@ -8,6 +8,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.DataElementCategoryOptionCombo;
import org.hisp.dhis.dataelement.DataElementCategoryService;
@@ -20,7 +21,6 @@
import org.hisp.dhis.den.api.LLDataValueService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.MonthlyPeriodType;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
@@ -250,7 +250,7 @@
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator<OrganisationUnit> childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-dataentry-linelisting/src/main/resources/META-INF/dhis/beans.xml 2011-10-14 13:44:18 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -2,8 +2,8 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
-
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
+ <!-- Home Page -->
<bean id="org.hisp.dhis.den.action.EmptyAction"
class="org.hisp.dhis.den.action.EmptyAction"/>
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/select.vm'
--- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/select.vm 2011-10-07 12:25:01 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/select.vm 2012-02-02 09:56:51 +0000
@@ -19,7 +19,7 @@
</div>
-<div id="currentSelection" text-align:right">
+<div id="currentSelection"><span style="float:left;cursor:pointer;margin-right:5px;"><img src="../images/hide.png" title="$i18n.getString( 'close' )" onclick="closeCurrentSelection()"></span>
#if ( $organisationUnit ) $encoder.htmlEncode( $organisationUnit.name )#else $i18n.getString("no_organisationunit_selected") #end -
#set( $period = $selectedStateManager.getSelectedPeriod() )
#if ( $period ) $format.formatPeriod( $period ) #else $i18n.getString("no_period_selected") #end <br>
@@ -91,3 +91,10 @@
</form>
<hr style="clear:both;">
+
+<script>
+ function closeCurrentSelection()
+ {
+ $( '#currentSelection' ).fadeOut();
+ }
+</script>
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/style/dhis-web-dataentry-national.css'
--- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/style/dhis-web-dataentry-national.css 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/style/dhis-web-dataentry-national.css 2012-02-02 09:56:51 +0000
@@ -1,4 +1,19 @@
#currentSelection {
+ padding: 6px;
+ background-color: #e0e0e0;
+ border: 1px solid #a0a0a0;
+ font-size: 14px;
+ text-align: right;
+ position: fixed;
+ top: 55px;
+ right: 10px;
+ filter: alpha(opacity=85);
+ opacity: 0.85;
+ border-radius: 3px;
+ -moz-border-radius: 3px; /* Firefox */
+}
+/*
+#currentSelection {
position: fixed;
top: 95px;
right: 0;
@@ -8,6 +23,7 @@
font-size: 1.3em;
font-weight: bold;
}
+*/
#selectForm {
padding-top: 32px;
}
=== modified file 'local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/GetDataElementsAction.java'
--- local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/GetDataElementsAction.java 2010-06-15 11:26:37 +0000
+++ local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/GetDataElementsAction.java 2012-02-02 09:56:51 +0000
@@ -9,11 +9,10 @@
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.options.displayproperty.DefaultDisplayPropertyHandler;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-public class GetDataElementsAction extends ActionSupport
+
+import com.opensymphony.xwork2.Action;
+
+public class GetDataElementsAction implements Action
{
private final int ALL = 0;
@@ -50,14 +49,14 @@
// -------------------------------------------------------------------------
// DisplayPropertyHandler
// -------------------------------------------------------------------------
-
+ /*
private DefaultDisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DefaultDisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
// -------------------------------------------------------------------------
// Input & output
// -------------------------------------------------------------------------
@@ -132,7 +131,7 @@
Collections.sort( dataElements, dataElementComparator );
- displayPropertyHandler.handle( dataElements );
+ //displayPropertyHandler.handle( dataElements );
/*
if ( deOptionValue != null )
=== modified file 'local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml 2011-04-15 11:43:00 +0000
+++ local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
<!-- Static Excel Import -->
<bean id="org.hisp.dhis.excelimport.action.ExcelImportFormAction"
=== modified file 'local/in/dhis-web-linelisting-in/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-linelisting-in/src/main/resources/META-INF/dhis/beans.xml 2011-10-07 12:25:01 +0000
+++ local/in/dhis-web-linelisting-in/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:aop="http://www.springframework.org/schema/aop";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd";>
<!-- Line List Option -->
=== modified file 'local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml 2011-09-08 05:43:00 +0000
+++ local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
-
-
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
+
+<!-- Home Page -->
<bean id="org.hisp.dhis.config.action.NoAction" class="org.hisp.dhis.config.action.NoAction"
scope="prototype">
</bean>
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/TwentyPoint/action/GenerateTwentyPointReportsResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/TwentyPoint/action/GenerateTwentyPointReportsResultAction.java 2011-12-14 11:06:08 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/TwentyPoint/action/GenerateTwentyPointReportsResultAction.java 2012-02-02 09:56:51 +0000
@@ -36,6 +36,7 @@
import org.amplecode.quick.StatementManager;
import org.apache.velocity.tools.generic.MathTool;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -52,7 +53,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -428,7 +428,7 @@
{
OrganisationUnitGroup oug = (OrganisationUnitGroup) iterator1.next();
List<OrganisationUnit> tempList = new ArrayList<OrganisationUnit>( oug.getMembers() );
- Collections.sort( tempList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( tempList, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( tempList );
ougmemberCountList.add( oug.getMembers().size() );
if ( tempCount1 != 0 && tempCount1 != orgUnitGroupList.size() )
@@ -439,14 +439,14 @@
else if ( reportModelTB.equals( "dynamicwithrootfacility" ) )
{
orgUnitList = new ArrayList<OrganisationUnit>( selectedOrgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
Collections.sort( orgUnitList, new OrganisationUnitCommentComparator() );
orgUnitList.add( selectedOrgUnit );
}
else if ( reportModelTB.equals( "dynamicwithoutrootfacility" ) )
{
orgUnitList = new ArrayList<OrganisationUnit>( selectedOrgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
Collections.sort( orgUnitList, new OrganisationUnitCommentComparator() );
}
else
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetDataElementsAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetDataElementsAction.java 2010-08-28 10:15:38 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetDataElementsAction.java 2012-02-02 09:56:51 +0000
@@ -8,7 +8,6 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.options.displayproperty.DefaultDisplayPropertyHandler;
import com.opensymphony.xwork2.Action;
@@ -43,14 +42,14 @@
// -------------------------------------------------------------------------
// DisplayPropertyHandler
// -------------------------------------------------------------------------
-
+ /*
private DefaultDisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DefaultDisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
// -------------------------------------------------------------------------
// Input & output
// -------------------------------------------------------------------------
@@ -125,7 +124,7 @@
Collections.sort( dataElements, dataElementComparator );
- displayPropertyHandler.handle( dataElements );
+ //displayPropertyHandler.handle( dataElements );
/*
* if ( deOptionValue != null ) { if( deOptionValue.equalsIgnoreCase(
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/advanced/action/GenerateAdvancedReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/advanced/action/GenerateAdvancedReportResultAction.java 2011-12-14 11:06:08 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/advanced/action/GenerateAdvancedReportResultAction.java 2012-02-02 09:56:51 +0000
@@ -36,6 +36,7 @@
import org.amplecode.quick.StatementManager;
import org.apache.velocity.tools.generic.MathTool;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -47,7 +48,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -412,7 +412,8 @@
if ( reportModelTB.equals( "dynamicwithrootfacility" ) )
{
orgUnitList = new ArrayList<OrganisationUnit>( selectedOrgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ //Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
// Collections.sort( orgUnitList, new
// OrganisationUnitCommentComparator() );
orgUnitList.add( selectedOrgUnit );
@@ -420,7 +421,7 @@
else if ( reportModelTB.equals( "dynamicwithoutrootfacility" ) )
{
orgUnitList = new ArrayList<OrganisationUnit>( selectedOrgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
// Collections.sort( orgUnitList, new
// OrganisationUnitCommentComparator() );
}
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/action/GenerateAggregationReportAnalyserResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/action/GenerateAggregationReportAnalyserResultAction.java 2011-07-07 10:56:12 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/action/GenerateAggregationReportAnalyserResultAction.java 2012-02-02 09:56:51 +0000
@@ -34,11 +34,11 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -221,7 +221,7 @@
{
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
}
else if( reportModelTB.equalsIgnoreCase( "STATIC" ) || reportModelTB.equalsIgnoreCase( "STATIC-DATAELEMENTS" ) || reportModelTB.equalsIgnoreCase( "STATIC-FINANCIAL" ) )
{
@@ -233,7 +233,7 @@
{
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
orgUnitList.add( orgUnit );
parentUnit = orgUnit.getName();
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/benificiaryinfo/action/BenificiaryInfoReportsResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/benificiaryinfo/action/BenificiaryInfoReportsResultAction.java 2011-12-14 11:06:08 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/benificiaryinfo/action/BenificiaryInfoReportsResultAction.java 2012-02-02 09:56:51 +0000
@@ -36,11 +36,11 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.patient.PatientAttribute;
import org.hisp.dhis.patient.PatientAttributeService;
@@ -630,7 +630,7 @@
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
for ( OrganisationUnit child : children )
{
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/csreview/action/GenerateCSReviewReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/csreview/action/GenerateCSReviewReportResultAction.java 2011-07-07 10:56:12 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/csreview/action/GenerateCSReviewReportResultAction.java 2012-02-02 09:56:51 +0000
@@ -34,11 +34,11 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.reports.ReportService;
@@ -231,7 +231,7 @@
for ( OrganisationUnit orgUnit : curUserRootOrgUnitList )
{
List<OrganisationUnit> childOrgList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( childOrgList, new OrganisationUnitNameComparator() );
+ Collections.sort( childOrgList, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( childOrgList );
orgUnitList.add( orgUnit );
}
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/datasetlock/action/GenerateDataSetLockReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/datasetlock/action/GenerateDataSetLockReportResultAction.java 2011-07-07 10:56:12 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/datasetlock/action/GenerateDataSetLockReportResultAction.java 2012-02-02 09:56:51 +0000
@@ -22,6 +22,7 @@
import jxl.write.WritableSheet;
import jxl.write.WritableWorkbook;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.datalock.DataSetLock;
import org.hisp.dhis.datalock.DataSetLockService;
@@ -30,7 +31,6 @@
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.reports.ReportService;
@@ -269,7 +269,7 @@
{
organisationUnitChildren = new ArrayList<OrganisationUnit>( organisationUnit.getChildren() );
- Collections.sort( organisationUnitChildren, new OrganisationUnitNameComparator() );
+ Collections.sort( organisationUnitChildren, new IdentifiableObjectNameComparator() );
int organisationUnitChildrenCounter = 0;
for ( OrganisationUnit orgElement : organisationUnitChildren )
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ed/action/EDReportFormAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ed/action/EDReportFormAction.java 2011-05-18 11:56:37 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ed/action/EDReportFormAction.java 2012-02-02 09:56:51 +0000
@@ -7,9 +7,9 @@
import java.util.Iterator;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.comparator.IndicatorGroupNameComparator;
import org.hisp.dhis.period.MonthlyPeriodType;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
@@ -72,7 +72,7 @@
{
//Indicator Group
indicatorGroups = new ArrayList<IndicatorGroup>( indicatorService.getAllIndicatorGroups()) ;
- Collections.sort( indicatorGroups, new IndicatorGroupNameComparator() );
+ Collections.sort( indicatorGroups, new IdentifiableObjectNameComparator() );
//period information
periods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( new MonthlyPeriodType() ) );
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ed/action/EDReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ed/action/EDReportResultAction.java 2011-09-03 05:48:23 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ed/action/EDReportResultAction.java 2012-02-02 09:56:51 +0000
@@ -31,13 +31,13 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.reports.ReportService;
@@ -203,7 +203,7 @@
{
orgUnitName += orgUnit.getName() + ", ";
List<OrganisationUnit> childList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( childList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( childList, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( childList );
orgUnitList.add( orgUnit );
}
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/feedback/action/GenerateFeedbackReportAnalyserResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/feedback/action/GenerateFeedbackReportAnalyserResultAction.java 2011-07-07 10:56:12 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/feedback/action/GenerateFeedbackReportAnalyserResultAction.java 2012-02-02 09:56:51 +0000
@@ -32,11 +32,11 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -226,7 +226,7 @@
selOrgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>();
orgUnitList.addAll( selOrgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
orgUnitList.add( 0, selOrgUnit );
}
else if( reportModelTB.equalsIgnoreCase( "INDICATOR-FOR-FEEDBACK" ) )
@@ -234,7 +234,7 @@
selOrgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>();
orgUnitList.addAll( selOrgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
orgUnitList.add( 0, selOrgUnit );
}
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GenerateGradingReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GenerateGradingReportResultAction.java 2011-12-14 11:06:08 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GenerateGradingReportResultAction.java 2012-02-02 09:56:51 +0000
@@ -40,6 +40,7 @@
import org.amplecode.quick.StatementManager;
import org.apache.velocity.tools.generic.MathTool;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -56,7 +57,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -371,7 +371,7 @@
{
selectedOrgUnit = organisationUnitService.getOrganisationUnit( Integer.parseInt( orgUnitListCB.get( 0 ) ) );
orgUnitList = new ArrayList<OrganisationUnit>( selectedOrgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
}
else
{
@@ -380,7 +380,7 @@
{
OrganisationUnitGroup oug = organisationUnitGroupService.getOrganisationUnitGroup( Integer.parseInt( (String) it7.next() ) );
List<OrganisationUnit> tempOUList = new ArrayList<OrganisationUnit>(oug.getMembers());
- Collections.sort( tempOUList, new OrganisationUnitShortNameComparator());
+ Collections.sort( tempOUList, new IdentifiableObjectNameComparator());
orgUnitList.addAll( tempOUList );
}
}
@@ -480,7 +480,7 @@
childRowCount += orgUnit.getChildren().size();
List<OrganisationUnit> cOUList = new ArrayList<OrganisationUnit>(orgUnit.getChildren());
- Collections.sort( cOUList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( cOUList, new IdentifiableObjectNameComparator() );
Iterator<OrganisationUnit> it2 = cOUList.iterator();
while( it2.hasNext() )
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GenerateImmChildGradingReportAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GenerateImmChildGradingReportAction.java 2011-12-14 11:06:08 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GenerateImmChildGradingReportAction.java 2012-02-02 09:56:51 +0000
@@ -38,6 +38,7 @@
import org.amplecode.quick.StatementManager;
import org.apache.velocity.tools.generic.MathTool;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -54,8 +55,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -359,7 +358,7 @@
orgUnitList.add( orgU );
}
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
}
else
{
@@ -370,7 +369,7 @@
orgUnitGroupList.add( oug );
}
- Collections.sort( orgUnitGroupList, new OrganisationUnitGroupNameComparator() );
+ Collections.sort( orgUnitGroupList, new IdentifiableObjectNameComparator() );
}
// Period Info
@@ -442,7 +441,7 @@
childRowCount += orgUnit.getChildren().size();
List<OrganisationUnit> cOUList = new ArrayList<OrganisationUnit>(orgUnit.getChildren());
- Collections.sort( cOUList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( cOUList, new IdentifiableObjectNameComparator() );
Iterator<OrganisationUnit> it2 = cOUList.iterator();
while( it2.hasNext() )
@@ -613,7 +612,7 @@
childRowCount += orgUnitGroup.getMembers().size();
List<OrganisationUnit> cOUList = new ArrayList<OrganisationUnit>(orgUnitGroup.getMembers());
- Collections.sort( cOUList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( cOUList, new IdentifiableObjectNameComparator() );
Iterator<OrganisationUnit> it2 = cOUList.iterator();
while( it2.hasNext() )
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GenerateSelChildGradingReportAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GenerateSelChildGradingReportAction.java 2011-12-14 11:06:08 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GenerateSelChildGradingReportAction.java 2012-02-02 09:56:51 +0000
@@ -37,6 +37,7 @@
import org.amplecode.quick.StatementManager;
import org.apache.velocity.tools.generic.MathTool;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -53,8 +54,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -357,7 +356,7 @@
orgUnitList.add( orgU );
}
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
}
else
{
@@ -368,7 +367,7 @@
orgUnitGroupList.add( oug );
}
- Collections.sort( orgUnitGroupList, new OrganisationUnitGroupNameComparator() );
+ Collections.sort( orgUnitGroupList, new IdentifiableObjectNameComparator() );
}
// Period Info
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GradingAbstractionResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GradingAbstractionResultAction.java 2011-12-14 11:06:08 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/grading/action/GradingAbstractionResultAction.java 2012-02-02 09:56:51 +0000
@@ -39,6 +39,7 @@
import org.amplecode.quick.StatementManager;
import org.apache.velocity.tools.generic.MathTool;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -55,7 +56,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -374,7 +374,7 @@
selectedOrgUnit = organisationUnitService.getOrganisationUnit( Integer.parseInt( (String) orgUnitListCB.get( 0 ) ) );
orgUnitList = new ArrayList<OrganisationUnit>( selectedOrgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
// Period Info
sDate = format.parseDate( startDate );
@@ -503,7 +503,7 @@
List<OrganisationUnit> cOUList = new ArrayList<OrganisationUnit>();
cOUList = getChildList(orgUnit);
- Collections.sort( cOUList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( cOUList, new IdentifiableObjectNameComparator() );
int gradeATotal = 0;
int gradeBTotal = 0;
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/idsp/action/GenerateIDSPReportAnalyserResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/idsp/action/GenerateIDSPReportAnalyserResultAction.java 2011-10-24 11:27:50 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/idsp/action/GenerateIDSPReportAnalyserResultAction.java 2012-02-02 09:56:51 +0000
@@ -33,6 +33,7 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -42,7 +43,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -262,13 +262,13 @@
{
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
}
else if( reportModelTB.equalsIgnoreCase( "dynamicwithrootfacility" ) )
{
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
orgUnitList.add( orgUnit );
parentUnit = orgUnit.getName();
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/leprosy/action/LeprosyReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/leprosy/action/LeprosyReportResultAction.java 2011-12-14 11:06:08 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/leprosy/action/LeprosyReportResultAction.java 2012-02-02 09:56:51 +0000
@@ -37,6 +37,7 @@
import org.amplecode.quick.StatementManager;
import org.apache.velocity.tools.generic.MathTool;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -49,7 +50,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -376,7 +376,7 @@
if ( reportModelTB.equals( "dynamicwithrootfacility" ) )
{
orgUnitList = new ArrayList<OrganisationUnit>( selectedOrgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
// Collections.sort( orgUnitList, new
// OrganisationUnitCommentComparator() );
orgUnitList.add( selectedOrgUnit );
@@ -384,7 +384,7 @@
else if ( reportModelTB.equals( "dynamicwithoutrootfacility" ) )
{
orgUnitList = new ArrayList<OrganisationUnit>( selectedOrgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
// Collections.sort( orgUnitList, new
// OrganisationUnitCommentComparator() );
}
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/linelisting/action/GenerateLinelistingWebPortalReportAnalyserResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/linelisting/action/GenerateLinelistingWebPortalReportAnalyserResultAction.java 2011-10-13 08:00:58 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/linelisting/action/GenerateLinelistingWebPortalReportAnalyserResultAction.java 2012-02-02 09:56:51 +0000
@@ -37,6 +37,7 @@
import org.amplecode.quick.StatementManager;
import org.apache.velocity.tools.generic.MathTool;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -45,7 +46,6 @@
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.reports.ReportService;
@@ -402,7 +402,7 @@
{
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
}
else if ( reportModelTB.equalsIgnoreCase( "STATIC" ) || reportModelTB.equalsIgnoreCase( "STATIC-DATAELEMENTS" )
|| reportModelTB.equalsIgnoreCase( "STATIC-FINANCIAL" ) )
@@ -415,7 +415,7 @@
{
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
orgUnitList.add( orgUnit );
parentUnit = orgUnit.getName();
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/malarya/action/GenerateMalaryaReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/malarya/action/GenerateMalaryaReportResultAction.java 2011-12-14 11:06:08 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/malarya/action/GenerateMalaryaReportResultAction.java 2012-02-02 09:56:51 +0000
@@ -63,6 +63,7 @@
import org.amplecode.quick.StatementManager;
import org.apache.velocity.tools.generic.MathTool;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -75,7 +76,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -418,7 +418,7 @@
if ( reportModelTB.equals( "dynamicwithrootfacility" ) )
{
orgUnitList = new ArrayList<OrganisationUnit>( selectedOrgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
// Collections.sort( orgUnitList, new
// OrganisationUnitCommentComparator() );
orgUnitList.add( selectedOrgUnit );
@@ -426,7 +426,7 @@
else if ( reportModelTB.equals( "dynamicwithoutrootfacility" ) )
{
orgUnitList = new ArrayList<OrganisationUnit>( selectedOrgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
// Collections.sort( orgUnitList, new
// OrganisationUnitCommentComparator() );
}
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/md/action/GenerateMDReportAnalyserResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/md/action/GenerateMDReportAnalyserResultAction.java 2011-12-20 06:21:32 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/md/action/GenerateMDReportAnalyserResultAction.java 2012-02-02 09:56:51 +0000
@@ -35,11 +35,11 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.reports.ReportService;
@@ -219,7 +219,7 @@
// Getting selected orgunit and its immediate children
OrganisationUnit selOrgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( selOrgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
// Org unit Group Information
OrganisationUnitGroup orgUnitGroup = selReportObj.getOrgunitGroup();
@@ -609,7 +609,7 @@
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/GenerateMetaDataReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/GenerateMetaDataReportResultAction.java 2011-11-15 06:13:46 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/GenerateMetaDataReportResultAction.java 2012-02-02 09:56:51 +0000
@@ -24,31 +24,27 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementNameComparator;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.dataset.comparator.DataSetNameComparator;
import org.hisp.dhis.expression.ExpressionService;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.comparator.IndicatorNameComparator;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.reports.ReportService;
import org.hisp.dhis.user.User;
import org.hisp.dhis.user.UserStore;
import org.hisp.dhis.validation.ValidationRule;
import org.hisp.dhis.validation.ValidationRuleGroup;
import org.hisp.dhis.validation.ValidationRuleService;
-import org.hisp.dhis.validation.comparator.ValidationRuleNameComparator;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.support.rowset.SqlRowSet;
@@ -441,7 +437,7 @@
throws Exception
{
List<DataElement> dataElementList = new ArrayList<DataElement>( dataElementService.getAllDataElements() );
- Collections.sort( dataElementList, new DataElementNameComparator() );
+ Collections.sort( dataElementList, new IdentifiableObjectNameComparator() );
// String outputReportPath = System.getenv( "DHIS2_HOME" ) +
// File.separator + raFolderName + File.separator
@@ -663,7 +659,7 @@
List<DataElement> dataElementList = new ArrayList<DataElement>( dataElementGroup.getMembers() );
- Collections.sort( dataElementList, new DataElementNameComparator() );
+ Collections.sort( dataElementList, new IdentifiableObjectNameComparator() );
for ( DataElement dataElement : dataElementList )
{
@@ -834,7 +830,7 @@
List<OrganisationUnit> organisationUnitList = new ArrayList<OrganisationUnit>( organisationUnitGroup
.getMembers() );
- Collections.sort( organisationUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( organisationUnitList, new IdentifiableObjectNameComparator() );
for ( OrganisationUnit organisationUnit : organisationUnitList )
{
@@ -1306,7 +1302,7 @@
throws Exception
{
List<Indicator> indicatorList = new ArrayList<Indicator>( indicatorService.getAllIndicators() );
- Collections.sort( indicatorList, new IndicatorNameComparator() );
+ Collections.sort( indicatorList, new IdentifiableObjectNameComparator() );
String outputReportPath = System.getenv( "DHIS2_HOME" ) + File.separator + Configuration_IN.DEFAULT_TEMPFOLDER;
File newdir = new File( outputReportPath );
@@ -1519,7 +1515,7 @@
rowStart++;
List<Indicator> indicatorList = new ArrayList<Indicator>( indicatorGroup.getMembers() );
- Collections.sort( indicatorList, new IndicatorNameComparator() );
+ Collections.sort( indicatorList, new IdentifiableObjectNameComparator() );
for ( Indicator indicator : indicatorList )
{
if ( incID != null )
@@ -1586,7 +1582,7 @@
throws Exception
{
List<DataSet> datasetList = new ArrayList<DataSet>( dataSetService.getAllDataSets() );
- Collections.sort( datasetList, new DataSetNameComparator() );
+ Collections.sort( datasetList, new IdentifiableObjectNameComparator() );
// String outputReportPath = System.getenv( "DHIS2_HOME" ) +
// File.separator + raFolderName + File.separator
@@ -1678,7 +1674,7 @@
{
List<ValidationRule> validationRuleList = new ArrayList<ValidationRule>( validationRuleService
.getAllValidationRules() );
- Collections.sort( validationRuleList, new ValidationRuleNameComparator() );
+ Collections.sort( validationRuleList, new IdentifiableObjectNameComparator() );
// String outputReportPath = System.getenv( "DHIS2_HOME" ) +
// File.separator + raFolderName + File.separator
@@ -1865,7 +1861,7 @@
rowStart++;
List<ValidationRule> validationRuleList = new ArrayList<ValidationRule>( validationRuleGroup.getMembers() );
- Collections.sort( validationRuleList, new ValidationRuleNameComparator() );
+ Collections.sort( validationRuleList, new IdentifiableObjectNameComparator() );
for ( ValidationRule validationRule : validationRuleList )
{
if ( incID != null )
@@ -2075,7 +2071,7 @@
throws Exception
{
List<DataSet> datasetList = new ArrayList<DataSet>( dataSetService.getAllDataSets() );
- Collections.sort( datasetList, new DataSetNameComparator() );
+ Collections.sort( datasetList, new IdentifiableObjectNameComparator() );
// List<DataElement> tttt = new ArrayList<DataElement>(
// dataSet.getDataElements() );
@@ -2149,7 +2145,7 @@
List<DataElement> dataElementList = new ArrayList<DataElement>( dataSet.getDataElements() );
- Collections.sort( dataElementList, new DataElementNameComparator() );
+ Collections.sort( dataElementList, new IdentifiableObjectNameComparator() );
for ( DataElement dataElement : dataElementList )
{
@@ -2245,7 +2241,7 @@
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator<OrganisationUnit> childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/nbits/action/NBITSReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/nbits/action/NBITSReportResultAction.java 2011-07-07 10:56:12 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/nbits/action/NBITSReportResultAction.java 2012-02-02 09:56:51 +0000
@@ -26,9 +26,9 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.comparator.DataElementNameComparator;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
@@ -250,7 +250,7 @@
dataElements.add( programStageDataElement.getDataElement() );
}
- Collections.sort( dataElements, new DataElementNameComparator() );
+ Collections.sort( dataElements, new IdentifiableObjectNameComparator() );
programStageDataElementMap.put( programStage, dataElements );
}
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/orgunitgroupsetreport/action/GenerateOrgunitGroupsetReportsResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/orgunitgroupsetreport/action/GenerateOrgunitGroupsetReportsResultAction.java 2011-07-07 10:56:12 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/orgunitgroupsetreport/action/GenerateOrgunitGroupsetReportsResultAction.java 2012-02-02 09:56:51 +0000
@@ -62,6 +62,7 @@
import org.amplecode.quick.StatementManager;
import org.hisp.dhis.aggregation.AggregationService;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -78,8 +79,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitGroupNameComparator;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -394,7 +393,7 @@
sellectedOrgUnitGroupSet = organisationUnitGroupService.getOrganisationUnitGroupSet( orgUnitGroupSetList );
sellectedOrgUnitGroupList = new ArrayList<OrganisationUnitGroup>( sellectedOrgUnitGroupSet.getOrganisationUnitGroups());
- Collections.sort( sellectedOrgUnitGroupList, new OrganisationUnitGroupNameComparator() );
+ Collections.sort( sellectedOrgUnitGroupList, new IdentifiableObjectNameComparator() );
Iterator<OrganisationUnitGroup> ougtr1 = sellectedOrgUnitGroupList.iterator();
OrganisationUnitGroup selectedOrgUnitGroup1 = new OrganisationUnitGroup();
@@ -423,7 +422,7 @@
orgUnitList = new ArrayList<OrganisationUnit>();
List<OrganisationUnit> orgUnitList = new ArrayList<OrganisationUnit>( selectedOrgUnitGroup1.getMembers() );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
Collections.sort( orgUnitList, new OrganisationUnitCommentComparator() );
List<String> deCodesList = getDECodes( deCodesXMLFileName );
Iterator<OrganisationUnit> it = orgUnitList.iterator();
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.java 2011-12-05 05:56:00 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.java 2012-02-02 09:56:51 +0000
@@ -36,13 +36,13 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.reports.ReportService;
@@ -244,7 +244,7 @@
}
}
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
//Hardcoded to level 2 to make report fast for state level
if( selectedOrgUnitLevel != 2 )
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/physical/action/GeneratePhysicalReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/physical/action/GeneratePhysicalReportResultAction.java 2011-07-07 10:56:12 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/physical/action/GeneratePhysicalReportResultAction.java 2012-02-02 09:56:51 +0000
@@ -28,10 +28,10 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.YearlyPeriodType;
@@ -172,7 +172,7 @@
for ( OrganisationUnit orgUnit : curUserRootOrgUnitList )
{
List<OrganisationUnit> childList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( childList, new OrganisationUnitNameComparator() );
+ Collections.sort( childList, new IdentifiableObjectNameComparator() );
orgUnitList.addAll( childList );
orgUnitList.add( orgUnit );
}
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/portal/action/PortalReportsResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/portal/action/PortalReportsResultAction.java 2011-10-13 09:13:08 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/portal/action/PortalReportsResultAction.java 2012-02-02 09:56:51 +0000
@@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -28,13 +29,17 @@
import jxl.format.Border;
import jxl.format.BorderLineStyle;
import jxl.format.VerticalAlignment;
+import jxl.write.Label;
+import jxl.write.WritableCell;
import jxl.write.WritableCellFormat;
import jxl.write.WritableSheet;
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
-import org.apache.velocity.tools.generic.MathTool;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.i18n.I18nFormat;
@@ -43,9 +48,14 @@
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.patient.PatientAttribute;
import org.hisp.dhis.patient.PatientAttributeService;
+import org.hisp.dhis.patient.PatientIdentifier;
import org.hisp.dhis.patient.PatientIdentifierService;
+import org.hisp.dhis.patient.PatientIdentifierType;
+import org.hisp.dhis.patient.PatientIdentifierTypeService;
import org.hisp.dhis.patient.PatientService;
+import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
import org.hisp.dhis.patientattributevalue.PatientAttributeValueService;
+import org.hisp.dhis.patientdatavalue.PatientDataValue;
import org.hisp.dhis.patientdatavalue.PatientDataValueService;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
@@ -67,17 +77,6 @@
import org.xml.sax.SAXParseException;
import com.opensymphony.xwork2.Action;
-import java.util.Collections;
-import jxl.write.Label;
-import jxl.write.WritableCell;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
-import org.hisp.dhis.patient.PatientIdentifier;
-import org.hisp.dhis.patient.PatientIdentifierType;
-import org.hisp.dhis.patient.PatientIdentifierTypeService;
-import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
-import org.hisp.dhis.patientdatavalue.PatientDataValue;
public class PortalReportsResultAction implements Action
{
@@ -1853,7 +1852,7 @@
orgUnitTree.add( orgUnit );
List<OrganisationUnit> children = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( children, new OrganisationUnitNameComparator() );
+ Collections.sort( children, new IdentifiableObjectNameComparator() );
Iterator childIterator = children.iterator();
OrganisationUnit child;
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ranking/action/GenerateRankingReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ranking/action/GenerateRankingReportResultAction.java 2011-07-07 10:56:12 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ranking/action/GenerateRankingReportResultAction.java 2012-02-02 09:56:51 +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.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -44,7 +45,6 @@
import org.hisp.dhis.datavalue.DataValueService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -237,7 +237,7 @@
// Orgunit Info
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
// Period Info
selPeriod = periodService.getPeriod( selectedPeriodId );
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateColdChainReportAnalyserResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateColdChainReportAnalyserResultAction.java 2011-11-02 09:54:19 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateColdChainReportAnalyserResultAction.java 2012-02-02 09:56:51 +0000
@@ -36,6 +36,7 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -46,7 +47,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -256,13 +256,13 @@
{
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
}
else if ( reportModelTB.equalsIgnoreCase( "dynamicwithrootfacility" ) )
{
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
orgUnitList.add( orgUnit );
parentUnit = orgUnit.getName();
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateRoutineReportAnalyserResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateRoutineReportAnalyserResultAction.java 2011-10-13 08:00:58 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateRoutineReportAnalyserResultAction.java 2012-02-02 09:56:51 +0000
@@ -32,13 +32,13 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -224,13 +224,13 @@
{
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
}
else if( reportModelTB.equalsIgnoreCase( "dynamicwithrootfacility" ) )
{
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
orgUnitList.add( orgUnit );
parentUnit = orgUnit.getName();
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserResultAction.java 2011-07-07 10:56:12 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserResultAction.java 2012-02-02 09:56:51 +0000
@@ -32,11 +32,11 @@
import jxl.write.WritableWorkbook;
import org.amplecode.quick.StatementManager;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.reports.ReportService;
@@ -204,7 +204,7 @@
{
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
}
else if ( reportModelTB.equalsIgnoreCase( "STATIC" ) || reportModelTB.equalsIgnoreCase( "STATIC-DATAELEMENTS" ) || reportModelTB.equalsIgnoreCase( "STATIC-FINANCIAL" ) )
{
@@ -216,7 +216,7 @@
{
OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( ouIDTB );
orgUnitList = new ArrayList<OrganisationUnit>( orgUnit.getChildren() );
- Collections.sort( orgUnitList, new OrganisationUnitNameComparator() );
+ Collections.sort( orgUnitList, new IdentifiableObjectNameComparator() );
orgUnitList.add( orgUnit );
parentUnit = orgUnit.getName();
=== modified file 'local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml 2011-12-26 07:49:43 +0000
+++ local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
<!-- Reports -->
<bean id="org.hisp.dhis.reports.action.ReportsHomePageAction"
=== modified file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DataElementGroupListAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DataElementGroupListAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DataElementGroupListAction.java 2012-02-02 09:56:51 +0000
@@ -30,9 +30,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 com.opensymphony.xwork2.Action;
@@ -75,7 +75,7 @@
{
dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
- Collections.sort( dataElementGroups, new DataElementGroupNameComparator() );
+ Collections.sort( dataElementGroups, new IdentifiableObjectNameComparator() );
return SUCCESS;
}
=== modified file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DeTargetAddFormAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DeTargetAddFormAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DeTargetAddFormAction.java 2012-02-02 09:56:51 +0000
@@ -30,11 +30,10 @@
import java.util.Collections;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator;
-import org.hisp.dhis.dataelement.comparator.DataElementNameComparator;
import com.opensymphony.xwork2.Action;
@@ -88,8 +87,8 @@
/* DataElements and Groups */
dataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() );
dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
- Collections.sort( dataElements, new DataElementNameComparator() );
- Collections.sort( dataElementGroups, new DataElementGroupNameComparator() );
+ Collections.sort( dataElements, new IdentifiableObjectNameComparator() );
+ Collections.sort( dataElementGroups, new IdentifiableObjectNameComparator() );
// indicatorgroups = new ArrayList<IndicatorGroup>(indicatorService.getAllIndicatorGroups() );
=== modified file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/FormAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/FormAction.java 2011-01-17 09:20:40 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/FormAction.java 2012-02-02 09:56:51 +0000
@@ -16,7 +16,6 @@
import org.hisp.dhis.detargetdatavalue.DeTargetDataValue;
import org.hisp.dhis.detargetdatavalue.DeTargetDataValueService;
import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
@@ -71,14 +70,15 @@
// DisplayPropertyHandler
// -------------------------------------------------------------------------
- @SuppressWarnings("unused")
+
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
//--------------------------------------------------------------------------
//Input/Output
//--------------------------------------------------------------------------
=== modified file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GenerateTargetAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GenerateTargetAction.java 2011-01-15 11:35:42 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GenerateTargetAction.java 2012-02-02 09:56:51 +0000
@@ -6,14 +6,13 @@
import java.util.Iterator;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator;
-import org.hisp.dhis.dataelement.comparator.DataElementNameComparator;
import com.opensymphony.xwork2.Action;
@@ -110,8 +109,8 @@
defaultoptioncombo = dataElementCategoryService.getDefaultDataElementCategoryOptionCombo();
- Collections.sort( dataElements, new DataElementNameComparator() );
- Collections.sort( dataElementGroups, new DataElementGroupNameComparator() );
+ Collections.sort( dataElements, new IdentifiableObjectNameComparator() );
+ Collections.sort( dataElementGroups, new IdentifiableObjectNameComparator() );
Iterator<DataElement> deIterator = dataElements.iterator();
while ( deIterator.hasNext() )
=== modified file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetDataElementsAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetDataElementsAction.java 2011-01-15 11:35:42 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetDataElementsAction.java 2012-02-02 09:56:51 +0000
@@ -39,7 +39,6 @@
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
import com.opensymphony.xwork2.ActionSupport;
@@ -85,14 +84,14 @@
// -------------------------------------------------------------------------
// DisplayPropertyHandler
// -------------------------------------------------------------------------
-
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
// -------------------------------------------------------------------------
// Input & output
// -------------------------------------------------------------------------
@@ -167,7 +166,7 @@
Collections.sort( dataElements, dataElementComparator );
- displayPropertyHandler.handle( dataElements );
+ //displayPropertyHandler.handle( dataElements );
if ( deOptionValue != null )
{
=== modified file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetDeTargetAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetDeTargetAction.java 2011-12-26 10:07:59 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetDeTargetAction.java 2012-02-02 09:56:51 +0000
@@ -30,10 +30,10 @@
import java.util.Collections;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator;
import org.hisp.dhis.detarget.DeTarget;
import org.hisp.dhis.detarget.DeTargetMember;
import org.hisp.dhis.detarget.DeTargetService;
@@ -131,7 +131,7 @@
dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
- Collections.sort( dataElementGroups, new DataElementGroupNameComparator() );
+ Collections.sort( dataElementGroups, new IdentifiableObjectNameComparator() );
=== modified file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/FormAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/FormAction.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/FormAction.java 2012-02-02 09:56:51 +0000
@@ -35,7 +35,6 @@
import org.hisp.dhis.i18n.I18n;
import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.survey.Survey;
import org.hisp.dhis.survey.state.SelectedStateManager;
@@ -81,13 +80,14 @@
// -------------------------------------------------------------------------
@SuppressWarnings("unused")
+ /*
private DisplayPropertyHandler displayPropertyHandler;
public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
{
this.displayPropertyHandler = displayPropertyHandler;
}
-
+ */
// -------------------------------------------------------------------------
// Output
// -------------------------------------------------------------------------
=== modified file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/IndicatorGroupListAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/IndicatorGroupListAction.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/IndicatorGroupListAction.java 2012-02-02 09:56:51 +0000
@@ -31,9 +31,9 @@
import java.util.Collections;
import java.util.List;
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.comparator.IndicatorGroupNameComparator;
import com.opensymphony.xwork2.Action;
@@ -75,7 +75,7 @@
{
indicatorGroups = new ArrayList<IndicatorGroup>( indicatorService.getAllIndicatorGroups() );
- Collections.sort( indicatorGroups, new IndicatorGroupNameComparator() );
+ Collections.sort( indicatorGroups, new IdentifiableObjectNameComparator() );
return SUCCESS;
}
=== modified file 'local/in/dhis-web-survey/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-survey/src/main/resources/META-INF/dhis/beans.xml 2011-06-22 11:47:58 +0000
+++ local/in/dhis-web-survey/src/main/resources/META-INF/dhis/beans.xml 2012-02-02 09:56:51 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
<bean id="org.hisp.dhis.survey.action.EmptyAction"
class="org.hisp.dhis.survey.action.EmptyAction"/>
