From 3b25bed168edc1066109467c8c5f2f6e81a6d75e Mon Sep 17 00:00:00 2001
From: Fredrik Norberg <fnorbe@dsv.su.se>
Date: Mon, 25 Jul 2011 16:20:36 +0200
Subject: [PATCH] added daysOffset to projecteventtemplate
---
.../data/dataobjects/ProjectEventTemplate.java | 15 +++++++++++++++
.../se/su/dsv/scipro/util/TemplateGenerator.java | 7 ++-----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/data/dataobjects/ProjectEventTemplate.java b/src/main/java/se/su/dsv/scipro/data/dataobjects/ProjectEventTemplate.java
index 38811fcf5b..9e5f128247 100644
--- a/src/main/java/se/su/dsv/scipro/data/dataobjects/ProjectEventTemplate.java
+++ b/src/main/java/se/su/dsv/scipro/data/dataobjects/ProjectEventTemplate.java
@@ -38,6 +38,9 @@ public class ProjectEventTemplate extends DomainObject implements Comparable<Pro
@Column(nullable=false)
private long estimatedTimeConsumption = 0;
+ @Column(nullable=false)
+ private int daysOffset;
+
@Column(nullable=false)
private boolean requireHandIn = false;
@@ -46,6 +49,10 @@ public class ProjectEventTemplate extends DomainObject implements Comparable<Pro
public ProjectEventTemplate(){}
+ public ProjectEventTemplate(int daysOffset){
+ this.daysOffset = daysOffset;
+ }
+
public Long getId() {
return id;
}
@@ -53,6 +60,14 @@ public class ProjectEventTemplate extends DomainObject implements Comparable<Pro
public void setId(Long id) {
this.id = id;
}
+
+ public void setdaysOffset(int daysOffset){
+ this.daysOffset = daysOffset;
+ }
+
+ public int getDaysOffset(){
+ return daysOffset;
+ }
public String getTitle() {
return title;
diff --git a/src/main/java/se/su/dsv/scipro/util/TemplateGenerator.java b/src/main/java/se/su/dsv/scipro/util/TemplateGenerator.java
index 5ef62a4209..88b60484a9 100644
--- a/src/main/java/se/su/dsv/scipro/util/TemplateGenerator.java
+++ b/src/main/java/se/su/dsv/scipro/util/TemplateGenerator.java
@@ -38,6 +38,7 @@ public class TemplateGenerator { //based on ScheduleGenerator
private int templateEstimatedDays = 0;
private int durationInDays = 0;
+ private int daysOffset;
private DateMidnight startDate;
@@ -58,10 +59,6 @@ public class TemplateGenerator { //based on ScheduleGenerator
}else{
this.startDate = new DateMidnight(projectEvents.first().getDueDate());
}
-
-
-
-
}
public ScheduleTemplate generate(){
@@ -93,7 +90,7 @@ public class TemplateGenerator { //based on ScheduleGenerator
pet.setNumberInOrder(counter);
pet.setRequireHandIn(pe.isRequireHandIn());
pet.setScheduleTemplate(template);
-
+ måste få in daysOffset i projectEventTemplate
datePointer = datePointer.plusDays(durationInDays);
templateEstimatedDays += durationInDays;