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

changes some functions names in ExpenseSheetModel in order to

Browse source 
understand its behaviour easily.

FEA: ItEr76S22ExpenseTrackingSystem
This commit is contained in:
Susana Montes Pedreira 2012-06-08 10:23:21 +01:00
parent 0316d73288
commit dc1c566118
4 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java
View file

@ -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<Order> 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);
}
}

18
libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetModel.java
View file

@ -83,7 +83,7 @@ public class ExpenseSheetModel extends IntegrationEntityModel implements IExpens
private ExpenseSheet expenseSheet;
private ExpenseSheetLine expenseSheetLineDTO;
private ExpenseSheetLine newExpenseSheetLine;
private List<Order> activeOrders = new ArrayList<Order>();
@ -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

2
libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/IExpenseSheetModel.java
View file

@ -59,7 +59,7 @@ public interface IExpenseSheetModel extends IIntegrationEntityModel {
void addExpenseSheetLine();
ExpenseSheetLine getExpenseSheetLineDTO();
ExpenseSheetLine getNewExpenseSheetLine();
List<Order> getOrders();

8
libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul
View file

@ -130,20 +130,20 @@
widthListbox="400px"
finder="OrderElementInExpenseSheetBandboxFinder"
model="@{controller.tasks}"
selectedElement="@{controller.expenseSheetLineDTO.orderElement, access='both'}"/>
selectedElement="@{controller.newExpenseSheetLine.orderElement, access='both'}"/>
<separator bar="false" spacing="10px" orient="vertical"/>
<label value="${i18n:_('Value')}" />
<decimalbox id="dboxValue"
value="@{controller.expenseSheetLineDTO.value}"
value="@{controller.newExpenseSheetLine.value}"
format="@{controller.moneyFormat}"
constraint="@{controller.checkConstraintExpenseValue}"/>
<separator bar="false" spacing="10px" orient="vertical"/>
<label value="${i18n:_('Concept')}" />
<textbox id="tbConcept" width="200px" value="@{controller.expenseSheetLineDTO.concept}" />
<textbox id="tbConcept" width="200px" value="@{controller.newExpenseSheetLine.concept}" />
<separator bar="false" spacing="10px" orient="vertical"/>
@ -153,7 +153,7 @@
widthBandbox="285px"
widthListbox="400px"
finder="ResourceInExpenseSheetBandboxFinder"
selectedElement="@{controller.expenseSheetLineDTO.resource, access='both'}"/>
selectedElement="@{controller.newExpenseSheetLine.resource, access='both'}"/>
</div>
<separator bar="false" spacing="10px" orient="vertical"/>