Author: hansbak
Date: Thu Dec 20 02:23:20 2007
New Revision: 605867
URL: http://svn.apache.org/viewvc?rev=605867&view=rev
Log:
add a task find option to the top menu
Modified:
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.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=605867&r1=605866&r2=605867&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
Thu Dec 20 02:23:20 2007
@@ -112,6 +112,7 @@
ProjectMgrTaskDetails=Enter the Task Details below
ProjectMgrTaskList=List of Project Tasks
ProjectMgrTaskName=Task Name
+ProjectMgrTaskId=Task Id
ProjectMgrTasks=Tasks
ProjectMgrTreeDetails=TreeDetails
ProjectMgrParties=Parties
@@ -120,10 +121,10 @@
ProjectMgrWorkEffortPurposeTypeId=Purpose Type
ProjectMgrWorkEffortId=Id
ProjectMgrWorkEffortScopeEnumId=Scope
-ProjectMgrWorkEffortEstimatedStartDate=Estimated StartDate
-ProjectMgrWorkEffortEstimatedCompletionDate=Estimated CompletionDate
-ProjectMgrWorkEffortActualStartDate=Actual StartDate
-ProjectMgrWorkEffortActualCompletionDate=Actual CompletionDate
+ProjectMgrWorkEffortEstimatedStartDate=Estimated Start Date
+ProjectMgrWorkEffortEstimatedCompletionDate=Estimated Completion Date
+ProjectMgrWorkEffortActualStartDate=Actual Start Date
+ProjectMgrWorkEffortActualCompletionDate=Actual Completion Date
ProjectMgrWorkEffortIdFrom=Id From
ProjectMgrWorkEffortIdTo=Id To
ProjectMgrPartyRoleTypeId=Role Type Id
@@ -138,5 +139,5 @@
PageTitleListTimeEntries=List Time Entries for
ProjectMgrQuickAssignPartyId=Quick Assign Party Id
CommonStatustoComplete=Status to 'complete'
-
+ProjectMgrStatusId = Status Id
Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml?rev=605867&r1=605866&r2=605867&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml Thu Dec
20 02:23:20 2007
@@ -21,7 +21,8 @@
<entity-engine-xml>
<RoleType description="Project Team" hasTable="N" parentTypeId=""
roleTypeId="PROJECT_TEAM"/>
<RoleType description="Client Manager" hasTable="N"
parentTypeId="PROJECT_TEAM" roleTypeId="CLIENT_MANAGER"/>
- <RoleType description="Client Analyst" hasTable="N"
parentTypeId="PROJECT_TEAM" roleTypeId="CLIENT_ANALYST"/>
+ <RoleType description="Client Analyst" hasTable="N"
parentTypeId="PROJECT_TEAM" roleTypeId="CLIENT_ANALYST"/>
+ <RoleType description="Client Billing" hasTable="N"
parentTypeId="PROJECT_TEAM" roleTypeId="CLIENT_BILLING"/>
<RoleType description="Provider Manager" hasTable="N"
parentTypeId="PROJECT_TEAM" roleTypeId="PROVIDER_MANAGER"/>
<RoleType description="Provider Accounting" hasTable="N"
parentTypeId="PROJECT_TEAM" roleTypeId="PROVIDER_ACCOUNTING"/>
<RoleType description="Provider Analyst" hasTable="N"
parentTypeId="PROJECT_TEAM" roleTypeId="PROVIDER_ANALYST"/>
@@ -43,5 +44,22 @@
<SkillType skillTypeId="9004" description="Screens/forms"/>
<SkillType skillTypeId="9005" description="OFBiz Installation"/>
<SkillType skillTypeId="_NA_" description="Not Applicable"/>
+
+ <StatusType description="Project" statusTypeId="PROJECT" hasTable="N"
parentTypeId=""/>
+ <StatusType description="Project Task" statusTypeId="PROJECT_TASK_STATUS"
hasTable="N" parentTypeId="PROJECT"/>
+ <StatusType description="Project Assignment"
statusTypeId="PROJECT_ASSIGN_STATUS" hasTable="N" parentTypeId="PROJECT"/>
+
+ <StatusItem description="Assigned" sequenceId="01" statusCode="ASSIGNED"
statusId="PAS_ASSIGNED" statusTypeId="PROJECT_ASSIGN_STATUS"/>
+ <StatusItem description="Completed" sequenceId="02" statusCode="COMPLETED"
statusId="PAS_COMPLETED" statusTypeId="PROJECT_ASSIGN_STATUS"/>
+ <StatusValidChange condition="" statusId="PAS_ASSIGNED"
statusIdTo="PAS_COMPLETED" transitionName="Assignment Complete"/>
+
+ <StatusItem description="Created" sequenceId="01" statusCode="CREATED"
statusId="PTS_CREATED" statusTypeId="PROJECT_TASK_STATUS"/>
+ <StatusItem description="Completed" sequenceId="02" statusCode="COMPLETED"
statusId="PTS_COMPLETED" statusTypeId="PROJECT_TASK_STATUS"/>
+ <StatusItem description="On Hold" sequenceId="07" statusCode="ON_HOLD"
statusId="PTS_ON_HOLD" statusTypeId="PROJECT_TASK_STATUS"/>
+ <StatusItem description="Cancelled" sequenceId="09" statusCode="CANCELLED"
statusId="PTS_CANCELLED" statusTypeId="PROJECT_TASK_STATUS"/>
+ <StatusValidChange condition="" statusId="PTS_CREATED"
statusIdTo="PTS_COMPLETED" transitionName="Task Complete"/>
+ <StatusValidChange condition="" statusId="PTS_CREATED"
statusIdTo="PTS_ON_HOLD" transitionName="Task On Hold"/>
+ <StatusValidChange condition="" statusId="PTS_CREATED"
statusIdTo="PTS_CANCELLED" transitionName="Task On Hold"/>
+ <StatusValidChange condition="" statusId="PTS_ON_HOLD"
statusIdTo="PTS_CREATED" transitionName="Activated"/>
</entity-engine-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=605867&r1=605866&r2=605867&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 02:23:20 2007
@@ -474,6 +474,10 @@
<event type="service" invoke="updateTimesheet"/>
<response name="success" type="view" value="MyTimesheets"/>
<response name="error" type="view" value="MyTimesheets"/>
+ </request-map>
+ <request-map uri="FindTask">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindTask"/>
</request-map>
<!-- end of request mappings -->
@@ -488,7 +492,8 @@
<view-map name="ChildWorkEfforts" type="screen"
page="component://projectmgr/widget/ProjectScreens.xml#ChildWorkEfforts"/>
<view-map name="EditProjectAndAssoc" type="screen"
page="component://projectmgr/widget/ProjectScreens.xml#EditProjectAndAssoc"/>
<view-map name="EditProjectTasks" type="screen"
page="component://projectmgr/widget/ProjectScreens.xml#EditProjectTasks"/>
- <view-map name="MyTasks" type="screen"
page="component://projectmgr/widget/TaskScreens.xml#MyTasks"/>
+ <view-map name="MyTasks" type="screen"
page="component://projectmgr/widget/TaskScreens.xml#MyTasks"/>
+ <view-map name="FindTask" type="screen"
page="component://projectmgr/widget/TaskScreens.xml#FindTask"/>
<view-map name="EditTask" type="screen"
page="component://projectmgr/widget/TaskScreens.xml#EditTask"/>
<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"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=605867&r1=605866&r2=605867&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Thu Dec 20 02:23:20
2007
@@ -24,7 +24,8 @@
<menu-item name="mytasks"
title="${uiLabelMap.WorkEffortMyTasks}"><link target="MyTasks"/></menu-item>
<menu-item name="mytime" title="${uiLabelMap.TimesheetMyTime}"><link
target="MyTimesheets"/></menu-item>
- <menu-item name="projects"
title="${uiLabelMap.WorkEffortProjects}"><link
target="FindProject"/></menu-item>
+ <menu-item name="projects"
title="${uiLabelMap.WorkEffortProjects}"><link
target="FindProject"/></menu-item>
+ <menu-item name="task" title="${uiLabelMap.ProjectMgrTasks}"><link
target="FindTask"/></menu-item>
<menu-item name="resources"
title="${uiLabelMap.ProjectMgrResources}"><link
target="FindResource"/></menu-item>
<menu-item name="timesheet" title="${uiLabelMap.Timesheet}"><link
target="FindTimeSheet?findAll=N"/></menu-item>
<menu-item name="SkillType"
title="${uiLabelMap.ProjectMgrSkillType}"><link
target="findSkillTypes"/></menu-item>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=605867&r1=605866&r2=605867&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Thu Dec 20
02:23:20 2007
@@ -22,7 +22,8 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
<screen name="Dependencies">
<section>
- <actions>
+ <actions>
+ <set field="headerItem" value="task"/>
<set field="titleProperty" value="PageTitleDependencies"/>
<set field="tabButtonItem" value="dependencies"/>
<set field="workEffortId"
from-field="parameters.workEffortId"/>
@@ -134,10 +135,46 @@
</decorator-screen>
</widgets>
</section>
- </screen>
+ </screen>
+ <screen name="FindTask">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleFindTask"/>
+ <set field="headerItem" value="task"/>
+ <set field="labelTitleProperty" value="ProjectMgrMyTasks"/>
+ <entity-and entity-name="WorkEffortAndPartyAssign"
list-name="tasks">
+ <field-map field-name="partyId"
env-name="userLogin.partyId"/>
+ <field-map field-name="workEffortTypeId" value="TASK"/>
+ </entity-and>
+ <entity-one entity-name="WorkEffort" value-name="task">
+ <field-map field-name="workEffortId" value="dummy"/>
+ </entity-one>
+ <set field="myTask" value="notNull"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonMyTaskDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <container style="screenlet">
+ <container
style="screenlet-title-bar"><label
style="boxhead">${uiLabelMap.PageTitleFindTask}</label></container>
+ <container style="screenlet-body">
+ <include-form name="FindTask"
location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ <include-form name="ListTasks"
location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </container>
+ </container>
+
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="EditTask">
<section>
- <actions>
+ <actions>
+ <set field="headerItem" value="task"/>
<set field="titleProperty" value="PageTitleEditTaskList"/>
<set field="tabButtonItem" value="edittask"/>
<set field="labelTitleProperty" value="PageTitleEditTaskList"/>
@@ -190,7 +227,8 @@
</screen>
<screen name="EditTaskSkills">
<section>
- <actions>
+ <actions>
+ <set field="headerItem" value="task"/>
<set field="titleProperty" value="PageTitleEditSkill"/>
<set field="tabButtonItem" value="projectskills"/>
<set field="labelTitleProperty" value="PageTitleEditSkill"/>
@@ -270,6 +308,7 @@
<screen name="EditTaskPartyAssigns">
<section>
<actions>
+ <set field="headerItem" value="task"/>
<set field="titleProperty"
value="PageTitleListWorkEffortPartyAssigns"/>
<set field="tabButtonItem" value="parties"/>
<set field="labelTitleProperty"
value="PageTitleListWorkEffortPartyAssigns"/>
@@ -331,7 +370,8 @@
</screen>
<screen name="TaskView">
<section>
- <actions>
+ <actions>
+ <set field="headerItem" value="task"/>
<set field="tabButtonItem" value="taskView"/>
<set field="workEffortId"
from-field="parameters.workEffortId"/>
<set field="projectId" from-field="parameters.workEffortId"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=605867&r1=605866&r2=605867&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Thu Dec 20
02:23:20 2007
@@ -169,23 +169,44 @@
<field name="phaseDdescription" parameter-name="description"
title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
-
- <form name="FindTask" type="single" target="MyTasks">
- <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time
type="date"/></field>
- <field name="taskName" parameter-name="workEffortName"
title="${uiLabelMap.ProjectMgrTaskName}"><text/></field>
+ <form name="FindTask" type="single" target="FindTask" >
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="hideSearch"><hidden value="Y"/></field>
+ <field name="workEffortTypeId"><hidden value="TASK"/></field>
+ <field name="workEffortId"
title="${uiLabelMap.ProjectMgrTaskId}"><text-find default-option="contains"
ignore-case="true"/></field>
+ <field name="workEffortName"
title="${uiLabelMap.ProjectMgrTaskName}"><text-find default-option="contains"
ignore-case="true"/></field>
+ <field name="projectName"><text-find default-option="contains"
ignore-case="true"/></field>
+ <field name="estimatedStartDate"
title="${uiLabelMap.CommonFromDate}"><date-find/></field>
<field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>
- </form>
- <form name="ListTasks" type="list" list-name="tasks"
paginate-target="Dependencies">
- <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}"
widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortName}
[${workEffortId}]" target="taskView?workEffortId=${workEffortId}"/>
+ </form>
+ <form name="ListTasks" type="list" separate-columns="true" title="Project
List" list-name="listIt" paginate-target="FindTask">
+ <actions>
+ <service service-name="performFind" result-map-name="result"
result-map-list-name="listIt">
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName"
value="ProjectAndPhaseAndTask"/>
+ <field-map field-name="orderBy" value="lastStatusUpdate"/>
+ </service>
+ </actions>
+ <row-actions>
+ <service service-name="getProjectTask" result-map-name="result">
+ <field-map field-name="taskId" env-name="workEffortId"/>
+ <field-map field-name="hoursPartyId"
env-name="userLogin.partyId"/>
+ </service>
+ <set field="plannedHours"
from-field="result.taskInfo.plannedHours"/>
+ <set field="actualHours" from-field="result.taskInfo.actualHours"/>
+ </row-actions>
+ <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskId}"
widget-style="buttontext">
+ <hyperlink also-hidden="false"
description="${workEffortName}[${workEffortId}]"
target="taskView?workEffortId=${workEffortId}"/>
+ </field>
+ <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"
widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${projectName}"
target="projectView?projectId=${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>
- <field use-when="actualStartDate==null" name="startDate"
entry-name="estimatedStartDate" title="${uiLabelMap.WorkEffortStartDate}"
parameter-name="estimatedStartDate" red-when="before-now"><display
type="date"/></field>
- <field use-when="actualCompletionDate!=null" name="completionDate"
entry-name="actualCompletionDate"
title="${uiLabelMap.WorkEffortCompletionDate}"
parameter-name="actualCompletionDate"><display type="date"/></field>
- <field use-when="actualCompletionDate==null" name="completionDate"
entry-name="estimatedCompletionDate"
title="${uiLabelMap.WorkEffortCompletionDate}"
parameter-name="estimatedCompletionDate" red-when="before-now"><display
type="date"/></field>
+ <field name="description"><display/></field>
+ <field name="estimatedStartDate"
title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display
type="date"/></field>
+ <field name="estimatedCompletionDate"
title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"
red-when="before-now"><display type="date"/></field>
+ <field name="actualStartDate"
title="${uiLabelMap.ProjectMgrWorkEffortActualStartDate}"><display
type="date"/></field>
+ <field name="actualCompletionDate"
title="${uiLabelMap.ProjectMgrWorkEffortActualCompletionDate}"
red-when="before-now"><display type="date"/></field>
<field name="plannedHours"><display/></field>
<field name="actualHours"><display/></field>
<field name="createdDate"><display type="date"/></field>
