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

[Bug #758] Fix bug

Browse source 
Changed deadline styles from zigzag to stright line and adapted background-positioning

FEA: ItEr65S06BugFixing
This commit is contained in:
Lorenzo Tilve 2010-12-15 18:09:07 +01:00
parent 988b911365
commit 7c36182be7
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,8 +36,8 @@ import org.zkoss.ganttz.adapters.IDisabilityConfiguration;
import org.zkoss.ganttz.data.GanttDate;
import org.zkoss.ganttz.data.Milestone;
import org.zkoss.ganttz.data.Task;
import org.zkoss.ganttz.data.Task.IReloadResourcesTextRequested;
import org.zkoss.ganttz.data.TaskContainer;
import org.zkoss.ganttz.data.Task.IReloadResourcesTextRequested;
import org.zkoss.ganttz.data.constraint.Constraint;
import org.zkoss.ganttz.data.constraint.Constraint.IConstraintViolationListener;
import org.zkoss.lang.Objects;
@ -65,6 +65,7 @@ public class TaskComponent extends Div implements AfterCompose {
private static final int HEIGHT_PER_TASK = 10;
private static final int CONSOLIDATED_MARK_HALF_WIDTH = 3;
private static final int HALF_DEADLINE_MARK = 3;
private static Pattern pixelsSpecificationPattern = Pattern
@ -498,8 +499,8 @@ public class TaskComponent extends Div implements AfterCompose {
private void updateDeadline() {
if (task.getDeadline() != null) {
String position = getMapper().toPixels(
LocalDate.fromDateFields(task.getDeadline()))
String position = (getMapper().toPixels(
LocalDate.fromDateFields(task.getDeadline())) - HALF_DEADLINE_MARK)
+ "px";
response(null, new AuInvoke(this, "moveDeadline", position));
} else {

2
ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailItem.java
View file

@ -98,7 +98,7 @@ public final class DetailItem {
.daysBetween(this.startDate, this.endDate).getDays()))
* this.size);
// Management of left border case for current line format
this.markDeadlineDay(Math.min((this.size - 6), offsetInPx));
this.markDeadlineDay(Math.min(this.size - 1, offsetInPx));
}
}

4
navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
View file

@ -410,7 +410,7 @@ div.box.limiting-unassigned {
#watermark .timetracker_column_today.timetracker_column_deadline,
#watermark .timetracker_column_deadline.timetracker_column_today {
background-image: url("../../zkau/web/ganttz/img/watermark_deadline.png");
background-image: url("../../zkau/web/ganttz/img/pixel.gif");
}
/* Background image for current day vertical line */
@ -421,7 +421,7 @@ div.box.limiting-unassigned {
#watermark .timetracker_column_deadline {
background-image:
url("../../zkau/web/ganttz/img/watermark_deadline.png");
url("../../zkau/web/ganttz/img/pixel.gif");
background-repeat: repeat-y;
}