dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #10189
[Branch ~dhis2-devs-core/dhis2/2.0.6] Rev 2754: Improved code.
------------------------------------------------------------
revno: 2754
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: 2.0.6
timestamp: Wed 2011-02-02 17:50:16 +0100
message:
Improved code.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java
--
lp:~dhis2-devs-core/dhis2/2.0.6
https://code.launchpad.net/~dhis2-devs-core/dhis2/2.0.6
Your team DHIS 2 developers is subscribed to branch lp:~dhis2-devs-core/dhis2/2.0.6.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/2.0.6/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java 2011-02-02 13:41:02 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java 2011-02-02 16:50:16 +0000
@@ -99,13 +99,13 @@
{
object = new ArrayList<Period>( periodService.getPeriodsByPeriodType( periodType ) );
+ FilterUtils.filter( object, new PastAndCurrentPeriodFilter() );
+
for ( Period period : object )
{
period.setName( format.formatPeriod( period ) );
}
- FilterUtils.filter( object, new PastAndCurrentPeriodFilter() );
-
Collections.sort( object, new PeriodComparator() );
}