ItEr57S16EscaladoPantallaGanttEmpresa: Show the order status in the tooltip with a color code.
This commit is contained in:
parent
9f3b856c0a
commit
2600f1e8df
2 changed files with 37 additions and 0 deletions
|
|
@ -25,6 +25,7 @@ import static org.navalplanner.web.I18nHelper._;
|
|||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
|
|
@ -46,6 +47,7 @@ import org.navalplanner.business.labels.entities.Label;
|
|||
import org.navalplanner.business.orders.daos.IOrderElementDAO;
|
||||
import org.navalplanner.business.orders.entities.Order;
|
||||
import org.navalplanner.business.orders.entities.OrderElement;
|
||||
import org.navalplanner.business.orders.entities.OrderStatusEnum;
|
||||
import org.navalplanner.business.planner.daos.IResourceAllocationDAO;
|
||||
import org.navalplanner.business.planner.daos.ITaskElementDAO;
|
||||
import org.navalplanner.business.planner.entities.Dependency;
|
||||
|
|
@ -476,6 +478,7 @@ public class TaskElementAdapter implements ITaskElementAdapter {
|
|||
result.append(_("Hours invested") + ": ").append(
|
||||
getHoursAdvancePercentage().multiply(new BigDecimal(100)))
|
||||
.append("% <br/>");
|
||||
result.append(_("State") +": ").append(getOrderState());
|
||||
String labels = buildLabelsText();
|
||||
if (!labels.equals("")) {
|
||||
result.append("<div class='tooltip-labels'>" + _("Labels")
|
||||
|
|
@ -484,6 +487,29 @@ public class TaskElementAdapter implements ITaskElementAdapter {
|
|||
return result.toString();
|
||||
}
|
||||
|
||||
private String getOrderState() {
|
||||
String cssClass;
|
||||
OrderStatusEnum state = taskElement.getOrderElement().getOrder().getState();
|
||||
|
||||
if(Arrays.asList(OrderStatusEnum.ACCEPTED,
|
||||
OrderStatusEnum.OFFERED,OrderStatusEnum.STARTED,
|
||||
OrderStatusEnum.SUBCONTRACTED_PENDING_ORDER)
|
||||
.contains(state)) {
|
||||
if(taskElement.getAssignedStatus() == "assigned") {
|
||||
cssClass="order-open-assigned";
|
||||
}
|
||||
else {
|
||||
cssClass="order-open-unassigned";
|
||||
}
|
||||
}
|
||||
else {
|
||||
cssClass="order-closed";
|
||||
}
|
||||
return "<font class='" + cssClass + "'>"
|
||||
+ state.toString()
|
||||
+ "</font>";
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Constraint<Date>> getStartConstraints() {
|
||||
if (taskElement instanceof Task) {
|
||||
|
|
|
|||
|
|
@ -1316,3 +1316,14 @@ tr.z-tree-row-seld td.z-row-inner {
|
|||
tr.z-tree-row-seld .z-row-cnt {
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
/* color code for order state */
|
||||
.order-open-unassigned {
|
||||
color: #AACCEE;
|
||||
}
|
||||
.order-open-assigned {
|
||||
color: #007BBE;
|
||||
}
|
||||
.order-closed {
|
||||
color: #000000;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue