Author: hansbak
Date: Wed Dec 12 22:23:10 2007
New Revision: 603836
URL: http://svn.apache.org/viewvc?rev=603836&view=rev
Log:
first version of the resource manager
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
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
Modified:
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=603836&r1=603835&r2=603836&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
Wed Dec 12 22:23:10 2007
@@ -27,6 +27,7 @@
PageTitleAddProject=Add Project
PageTitleAddPhase=Add Phase
PageTitleAddProjectNotes=Add Project Notes
+PageTitleAddResource=Add a Resource
PageTitleAddSkill=Add Skill
PageTitleAddSubProject=Add Sub Project
PageTitleAddSubTask=Add Sub Task
@@ -48,6 +49,7 @@
PageTitleFindTask=Find Task
PageTitleListPartyAssigns=Party Assigns
PageTitleListProjectNotes=List Project Notes
+PageTitleListResources=Resources
PageTitleListTaskNotes=List Task Notes
PageTitleMyTimesheets=My timesheet list
PageTitleProjectInformation=Project Information
@@ -84,6 +86,8 @@
ProjectMgrProjectSummary=Project Summary
ProjectMgrProjectTeam=Project Team
ProjectMgrPartySkills=Party Skills
+ProjectMgrResources=Resources
+ProjectMgrResourceName=Resource Name
ProjectMgrSkillStandards=Skill Standards
ProjectMgrSkillType=Skill Type
ProjectMgrSubProjectName=Sub Project Name
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=603836&r1=603835&r2=603836&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
Wed Dec 12 22:23:10 2007
@@ -72,7 +72,21 @@
<event type="service" invoke="deleteWorkEffort"/>
<response name="success" type="view" value="FindProject"/>
<response name="error" type="view" value="FindProject"/>
- </request-map>
+ </request-map>
+ <request-map uri="FindResource">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindResource"/>
+ </request-map>
+ <request-map uri="addResource">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createPartyRole"/>
+ <response name="success" type="view" value="FindResource"/>
+ </request-map>
+ <request-map uri="removeResource">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deletePartyRole"/>
+ <response name="success" type="view" value="FindResource"/>
+ </request-map>
<request-map uri="ChildWorkEfforts">
<security https="true" auth="true"/>
<response name="success" type="view" value="ChildWorkEfforts"/>
@@ -402,6 +416,7 @@
<view-map name="main" type="screen"
page="component://projectmgr/widget/TaskScreens.xml#MyTasks"/>
<view-map name="ganttChart" type="screen"
page="component://projectmgr/widget/ProjectScreens.xml#ganttChart"/>
<view-map name="ListSubProjects" type="screen"
page="component://projectmgr/widget/ProjectScreens.xml#ListSubProjects"/>
+ <view-map name="FindResource" type="screen"
page="component://projectmgr/widget/ProjectScreens.xml#FindResource"/>
<view-map name="FindProject" type="screen"
page="component://projectmgr/widget/ProjectScreens.xml#FindProject"/>
<view-map name="EditProject" type="screen"
page="component://projectmgr/widget/ProjectScreens.xml#EditProject"/>
<view-map name="EditWorkEffort" type="screen"
page="component://projectmgr/widget/ProjectScreens.xml#EditProject"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=603836&r1=603835&r2=603836&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Wed Dec 12
22:23:10 2007
@@ -53,6 +53,30 @@
</section>
</screen>
+ <screen name="CommonResourceDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="resources"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="WORKEFFORTMGR"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label
style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="CommonProjectDecorator">
<section>
<actions>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=603836&r1=603835&r2=603836&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Wed Dec 12 22:23:10
2007
@@ -25,6 +25,7 @@
<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="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>
<menu-item name="calendar"
title="${uiLabelMap.WorkEffortCalendar}"><link target="day"/></menu-item>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=603836&r1=603835&r2=603836&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed Dec 12
22:23:10 2007
@@ -49,6 +49,49 @@
</widgets>
</section>
</screen>
+ <screen name="FindResource">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleFindResource"/>
+ <set field="labelTitleProperty"
value="ProjectMgrResourceName"/>
+ <set field="workEffortId" from-field="parameters.projectId"/>
+ <entity-and entity-name="PartyRoleDetailAndPartyDetail"
list-name="resources">
+ <field-map field-name="parentTypeId" value="PROJECT_TEAM"/>
+ <order-by field-name="roleTypeId"/>
+ <order-by field-name="lastName"/>
+ <order-by field-name="groupName"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonResourceDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <!--container style="screenlet">
+ <container
style="screenlet-title-bar"><label
style="boxhead">${uiLabelMap.PageTitleFindResource}</label></container>
+ <container style="screenlet-body">
+ <include-form name="FindResource"
location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ </container>
+ </container-->
+ <container style="screenlet">
+ <container
style="screenlet-title-bar"><label
style="boxhead">${uiLabelMap.PageTitleListResources}</label></container>
+ <container style="screenlet-body">
+ <include-form name="ListResources"
location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container
style="screenlet-title-bar"><label
style="boxhead">${uiLabelMap.PageTitleAddResource}</label></container>
+ <container style="screenlet-body">
+ <include-form name="AddResource"
location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ </container>
+ </container>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="FindProject">
<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=603836&r1=603835&r2=603836&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed Dec
12 22:23:10 2007
@@ -63,6 +63,37 @@
</field>
<field name="add"><submit/></field>
</form>
+ <form name="FindResource" type="single" target="FindResource">
+ <field name="resourceName" parameter-name="partyId"
title="${uiLabelMap.ProjectMgrResourceName}"><text/></field>
+ <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>
+ </form>
+ <form name="ListResources" type="list" list-name="resources"
paginate-target="FindResource">
+ <row-actions>
+ <service service-name="getPartyEmail"
result-map-name="emailResult"/>
+ <service service-name="getPartyTelephone"
result-map-name="telResult"/>
+ </row-actions>
+ <field name="resourceName" parameter-name="partyId"
title="${uiLabelMap.ProjectMgrResourceName}" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${personalTitle}
${lastName},${firstName} ${middleName} ${groupName}"
target="viewprofile?partyId=${partyId}"/>
+ </field>
+ <field name="roleTypeId"><display-entity
entity-name="RoleType"/></field>
+ <field name="emailAddess"><hyperlink
target="/partymgr/control/EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyIdTo=${partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMechId}&contactMechTypeId=EMAIL_ADDRESS"
description="${emailResult.emailAddress}" target-type="inter-app"/></field>
+ <field use-when="telResult.get("extension")!=null"
name="telephone"><display description="${telResult.countryCode}
${telResult.areaCode} ${telResult.contactNumber}
Ext:${telResult.extension}"/></field>
+ <field use-when="telResult.get("extension")==null"
name="telephone"><display description="${telResult.countryCode}
${telResult.areaCode} ${telResult.contactNumber}"/></field>
+ <field name="contactMechPurposeTypeId"
entry-name="telResult.contactMechPurposeTypeId"
title="${uiLabelMap.CommonPurpose}"><display-entity
entity-name="ContactMechPurposeType"/></field>
+ <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink
target="removeResource?partyId=${partyId}&roleTypeId=${roleTypeId}"
description="${uiLabelMap.CommonRemove}"/></field>
+ </form>
+ <form name="AddResource" type="single" target="addResource">
+ <field name="PartyId" parameter-name="partyId"
title="${uiLabelMap.PartyPartyId}"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="roleTypeId">
+ <drop-down>
+ <entity-options entity-name="RoleType"
description="${description}">
+ <entity-constraint name="parentTypeId"
value="PROJECT_TEAM"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="addButton" ><submit/></field>
+ </form>
<form name="FindProject" type="single" target="FindProject">
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time
type="date"/></field>
<field name="projectName" parameter-name="workEffortName"
title="${uiLabelMap.ProjectMgrProjectName}"><text/></field>
