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

ItEr33S14CUCreacionUnidadesPlanificacion: Renaming endDate to deadline

Browse source
This commit is contained in:
Óscar González Fernández 2009-11-08 13:50:25 +01:00
parent 57f7509a48
commit e6d9f7c6fb
11 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
View file

@ -75,8 +75,8 @@ public class Order extends OrderLineGroup {
this.customer = customer;
}
public boolean isEndDateBeforeStart() {
return getEndDate() != null && getEndDate().before(getInitDate());
public boolean isDeadlineBeforeStart() {
return getDeadline() != null && getDeadline().before(getInitDate());
}
public List<OrderElement> getOrderElements() {
@ -110,9 +110,9 @@ public class Order extends OrderLineGroup {
}
@SuppressWarnings("unused")
@AssertTrue(message = "end date must be after start date")
private boolean theEndDateMustBeAfterStart() {
return !this.isEndDateBeforeStart();
@AssertTrue(message = "deadline must be after start date")
private boolean theDeadlineMustBeAfterStart() {
return !this.isDeadlineBeforeStart();
}
@SuppressWarnings("unused")

10
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
View file

@ -50,7 +50,7 @@ public abstract class OrderElement extends BaseEntity {
private Date initDate;
private Date endDate;
private Date deadline;
private Boolean mandatoryInit = false;
@ -107,12 +107,12 @@ public abstract class OrderElement extends BaseEntity {
this.initDate = initDate;
}
public Date getEndDate() {
return copy(endDate);
public Date getDeadline() {
return copy(deadline);
}
public void setEndDate(Date endDate) {
this.endDate = endDate;
public void setDeadline(Date deadline) {
this.deadline = deadline;
}
public void setMandatoryInit(Boolean mandatoryInit) {

2
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java
View file

@ -83,7 +83,7 @@ public class OrderLine extends OrderElement {
result.setName(getName());
result.setCode(getCode());
result.setInitDate(getInitDate());
result.setEndDate(getEndDate());
result.setDeadline(getDeadline());
this.setName(getName() + " (copy)");
this.setCode(getCode() + " (copy)");

2
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
View file

@ -155,7 +155,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup {
result.setName(getName());
result.setInitDate(getInitDate());
result.setEndDate(getEndDate());
result.setDeadline(getDeadline());
result.setWorkHours(0);
result.directAdvanceAssignments = new HashSet<DirectAdvanceAssignment>(
this.directAdvanceAssignments);

2
navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
View file

@ -11,7 +11,7 @@
<property name="name" access="field" />
<property name="initDate" access="field" />
<property name="endDate" access="field" />
<property name="deadline" access="field" />
<property name="mandatoryInit" access="field" />
<property name="mandatoryEnd" access="field" />
<property name="description" access="field" />

4
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
View file

@ -431,13 +431,13 @@ public class OrderElementTreeController extends GenericForwardComposer {
@Override
public Date get() {
return orderElementForThisRow.getEndDate();
return orderElementForThisRow.getDeadline();
}
}, new Util.Setter<Date>() {
@Override
public void set(Date value) {
orderElementForThisRow.setEndDate(value);
orderElementForThisRow.setDeadline(value);
}
}));

4
navalplanner-webapp/src/main/webapp/orders/_edition.zul
View file

@ -56,9 +56,9 @@
value="@{controller.order.initDate}" />
</row>
<row>
<label value="${i18n:_('Ending date')}" />
<label value="${i18n:_('Deadline')}" />
<datebox
value="@{controller.order.endDate}" />
value="@{controller.order.deadline}" />
</row>
<row>
<label value="${i18n:_('Responsible')}" />

6
navalplanner-webapp/src/main/webapp/orders/_list.zul
View file

@ -26,8 +26,8 @@
<column label="${i18n:_('Code')}" sort="auto(code)" />
<column label="${i18n:_('Starting date')}"
sort="auto(initDate)" />
<column label="${i18n:_('Ending date')}"
sort="auto(endDate)" />
<column label="${i18n:_('Deadline')}"
sort="auto(deadline)" />
<column label="${i18n:_('Responsible')}"
sort="auto(responsible)" />
<column label="${i18n:_('Customer')}" sort="auto(customer)" />
@ -40,7 +40,7 @@
<label value="@{order.name}" />
<label value="@{order.code}" />
<label value="@{order.initDate}" />
<label value="@{order.endDate}" />
<label value="@{order.deadline}" />
<label value="@{order.responsible}" />
<label value="@{order.customer}" />
<label value="@{order.description}" />

6
navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul
View file

@ -30,10 +30,10 @@
</hbox>
</row>
<row>
<label value="${i18n:_('Ending date')}" />
<label value="${i18n:_('Deadline')}" />
<hbox>
<datebox id="endDate"
value="@{detailsController.orderElement.endDate}" />
<datebox id="deadline"
value="@{detailsController.orderElement.deadline}" />
<checkbox id="mandatoryEnd"
checked="@{detailsController.orderElement.mandatoryEnd}" />
<label value="${i18n:_('Mandatory')}" />

4
navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul
View file

@ -63,8 +63,8 @@
<treecols sizable="false">
<treecol label="${i18n:_('Name and description')}" class="name"/>
<treecol label="${i18n:_('Code')}" class="code"/>
<treecol label="${i18n:_('Estimated init')}" class="estimated_init"/>
<treecol label="${i18n:_('Estimated end')}" class="estimated_end"/>
<treecol label="${i18n:_('Must start after')}" class="estimated_init"/>
<treecol label="${i18n:_('Deadline')}" class="estimated_end"/>
<treecol label="${i18n:_('Hours')}" class="hours"
tooltiptext="${i18n:_('Total order element hours')}" />
<treecol label="${i18n:_('Operations')}" class="operations"

2
navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java
View file

@ -220,7 +220,7 @@ public class OrderModelTest {
public void shouldSendValidationExceptionIfEndDateIsBeforeThanStartingDate()
throws ValidationException {
Order order = createValidOrder();
order.setEndDate(year(0));
order.setDeadline(year(0));
orderModel.setOrder(order);
orderModel.save();
}