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

Include a column with the name of the project and other with the "Delivery date,

Browse source 
and make the list sortable by the column "communication" or "company".

FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting
This commit is contained in:
Susana Montes Pedreira 2012-03-30 21:59:25 +01:00
parent 5cd943b1af
commit ff3c4f0c04
5 changed files with 54 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java
View file

@ -288,4 +288,13 @@ public class SubcontractedTaskData extends BaseEntity {
this.requiredDeliveringDates.first().setCommunicationDate(subcontractCommunicationDate);
}
}
public Date getLastRequiredDeliverDate() {
if (this.requiredDeliveringDates != null
&& !this.requiredDeliveringDates.isEmpty()) {
return this.requiredDeliveringDates.first()
.getSubcontractorDeliverDate();
}
return null;
}
}

4
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ISubcontractedTasksModel.java
View file

@ -23,6 +23,7 @@ package org.libreplan.web.subcontract;
import java.util.List;
import org.libreplan.business.common.exceptions.ValidationException;
import org.libreplan.business.orders.entities.Order;
import org.libreplan.business.planner.entities.SubcontractedTaskData;
import org.libreplan.web.subcontract.exceptions.ConnectionProblemsException;
import org.libreplan.web.subcontract.exceptions.UnrecoverableErrorServiceException;
@ -36,12 +37,11 @@ public interface ISubcontractedTasksModel {
List<SubcontractedTaskData> getSubcontractedTasks();
String getOrderCode(SubcontractedTaskData subcontractedTaskData);
void sendToSubcontractor(SubcontractedTaskData subcontractedTaskData)
throws ValidationException, ConnectionProblemsException,
UnrecoverableErrorServiceException;
String exportXML(SubcontractedTaskData subcontractedTaskData);
Order getOrder(SubcontractedTaskData subcontractedTaskData);
}

42
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java
View file

@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.libreplan.business.common.exceptions.ValidationException;
import org.libreplan.business.orders.entities.Order;
import org.libreplan.business.planner.entities.SubcontractedTaskData;
import org.libreplan.web.common.IMessagesForUser;
import org.libreplan.web.common.Level;
@ -109,21 +110,39 @@ public class SubcontractedTasksController extends GenericForwardComposer {
SubcontractedTaskData subcontractedTaskData = (SubcontractedTaskData) data;
row.setValue(subcontractedTaskData);
appendLabel(row, toString(subcontractedTaskData
.getSubcontratationDate()));
appendLabel(row, toString(subcontractedTaskData
.getSubcontractCommunicationDate()));
Order order = getOrder(subcontractedTaskData);
appendLabel(row,
toString(subcontractedTaskData.getSubcontratationDate(), "dd/MM/yyyy HH:mm"));
appendLabel(
row,
toString(subcontractedTaskData.getSubcontractCommunicationDate(),
"dd/MM/yyyy HH:mm"));
appendLabel(row, getExternalCompany(subcontractedTaskData));
appendLabel(row, getOrderCode(subcontractedTaskData));
appendLabel(row, getOrderCode(order));
appendLabel(row, getOrderName(order));
appendLabel(row, subcontractedTaskData.getSubcontractedCode());
appendLabel(row, getTaskName(subcontractedTaskData));
appendLabel(row, subcontractedTaskData.getWorkDescription());
appendLabel(row, toString(subcontractedTaskData
.getSubcontractPrice()));
appendLabel(row, toString(subcontractedTaskData.getSubcontractPrice()));
appendLabel(row,
toString(subcontractedTaskData.getLastRequiredDeliverDate(), "dd/MM/yyyy"));
appendLabel(row, _(toString(subcontractedTaskData.getState())));
appendOperations(row, subcontractedTaskData);
}
private String getOrderCode(Order order) {
return (order != null) ? order.getCode() : "";
}
private String getOrderName(Order order) {
return (order != null) ? order.getName() : "";
}
private Order getOrder(SubcontractedTaskData subcontractedTaskData) {
return subcontractedTasksModel.getOrder(subcontractedTaskData);
}
private String toString(Object object) {
if (object == null) {
return "";
@ -132,22 +151,17 @@ public class SubcontractedTasksController extends GenericForwardComposer {
return object.toString();
}
private String toString(Date date) {
private String toString(Date date, String precision) {
if (date == null) {
return "";
}
return new SimpleDateFormat("dd/MM/yyyy HH:mm").format(date);
return new SimpleDateFormat(precision).format(date);
}
private void appendLabel(Row row, String label) {
row.appendChild(new Label(label));
}
private String getOrderCode(SubcontractedTaskData subcontractedTaskData) {
return subcontractedTasksModel.getOrderCode(subcontractedTaskData);
}
private String getTaskName(SubcontractedTaskData subcontractedTaskData) {
return subcontractedTaskData.getTask().getName();
}

11
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java
View file

@ -31,7 +31,6 @@ import java.util.List;
import javax.ws.rs.WebApplicationException;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
import javax.xml.datatype.XMLGregorianCalendar;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -42,6 +41,7 @@ import org.libreplan.business.common.exceptions.ValidationException;
import org.libreplan.business.externalcompanies.entities.ExternalCompany;
import org.libreplan.business.orders.daos.IOrderDAO;
import org.libreplan.business.orders.daos.IOrderElementDAO;
import org.libreplan.business.orders.entities.Order;
import org.libreplan.business.orders.entities.OrderElement;
import org.libreplan.business.planner.daos.ISubcontractedTaskDataDAO;
import org.libreplan.business.planner.entities.SubcontractState;
@ -99,10 +99,15 @@ public class SubcontractedTasksModel implements ISubcontractedTasksModel {
.getAllForMasterScenario();
for (SubcontractedTaskData subcontractedTaskData : result) {
forceLoadExternalCompany(subcontractedTaskData);
forceLastDeliveryDate(subcontractedTaskData);
}
return sortByState(result);
}
private void forceLastDeliveryDate(SubcontractedTaskData subcontractedTaskData) {
subcontractedTaskData.getLastRequiredDeliverDate();
}
private void forceLoadExternalCompany(
SubcontractedTaskData subcontractedTaskData) {
subcontractedTaskData.getExternalCompany().getName();
@ -141,11 +146,11 @@ public class SubcontractedTasksModel implements ISubcontractedTasksModel {
@Override
@Transactional(readOnly = true)
public String getOrderCode(SubcontractedTaskData subcontractedTaskData) {
public Order getOrder(SubcontractedTaskData subcontractedTaskData) {
Task task = subcontractedTaskData.getTask();
OrderElement orderElement = orderDAO.loadOrderAvoidingProxyFor(task
.getOrderElement());
return orderElement.getOrder().getCode();
return orderElement.getOrder();
}
@Override

12
libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul
View file

@ -42,15 +42,17 @@
onInitRender="controller.initRender();">
<columns>
<column label="${i18n:_('Subcontracting date')}"
tooltiptext="${i18n:_('Subcontracting date')}" sort="auto(subcontratationDate)" width="150px"/>
<column label="${i18n:_('Communication')}" sort="auto(communicationdate)"
tooltiptext="${i18n:_('Communication date')}" />
<column label="${i18n:_('Company')}" tooltiptext="${i18n:_('External company')}" sort="auto(externalcompany)" />
tooltiptext="${i18n:_('Subcontracting date')}" sort="auto(subcontratationDate)" width="127px"/>
<column label="${i18n:_('Last communication')}" sort="auto(subcontractCommunicationDate)"
tooltiptext="${i18n:_('Communication date')}" width="127px"/>
<column label="${i18n:_('Company')}" tooltiptext="${i18n:_('External company')}" sort="auto(externalCompany)" width="100px"/>
<column label="${i18n:_('Project code')}" tooltiptext="${i18n:_('Project code')}" />
<column label="${i18n:_('Subcontracted code')}" tooltiptext="${i18n:_('Subcontracted code')}" />
<column label="${i18n:_('Project name')}" tooltiptext="${i18n:_('Project name')}" />
<column label="${i18n:_('Subcontracted code')}" tooltiptext="${i18n:_('Subcontracted code')}" width="130px"/>
<column label="${i18n:_('Task name')}" tooltiptext="${i18n:_('Task name')}" />
<column label="${i18n:_('Description')}" tooltiptext="${i18n:_('Work description')}" />
<column label="${i18n:_('Budget')}" tooltiptext="${i18n:_('Budget')}" />
<column label="${i18n:_('Delivery date')}" tooltiptext="${i18n:_('Delivery date')}" />
<column id="columnBySort" label="${i18n:_('State')}" tooltiptext="${i18n:_('State')}" sort="auto(state)" sortDirection="ascending"/>
<column label="${i18n:_('Operations')}" tooltiptext="${i18n:_('Operations')}" width="100px"/>
</columns>