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

Applying days from start to deadline when selecting template

Browse source 
FEA: ItEr75S04BugFixing
This commit is contained in:
Lorenzo Tilve Álvaro 2011-11-08 14:57:12 +01:00
parent 3bd402d5ba
commit 760bb08a55
3 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
View file

@ -404,7 +404,9 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
newOrder.setCodeAutogenerated();
newOrder.setCode(getOrder().getCode());
}
if (getOrder().getDeadline() != null) {
newOrder.setDeadline(getOrder().getDeadline());
}
newOrder.setCustomer(((Order) getOrder()).getCustomer());
newOrder.setCalendar(getCalendar());

18
libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
View file

@ -29,6 +29,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.joda.time.LocalDate;
import org.libreplan.business.calendars.entities.BaseCalendar;
import org.libreplan.business.externalcompanies.entities.ExternalCompany;
import org.libreplan.business.orders.daos.IOrderDAO;
@ -143,11 +144,9 @@ public class ProjectDetailsController extends GenericForwardComposer {
if (tabs != null) {
tabs.goToOrdersList();
}
if (bdProjectTemplate.getSelectedElement() != null) {
OrderTemplate template = (OrderTemplate) bdProjectTemplate
.getSelectedElement();
orderController.createFromTemplate(template);
}
orderController.editNewCreatedOrder(window);
@ -280,12 +279,23 @@ public class ProjectDetailsController extends GenericForwardComposer {
bdExternalCompanies.close();
}
});
txtName.addEventListener(Events.ON_OK, new EventListener() {
bdProjectTemplate.setListboxEventListener(Events.ON_SELECT,
new EventListener() {
@Override
public void onEvent(Event event) {
accept();
calculateDeadlineDate();
}
});
}
public void calculateDeadlineDate() {
if ((bdProjectTemplate.getSelectedElement() == null)
|| (((OrderTemplate) bdProjectTemplate.getSelectedElement())
.getDeadlineAsDaysFromBeginning() == null)
|| (initDate.getValue() == null)) {
return;
}
int days = ((OrderTemplate) bdProjectTemplate.getSelectedElement()).getDeadlineAsDaysFromBeginning();
deadline.setValue( new LocalDate(initDate.getValue()).plusDays(days).toDateTimeAtStartOfDay().toDate());
}
}

5
libreplan-webapp/src/main/webapp/orders/_projectDetails.zul
View file

@ -34,7 +34,8 @@
<row>
<label value="${i18n:_('Name')}" />
<textbox id="txtName" value="@{projectController.order.name}" width="500px"
constraint="no empty:${i18n:_('cannot be null or empty')}"/>
constraint="no empty:${i18n:_('cannot be null or empty')}"
onOK="projectController.accept();"/>
</row>
<row>
<label value="${i18n:_('Code')}" />
@ -49,7 +50,7 @@
<row>
<label value="${i18n:_('Template')}" />
<bandboxSearch id="bdProjectTemplate" finder="templatesEligibleForOrder"
widthBandbox="300px" widthListbox="500px" />
widthBandbox="400px" widthListbox="500px" />
</row>
<row>
<label value="${i18n:_('Starting date')}" />