ItEr13S14ArquitecturaClientesItEr11S12: Task height recalculation adjustments and CSS refactorization

navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java

@@ -35,7 +35,7 @@ import org.zkoss.zul.impl.XulElement;
  */
 public class TaskList extends XulElement implements AfterCompose {
 
-    private static final int HEIGHT_PER_ROW = 31;
+    private static final int HEIGHT_PER_ROW = 30;
 
     private List<WeakReference<DependencyAddedListener>> listeners = new LinkedList<WeakReference<DependencyAddedListener>>();
 

navalplanner-gantt-zk/src/main/resources/web/ganttz/task.dsp

@@ -6,7 +6,7 @@
 
 
 <div id="row${self.uuid}" class="row" z.valor="boxid="${self.uuid}">
-    <div id="${self.uuid}" z.type="ganttz.task.Task" idTask="${self.id}" z.autoz="true"${self.outerAttrs}">
+    <div id="${self.uuid}" z.type="ganttz.task.Task" idTask="${self.id}" z.autoz="true"${self.outerAttrs}" class="box">
         <span id="${self.uuid}!real">${self.taskName}</span>
         <div id="completion${self.uuid}" class="completion"></div>
     </div>

navalplanner-gantt-zk/src/main/resources/web/js/ganttz/tasklist.js

@@ -1,3 +1,6 @@
+HEIGHT_PER_ROW = 30;
+HEIGHT_TIME_TRACKER = 130;
+
 zkTasklist = {};
 
 zkTasklist.init = function(cmp) {
@@ -17,16 +20,13 @@ zkTasklist.adjust_height = function(cmp) {
         element.style["height"] = newheigth + 'px';
     }
 
-    setHeight(document.getElementById('ganttpanel'), 120);/*
+    setHeight(document.getElementById('ganttpanel'), HEIGHT_TIME_TRACKER);
-                                                             * timetracker
-                                                             * height
-                                                             */
     if (component_to_adjust) {
         setHeight(component_to_adjust);
     }
     var found = YAHOO.util.Selector.query(".fake_column", component_to_adjust,
             false);
     found.each( function(element) {
-        setHeight(element);
+        setHeight(element,HEIGHT_PER_ROW);
     });
 }

navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java

@@ -62,4 +62,4 @@ public class DataForPlanner {
         return calendar.getTime();
     }
 
-}
+}

navalplanner-webapp/src/main/webapp/common/css/navalpro.css

@@ -1,123 +1,3 @@
-/* ProductionManagement Global Styles */
-
-/*** Tasks ***/
-#listtasks {
-    position:relative;
-    width:400px; /** Constants */
-    top:100px;
-}
-
-.listdetails {
-    width:200px;
-    float:left;
-    margin-top:80px;
-}
-
-.listdetails table {
-    height:30px;
-}
-
-.listdetails td {
-    padding-left:3px;
-}
-
-.listdetails input {
-    width: 90px;
-}
-
-
-.z-datebox-inp {
-    width:100px;
-}
-
-
-/* Task box properties */
-.yui-resize {
-    border: 1px solid;
-    text-align:center;
-    vertical-align: middle;
-    font-size:0.8em;
-    z-index:10;
-    cursor: pointer;
-    cursor: hand;
-}
-
-/* Task lane properties */
-.row {
-    height: 19px;
-    border-bottom: dotted 1px #CCCCCC;
-    margin-bottom: 10px;
-    margin-top: 10px;
-    width: 1800px;
-}
-
-
-/*** Dependencies ***/
-#listdependencies {
-    position:relative;
-    width:400px;
-    float:left;
-    top:0px; /* Should be -60, recalc. redrawing deps. */
-}
-
-.dependence {
-    z-index:1;
-    position: absolute;
-}
-
-.end, .start, .mid, .arrow {
-    position:absolute;
-    padding:4px;
-    cursor: crosshair;
-}
-
-.end, .start {
-    height:1px;
-}
-
-.mid {
-    width:1px;
-}
-
-.footer {
-    clear:both;
-    margin:20px;
-    font-size: 12px;
-}
-
-
-/* Width: ganttpanel constant,
-Height: is recalculated on number of tasks */
-#ganttpanel {
-    /* border: 1px solid; */
-    height:400px;
-    width: 900px;
-    overflow-x: scroll;
-}
-
-#ganttpanel table {
-    float:left;
-    padding:0;
-    margin:0;
-    overflow:hidden;
-}
-
-#ganttpanel table td {
-    padding:0;
-}
-
-.fake_column.timetracker_column_even {
-    background-color: #EEEEEE;
-}
-
-.timetracker_fake_row {
-    height: 80px;
-}
-
-/*
-.extra_padding {
-padding: 6px;
-} */
 
 .logo {
     background-image: url("../img/v3/blue_ga.jpg");
@@ -192,3 +72,9 @@ table {
 .z-button-br {
     background-image: none !important;
 }
+
+.footer {
+    clear:both;
+    margin:20px;
+    font-size: 12px;
+}

navalplanner-webapp/src/main/webapp/planner/css/productionmanagement.css

@@ -1,16 +1,16 @@
-/* ProductionManagement Global Styles */
+/* Planificator specific styles */
 
 /*** Tasks ***/
 #listtasks {
     position:relative;
-    width:400px; /** Constants */
+    width:400px;
     top:100px;
 }
 
 .listdetails {
     width:200px;
     float:left;
-    margin-top:80px;
+    margin-top:79px;
 }
 
 .listdetails table {
@@ -32,7 +32,7 @@
 
 
 /* Task box properties */
-.yui-resize {
+.yui-resize, .box {
     border: 1px solid;
     text-align:center;
     vertical-align: middle;
@@ -57,7 +57,7 @@
     position:relative;
     width:400px;
     float:left;
-    top:0px; /* Should be -60, recalc. redrawing deps. */
+    top:0px;
 }
 
 .dependence {
@@ -79,16 +79,9 @@
     width:1px;
 }
 
-.footer {
-    clear:both;
-    margin:20px;
-}
-
-
 /* Width: ganttpanel constant,
 Height: is recalculated on number of tasks */
 #ganttpanel {
-    /* border: 1px solid; */
     height:400px;
     width: 900px;
     overflow-x: scroll;
@@ -113,29 +106,6 @@ Height: is recalculated on number of tasks */
     height: 80px;
 }
 
-/*
-.extra_padding {
-padding: 6px;
-} */
-
-.logo {
-    background-image: url("../img/v3/blue_ga.jpg");
-    height:50px;
-    width:300px;
-    height:100px;
-    float:left;
-    clear:both;
-    position:absolute;
-}
-
-.vision {
-}
-
-.headings {
-    /* height:90px; */
-    height:90px;
-}
-
 table {
     margin:0px;
     padding:0px;