diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java index 8ca9445a6..9d216cee4 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java @@ -152,7 +152,7 @@ public class ExpenseSheetCRUDController extends * @param rows */ public void addExpenseSheetLine() { - if (validateLineDTO()) { + if (validateNewLine()) { expenseSheetModel.addExpenseSheetLine(); reloadExpenseSheetLines(); reloadComponentsNewLine(); @@ -166,17 +166,17 @@ public class ExpenseSheetCRUDController extends Util.reloadBindings(dboxValue); } - private boolean validateLineDTO() { + private boolean validateNewLine() { boolean result = true; - if (expenseSheetModel.getExpenseSheetLineDTO().getDate() == null) { + if (expenseSheetModel.getNewExpenseSheetLine().getDate() == null) { result = false; throw new WrongValueException(this.dateboxExpenseDate, _("must be not empty")); } - if (expenseSheetModel.getExpenseSheetLineDTO().getOrderElement() == null) { + if (expenseSheetModel.getNewExpenseSheetLine().getOrderElement() == null) { result = false; throw new WrongValueException(this.bandboxTasks, _("must be not empty")); } - BigDecimal value = expenseSheetModel.getExpenseSheetLineDTO().getValue(); + BigDecimal value = expenseSheetModel.getNewExpenseSheetLine().getValue(); if (value == null || value.compareTo(BigDecimal.ZERO) < 0) { result = false; throw new WrongValueException(this.dboxValue, @@ -236,8 +236,8 @@ public class ExpenseSheetCRUDController extends reloadExpenseSheetLines(); } - public ExpenseSheetLine getExpenseSheetLineDTO() { - return expenseSheetModel.getExpenseSheetLineDTO(); + public ExpenseSheetLine getNewExpenseSheetLine() { + return expenseSheetModel.getNewExpenseSheetLine(); } public List getOrders() { @@ -522,21 +522,21 @@ public class ExpenseSheetCRUDController extends } public Date getExpenseSheetLineDate() { - if (expenseSheetModel.getExpenseSheetLineDTO() != null) { - return (expenseSheetModel.getExpenseSheetLineDTO().getDate() != null) ? expenseSheetModel - .getExpenseSheetLineDTO().getDate().toDateTimeAtStartOfDay().toDate() + if (expenseSheetModel.getNewExpenseSheetLine() != null) { + return (expenseSheetModel.getNewExpenseSheetLine().getDate() != null) ? expenseSheetModel + .getNewExpenseSheetLine().getDate().toDateTimeAtStartOfDay().toDate() : null; } return null; } public void setExpenseSheetLineDate(Date date) { - if (expenseSheetModel.getExpenseSheetLineDTO() != null) { + if (expenseSheetModel.getNewExpenseSheetLine() != null) { LocalDate localDate = null; if (date != null) { localDate = LocalDate.fromDateFields(date); } - expenseSheetModel.getExpenseSheetLineDTO().setDate(localDate); + expenseSheetModel.getNewExpenseSheetLine().setDate(localDate); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetModel.java index 412f70087..49a28b60a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetModel.java @@ -83,7 +83,7 @@ public class ExpenseSheetModel extends IntegrationEntityModel implements IExpens private ExpenseSheet expenseSheet; - private ExpenseSheetLine expenseSheetLineDTO; + private ExpenseSheetLine newExpenseSheetLine; private List activeOrders = new ArrayList(); @@ -149,7 +149,7 @@ public class ExpenseSheetModel extends IntegrationEntityModel implements IExpens @Transactional(readOnly = true) public void initCreate(boolean personal) { this.setSelectedProject(null); - resetExpenseSheetLineDTO(); + createNewExpenseSheetLine(); this.expenseSheet = ExpenseSheet.create(); this.expenseSheet.setCodeAutogenerated(configurationDAO.getConfiguration() @@ -188,7 +188,7 @@ public class ExpenseSheetModel extends IntegrationEntityModel implements IExpens @Transactional(readOnly = true) public void prepareToEdit(ExpenseSheet expenseSheet) { this.setSelectedProject(null); - resetExpenseSheetLineDTO(); + createNewExpenseSheetLine(); Validate.notNull(expenseSheet); this.expenseSheet = getFromDB(expenseSheet); initOldCodes(); @@ -231,8 +231,8 @@ public class ExpenseSheetModel extends IntegrationEntityModel implements IExpens } } - private void resetExpenseSheetLineDTO() { - this.expenseSheetLineDTO = ExpenseSheetLine.create(new BigDecimal(0), "", new LocalDate(), + private void createNewExpenseSheetLine() { + this.newExpenseSheetLine = ExpenseSheetLine.create(new BigDecimal(0), "", new LocalDate(), null); } @@ -279,19 +279,19 @@ public class ExpenseSheetModel extends IntegrationEntityModel implements IExpens @Override public void addExpenseSheetLine() { if (expenseSheet != null) { - ExpenseSheetLine line = this.getExpenseSheetLineDTO(); + ExpenseSheetLine line = this.getNewExpenseSheetLine(); line.setExpenseSheet(expenseSheet); if (expenseSheet.isPersonal()) { line.setResource(resource); } expenseSheet.add(line); } - this.resetExpenseSheetLineDTO(); + this.createNewExpenseSheetLine(); } @Override - public ExpenseSheetLine getExpenseSheetLineDTO() { - return expenseSheetLineDTO; + public ExpenseSheetLine getNewExpenseSheetLine() { + return newExpenseSheetLine; } @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/IExpenseSheetModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/IExpenseSheetModel.java index 11889f91b..4f8ed6940 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/IExpenseSheetModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/IExpenseSheetModel.java @@ -59,7 +59,7 @@ public interface IExpenseSheetModel extends IIntegrationEntityModel { void addExpenseSheetLine(); - ExpenseSheetLine getExpenseSheetLineDTO(); + ExpenseSheetLine getNewExpenseSheetLine(); List getOrders(); diff --git a/libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul b/libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul index 6e09d096c..dd3faad3d 100644 --- a/libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul +++ b/libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul @@ -130,20 +130,20 @@ widthListbox="400px" finder="OrderElementInExpenseSheetBandboxFinder" model="@{controller.tasks}" - selectedElement="@{controller.expenseSheetLineDTO.orderElement, access='both'}"/> + selectedElement="@{controller.newExpenseSheetLine.orderElement, access='both'}"/>