ItEr26S06RFControlAvancesIncompatiblesEnUnidadesTraballoItEr25S06: Added method getAdvancePercentage() to OrderElement.
This commit is contained in:
Manuel Rego Casasnovas
Javier Moran Rua
parent
13f04f8c23
commit
1f371961ba
5 changed files with 304 additions and 0 deletions
|
|
@ -1,6 +1,7 @@
|
|||
package org.navalplanner.business.advance.entities;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.SortedSet;
|
||||
import java.util.TreeSet;
|
||||
|
||||
|
|
@ -92,4 +93,34 @@ public class AdvanceAssigment extends BaseEntity {
|
|||
public Type getType() {
|
||||
return this.type;
|
||||
}
|
||||
|
||||
public AdvanceMeasurement getLastAdvanceMeasurement() {
|
||||
if (advanceMeasurements.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
AdvanceMeasurement last = advanceMeasurements.first();
|
||||
for (AdvanceMeasurement advanceMeasurement : advanceMeasurements) {
|
||||
Date date = advanceMeasurement.getDate();
|
||||
if (last.getDate().compareTo(date) < 0) {
|
||||
last = advanceMeasurement;
|
||||
}
|
||||
}
|
||||
|
||||
return last;
|
||||
}
|
||||
|
||||
public BigDecimal getLastPercentage() {
|
||||
BigDecimal zero = new BigDecimal(0);
|
||||
if (maxValue.compareTo(zero) == 0) {
|
||||
return zero;
|
||||
}
|
||||
|
||||
AdvanceMeasurement advanceMeasurement = getLastAdvanceMeasurement();
|
||||
if (advanceMeasurement == null) {
|
||||
return zero;
|
||||
}
|
||||
return advanceMeasurement.getValue().divide(maxValue);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package org.navalplanner.business.orders.entities;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.HashSet;
|
||||
|
|
@ -256,4 +257,7 @@ public abstract class OrderElement extends BaseEntity {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
public abstract BigDecimal getAdvancePercentage();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ import java.util.HashSet;
|
|||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.navalplanner.business.advance.entities.AdvanceAssigment;
|
||||
|
||||
public class OrderLine extends OrderElement {
|
||||
|
||||
public static OrderLine create() {
|
||||
|
|
@ -342,4 +344,22 @@ public class OrderLine extends OrderElement {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public BigDecimal getAdvancePercentage() {
|
||||
Set<AdvanceAssigment> advanceAssigments = getAdvanceAssigments();
|
||||
|
||||
BigDecimal temp = new BigDecimal(0);
|
||||
for (AdvanceAssigment advanceAssigment : advanceAssigments) {
|
||||
BigDecimal percentage = advanceAssigment.getLastPercentage();
|
||||
temp = temp.add(percentage);
|
||||
}
|
||||
|
||||
Integer number = advanceAssigments.size();
|
||||
if (number > 0) {
|
||||
temp = temp.divide(new BigDecimal(number));
|
||||
}
|
||||
|
||||
return temp.setScale(2);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
package org.navalplanner.business.orders.entities;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.hibernate.validator.Valid;
|
||||
import org.navalplanner.business.advance.entities.AdvanceAssigment;
|
||||
|
||||
public class OrderLineGroup extends OrderElement implements IOrderLineGroup {
|
||||
|
||||
|
|
@ -104,4 +107,35 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup {
|
|||
return hoursGroups;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BigDecimal getAdvancePercentage() {
|
||||
Integer hours = getWorkHours();
|
||||
BigDecimal temp = new BigDecimal(0);
|
||||
|
||||
if (hours > 0) {
|
||||
for (OrderElement orderElement : children) {
|
||||
BigDecimal childPercentage = orderElement
|
||||
.getAdvancePercentage();
|
||||
Integer childHours = orderElement.getWorkHours();
|
||||
temp = temp.add(childPercentage.multiply(new BigDecimal(
|
||||
childHours)));
|
||||
}
|
||||
|
||||
temp = temp.divide(new BigDecimal(hours));
|
||||
}
|
||||
|
||||
Set<AdvanceAssigment> advanceAssigments = getAdvanceAssigments();
|
||||
if (!advanceAssigments.isEmpty()) {
|
||||
for (AdvanceAssigment advanceAssigment : advanceAssigments) {
|
||||
BigDecimal percentage = advanceAssigment.getLastPercentage();
|
||||
temp = temp.add(percentage);
|
||||
}
|
||||
|
||||
Integer number = advanceAssigments.size() + 1;
|
||||
temp = temp.divide(new BigDecimal(number));
|
||||
}
|
||||
|
||||
return temp.setScale(2);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,215 @@
|
|||
package org.navalplanner.business.test.orders.entities;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.equalTo;
|
||||
import static org.junit.Assert.assertThat;
|
||||
import static org.navalplanner.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE;
|
||||
import static org.navalplanner.business.test.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_TEST_FILE;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.navalplanner.business.IDataBootstrap;
|
||||
import org.navalplanner.business.advance.bootstrap.PredefinedAdvancedTypes;
|
||||
import org.navalplanner.business.advance.entities.AdvanceAssigment;
|
||||
import org.navalplanner.business.advance.entities.AdvanceMeasurement;
|
||||
import org.navalplanner.business.advance.entities.AdvanceType;
|
||||
import org.navalplanner.business.advance.entities.AdvanceAssigment.Type;
|
||||
import org.navalplanner.business.advance.exceptions.DuplicateAdvanceAssigmentForOrderElementException;
|
||||
import org.navalplanner.business.advance.exceptions.DuplicateValueTrueReportGlobalAdvanceException;
|
||||
import org.navalplanner.business.orders.entities.OrderElement;
|
||||
import org.navalplanner.business.orders.entities.OrderLine;
|
||||
import org.navalplanner.business.orders.entities.OrderLineGroup;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
/**
|
||||
* Tests for {@link OrderElement}. <br />
|
||||
*
|
||||
* @author Manuel Rego Casasnovas <mrego@igalia.com>
|
||||
*/
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
@ContextConfiguration(locations = { BUSINESS_SPRING_CONFIG_FILE,
|
||||
BUSINESS_SPRING_CONFIG_TEST_FILE })
|
||||
@Transactional
|
||||
public class OrderElementTest {
|
||||
|
||||
@Resource
|
||||
private IDataBootstrap defaultAdvanceTypesBootstrapListener;
|
||||
|
||||
@Before
|
||||
public void loadRequiredaData() {
|
||||
defaultAdvanceTypesBootstrapListener.loadRequiredData();
|
||||
}
|
||||
|
||||
private OrderLine givenOrderLine(String name, String code, Integer hours) {
|
||||
OrderLine orderLine = OrderLine
|
||||
.createOrderLineWithUnfixedPercentage(hours);
|
||||
orderLine.setName(name);
|
||||
orderLine.setCode(code);
|
||||
|
||||
return orderLine;
|
||||
}
|
||||
|
||||
private OrderLineGroup givenOrderLineGroupWithOneOrderLine(Integer hours) {
|
||||
OrderLineGroup orderLineGroup = OrderLineGroup.create();
|
||||
orderLineGroup.setName("OrderLineGroup1");
|
||||
orderLineGroup.setCode("1");
|
||||
|
||||
OrderLine orderLine = givenOrderLine("OrderLine1", "1.1", hours);
|
||||
orderLineGroup.add(orderLine);
|
||||
|
||||
return orderLineGroup;
|
||||
}
|
||||
|
||||
private OrderLineGroup givenOrderLineGroupWithTwoOrderLines(Integer hours1,
|
||||
Integer hours2) {
|
||||
OrderLineGroup orderLineGroup = givenOrderLineGroupWithOneOrderLine(hours1);
|
||||
|
||||
OrderLine orderLine = givenOrderLine("OrderLine2", "1.2", hours2);
|
||||
orderLineGroup.add(orderLine);
|
||||
|
||||
return orderLineGroup;
|
||||
}
|
||||
|
||||
private AdvanceAssigment givenAdvanceAssigement(BigDecimal maxValue,
|
||||
AdvanceType advanceType) {
|
||||
AdvanceAssigment advanceAssigment = AdvanceAssigment.create();
|
||||
advanceAssigment.setMaxValue(maxValue);
|
||||
advanceAssigment.setAdvanceType(advanceType);
|
||||
advanceAssigment.setReportGlobalAdvance(false);
|
||||
advanceAssigment.setType(Type.DIRECT);
|
||||
|
||||
return advanceAssigment;
|
||||
}
|
||||
|
||||
private void addAvanceAssigmentWithMeasurement(OrderElement orderElement,
|
||||
AdvanceType advanceType, BigDecimal maxValue,
|
||||
BigDecimal currentValue)
|
||||
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||
DuplicateAdvanceAssigmentForOrderElementException {
|
||||
AdvanceMeasurement advanceMeasurement = AdvanceMeasurement.create();
|
||||
advanceMeasurement.setDate(new Date());
|
||||
advanceMeasurement.setValue(currentValue);
|
||||
|
||||
AdvanceAssigment advanceAssigment = givenAdvanceAssigement(maxValue,
|
||||
advanceType);
|
||||
advanceAssigment.getAdvanceMeasurements().add(advanceMeasurement);
|
||||
|
||||
orderElement.addAdvanceAssigment(advanceAssigment);
|
||||
}
|
||||
|
||||
private AdvanceType givenAdvanceType(String name) {
|
||||
BigDecimal value = new BigDecimal(5000).setScale(2);
|
||||
BigDecimal precision = new BigDecimal(10).setScale(2);
|
||||
AdvanceType advanceType = AdvanceType.create(name, value, true,
|
||||
precision, true);
|
||||
return advanceType;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void checkAdvancePercentageEmptyOrderLine() {
|
||||
OrderLine orderLine = givenOrderLine("name", "code", 1000);
|
||||
assertThat(orderLine.getAdvancePercentage(), equalTo(new BigDecimal(0)
|
||||
.setScale(2)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void checkAdvancePercentageOrderLineWithAdvanceAssigmentWithoutMesaurement()
|
||||
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||
DuplicateAdvanceAssigmentForOrderElementException {
|
||||
OrderLine orderLine = givenOrderLine("name", "code", 1000);
|
||||
|
||||
AdvanceAssigment advanceAssigment = givenAdvanceAssigement(
|
||||
new BigDecimal(5000), PredefinedAdvancedTypes.UNITS.getType());
|
||||
|
||||
orderLine.addAdvanceAssigment(advanceAssigment);
|
||||
|
||||
assertThat(orderLine.getAdvancePercentage(), equalTo(new BigDecimal(0)
|
||||
.setScale(2)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void checkAdvancePercentageOrderLineWithTwoAssigments()
|
||||
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||
DuplicateAdvanceAssigmentForOrderElementException {
|
||||
OrderLine orderLine = givenOrderLine("name", "code", 1000);
|
||||
|
||||
addAvanceAssigmentWithMeasurement(orderLine, givenAdvanceType("test1"),
|
||||
new BigDecimal(2000), new BigDecimal(200));
|
||||
|
||||
addAvanceAssigmentWithMeasurement(orderLine, givenAdvanceType("test2"),
|
||||
new BigDecimal(1000), new BigDecimal(600));
|
||||
|
||||
assertThat(orderLine.getAdvancePercentage(), equalTo(new BigDecimal(35)
|
||||
.divide(new BigDecimal(100)).setScale(2)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void checkAdvancePercentageOrderLineWithThreeAssigments()
|
||||
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||
DuplicateAdvanceAssigmentForOrderElementException {
|
||||
OrderLine orderLine = givenOrderLine("name", "code", 1000);
|
||||
|
||||
addAvanceAssigmentWithMeasurement(orderLine, givenAdvanceType("test1"),
|
||||
new BigDecimal(2000), new BigDecimal(200));
|
||||
|
||||
addAvanceAssigmentWithMeasurement(orderLine, givenAdvanceType("test2"),
|
||||
new BigDecimal(1000), new BigDecimal(600));
|
||||
|
||||
addAvanceAssigmentWithMeasurement(orderLine, givenAdvanceType("test3"),
|
||||
new BigDecimal(4000), new BigDecimal(800));
|
||||
|
||||
assertThat(orderLine.getAdvancePercentage(), equalTo(new BigDecimal(30)
|
||||
.divide(new BigDecimal(100)).setScale(2)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void checkAdvancePercentageOrderGroupLine()
|
||||
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||
DuplicateAdvanceAssigmentForOrderElementException {
|
||||
OrderElement orderElement = givenOrderLineGroupWithTwoOrderLines(1000,
|
||||
2000);
|
||||
|
||||
List<OrderElement> children = orderElement.getChildren();
|
||||
addAvanceAssigmentWithMeasurement(children.get(0),
|
||||
PredefinedAdvancedTypes.UNITS.getType(), new BigDecimal(1000),
|
||||
new BigDecimal(400));
|
||||
addAvanceAssigmentWithMeasurement(children.get(1),
|
||||
PredefinedAdvancedTypes.UNITS.getType(), new BigDecimal(2000),
|
||||
new BigDecimal(200));
|
||||
|
||||
assertThat(orderElement.getAdvancePercentage(), equalTo(new BigDecimal(
|
||||
20).divide(new BigDecimal(100)).setScale(2)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void checkAdvancePercentageOrderGroupLineWithAssigments()
|
||||
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||
DuplicateAdvanceAssigmentForOrderElementException {
|
||||
OrderElement orderElement = givenOrderLineGroupWithTwoOrderLines(1000,
|
||||
2000);
|
||||
|
||||
List<OrderElement> children = orderElement.getChildren();
|
||||
addAvanceAssigmentWithMeasurement(children.get(0),
|
||||
PredefinedAdvancedTypes.UNITS.getType(), new BigDecimal(1000),
|
||||
new BigDecimal(400));
|
||||
addAvanceAssigmentWithMeasurement(children.get(1),
|
||||
PredefinedAdvancedTypes.UNITS.getType(), new BigDecimal(2000),
|
||||
new BigDecimal(200));
|
||||
|
||||
addAvanceAssigmentWithMeasurement(orderElement,
|
||||
PredefinedAdvancedTypes.PERCENTAGE.getType(), new BigDecimal(
|
||||
100), new BigDecimal(10));
|
||||
|
||||
assertThat(orderElement.getAdvancePercentage(), equalTo(new BigDecimal(
|
||||
15).divide(new BigDecimal(100)).setScale(2)));
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue