ItEr35S04XestionDaComunidadeItEr34S04: Changed mold in orderElement tree and applied styles to scheduling state column

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();
         }
 

navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul

@@ -25,9 +25,10 @@
     </zscript>
     <div>
     <label value="${top.buttonLabel}" />
-    <button label="${i18n:_('Schedule')}" visible="${top.scheduleButtonVisible}"
+    <button tooltiptext="${i18n:_('Schedule')}" visible="${top.scheduleButtonVisible}" sclass="icono"
+	image="/common/img/ico_planificador1.png" hoverImage="/common/img/ico_planificador.png"
         onClick="top.schedule();"/>
     <button label="${i18n:_('Unschedule')}" visible="${top.unscheduleButtonVisible}"
         onClick="top.unschedule();"/>
     </div>
-</zk>
+</zk>

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;
+}

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">
-            <treecols sizable="false">
+            sclass="orderTree"
+            zclass="z-dottree">
+            <treecols sizable="true">
                 <treecol label="${i18n:_('Scheduling state')}" class="scheduling_state"/>
-                <treecol label="${i18n:_('Name and description')}" class="name"/>
                 <treecol label="${i18n:_('Code')}" class="code"/>
-                <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:_('Name and description')}" class="name"/>
+                <treecol label="${i18n:_('Must start after')}" class="estimated_init"/>
+                <treecol label="${i18n:_('Deadline')}" class="estimated_end"/>
                 <treecol label="${i18n:_('Operations')}" class="operations"
                     tooltiptext="${i18n:_('Click on the icons to execute operation in the order element')}"/>
             </treecols>