diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java index 16d32496b..e1a79cddd 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java @@ -62,6 +62,8 @@ public class TaskComponent extends Div implements AfterCompose { private static final Log LOG = LogFactory.getLog(TaskComponent.class); private static final int HEIGHT_PER_TASK = 10; + private static final int CONSOLIDATED_MARK_HALF_WIDTH = 3; + private static Pattern pixelsSpecificationPattern = Pattern .compile("\\s*(\\d+)px\\s*;?\\s*"); @@ -438,7 +440,7 @@ public class TaskComponent extends Div implements AfterCompose { response(null, new AuInvoke(this, "moveDeadline", position)); } if (task.getConsolidatedline() != null) { - String position = getMapper().toPixels(task.getConsolidatedline()) + String position = (getMapper().toPixels(task.getConsolidatedline()) - CONSOLIDATED_MARK_HALF_WIDTH) + "px"; response(null, new AuInvoke(this, "moveConsolidatedline", position)); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java index e527cb8da..e3af953d9 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java @@ -552,7 +552,7 @@ public class TaskElementAdapter implements ITaskElementAdapter { if (consolidatedline == null) { return null; } - return consolidatedline.minusDays(1).toDateTimeAtStartOfDay() + return consolidatedline.toDateTimeAtStartOfDay() .toDate(); }