Author: hansbak
Date: Sun Dec 16 05:35:50 2007
New Revision: 604623
URL: http://svn.apache.org/viewvc?rev=604623&view=rev
Log:
add resource maintenance to task
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=604623&r1=604622&r2=604623&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
Sun Dec 16 05:35:50 2007
@@ -111,10 +111,20 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="EditProjectTasks"/>
</request-map>
- <request-map uri="EditTask">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditTask"/>
- </request-map>
+ <request-map uri="EditTask">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditTask"/>
+ </request-map>
+ <request-map uri="EditTaskPartyAssigns">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditTaskPartyAssigns"/>
+ </request-map>
+ <request-map uri="createTaskPartyAssign">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="assignPartyToWorkEffort"/>
+ <response name="success" type="view" value="EditTaskPartyAssigns"/>
+ <response name="error" type="view" value="EditTaskPartyAssigns"/>
+ </request-map>
<request-map uri="createTask">
<security https="true" auth="true"/>
<event type="service" invoke="createWorkEffort"/>
@@ -292,11 +302,6 @@
<response name="success" type="view" value="projectView"/>
<response name="error" type="view" value="projectView"/>
</request-map>
- <request-map uri="ListWorkEffortPartyAssigns">
- <security https="true" auth="true"/>
- <response name="success" type="view"
value="ListWorkEffortPartyAssigns"/>
- <response name="error" type="view" value="ListWorkEffortPartyAssigns"/>
- </request-map>
<request-map uri="EditTimeEntries">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditTimeEntries"/>
@@ -428,7 +433,8 @@
<view-map name="AddTaskAndAssoc" type="screen"
page="component://projectmgr/widget/ProjectScreens.xml#AddTaskAndAssoc"/>
<view-map name="EditTaskAndAssoc" type="screen"
page="component://projectmgr/widget/TaskScreens.xml#EditTaskAndAssoc"/>
<view-map name="Dependencies" type="screen"
page="component://projectmgr/widget/TaskScreens.xml#Dependencies"/>
- <view-map name="EditTaskList" type="screen"
page="component://projectmgr/widget/TaskScreens.xml#EditTaskList"/>
+ <view-map name="EditTaskList" type="screen"
page="component://projectmgr/widget/TaskScreens.xml#EditTaskList"/>
+ <view-map name="EditTaskPartyAssigns" type="screen"
page="component://projectmgr/widget/TaskScreens.xml#EditTaskPartyAssigns"/>
<view-map name="EditTaskListAndAssoc" type="screen"
page="component://projectmgr/widget/TaskScreens.xml#EditTaskListAndAssoc"/>
<view-map name="ChildTaskWorkEfforts" type="screen"
page="component://projectmgr/widget/TaskScreens.xml#ChildTaskWorkEfforts"/>
<view-map name="ListWorkEffortPartyAssigns" type="screen"
page="component://projectmgr/widget/ProjectScreens.xml#EditProjectParties"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=604623&r1=604622&r2=604623&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Sun Dec 16
05:35:50 2007
@@ -125,7 +125,7 @@
<field-map field-name="taskId"
env-name="parameters.workEffortId"/>
</service>
<set field="projectId" from-field="result.projectId"/>
- <set field="projectName" from-field="result.projectId"/>
+ <set field="projectName" from-field="result.projectName"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=604623&r1=604622&r2=604623&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Sun Dec 16 05:35:50
2007
@@ -52,7 +52,7 @@
<menu-item name="editproject"
title="${uiLabelMap.ProjectMgrEditPoject}"><link
target="EditProject?projectId=${projectId}"/></menu-item>
<menu-item name="phases" title="${uiLabelMap.ProjectMgrPhases}"><link
target="FindPhase?projectId=${projectId}"/></menu-item>
<menu-item name="tasks" title="${uiLabelMap.ProjectMgrTasks}"><link
target="EditProjectTasks?projectId=${projectId}"/></menu-item>
- <menu-item name="parties"
title="${uiLabelMap.ProjectMgrParties}"><link
target="ListWorkEffortPartyAssigns?projectId=${projectId}"/></menu-item>
+ <menu-item name="parties"
title="${uiLabelMap.ProjectMgrResources}"><link
target="ListWorkEffortPartyAssigns?projectId=${projectId}"/></menu-item>
<menu-item name="notes" title="${uiLabelMap.CommonNotes}"><link
target="EditWorkEffortNotes?projectId=${projectId}"/></menu-item>
<menu-item name="subprojects"
title="${uiLabelMap.ProjectMgrSubProjects}"><link
target="ListSubProjects?projectId=${projectId}"/></menu-item>
<!--menu-item name="treeDetails"
title="${uiLabelMap.ProjectMgrTreeDetails}"><link
target="ChildWorkEfforts?projectId=${projectId}&trail=${workEffortId}&workEffortTypeId=PROJECT&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item-->
@@ -61,6 +61,7 @@
<menu-item name="taskView"
title="${uiLabelMap.ProjectMgrTaskSummary}"><link
target="taskView?workEffortId=${workEffortId}"/></menu-item>
<menu-item name="edittask"
title="${uiLabelMap.ProjectMgrEditTask}"><link
target="EditTask?workEffortId=${workEffortId}"/></menu-item>
<menu-item name="dependencies"
title="${uiLabelMap.ProjectMgrDependencies}"><link
target="Dependencies?workEffortId=${workEffortId}"/></menu-item>
+ <menu-item name="parties"
title="${uiLabelMap.ProjectMgrResources}"><link
target="EditTaskPartyAssigns?workEffortId=${workEffortId}"/></menu-item>
<menu-item name="projectskills"
title="${uiLabelMap.ProjectMgrSkillStandards}"><link
target="EditTaskSkills?workEffortId=${workEffortId}"/></menu-item>
<menu-item name="notes" title="${uiLabelMap.CommonNotes}"><link
target="EditTaskNotes?workEffortId=${workEffortId}"/></menu-item>
<!--menu-item name="treeDetails"
title="${uiLabelMap.ProjectMgrTreeDetails}"><link
target="ChildTaskWorkEfforts?workEffortId=${workEffortId}&trail=${workEffortId}&workEffortTypeId=TASK&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item-->
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=604623&r1=604622&r2=604623&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Sun Dec 16
05:35:50 2007
@@ -245,6 +245,36 @@
</widgets>
</section>
</screen>
+ <screen name="EditTaskPartyAssigns">
+ <section>
+ <actions>
+ <set field="titleProperty"
value="PageTitleListWorkEffortPartyAssigns"/>
+ <set field="tabButtonItem" value="parties"/>
+ <set field="labelTitleProperty"
value="PageTitleListWorkEffortPartyAssigns"/>
+ <set field="workEffortId"
from-field="parameters.workEffortId"/>
+ <entity-one entity-name="WorkEffortPartyAssignment"
value-name="workEffortPartyAssignment"/>
+ <set field="inTask" value="notnull"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonTaskDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container style="screenlet">
+ <container style="screenlet-title-bar"><label
style="boxhead">${uiLabelMap.PageTitleListPartyAssigns}</label></container>
+ <container style="screenlet-body">
+ <include-form
name="EditWorkEffortPartyAssigns"
location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar"><label
style="boxhead">${uiLabelMap.PageTitleAddPartyAssign}</label></container>
+ <container style="screenlet-body">
+ <include-form name="AddWorkEffortPartyAssign"
location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ </container>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="EditTaskNotes">
<section>
<actions>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=604623&r1=604622&r2=604623&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sun Dec
16 05:35:50 2007
@@ -287,11 +287,11 @@
<form name="EditWorkEffortPartyAssigns"
target="deleteWorkEffortPartyAssign" title="" type="list"
paginate-target="ListWorkEffortPartyAssigns">
<actions>
<entity-condition entity-name="WorkEffortPartyAssignment">
- <condition-expr field-name="workEffortId" operator="equals"
env-name="projectId"/>
+ <condition-expr field-name="workEffortId" operator="equals"
env-name="workEffortId"/>
<order-by field-name="roleTypeId"/>
</entity-condition>
</actions>
- <field name="workEffortId"><hidden value="${projectId}"/></field>
+ <field name="workEffortId"><hidden/></field>
<field name="projectId"><hidden/></field>
<field name="partyId" widget-style="buttontext">
<display-entity entity-name="PartyNameView"
description="${firstName} ${middleName} ${lastName} ${groupName}">
@@ -306,9 +306,10 @@
<field name="deleteButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
<form name="AddWorkEffortPartyAssign" target="createWorkEffortPartyAssign"
title="" type="single">
+ <alt-target use-when="workEffortId!=projectId"
target="createTaskPartyAssign"/><!-- this used for tasks else for project -->
<field name="projectId"><hidden/></field>
<field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field>
- <field name="workEffortId"><hidden value="${projectId}"/></field>
+ <field name="workEffortId"><hidden value="${workEffortId}"/></field>
<field entry-name="xx" name="partyId">
<drop-down>
<entity-options entity-name="PartyRoleDetailAndPartyDetail"
description="${firstName} ${middleName} ${lastName} ${groupName}">
