OFBiz › OFBiz - Commits

svn commit: r599021 - in /ofbiz/trunk/specialpurpose/projectmgr: config/ webapp/projectmgr/WEB-INF/actions/ widget/ widget/forms/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

hansbak-2

svn commit: r599021 - in /ofbiz/trunk/specialpurpose/projectmgr: config/ webapp/projectmgr/WEB-INF/actions/ widget/ widget/forms/

Author: hansbak
Date: Wed Nov 28 07:13:19 2007
New Revision: 599021

URL: http://svn.apache.org/viewvc?rev=599021&view=rev
Log:
rename request parameter workeffortidfrom to projectId, remove skill standard from project, is only defined on task level

Modified:
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh
ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=599021&r1=599020&r2=599021&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Wed Nov 28 07:13:19 2007
@@ -22,7 +22,8 @@
nl=Dutch

# Override Page and Label title
-
+PageTitleAddDependency=Add Dependency
+PageTitleAddPartyAssign=Add Party Assign
PageTitleAddProject=Add Project
PageTitleAddPhase=Add Phase
PageTitleAddProjectNotes=Add Project Notes
@@ -31,8 +32,8 @@
PageTitleAddSubTask=Add Sub Task
PageTitleAddTask=Add Task
PageTitleAddTaskNotes=Add Task Notes
-PageTitleListTaskNotes=List Task Notes
PageTitleAddTimeEntry=Add Time Entry
+PageTitleDependencies=Task dependencies
PageTitleEditProject=Edit Project
PageTitleEditPhase=Edit Phase
PageTitleEditSkill=Edit Skill
@@ -44,12 +45,12 @@
PageTitleFindSubProject=Find Sub Project
PageTitleFindSubTask=Find Sub Task
PageTitleFindTask=Find Task
-PageTitleUnassignedTask=Unassigned Task
-PageTitleAddPartyAssign=Add Party Assign
PageTitleListPartyAssigns=Party Assigns
PageTitleListProjectNotes=List Project Notes
-PageTitleTasksAfter=Tasks to be executed before the current task
+PageTitleListTaskNotes=List Task Notes
+PageTitleTasksBefore=Tasks to be executed before the current task
PageTitleTasksAfter=Tasks to be executed after the current task
+PageTitleUnassignedTask=Unassigned Task
ProjectMgrActualHours=Actual Hours
ProjectMgrCompanyName=Ofbiz Company
ProjectMgrCompanySubtitle=Project
@@ -69,12 +70,13 @@
ProjectMgrNotesCreateNew=Create New
ProjectMgrPartyList=List of Parties
ProjectMgrProjectCurrent=Current Project
-ProjectMgrProjectName=Project Name
-ProjectMgrProjectSummary=Project Summary
-ProjectMgrProjectTeam=Project Team
ProjectMgrPhaseDetails=Enter the Phase Details below
+ProjectMgrPhaseName=Phase Name
ProjectMgrPhases=Phases
ProjectMgrPhaseTaskList=List of Phases and Tasks
+ProjectMgrProjectName=Project Name
+ProjectMgrProjectSummary=Project Summary
+ProjectMgrProjectTeam=Project Team
ProjectMgrPartySkills=Party Skills
ProjectMgrSkillStandards=Skill Standards
ProjectMgrSkillType=Skill Type

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh?rev=599021&r1=599020&r2=599021&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh Wed Nov 28 07:13:19 2007
@@ -26,9 +26,7 @@
import org.ofbiz.entity.util.EntityUtil;
import javolution.util.FastMap;

-if(workEffortIdFrom == null) {
- workEffortIdFrom = parameters.get("workEffortIdFrom");
-}
+workEffortIdFrom = parameters.get("projectId");
workEffortTypeId = parameters.get("workEffortTypeId");

if(workEffortIdFrom != null) {

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh?rev=599021&r1=599020&r2=599021&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh Wed Nov 28 07:13:19 2007
@@ -1,5 +1,4 @@
/*
-/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -27,7 +26,9 @@

if (parameters.get("workEffortId") != null) {
workEffortId = parameters.get("workEffortId");
- project = delegator.findByAnd("ProjectAndPhaseAndTask", UtilMisc.toMap("workEffortId", workEffortId)).get(0);
- context.put("projectId", project.getString("projectId"));
- context.put("projectName", project.getString("projectName"));
+ project = delegator.findByAnd("ProjectAndPhaseAndTask", UtilMisc.toMap("workEffortId", workEffortId));
+ if (UtilValidate.isNotEmpty(project)) {
+ context.put("projectId", project.get(0).getString("projectId"));
+ context.put("projectName", project.get(0).getString("projectName"));
+ }
}

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=599021&r1=599020&r2=599021&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Wed Nov 28 07:13:19 2007
@@ -58,9 +58,9 @@
<section>
<actions>
<set field="headerItem" value="projects"/>
- <set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/>
+ <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
<entity-one entity-name="WorkEffort" value-name="project">
- <field-map field-name="workEffortId" env-name="parameters.workEffortIdFrom"/>
+ <field-map field-name="workEffortId" env-name="projectId"/>
</entity-one>
</actions>
<widgets>
@@ -97,7 +97,6 @@
<screen name="CommonTaskDecorator">
<section>
<actions>
- <set field="headerItem" value="mytasks"/>
<entity-one entity-name="WorkEffort" value-name="workEffort"/>
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh"/>
</actions>
@@ -120,7 +119,6 @@
<label style="head1" text="${uiLabelMap.ProjectMgrTaskCurrent}: ${workEffort.workEffortName}[${workEffort.workEffortId}] Project: ${projectName}"/>
</widgets>
</section>
-
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=599021&r1=599020&r2=599021&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Wed Nov 28 07:13:19 2007
@@ -40,15 +40,15 @@
</menu-item>
</menu>
<menu name="ProjectTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected">
- <menu-item name="projectView" title="${uiLabelMap.ProjectMgrProjectSummary}"><link target="projectView?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item>
- <menu-item name="editproject" title="${uiLabelMap.ProjectMgrEditPoject}"><link target="EditProject?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item>
- <menu-item name="phases" title="${uiLabelMap.ProjectMgrPhases}"><link target="FindPhase?workEffortIdFrom=${parameters.workEffortIdFrom}&workEffortTypeId=PHASE&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>
- <menu-item name="tasks" title="${uiLabelMap.ProjectMgrTasks}"><link target="FindTask?workEffortIdFrom=${parameters.workEffortIdFrom}&workEffortTypeId=TASK&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>
- <menu-item name="subprojects" title="${uiLabelMap.ProjectMgrSubProjects}"><link target="FindProject?workEffortIdFrom=${parameters.workEffortIdFrom}&workEffortTypeId=PROJECT&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>
- <menu-item name="notes" title="${uiLabelMap.CommonNotes}"><link target="EditWorkEffortNotes?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item>
- <menu-item name="projectskills" title="${uiLabelMap.ProjectMgrSkillStandards}"><link target="EditProjectSkills?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item>
- <menu-item name="parties" title="${uiLabelMap.ProjectMgrParties}"><link target="ListWorkEffortPartyAssigns?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item>
- <menu-item name="treeDetails" title="${uiLabelMap.ProjectMgrTreeDetails}"><link target="ChildWorkEfforts?workEffortIdFrom=${parameters.workEffortIdFrom}&trail=${workEffortId}&workEffortTypeId=PROJECT&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>
+ <menu-item name="projectView" title="${uiLabelMap.ProjectMgrProjectSummary}"><link target="projectView?projectId=${parameters.projectId}"/></menu-item>
+ <menu-item name="editproject" title="${uiLabelMap.ProjectMgrEditPoject}"><link target="EditProject?projectId=${parameters.projectId}"/></menu-item>
+ <menu-item name="phases" title="${uiLabelMap.ProjectMgrPhases}"><link target="FindPhase?projectId=${parameters.projectId}&workEffortTypeId=PHASE&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>
+ <menu-item name="tasks" title="${uiLabelMap.ProjectMgrTasks}"><link target="FindTask?projectId=${parameters.projectId}"/></menu-item>
+ <menu-item name="parties" title="${uiLabelMap.ProjectMgrParties}"><link target="ListWorkEffortPartyAssigns?projectId=${parameters.projectId}"/></menu-item>
+ <menu-item name="notes" title="${uiLabelMap.CommonNotes}"><link target="EditWorkEffortNotes?projectId=${parameters.projectId}"/></menu-item>
+ <menu-item name="subprojects" title="${uiLabelMap.ProjectMgrSubProjects}"><link target="FindProject?projectId=${parameters.projectId}&workEffortTypeId=PROJECT&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>
+ 
+ <menu-item name="treeDetails" title="${uiLabelMap.ProjectMgrTreeDetails}"><link target="ChildWorkEfforts?projectId=${parameters.projectId}&trail=${workEffortId}&workEffortTypeId=PROJECT&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item>
</menu>
<menu name="TaskTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected">
<menu-item name="taskView" title="${uiLabelMap.ProjectMgrTaskSummary}"><link target="taskView?workEffortId=${workEffortId}"/></menu-item>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=599021&r1=599020&r2=599021&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed Nov 28 07:13:19 2007
@@ -27,8 +27,9 @@
<set field="tabButtonItem" value="subprojects"/>
<set field="labelTitleProperty" value="ProjectMgrProjectName"/>
<set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/FindProject"/>
- <set field="workEffortId" from-field="parameters.workEffortIdFrom"/>
- <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
+ <set field="workEffortId" from-field="parameters.projectId"/>
+ <set field="parameters.workEffortIdFrom" from-field="parameters.projectId"/>
+ <set field="projectId" from-field="parameters.projectId"/>
<set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/>
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh"/>
</actions>
@@ -37,7 +38,7 @@
<decorator-section name="body">
<section>
<condition>
- 
+ <if-empty field-name="workEffortId"/>
</condition>

<widgets>
@@ -73,7 +74,7 @@
<set field="titleProperty" value="PageTitleFindProject"/>
<set field="labelTitleProperty" value="ProjectMgrProjectName"/>
<set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/FindProject"/>
- <set field="workEffortId" from-field="parameters.workEffortIdFrom"/>
+ <set field="workEffortId" from-field="parameters.projectId"/>
<set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/>
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListProjectsByDateRange.bsh"/>
</actions>
@@ -100,9 +101,9 @@
<set field="titleProperty" value="PageTitleEditProject"/>
<set field="tabButtonItem" value="editproject"/>
<set field="labelTitleProperty" value="PageTitleEditProject"/>
- <set field="workEffortId" from-field="parameters.workEffortIdFrom"/>
+ <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
<service service-name="getProject" result-map-name="result">
- <field-map field-name="projectId" env-name="parameters.workEffortIdFrom"/>
+ <field-map field-name="projectId" env-name="projectId"/>
</service>
<set field="project" from-field="result.projectInfo"/>
</actions>
@@ -204,13 +205,13 @@
<set field="titleProperty" value="PageTitleEditTask"/>
<set field="tabButtonItem" value="tasks"/>
<set field="labelTitleProperty" value="PageTitleFindTask"/>
- <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
+ <set field="projectId" from-field="parameters.projectId"/>
<entity-and entity-name="ProjectAndPhaseAndTask" list-name="tasks">
- <field-map field-name="projectId" env-name="parameters.workEffortIdFrom"/>
+ <field-map field-name="projectId" env-name="parameters.projectId"/>
<order-by field-name="phaseName"/>
<order-by field-name="workEffortName"/>
</entity-and>
- <set field="task" from-field=""/>
+ <set field="task" value=""/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -244,7 +245,6 @@
</widgets>
</section>
</screen>
- 
<screen name="EditTask">
<section>
<actions>
@@ -252,7 +252,7 @@
<set field="tabButtonItem" value="edittask"/>
<set field="labelTitleProperty" value="ProjectMgrTaskName"/>
<set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/FindTasks"/>
- <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
+ <set field="projectId" from-field="parameters.projectId"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
<set field="workEffortAssocTypeId" from-field="parameters.workEffortAssocTypeId"/>
<set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/>
@@ -334,7 +334,7 @@
<set field="titleProperty" value="PageTitleEditPhase"/>
<set field="tabButtonItem" value="phases"/>
<set field="labelTitleProperty" value="PageTitleFindPhase"/>
- <set field="projectId" from-field="parameters.workEffortIdFrom"/>
+ <set field="projectId" from-field="parameters.projectId"/>
<service service-name="getProjectPhaseList" result-map-name="result">
<field-map field-name="projectId" env-name="projectId"/>
</service>
@@ -352,7 +352,7 @@
<container style="screenlet">
<container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.${titleProperty}}</label></container>
<container style="screenlet-body">
- 
+ 
<include-form name="ListPhases" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
</container>
</container>
@@ -375,7 +375,7 @@
<set field="titleProperty" value="PageTitleListWorkEffortPartyAssigns"/>
<set field="tabButtonItem" value="parties"/>
<set field="labelTitleProperty" value="PageTitleListWorkEffortPartyAssigns"/>
- <set field="workEffortId" from-field="parameters.workEffortIdFrom"/>
+ <set field="workEffortId" from-field="parameters.projectId"/>
<entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
</actions>
<widgets>
@@ -404,7 +404,7 @@
<set field="titleProperty" value="PageTitleEditSkill"/>
<set field="tabButtonItem" value="projectskills"/>
<set field="labelTitleProperty" value="PageTitleEditSkill"/>
- <set field="workEffortId" from-field="parameters.workEffortIdFrom" default-value="${parameters.workEffortId}"/>
+ <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
<entity-and entity-name="WorkEffortSkillStandard" list-name="workEffortSkillStandardList">
<field-map field-name="workEffortId"/>
</entity-and>
@@ -435,7 +435,7 @@
<actions>
<set field="tabButtonItem" value="parties"/>
<set field="partyId" from-field="parameters.partyId"/>
- <set field="workEffortId" from-field="parameters.workEffortIdFrom"/>
+ <set field="workEffortId" from-field="parameters.projectId"/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -490,8 +490,8 @@
<set field="titleProperty" value="PageTitleListProjectNotes"/>
<set field="tabButtonItem" value="notes"/>
<set field="labelTitleProperty" value="PageTitleListProjectNotes"/>
- <set field="workEffortId" from-field="parameters.workEffortIdFrom" default-value="${parameters.workEffortId}"/>
- <set field="parameters.workEffortIdFrom" from-field="workEffortId"/>
+ <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
+ <set field="parameters.projectId" from-field="workEffortId"/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -515,8 +515,8 @@
<section>
<actions>
<set field="tabButtonItem" value="projectView"/>
- <set field="workEffortId" from-field="parameters.workEffortIdFrom"/>
- <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
+ <set field="workEffortId" from-field="parameters.projectId"/>
+ <set field="projectId" from-field="parameters.projectId"/>
<entity-one entity-name="WorkEffort" value-name="project"/>
</actions>
<widgets>
@@ -565,7 +565,7 @@
<screen name="SubProjectsInfo">
<section>
<actions>
- <set field="parameters.workEffortIdFrom" from-field="parameters.workEffortId"/>
+ <set field="parameters.projectId" from-field="parameters.workEffortId"/>
<set field="parameters.workEffortTypeId" value="PROJECT"/>
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh"/>
</actions>
@@ -585,7 +585,7 @@
<section>
<actions>
<entity-and entity-name="ProjectAndPhaseAndTask" list-name="phases">
- <field-map field-name="projectId" env-name="parameters.workEffortIdFrom"/>
+ <field-map field-name="projectId" env-name="parameters.projectId"/>
</entity-and>
</actions>
<widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=599021&r1=599020&r2=599021&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Wed Nov 28 07:13:19 2007
@@ -23,11 +23,9 @@
<screen name="Dependencies">
<section>
<actions>
- <set field="titleProperty" value="PageTitleUnassignedTask"/>
+ <set field="titleProperty" value="PageTitleDependencies"/>
<set field="tabButtonItem" value="dependencies"/>
- <set field="labelTitleProperty" value="PageTitleFindTask"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
- <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh"/>
</actions>
<widgets>
@@ -281,7 +279,7 @@
<actions>
<set field="tabButtonItem" value="taskView"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
- <set field="workEffortIdFrom" from-field="parameters.workEffortId"/>
+ <set field="projectId" from-field="parameters.workEffortId"/>
<entity-one entity-name="WorkEffort" value-name="task"/>
</actions>
<widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=599021&r1=599020&r2=599021&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed Nov 28 07:13:19 2007
@@ -20,7 +20,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<form name="EditProject" type="single" target="updateProject" default-map-name="project">
<alt-target use-when="project==null" target="createProject"/>
- <field name="workEffortIdFrom"><hidden value="${parameters.workEffortIdFrom}"/></field>
+ <field name="projectId"><hidden value="${parameters.projectId}"/></field>
<field name="DONE_PAGE"><hidden value="${donePage}"/></field>
<field name="workEffortTypeId"><hidden value="PROJECT"/></field>
<field name="projectId" parameter-name="workEffortId"><hidden/></field>
@@ -58,7 +58,7 @@

<form name="ListProjects" type="list" list-name="projects" paginate-target="FindProject">
<field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortId}" target="EditProject?workEffortIdFrom=${workEffortId}"/>
+ <hyperlink also-hidden="false" description="${workEffortId}" target="EditProject?projectId=${workEffortId}"/>
</field>
<field name="workEffortName" title="${uiLabelMap.CommonName}"><display/></field>
<field name="workEffortTypeId" title="${uiLabelMap.ProjectMgrWorkEffortTypeId}"><display-entity entity-name="WorkEffortType"/></field>
@@ -76,7 +76,7 @@
</row-actions>
<field name="workEffortTypeId"><hidden/></field>
<field name="workEffortId"><hidden/></field>
- <field name="workEffortIdFrom"><hidden/></field>
+ <field name="projectId"><hidden/></field>
<field name="fromDate"><hidden/></field>
<field name="workEffortAssocTypeId"><hidden/></field>
<field name="workEffortIdTo" entry-name="workEffortId"><hidden/></field>
@@ -111,12 +111,12 @@
</row-actions>
<field entry-name="workEffortName" name="taskName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}*"><hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortName}"/></field>
<field name="workEffortId"><hidden value="${workEffortId}"/></field>
- <field name="workEffortIdFrom"><hidden/></field>
+ <field name="projectId"><hidden/></field>
<field name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}">
<drop-down allow-empty="false">
<entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}[${workEffortId}]">
<entity-constraint name="workEffortTypeId" value="PHASE"/>
- <entity-constraint name="workEffortParentId" value="${workEffortIdFrom}"/>
+ <entity-constraint name="workEffortParentId" value="${projectId}"/>
<entity-order-by field-name="workEffortName"/>
</entity-options>
</drop-down>
@@ -156,7 +156,7 @@
<field name="workEffortAssocTypeId"><hidden/></field>
<field name="workEffortIdTo" entry-name="workEffortId"><hidden/></field>
<field name="workEffortName" position="1" title="${uiLabelMap.CommonName}*"><display/></field>
- <field name="workEffortIdFrom" title="${uiLabelMap.ProjectMgrWorkEffortIdFrom}"><lookup target-form-name="LookupWorkEffort"/></field>
+ <field name="projectId" title="${uiLabelMap.ProjectMgrWorkEffortIdFrom}"><lookup target-form-name="LookupWorkEffort"/></field>
<field name="fromDate"><date-time/></field>
<field name="currentStatusId">
<drop-down allow-empty="false" current-description="${currentStatus.description}">
@@ -176,7 +176,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
<form name="ListPhases" target="updateProjectPhase" title="" list-name="phases" type="list" separate-columns="true" paginate-target="FindPhase">
- <field name="workEffortIdFrom"><hidden value="${parameters.workEffortIdFrom}"/></field>
+ <field name="projectId"><hidden value="${parameters.projectId}"/></field>
<field name="phaseId" parameter-name="workEffortId"><hidden/></field>
<field name="phaseName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}*"><text/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
@@ -207,8 +207,8 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
<form name="ListPhaseTaskInfo" type="list" list-name="phases">
- <field name="workEffortIdFrom"><hidden value="parameters.worEffortIdFrom"/></field>
- <field name="Phase"><hyperlink target="FindPhase?workEffortIdFrom=${projectId}" description="${phaseName}"/></field>
+ <field name="projectId"><hidden value="parameters.worEffortIdFrom"/></field>
+ <field name="Phase"><hyperlink target="FindPhase?projectId=${projectId}" description="${phaseName}"/></field>
<field name="Task"><hyperlink target="EditTask?workEffortId=${workEffortId}" description="${workEffortName}"/></field>
<field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
<field name="estimatedStartDate"><display/></field>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=599021&r1=599020&r2=599021&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed Nov 28 07:13:19 2007
@@ -23,21 +23,18 @@

<form name="EditTask" type="single" target="updateTask" default-map-name="task">
<actions>
- <set field="projectId" from-field="parameters.workEffortIdFrom"/>
<entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
<field-map field-name="statusId" env-name="task.statusId"/>
</entity-one>
</actions>
<alt-target use-when="projectId!=null" target="createProjectTaskOrPhase"/>
<alt-target use-when="task==null&&projectId==null" target="createTask"/>
- <field name="workEffortIdFrom"><hidden value="${parameters.workEffortIdFrom}"/></field>
+ <field name="projectId"><hidden value="${parameters.projectId}"/></field>
<field name="DONE_PAGE"><hidden value="${donePage}"/></field>
<field name="workEffortTypeId"><hidden value="TASK"/></field>
<field use-when="task!=null" name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
- <field use-when="task==null&&workEffortId==null" name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}"><ignored/></field>
- <field use-when="task==null&&workEffortId!=null" name="workEffortName" title="${uiLabelMap.CommonName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
- <field use-when="task!=null" name="workEffortName" title="${uiLabelMap.CommonName}*"><display/></field>
- <field use-when="task==null&&workEffortId!=null" name="workEffortName" title="${uiLabelMap.CommonName}*"><text/></field>
+ <field use-when="task==null" entry-name="dummy" name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
+ <field use-when="task!=null&&workEffortId!=null" name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*"><text/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field use-when="task!=null" name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false" current-description="${currentStatus.description}">
@@ -50,7 +47,7 @@
<field use-when="task==null" name="currentStatusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false">
<entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
- <entity-constraint name="statusTypeId" value="CALENDAR_STATUS"/>
+ <entity-constraint name="statusTypeId" value="TASK_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
</drop-down>
@@ -99,11 +96,11 @@
<field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
<form name="AddPhase" type="single" target="createProjectTaskOrPhase">
- <field name="workEffortIdFrom"><hidden value="${parameters.workEffortIdFrom}"/></field>
- <field name="workEffortParentId"><hidden value="${parameters.workEffortIdFrom}"/></field>
+ <field name="projectId"><hidden value="${parameters.projectId}"/></field>
+ <field name="workEffortParentId"><hidden value="${parameters.projectId}"/></field>
<field name="workEffortTypeId"><hidden value="PHASE"/></field>
<field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field>
- <field name="workEffortName" title="${uiLabelMap.CommonName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
+ <field name="phaseName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrPhaseName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="priority" title="${uiLabelMap.CommonPriority}">
<drop-down allow-empty="true" current="selected">
@@ -128,11 +125,11 @@
<field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
<form name="AddProjectPhase" type="single" target="createProjectPhase">
- <field name="workEffortIdFrom"><hidden value="${parameters.workEffortIdFrom}"/></field>
- <field name="workEffortParentId"><hidden value="${parameters.workEffortIdFrom}"/></field>
+ <field name="projectId"><hidden value="${parameters.projectId}"/></field>
+ <field name="workEffortParentId"><hidden value="${parameters.projectId}"/></field>
<field name="workEffortTypeId"><hidden value="PHASE"/></field>
<field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field>
- <field name="workEffortName" title="${uiLabelMap.CommonName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
+ <field name="phaseName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrPhaseName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="priority" title="${uiLabelMap.CommonPriority}">
<drop-down allow-empty="true" current="selected">
@@ -166,7 +163,7 @@
<field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditTask?workEffortId=${workEffortId}"/>
</field>
- <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><hyperlink target="projectView?workEffortIdFrom=${projectId}" description="${projectName}[${projectId}]"/></field>
+ <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><hyperlink target="projectView?projectId=${projectId}" description="${projectName}[${projectId}]"/></field>
<field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="priority"><display/></field>
<field use-when="actualStartDate!=null" name="startDate" entry-name="actualStartDate" title="${uiLabelMap.WorkEffortStartDate}" parameter-name="actualStartDate"><display type="date"/></field>
@@ -179,7 +176,7 @@
</form>
<form name="Dependencies" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies">
<field name="workEffortIdTo"><hidden/></field>
- <field name="workEffortIdFrom"><hidden/></field>
+ <field name="projectId"><hidden/></field>
<field name="workEffortAssocTypeId"><hidden value="WORK_EFF_DEPENDENCY"/></field>
<field name="fromDate"><hidden/></field>
<field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field>
@@ -192,10 +189,10 @@
<field name="deleteButton"><submit button-type="button"/></field>
</form>
<form name="AddDependencyBefore" type="single" target="addDependency">
- <field name="Copy of ListFilteredTasks.bshworkEffortId"><hidden/></field>
+ <field name="workEffortId"><hidden/></field>
<field name="workEffortIdTo"><hidden value="${parameters.workEffortId}"/></field>
<field name="workEffortAssocTypeId"><hidden value="WORK_EFF_DEPENDENCY"/></field>
- <field name="workEffortIdFrom" title="${pr}">
+ <field name="relatedTasks" parameter-name="workEffortIdFrom">
<drop-down>
<entity-options entity-name="ProjectAndPhaseAndTask" key-field-name="workEffortId" description="${phaseName} -- ${workEffortName}">
<entity-constraint name="projectId" value="${projectId}"/>
@@ -209,9 +206,9 @@
</form>
<form name="AddDependencyAfter" type="single" target="addDependency">
<field name="workEffortId"><hidden/></field>
- <field name="workEffortIdFrom"><hidden value="${parameters.workEffortId}"/></field>
+ <field name="projectId"><hidden value="${parameters.workEffortId}"/></field>
<field name="workEffortAssocTypeId"><hidden value="WORK_EFF_DEPENDENCY"/></field>
- <field name="workEffortIdTo">
+ <field name="relatedTasks" parameter-name="workEffortIdTo">
<drop-down>
<entity-options entity-name="ProjectAndPhaseAndTask" key-field-name="workEffortId" description="${phaseName} -- ${workEffortName}">
<entity-constraint name="projectId" value="${projectId}"/>