From be4d6bd6c212954dc0f375ba2ecdd78669f56940 Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Tue, 17 Nov 2009 22:15:35 +0100 Subject: [PATCH] ItEr35S04XestionDaComunidadeItEr34S04: Changed mold in orderElement tree and applied styles to scheduling state column --- .../orders/OrderElementTreeController.java | 14 ++- .../components/schedulingStateToggler.zul | 5 +- .../main/webapp/common/css/navalpro_zk.css | 103 +++++++++--------- .../main/webapp/orders/_orderElementTree.zul | 11 +- 4 files changed, 69 insertions(+), 64 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java index 575c0dc71..9c82578b9 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java @@ -308,11 +308,11 @@ public class OrderElementTreeController extends GenericForwardComposer { currentTreeRow = getTreeRowWithoutChildrenFor(item); final OrderElement currentOrderElement = (OrderElement) data; addSchedulingStateCell(currentOrderElement); - addTaskNumberCell(currentOrderElement); addCodeCell(currentOrderElement); + addHoursCell(currentOrderElement); + addTaskNumberCell(currentOrderElement); addInitDateCell(currentOrderElement); addEndDateCell(currentOrderElement); - addHoursCell(currentOrderElement); addOperationsCell(item, currentOrderElement); onDropMoveFromDraggedToTarget(); @@ -396,7 +396,15 @@ public class OrderElementTreeController extends GenericForwardComposer { private void addSchedulingStateCell(OrderElement currentOrderElement) { SchedulingStateToggler schedulingStateToggler = new SchedulingStateToggler(currentOrderElement .getSchedulingState()); - addCell(schedulingStateToggler); + if (currentOrderElement.getSchedulingState() + .isCompletelyScheduled()) { + addCell("completely-scheduled", schedulingStateToggler); + } else if (currentOrderElement.getSchedulingState() + .isPartiallyScheduled()) { + addCell("partially-scheduled", schedulingStateToggler); + } else { + addCell("not-scheduled", schedulingStateToggler); + } schedulingStateToggler.afterCompose(); } diff --git a/navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul b/navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul index f57d6a778..ce1dd7741 100644 --- a/navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul +++ b/navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul @@ -25,9 +25,10 @@
- \ No newline at end of file + diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css index 67aae3a02..0fcd4fe9c 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css @@ -101,60 +101,17 @@ table { } /* These constants may be reviewed when testing with 3 digit tasknumbers */ -.orderTree .depth_1 input { +.orderTree .depth_1 input, +.orderTree .depth_2 input, +.orderTree .depth_3 input, +.orderTree .depth_4 input, +.orderTree .depth_5 input, +.orderTree .depth_6 input +{ width: 460px !important; border-right: 0px; } -.orderTree .depth_2 input { - width: 430px !important; /* prev - 30 px */ - border-right: 0px; -} - -.orderTree .depth_3 input { - width: 400px !important; /* prev - 30 px */ - border-right: 0px; -} - -.orderTree .depth_4 input { - width: 370px !important; /* prev - 30 px */ - border-right: 0px; -} - -.orderTree .depth_5 input { - width: 340px !important; /* prev - 30 px */ - border-right: 0px; -} - -.orderTree .depth_6 input { - width: 310px !important; /* prev - 30 px */ - border-right: 0px; -} - -.orderTree .depth_1 .tasknumber { - width: 25px; -} - -.orderTree .depth_2 .tasknumber { - width: 37px; /* prev + 12 px */ -} - -.orderTree .depth_3 .tasknumber { - width: 49px; /* prev + 12 px */ -} - -.orderTree .depth_4 .tasknumber { - width: 61px; /* prev + 12 px */ -} - -.orderTree .depth_5 .tasknumber { - width: 73px; /* prev + 12 px */ -} - -.orderTree .depth_6 .tasknumber { - width: 85px; /* prev + 12 px */ -} - /* Cleaning window borders */ .z-window-embedded-tr,.z-window-embedded-tl { display: none; @@ -435,18 +392,25 @@ div.z-grid { } .orderTree .operations { - min-width:130px; + min-width:150px; } .orderTree .name { - min-width:515px; + min-width:140px; } .orderTree .hours { min-width:50px; } .orderTree .code { - min-width:50px; + min-width:100px; +} +.orderTree .scheduling_state { + min-width:260px; +} + +.orderTree .tasknumber { + display:none; } @@ -604,6 +568,37 @@ div.z-grid { border-style: none none none; } -div.z-grid-pgi-b { +div.z-grid-pgi-b, +div.z-listbox-pgi-b { border-top:none; } + +.z-dottree-body .tasknumber { + /* Pending removal from the code */ + display:none; +} + +.z-dottree-body .not-scheduled span, +.z-dottree-body .partially-scheduled span, +.z-dottree-body .completely-scheduled span { + float:left; + padding-right:2px; +} + +.z-dottree-body .not-scheduled, +.z-dottree-body .partially-scheduled, +.z-dottree-body .completely-scheduled { + border-bottom:dotted #EEEEEE 1px; +} + +.partially-scheduled { + background-color: #fddf9b; +} + +.completely-scheduled { + background-color: #bee5a9; +} + +span.z-dottree-ico, span.z-dottree-line { + min-height:22px; +} \ No newline at end of file diff --git a/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul b/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul index 6d8cf3ef0..7792a553a 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul @@ -59,15 +59,16 @@ onSelect="orderElementTreeController.updateControlButtons(event)" model="@{orderElementTreeController.orderElementTreeModel}" treeitemRenderer="@{orderElementTreeController.renderer}" pageSize="10" - sclass="orderTree"> - + sclass="orderTree" + zclass="z-dottree"> + - - - + + +