Author: hansbak
Date: Thu Dec 20 23:45:37 2007
New Revision: 606125
URL: http://svn.apache.org/viewvc?rev=606125&view=rev
Log:
add 2 buttons to set taskstatus to onhold or cancelled
Modified:
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
Modified:
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=606125&r1=606124&r2=606125&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
Thu Dec 20 23:45:37 2007
@@ -97,8 +97,10 @@
ProjectMgrProjectSummary=Project Summary
ProjectMgrProjectTeam=Project Team
ProjectMgrPartySkills=Party Skills
+ProjectMgrRelease=Release
ProjectMgrResources=Resources
ProjectMgrResourceName=Resource Name
+ProjectMgrSetOnHold=On-Hold
ProjectMgrSkillStandards=Skill Standards
ProjectMgrSkillType=Skill Type
ProjectMgrSaveAsTemplate=Save As Template
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=606125&r1=606124&r2=606125&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
Thu Dec 20 23:45:37 2007
@@ -137,6 +137,11 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="EditTaskPartyAssigns"/>
</request-map>
+ <request-map uri="setTaskStatus">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateWorkEffort"/>
+ <response name="success" type="view" value="taskView"/>
+ </request-map>
<request-map uri="createTaskPartyAssign">
<security https="true" auth="true"/>
<event type="service" invoke="assignPartyToWorkEffort"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=606125&r1=606124&r2=606125&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Thu Dec 20
23:45:37 2007
@@ -144,6 +144,7 @@
</condition>
<widgets>
<include-menu name="TaskTabBar"
location="component://projectmgr/widget/Menus.xml"/>
+ <include-menu name="TaskSubTabBar"
location="component://projectmgr/widget/Menus.xml"/>
<label style="head1"
text="${uiLabelMap.ProjectMgrTaskCurrent}:
${workEffort.workEffortName}[${workEffort.workEffortId}] Project:
${projectName}"/>
<link style="head1"
text="[${projectId}]" target="projectView?projectId=${projectId}"/>
</widgets>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=606125&r1=606124&r2=606125&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Thu Dec 20 23:45:37
2007
@@ -97,13 +97,80 @@
</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>
- <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="edittask" title="${uiLabelMap.ProjectMgrEditTask}">
+ <condition>
+ <and>
+ <not><if-empty field-name="workEffort"/></not>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_COMPLETED"/>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_CANCELLED"/>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_ON_HOLD"/>
+ </and>
+ </condition>
+ <link target="EditTask?workEffortId=${workEffortId}"/></menu-item>
+ <menu-item name="dependencies"
title="${uiLabelMap.ProjectMgrDependencies}">
+ <condition>
+ <and>
+ <not><if-empty field-name="workEffort"/></not>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_COMPLETED"/>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_CANCELLED"/>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_ON_HOLD"/>
+ </and>
+ </condition>
+ <link
target="Dependencies?workEffortId=${workEffortId}"/></menu-item>
+ <menu-item name="parties" title="${uiLabelMap.ProjectMgrResources}">
+ <condition>
+ <and>
+ <not><if-empty field-name="workEffort"/></not>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_COMPLETED"/>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_CANCELLED"/>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_ON_HOLD"/>
+ </and>
+ </condition>
+ <link
target="EditTaskPartyAssigns?workEffortId=${workEffortId}"/></menu-item>
+ <menu-item name="projectskills"
title="${uiLabelMap.ProjectMgrSkillStandards}">
+ <condition>
+ <and>
+ <not><if-empty field-name="workEffort"/></not>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_COMPLETED"/>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_CANCELLED"/>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_ON_HOLD"/>
+ </and>
+ </condition>
+ <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-->
</menu>
+ <menu name="TaskSubTabBar" menu-container-style="button-bar
button-style-2" default-selected-style="selected">
+ <menu-item name="setonhold" title="${uiLabelMap.ProjectMgrSetOnHold}" >
+ <condition>
+ <and>
+ <not><if-empty field-name="workEffort"/></not>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_CANCELLED"/>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_ON_HOLD"/>
+ </and>
+ </condition>
+ <link
target="setTaskStatus?workEffortId=${workEffortId}&currentStatusId=PTS_ON_HOLD"/>
+ </menu-item>
+ <menu-item name="release" title="${uiLabelMap.ProjectMgrRelease}" >
+ <condition>
+ <and>
+ <not><if-empty field-name="workEffort"/></not>
+ <if-compare field-name="workEffort.currentStatusId"
operator="equals" value="PTS_ON_HOLD"/>
+ </and>
+ </condition>
+ <link
target="setTaskStatus?workEffortId=${workEffortId}&currentStatusId=PTS_CREATED"/>
+ </menu-item>
+ <menu-item name="cancel" title="${uiLabelMap.CommonCancel}" >
+ <condition>
+ <and>
+ <not><if-empty field-name="workEffort"/></not>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_COMPLETED"/>
+ <if-compare field-name="workEffort.currentStatusId"
operator="not-equals" value="PTS_CANCELLED"/>
+ </and>
+ </condition>
+ <link
target="setTaskStatus?workEffortId=${workEffortId}&currentStatusId=PTS_CANCELLED"/>
+ </menu-item>
+ </menu>
<menu name="TimesheetTabBar" menu-container-style="button-bar tab-bar"
default-menu-item-name="edittimesheet" default-selected-style="selected">
<menu-item name="edittimesheet"
title="${uiLabelMap.TimesheetTimsheetEdit}">
<link target="EditTimeSheet?timesheetId=${timesheetId}"/>
