From fc424944d109146cf46b0d3dd698d9811a45dcc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Mon, 26 Nov 2012 09:44:03 +0100 Subject: [PATCH] Exposed project and tasks codes from fundamental properties to generate entry point URLs FEA: ItEr77S03Community --- .../ganttz/data/DefaultFundamentalProperties.java | 10 ++++++++++ .../zkoss/ganttz/data/ITaskFundamentalProperties.java | 4 ++++ ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java | 7 +++++++ .../business/planner/entities/TaskElement.java | 8 ++++++++ .../org/libreplan/web/planner/TaskElementAdapter.java | 10 ++++++++++ 5 files changed, 39 insertions(+) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java index 68387ac79..c61501d22 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java @@ -323,4 +323,14 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties return null; } + @Override + public String getCode() { + return ""; + } + + @Override + public String getProjectCode() { + return ""; + } + } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java index 461366b35..5091fd276 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java @@ -131,4 +131,8 @@ public interface ITaskFundamentalProperties { Date getLastTimesheetDate(); + public String getCode(); + + public String getProjectCode(); + } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java index 911362273..51c39df21 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java @@ -570,4 +570,11 @@ public abstract class Task implements ITaskFundamentalProperties { getEndDate()); } + public String getCode() { + return fundamentalProperties.getCode(); + } + + public String getProjectCode() { + return fundamentalProperties.getProjectCode(); + } } diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java index 3d7360085..767781861 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java @@ -250,6 +250,14 @@ public abstract class TaskElement extends BaseEntity { return name; } + public String getCode() { + return getOrderElement().getCode(); + } + + public String getProjectCode() { + return getOrderElement().getOrder().getCode(); + } + public void setName(String name) { this.name = name; if (taskSource != null && taskSource.getOrderElement() != null) { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java index 9c5a003f3..7d44fcb41 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java @@ -467,6 +467,16 @@ public class TaskElementAdapter { return taskElement.getName(); } + @Override + public String getCode() { + return taskElement.getCode(); + } + + @Override + public String getProjectCode() { + return taskElement.getProjectCode(); + } + @Override public String getNotes() { return taskElement.getNotes();