You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/01/20 15:03:47 UTC
svn commit: r736023 -
/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy
Author: hansbak
Date: Tue Jan 20 06:03:47 2009
New Revision: 736023
URL: http://svn.apache.org/viewvc?rev=736023&view=rev
Log:
only show not cancelled tasks in the ganntcgart, this after a suggestion from the mailing list (also removed some tabs)
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy?rev=736023&r1=736022&r2=736023&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy Tue Jan 20 06:03:47 2009
@@ -22,6 +22,10 @@
import org.ofbiz.entity.*;
import org.ofbiz.base.util.*;
import org.ofbiz.entity.util.*;
+import org.ofbiz.entity.condition.EntityCondition;
+import org.ofbiz.entity.condition.EntityConditionList;
+import org.ofbiz.entity.condition.EntityExpr;
+import org.ofbiz.entity.condition.EntityOperator;
import java.math.*;
projectId = parameters.projectId;
@@ -62,7 +66,12 @@
}
newPhase.workEffortTypeId = "PHASE";
ganttList.add(newPhase);
- tasks = delegator.findByAnd("WorkEffort", ["workEffortParentId" : phase.phaseId], ["workEffortName"]);
+ cond = EntityCondition.makeCondition(
+ [
+ EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "PTS_CANCELLED"),
+ EntityCondition.makeCondition("workEffortParentId", EntityOperator.EQUALS, phase.phaseId)
+ ], EntityOperator.AND);
+ tasks = delegator.findList("WorkEffort", cond, null, ["workEffortName"], null, false);
if (tasks){
tasks.each { task ->
resultTaskInfo = dispatcher.runSync("getProjectTask", [userLogin : userLogin , taskId : task.workEffortId]);
@@ -70,7 +79,7 @@
taskInfo.taskNr = task.workEffortId;
taskInfo.phaseNr = phase.phaseId;
if (taskInfo.plannedHours && !taskInfo.currentStatusId.equals("PTS_COMPLETED") && taskInfo.plannedHours > taskInfo.actualHours) {
- taskInfo.resource = taskInfo.plannedHours + " Hrs";
+ taskInfo.resource = taskInfo.plannedHours + " Hrs";
} else {
taskInfo.resource = taskInfo.actualHours + " Hrs";
}
@@ -78,11 +87,11 @@
if (taskInfo.currentStatusId.equals("PTS_COMPLETED")) {
taskInfo.completion = 100;
} else {
- if (taskInfo.actualHours && taskInfo.plannedHours) {
- taskInfo.completion = new BigDecimal(taskInfo.actualHours * 100 / taskInfo.plannedHours).setScale(0, BigDecimal.ROUND_UP);
- } else {
- taskInfo.completion = 0;
- }
+ if (taskInfo.actualHours && taskInfo.plannedHours) {
+ taskInfo.completion = new BigDecimal(taskInfo.actualHours * 100 / taskInfo.plannedHours).setScale(0, BigDecimal.ROUND_UP);
+ } else {
+ taskInfo.completion = 0;
+ }
}
if (!taskInfo.estimatedStartDate && taskInfo.actualStartDate) {
taskInfo.estimatedStartDate = taskInfo.actualStartDate;
@@ -102,9 +111,9 @@
taskInfo.estimatedCompletionDate = UtilDateTime.toDateString(taskInfo.estimatedCompletionDate, "MM/dd/yyyy");
taskInfo.workEffortTypeId = "TASK";
if (security.hasEntityPermission("PROJECTMGR", "_READ", session) || security.hasEntityPermission("PROJECTMGR", "_ADMIN", session)) {
- taskInfo.url = "/projectmgr/control/taskView?workEffortId="+task.workEffortId;
+ taskInfo.url = "/projectmgr/control/taskView?workEffortId="+task.workEffortId;
} else {
- taskInfo.url = "";
+ taskInfo.url = "";
}
// dependency can only show one in the ganttchart, so onl show the latest one..
@@ -112,13 +121,13 @@
latestTaskId = "";
Timestamp latestDate = null;
preTasks.each { preTask ->
- wf = preTask.getRelatedOne("FromWorkEffort");
- if (wf.estimatedStartDate) {
- if (!latestDate || latestDate.before(wf.estimatedStartDate)) {
- latestTaskId = wf.workEffortId;
- latestDate = wf.estimatedStartDate;
- }
- }
+ wf = preTask.getRelatedOne("FromWorkEffort");
+ if (wf.estimatedStartDate) {
+ if (!latestDate || latestDate.before(wf.estimatedStartDate)) {
+ latestTaskId = wf.workEffortId;
+ latestDate = wf.estimatedStartDate;
+ }
+ }
}
if (latestDate) {
taskInfo.preDecessor = latestTaskId;