RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #884] Show progress measurements list in reverse order.

Browse source 
FEA : ItEr72S04BugFixing
This commit is contained in:
Susana Montes Pedreira 2011-03-08 14:24:35 +01:00
parent 391666c638
commit 7eee8be116
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurementComparator.java
View file

@ -42,12 +42,12 @@ public class AdvanceMeasurementComparator implements Comparator<AdvanceMeasureme
if (arg0.getDate() == arg1.getDate()) {
return 0;
}
if (arg1.getDate() == null) {
if (arg0.getDate() == null) {
return -1;
}
if (arg0.getDate() == null) {
if (arg1.getDate() == null) {
return 1;
}
return arg0.getDate().compareTo(arg1.getDate());
return arg1.getDate().compareTo(arg0.getDate());
}
}

2
navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java
View file

@ -198,7 +198,7 @@ public class DirectAdvanceAssignment extends AdvanceAssignment {
&& (currentAdvance.getDate() != null)
&& (nextAdvance.getDate() != null)
&& (currentAdvance.getValue().compareTo(
nextAdvance.getValue()) > 0)) {
nextAdvance.getValue()) < 0)) {
return false;
}
currentAdvance = nextAdvance;

6
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
View file

@ -25,6 +25,7 @@ package org.navalplanner.web.orders;
import static org.navalplanner.web.I18nHelper._;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
@ -107,7 +108,10 @@ public class ManageOrderElementAdvancesController extends
}
public List<AdvanceMeasurement> getAdvanceMeasurements() {
return manageOrderElementAdvancesModel.getAdvanceMeasurements();
List<AdvanceMeasurement> measurements = manageOrderElementAdvancesModel
.getAdvanceMeasurements();
Collections.reverse(measurements);
return measurements;
}
public List<AdvanceAssignment> getAdvanceAssignments() {