------------------------------------------------------------ revno: 10096 committer: Morten Olav Hansen <[email protected]> branch nick: dhis2 timestamp: Sat 2013-03-09 09:53:43 +0300 message: bugfix for yearly lock-exception modified: dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/GetPeriodsAction.java
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java' --- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java 2012-12-18 08:47:37 +0000 +++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java 2013-03-09 06:53:43 +0000 @@ -27,13 +27,6 @@ package org.hisp.dhis.light.utils; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.Validate; import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator; @@ -65,6 +58,14 @@ import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * @author Morten Olav Hansen <[email protected]> */ @@ -181,9 +182,9 @@ { ValidationRule rule = result.getValidationRule(); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append( expressionService.getExpressionDescription( rule.getLeftSide().getExpression() ) ); - sb.append( " " + rule.getOperator().getMathematicalOperator() + " " ); + sb.append( " " ).append( rule.getOperator().getMathematicalOperator() ).append( " " ); sb.append( expressionService.getExpressionDescription( rule.getRightSide().getExpression() ) ); validationRuleViolations.add( sb.toString() ); @@ -259,37 +260,36 @@ Validate.notNull( dataSetId ); DataSet dataSet = dataSetService.getDataSet( dataSetId ); - - CalendarPeriodType periodType = null; + + CalendarPeriodType periodType; if ( dataSet.getPeriodType().getName().equalsIgnoreCase( "Yearly" ) ) { - periodType = (CalendarPeriodType) new YearlyPeriodType(); + periodType = new YearlyPeriodType(); } else { periodType = (CalendarPeriodType) dataSet.getPeriodType(); } - + if ( dataSet.isAllowFuturePeriods() ) { - List<Period> periods = new ArrayList<Period>(); - periods = periodType.generatePeriods( new Date() ); + List<Period> periods = periodType.generatePeriods( new Date() ); Collections.reverse( periods ); return periods; } else { - + List<Period> periods = periodType.generateLast5Years( new Date() ); FilterUtils.filter( periods, new PastAndCurrentPeriodFilter() ); Collections.reverse( periods ); - + if ( periods.size() > (first + max) ) { periods = periods.subList( first, max ); } - + return periods; } } @@ -349,7 +349,7 @@ return true; } } - catch ( NumberFormatException e ) + catch ( NumberFormatException ignored ) { } @@ -369,7 +369,7 @@ return true; } } - catch ( NumberFormatException e ) + catch ( NumberFormatException ignored ) { } @@ -390,7 +390,7 @@ sdf.parseDateTime( value ); return true; } - catch ( IllegalArgumentException e ) + catch ( IllegalArgumentException ignored ) { } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/GetPeriodsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/GetPeriodsAction.java 2012-02-17 13:13:54 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/GetPeriodsAction.java 2013-03-09 06:53:43 +0000 @@ -27,20 +27,20 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; - +import com.opensymphony.xwork2.Action; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.period.CalendarPeriodType; import org.hisp.dhis.period.Period; +import org.hisp.dhis.period.YearlyPeriodType; import org.hisp.dhis.system.filter.PastAndCurrentPeriodFilter; import org.hisp.dhis.system.util.FilterUtils; -import com.opensymphony.xwork2.Action; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; /** * @author Morten Olav Hansen <[email protected]> @@ -49,7 +49,7 @@ implements Action { private static final int MAX_PERIODS = 24; - + // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- @@ -112,7 +112,17 @@ return new ArrayList<Period>(); } - CalendarPeriodType periodType = (CalendarPeriodType) dataSet.getPeriodType(); + CalendarPeriodType periodType; + + if ( dataSet.getPeriodType().getName().equalsIgnoreCase( "Yearly" ) ) + { + periodType = new YearlyPeriodType(); + } + else + { + periodType = (CalendarPeriodType) dataSet.getPeriodType(); + } + List<Period> periods = periodType.generateLast5Years( new Date() ); FilterUtils.filter( periods, new PastAndCurrentPeriodFilter() ); Collections.reverse( periods );
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
