svn commit: r610701 - in /ofbiz/trunk/specialpurpose/pr
Locked
 
|
Author: hansbak
Date: Wed Jan 9 23:25:15 2008 New Revision: 610701 URL: http://svn.apache.org/viewvc?rev=610701&view=rev Log: status of customer request updated when connedted to a task, update of security seed data Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=610701&r1=610700&r2=610701&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml Wed Jan 9 23:25:15 2008 @@ -22,7 +22,7 @@ <PartyContactMech partyId="DemoEmployee2" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" /> <PartyRole partyId="DemoEmployee2" roleTypeId="PROJECT_TEAM"/> - <!-- Demo Customer1 --> + <!-- Demo Customer1 client for demo project 1--> <Party partyId="DemoCustomer1" partyTypeId="PERSON" statusId="PARTY_ENABLED" /> <Person partyId="DemoCustomer1" firstName="Sam" lastName="Customer 1" /> <UserLogin userLoginId="DemoCustomer1" partyId="DemoCustomer1"/> @@ -32,7 +32,7 @@ <PartyContactMech partyId="DemoCustomer" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" /> <PartyRole partyId="DemoCustomer1" roleTypeId="PROJECT_TEAM"/> - <!-- Demo Customer2 --> + <!-- Demo Customer2 client for demo project 2--> <Party partyId="DemoCustomer2" partyTypeId="PERSON" statusId="PARTY_ENABLED" /> <Person partyId="DemoCustomer2" firstName="John" lastName="Customer 2"/> <UserLogin userLoginId="DemoCustomer2" partyId="DemoCustomer2"/> @@ -49,7 +49,6 @@ <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PROJECTMGR_VIEW"/> <SecurityGroupPermission groupId="VIEWADMIN" permissionId="PROJECTMGR_VIEW"/> <SecurityGroupPermission groupId="BIZADMIN" permissionId="PROJECTMGR_VIEW"/> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="PROJECTMGR_ADMIN"/> <UserLoginAndSecurityGroup groupId="PROJECTUSER" userLoginId="DemoCustomer1" fromDate="2000-01-01 00:00:00.0"/> <UserLoginAndSecurityGroup groupId="PROJECTUSER" userLoginId="DemoCustomer2" fromDate="2000-01-01 00:00:00.0"/> @@ -57,7 +56,7 @@ <UserLoginAndSecurityGroup groupId="PROJECTUSER" userLoginId="DemoEmployee2" fromDate="2000-01-01 00:00:00.0"/> <!-- First Demo project from customer 1, phases and tasks with estimated time--> - <WorkEffort workEffortId="9000" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.901" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project Cust1" revisionNumber="1"/> + <WorkEffort workEffortId="9000" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.901" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project1 Cust1" revisionNumber="1"/> <WorkEffortPartyAssignment workEffortId="9000" partyId="admin" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/> <WorkEffortPartyAssignment workEffortId="9000" partyId="DemoCustomer1" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_MANAGER" fromDate="2007-12-14 16:45:21.831"/> <WorkEffortPartyAssignment workEffortId="9000" partyId="DemoEmployee1" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/> @@ -79,7 +78,7 @@ <WorkEffortAssoc workEffortIdFrom="9005" workEffortIdTo="9006" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" sequenceNum="0" fromDate="2000-01-01 00:00:00.0"/> <!-- Second Demo project for customer 2, phases and tasks with estimated time--> - <WorkEffort workEffortId="9100" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.911" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project Cust 2" revisionNumber="1"/> + <WorkEffort workEffortId="9100" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.911" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project2 Cust 2" revisionNumber="1"/> <WorkEffortPartyAssignment workEffortId="9100" partyId="admin" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/> <WorkEffortPartyAssignment workEffortId="9100" partyId="DemoCustomer2" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_MANAGER" fromDate="2007-12-14 16:45:21.831"/> <WorkEffortPartyAssignment workEffortId="9100" partyId="DemoEmployee1" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml?rev=610701&r1=610700&r2=610701&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml Wed Jan 9 23:25:15 2008 @@ -19,30 +19,35 @@ --> <entity-engine-xml> + <!-- Project Manager security --> + <!-- General, all projects --> <SecurityPermission description="ALL operations in the Project Manager." permissionId="PROJECTMGR_ADMIN"/> - <SecurityPermission description="Limited admin operations in the Project Manager for a project the user is member of." permissionId="PROJECTMGR_ROLE_ADMIN"/> - <SecurityPermission description="Limited view operations in the Project Manager (own data/projects only)." permissionId="PROJECTMGR_ROLE_VIEW"/> - <SecurityPermission description="Limited update operations in the Project Manager.(own data/projects only)" permissionId="PROJECTMGR_ROLE_UPDATE"/> - <SecurityPermission description="ALL View operations in the Project Manager." permissionId="PROJECTMGR_VIEW"/> - <SecurityPermission description="Be able to create a project." permissionId="PROJECTMGR_PROJECT_CREATE"/> - <SecurityPermission description="Be able to create a task." permissionId="PROJECTMGR_TASK_CREATE"/> - <SecurityPermission description="Be able to create a timesheet." permissionId="PROJECTMGR_TIMESHEET_CREATE"/> + <SecurityPermission description="ALL View operations in the Project Manager(but can be limited by ROLE_VIEW)" permissionId="PROJECTMGR_VIEW"/> + <!-- General, Role dependent (must be member of the project) --> + <SecurityPermission description="All admin operations in the Project Manager for a project/phase/task the user is member of." permissionId="PROJECTMGR_ROLE_ADMIN"/> + <SecurityPermission description="All view operations in the Project Manager for a project/phase/task the user is member of." permissionId="PROJECTMGR_ROLE_VIEW"/> + <SecurityPermission description="Update operations in the Project Manager for a project/phase/task the user is member of." permissionId="PROJECTMGR_ROLE_UPDATE"/> + <!-- Role and Task dependent --> + <SecurityPermission description="Be able to create a task (should be member of project)" permissionId="PROJECTMGR_ROLE_TASK_CREATE"/> + <SecurityPermission description="Be able to assign a task to a resource (should be member of project)" permissionId="PROJECTMGR_ROLE_TASK_ASSIGN"/> + <!-- Timesheet dependent --> + <SecurityPermission description="Be able to create a weekly timesheet." permissionId="PROJECTMGR_TIMESHEET_CREATE"/> + <SecurityPermission description="Be able to update(report) on an existing timesheet(should be member of project of the task)" permissionId="PROJECTMGR_ROLE_TIMESHEET_UPDATE"/> + + <!-- allow the security group FULLADMIN (userlogin 'admin') full access --> + <SecurityGroupPermission groupId="FULLADMIN" permissionId="PROJECTMGR_ADMIN"/> - <SecurityGroup description="Project User group, has only access to own projects." groupId="PROJECTADMIN"/> + <SecurityGroup description="Project Admin group, has update access to own projects." groupId="PROJECTADMIN"/> <SecurityGroupPermission groupId="PROJECTADMIN" permissionId="PROJECTMGR_ROLE_ADMIN"/> <SecurityGroupPermission groupId="PROJECTADMIN" permissionId="PROJECTMGR_VIEW"/> - <SecurityGroupPermission groupId="PROJECTADMIN" permissionId="PROJECTMGR_PROJECT_CREATE"/> - <SecurityGroupPermission groupId="PROJECTADMIN" permissionId="PROJECTMGR_TASK_CREATE"/> - <SecurityGroupPermission groupId="PROJECTADMIN" permissionId="PROJECTMGR_TIMESHEET_CREATE"/> - <SecurityGroup description="Project User group, has only access to own projects." groupId="PROJECTUSER"/> - <SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_ROLE_VIEW"/> + <SecurityGroup description="Project User group, has read, task create/assign and timesheet create/update access to own projects." groupId="PROJECTUSER"/> <SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_VIEW"/> - <SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_TASK_CREATE"/> + <SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_ROLE_VIEW"/> + <SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_ROLE_TASK_CREATE"/> + <SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_ROLE_TASK_ASSIGN"/> <SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_TIMESHEET_CREATE"/> + <SecurityGroupPermission groupId="PROJECTUSER" permissionId="PROJECTMGR_ROLE_TIMESHEET_UPDATE"/> - <!-- allow the userlogin 'admin' full access --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="PROJECTMGR_ADMIN"/> - </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=610701&r1=610700&r2=610701&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Wed Jan 9 23:25:15 2008 @@ -552,7 +552,7 @@ <request-map uri="createTaskListForms"> <security https="true" auth="true"/> <event type="service" invoke="createWorkEffortRequest"/> - <response name="success" type="view" value="RequestList"/> + <response name="success" type="request" value="updaterequeststatus"/> <response name="error" type="view" value="RequestList"/> </request-map> <request-map uri="newrequest"> @@ -577,6 +577,12 @@ <security https="true" auth="true"/> <response name="success" type="view" value="listResourcesProject"/> <response name="error" type="view" value="listResourcesProject"/> + </request-map> + <request-map uri="updaterequeststatus"> + <security https="true" auth="true"/> + <event type="service" invoke="updateCustRequest"/> + <response name="success" type="view" value="RequestList"/> + <response name="error" type="view" value="RequestList"/> </request-map> <!-- end of request mappings --> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=610701&r1=610700&r2=610701&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed Jan 9 23:25:15 2008 @@ -500,6 +500,7 @@ <field name="projectId"><hidden value="${parameters.projectId}"/></field> <field name="workEffortTypeId"><hidden value="TASK"/></field> <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field> + <field name="statusId"><hidden value="CRQ_ACCEPTED"/></field> <field name="taskName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field> <field name="taskDescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text default-value="${custRequest.description}"/></field> <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*" parameter-name="workEffortParentId"> @@ -542,6 +543,7 @@ </form> <form name="CreateCustRequestWorkEffortByExistingTaskForm" type="single" target="createTaskListForms"> <field name="custRequestId"><hidden/></field> + <field name="statusId"><hidden value="CRQ_ACCEPTED"/></field> <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}"> <drop-down allow-empty="false"> <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${workEffortName} (${phaseName}-${projectName})"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |