RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr59S04ValidacionEProbasFuncionaisItEr58S04: Shifted right consolidation mark till the end of last consolidated day

Browse source
This commit is contained in:
Lorenzo Tilve 2010-06-09 17:56:43 +02:00 • committed by Javier Moran Rua
parent 633d9f7e30
commit d98e090ce5
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
View file

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

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
View file

@ -552,7 +552,7 @@ public class TaskElementAdapter implements ITaskElementAdapter {
if (consolidatedline == null) {
return null;
}
return consolidatedline.minusDays(1).toDateTimeAtStartOfDay()
return consolidatedline.toDateTimeAtStartOfDay()
.toDate();
}