svn commit: r631504 - /ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r631504 - /ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml

mor-2
Author: mor
Date: Tue Feb 26 22:53:53 2008
New Revision: 631504

URL: http://svn.apache.org/viewvc?rev=631504&view=rev
Log:
Adding missing controller entry for unassigning a task to a party or resource
Thanks to Rishi Solanki for reporting this.

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.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=631504&r1=631503&r2=631504&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Tue Feb 26 22:53:53 2008
@@ -1,32 +1,32 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
-    <include location="component://product/webapp/catalog/WEB-INF/controller.xml"/>    
-    <include location="component://order/webapp/ordermgr/WEB-INF/controller.xml"/>    
-    <include location="component://accounting/webapp/accounting/WEB-INF/controller.xml"/>    
-    <include location="component://workeffort/webapp/workeffort/WEB-INF/controller.xml"/>
-    <include location="component://humanres/webapp/humanres/WEB-INF/controller.xml"/>
-    
-    <description>Project Management Component Site Configuration File</description>
-
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
+    <include location="component://product/webapp/catalog/WEB-INF/controller.xml"/>    
+    <include location="component://order/webapp/ordermgr/WEB-INF/controller.xml"/>    
+    <include location="component://accounting/webapp/accounting/WEB-INF/controller.xml"/>    
+    <include location="component://workeffort/webapp/workeffort/WEB-INF/controller.xml"/>
+    <include location="component://humanres/webapp/humanres/WEB-INF/controller.xml"/>
+    
+    <description>Project Management Component Site Configuration File</description>
+
     <request-map uri="main">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="main"/>
@@ -41,42 +41,42 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ListSubProjects"/>
     </request-map>
-    <request-map uri="AddSubProject">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffort"/>
-        <response name="error" type="view" value="ListSubProjects"/>
-        <response name="success" type="view" value="ListSubProjects"/>
-    </request-map>
-    <request-map uri="RemoveSubProject">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffort"/>
-        <response name="error" type="view" value="ListSubProjects"/>
-        <response name="success" type="view" value="ListSubProjects"/>
-    </request-map>
-    <request-map uri="FindProject">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="FindProject"/>
-    </request-map>
-    <request-map uri="EditProject">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditProject"/>
-    </request-map>
-    <request-map uri="projectBilling">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="projectBilling"/>
-    </request-map>
-    <request-map uri="createProject">
-        <security https="true" auth="true"/>
+    <request-map uri="AddSubProject">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffort"/>
+        <response name="error" type="view" value="ListSubProjects"/>
+        <response name="success" type="view" value="ListSubProjects"/>
+    </request-map>
+    <request-map uri="RemoveSubProject">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffort"/>
+        <response name="error" type="view" value="ListSubProjects"/>
+        <response name="success" type="view" value="ListSubProjects"/>
+    </request-map>
+    <request-map uri="FindProject">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="FindProject"/>
+    </request-map>
+    <request-map uri="EditProject">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditProject"/>
+    </request-map>
+    <request-map uri="projectBilling">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="projectBilling"/>
+    </request-map>
+    <request-map uri="createProject">
+        <security https="true" auth="true"/>
         <event type="service" invoke="createProject"/>
         <response name="success" type="request-redirect" value="projectView"/>
-        <response name="error" type="view" value="EditProject"/>
-    </request-map>
-    <request-map uri="updateProject">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffort"/>
-        <response name="success" type="view" value="projectView"/>
-        <response name="error" type="view" value="EditProject"/>
-    </request-map>
+        <response name="error" type="view" value="EditProject"/>
+    </request-map>
+    <request-map uri="updateProject">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffort"/>
+        <response name="success" type="view" value="projectView"/>
+        <response name="error" type="view" value="EditProject"/>
+    </request-map>
     <request-map uri="copyProject">
         <security https="true" auth="true"/>
         <event type="service" invoke="copyProject"/>
@@ -115,30 +115,30 @@
         <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"/>
-    </request-map>
-    <request-map uri="EditProjectAndAssoc">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditProjectAndAssoc"/>
-    </request-map>
-    <request-map uri="createProjectAndAssoc">
-        <security https="true" auth="true"/>
-        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
-        <response name="success" type="view" value="FindProject"/>
-        <response name="error" type="view" value="FindProject"/>
-    </request-map>
-    <request-map uri="updateProjectAndAssoc">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffortAndAssoc"/>
-        <response name="success" type="view" value="FindProject"/>
-        <response name="error" type="view" value="FindProject"/>
-    </request-map>    
-    <request-map uri="EditProjectTasks">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditProjectTasks"/>
-    </request-map>
+    <request-map uri="ChildWorkEfforts">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ChildWorkEfforts"/>
+    </request-map>
+    <request-map uri="EditProjectAndAssoc">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditProjectAndAssoc"/>
+    </request-map>
+    <request-map uri="createProjectAndAssoc">
+        <security https="true" auth="true"/>
+        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
+        <response name="success" type="view" value="FindProject"/>
+        <response name="error" type="view" value="FindProject"/>
+    </request-map>
+    <request-map uri="updateProjectAndAssoc">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffortAndAssoc"/>
+        <response name="success" type="view" value="FindProject"/>
+        <response name="error" type="view" value="FindProject"/>
+    </request-map>    
+    <request-map uri="EditProjectTasks">
+        <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"/>
@@ -152,30 +152,36 @@
         <event type="service" invoke="updateWorkEffort"/>
         <response name="success" type="view" value="taskView"/>
     </request-map>
-    <request-map uri="updateTaskAssigment">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateTaskAssigment"/>
-        <response name="success" type="view" value="MyTasks"/>
-        <response name="error" type="view" value="MyTasks"/>
-    </request-map>
-    <request-map uri="addTaskAssignment">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateTaskAssigment"/>
-        <response name="success" type="view" value="MyTasks"/>
-        <response name="error" type="view" value="MyTasks"/>
-    </request-map>
-    <request-map uri="createTaskPartyAssign">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateTaskAssigment"/>
-        <response name="success" type="view" value="EditTaskPartyAssigns"/>
-        <response name="error" type="view" value="EditTaskPartyAssigns"/>
-    </request-map>
-    <request-map uri="updateTaskPartyAssign">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateTaskAssigment"/>
-        <response name="success" type="view" value="EditTaskPartyAssigns"/>
-        <response name="error" type="view" value="EditTaskPartyAssigns"/>
-    </request-map>
+    <request-map uri="updateTaskAssigment">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateTaskAssigment"/>
+        <response name="success" type="view" value="MyTasks"/>
+        <response name="error" type="view" value="MyTasks"/>
+    </request-map>
+    <request-map uri="addTaskAssignment">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateTaskAssigment"/>
+        <response name="success" type="view" value="MyTasks"/>
+        <response name="error" type="view" value="MyTasks"/>
+    </request-map>
+    <request-map uri="createTaskPartyAssign">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateTaskAssigment"/>
+        <response name="success" type="view" value="EditTaskPartyAssigns"/>
+        <response name="error" type="view" value="EditTaskPartyAssigns"/>
+    </request-map>
+    <request-map uri="updateTaskPartyAssign">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateTaskAssigment"/>
+        <response name="success" type="view" value="EditTaskPartyAssigns"/>
+        <response name="error" type="view" value="EditTaskPartyAssigns"/>
+    </request-map>
+    <request-map uri="deleteTaskPartyAssign">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="unassignPartyFromWorkEffort"/>
+        <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="createProjectTask"/>
@@ -230,605 +236,605 @@
         <response name="success" type="view" value="FindPhase"/>
         <response name="error" type="view" value="FindPhase"/>
     </request-map>
-    <request-map uri="deleteTask">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="deleteWorkEffort"/>
-        <response name="success" type="view" value="EditProjectTasks"/>
-        <response name="error" type="view" value="EditProjectTasks"/>
-    </request-map>    
-    <request-map uri="EditTaskAndAssoc">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditTaskAndAssoc"/>
-        <response name="error" type="view" value="EditTaskAndAssoc"/>
-    </request-map>
-    <request-map uri="createTaskAndAssoc">
-        <security https="true" auth="true"/>
-        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
-        <response name="success" type="view" value="EditProjectTasks"/>
-        <response name="error" type="view" value="EditProjectTasks"/>
-    </request-map>
-    <request-map uri="updateTaskAndAssoc">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffortAndAssoc"/>
-        <response name="success" type="view" value="EditProjectTasks"/>
-        <response name="error" type="view" value="EditProjectTasks"/>
-    </request-map>
-    <request-map uri="Dependencies">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="Dependencies"/>
-        <response name="error" type="view" value="Dependencies"/>
-    </request-map>
-    <request-map uri="MyTasks">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="MyTasks"/>
-    </request-map>
-    <request-map uri="EditTaskList">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditTaskList"/>
-        <response name="error" type="view" value="EditTaskList"/>
-    </request-map>
-    <request-map uri="createTaskList">
-        <security https="true" auth="true"/>
-        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffort"/>
-        <response name="success" type="view" value="EditTaskList"/>
-        <response name="error" type="view" value="EditTaskList"/>
-    </request-map>    
-    <request-map uri="deleteTaskList">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="deleteWorkEffort"/>
-        <response name="success" type="view" value="Dependencies"/>
-        <response name="error" type="view" value="Dependencies"/>
-    </request-map>
-    <request-map uri="EditTaskListAndAssoc">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditTaskListAndAssoc"/>
-        <response name="error" type="view" value="EditTaskListAndAssoc"/>
-    </request-map>
-    <request-map uri="createTaskListAndAssoc">
-        <security https="true" auth="true"/>
-        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
-        <response name="success" type="view" value="Dependencies"/>
-        <response name="error" type="view" value="Dependencies"/>
-    </request-map>
-    <request-map uri="updateTaskListAndAssoc">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffortAndAssoc"/>
-        <response name="success" type="view" value="Dependencies"/>
-        <response name="error" type="view" value="Dependencies"/>
-    </request-map>
-    <request-map uri="ChildTaskWorkEfforts">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ChildTaskWorkEfforts"/>
-    </request-map>
-    <request-map uri="FindPhase">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="FindPhase"/>
-    </request-map>
-    <request-map uri="createPhaseAndAssoc">
-        <security https="true" auth="true"/>
-        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
-        <response name="success" type="view" value="FindPhase"/>
-        <response name="error" type="view" value="FindPhase"/>
-    </request-map>
-    <request-map uri="updatePhaseAndAssoc">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffortAndAssoc"/>
-        <response name="success" type="view" value="FindPhase"/>
-        <response name="error" type="view" value="FindPhase"/>
-    </request-map>
-    <request-map uri="EditProjectSkills">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditProjectSkills"/>
-    </request-map>
-    <request-map uri="createProjectSkillStandard">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createWorkEffortSkillStandard"/>
-        <response name="success" type="view" value="EditProjectSkills"/>
-        <response name="error" type="view" value="EditProjectSkills"/>
-    </request-map>
-    <request-map uri="updateProjectSkillStandard">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffortSkillStandard"/>
-        <response name="success" type="view" value="EditProjectSkills"/>
-        <response name="error" type="view" value="EditProjectSkills"/>
-    </request-map>
-    <request-map uri="deleteProjectSkillStandard">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="deleteWorkEffortSkillStandard"/>
-        <response name="success" type="view" value="EditProjectSkills"/>
-        <response name="error" type="view" value="EditProjectSkills"/>
-    </request-map>
-    <request-map uri="EditTaskSkills">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditTaskSkills"/>
-    </request-map>
-    <request-map uri="createTaskSkillStandard">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createWorkEffortSkillStandard"/>
-        <response name="success" type="view" value="EditTaskSkills"/>
-        <response name="error" type="view" value="EditTaskSkills"/>
-    </request-map>
-    <request-map uri="updateTaskSkillStandard">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffortSkillStandard"/>
-        <response name="success" type="view" value="EditTaskSkills"/>
-        <response name="error" type="view" value="EditTaskSkills"/>
-    </request-map>
-    <request-map uri="projectView">
-        <security https="true" auth="true"/>        
-        <response name="success" type="view" value="projectView"/>
-        <response name="error" type="view" value="projectView"/>
-    </request-map>
-    <request-map uri="createWeeklyTimesheet">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createTimesheetForThisWeek"/>
-        <response name="success" type="view" value="Timesheet"/>
-        <response name="error" type="view" value="Timesheet"/>
-    </request-map>
-    <request-map uri="addWeeklyTimesheet">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="addWeeklyTimesheet"/>
-        <response name="error" type="view" value="addWeeklyTimesheet"/>
-    </request-map>
-    <request-map uri="createMyWeeklyTimesheet">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createTimesheetForThisWeek"/>
-        <response name="success" type="view" value="MyTimesheet"/>
-        <response name="error" type="view" value="MyTimesheet"/>
-    </request-map>
-    <request-map uri="MyTimesheet">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="MyTimesheet"/>
-        <response name="error" type="view" value="MyTimesheet"/>
-    </request-map>
-    <request-map uri="EditTimeEntries">
-        <security https="true" auth="true"/>        
-        <response name="success" type="view" value="EditTimeEntries"/>
-        <response name="error" type="view" value="EditTimeEntries"/>    
-    </request-map>
-    <request-map uri="createTimeEntry">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createTimeEntryInTimesheet"/>
-        <response name="success" type="view" value="EditTimeEntries"/>
-        <response name="error" type="view" value="EditTimeEntries"/>
-    </request-map>
-    <request-map uri="updateMyTimesheet">
-        <security https="true" auth="true"/>
-        <event type="service-multi" invoke="updateTimeEntryByWorkeffort"/>
-        <response name="success" type="view" value="MyTimesheet"/>
-        <response name="error" type="view" value="MyTimesheet"/>
-    </request-map>
-    <request-map uri="updateTimesheet">
-        <security https="true" auth="true"/>
-        <event type="service-multi" invoke="updateTimeEntryByWorkeffort"/>
-        <response name="success" type="view" value="Timesheet"/>
-        <response name="error" type="view" value="Timesheet"/>
-    </request-map>
+    <request-map uri="deleteTask">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteWorkEffort"/>
+        <response name="success" type="view" value="EditProjectTasks"/>
+        <response name="error" type="view" value="EditProjectTasks"/>
+    </request-map>    
+    <request-map uri="EditTaskAndAssoc">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditTaskAndAssoc"/>
+        <response name="error" type="view" value="EditTaskAndAssoc"/>
+    </request-map>
+    <request-map uri="createTaskAndAssoc">
+        <security https="true" auth="true"/>
+        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
+        <response name="success" type="view" value="EditProjectTasks"/>
+        <response name="error" type="view" value="EditProjectTasks"/>
+    </request-map>
+    <request-map uri="updateTaskAndAssoc">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffortAndAssoc"/>
+        <response name="success" type="view" value="EditProjectTasks"/>
+        <response name="error" type="view" value="EditProjectTasks"/>
+    </request-map>
+    <request-map uri="Dependencies">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="Dependencies"/>
+        <response name="error" type="view" value="Dependencies"/>
+    </request-map>
+    <request-map uri="MyTasks">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="MyTasks"/>
+    </request-map>
+    <request-map uri="EditTaskList">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditTaskList"/>
+        <response name="error" type="view" value="EditTaskList"/>
+    </request-map>
+    <request-map uri="createTaskList">
+        <security https="true" auth="true"/>
+        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffort"/>
+        <response name="success" type="view" value="EditTaskList"/>
+        <response name="error" type="view" value="EditTaskList"/>
+    </request-map>    
+    <request-map uri="deleteTaskList">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteWorkEffort"/>
+        <response name="success" type="view" value="Dependencies"/>
+        <response name="error" type="view" value="Dependencies"/>
+    </request-map>
+    <request-map uri="EditTaskListAndAssoc">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditTaskListAndAssoc"/>
+        <response name="error" type="view" value="EditTaskListAndAssoc"/>
+    </request-map>
+    <request-map uri="createTaskListAndAssoc">
+        <security https="true" auth="true"/>
+        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
+        <response name="success" type="view" value="Dependencies"/>
+        <response name="error" type="view" value="Dependencies"/>
+    </request-map>
+    <request-map uri="updateTaskListAndAssoc">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffortAndAssoc"/>
+        <response name="success" type="view" value="Dependencies"/>
+        <response name="error" type="view" value="Dependencies"/>
+    </request-map>
+    <request-map uri="ChildTaskWorkEfforts">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ChildTaskWorkEfforts"/>
+    </request-map>
+    <request-map uri="FindPhase">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="FindPhase"/>
+    </request-map>
+    <request-map uri="createPhaseAndAssoc">
+        <security https="true" auth="true"/>
+        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
+        <response name="success" type="view" value="FindPhase"/>
+        <response name="error" type="view" value="FindPhase"/>
+    </request-map>
+    <request-map uri="updatePhaseAndAssoc">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffortAndAssoc"/>
+        <response name="success" type="view" value="FindPhase"/>
+        <response name="error" type="view" value="FindPhase"/>
+    </request-map>
+    <request-map uri="EditProjectSkills">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditProjectSkills"/>
+    </request-map>
+    <request-map uri="createProjectSkillStandard">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createWorkEffortSkillStandard"/>
+        <response name="success" type="view" value="EditProjectSkills"/>
+        <response name="error" type="view" value="EditProjectSkills"/>
+    </request-map>
+    <request-map uri="updateProjectSkillStandard">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffortSkillStandard"/>
+        <response name="success" type="view" value="EditProjectSkills"/>
+        <response name="error" type="view" value="EditProjectSkills"/>
+    </request-map>
+    <request-map uri="deleteProjectSkillStandard">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteWorkEffortSkillStandard"/>
+        <response name="success" type="view" value="EditProjectSkills"/>
+        <response name="error" type="view" value="EditProjectSkills"/>
+    </request-map>
+    <request-map uri="EditTaskSkills">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditTaskSkills"/>
+    </request-map>
+    <request-map uri="createTaskSkillStandard">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createWorkEffortSkillStandard"/>
+        <response name="success" type="view" value="EditTaskSkills"/>
+        <response name="error" type="view" value="EditTaskSkills"/>
+    </request-map>
+    <request-map uri="updateTaskSkillStandard">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffortSkillStandard"/>
+        <response name="success" type="view" value="EditTaskSkills"/>
+        <response name="error" type="view" value="EditTaskSkills"/>
+    </request-map>
+    <request-map uri="projectView">
+        <security https="true" auth="true"/>        
+        <response name="success" type="view" value="projectView"/>
+        <response name="error" type="view" value="projectView"/>
+    </request-map>
+    <request-map uri="createWeeklyTimesheet">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createTimesheetForThisWeek"/>
+        <response name="success" type="view" value="Timesheet"/>
+        <response name="error" type="view" value="Timesheet"/>
+    </request-map>
+    <request-map uri="addWeeklyTimesheet">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="addWeeklyTimesheet"/>
+        <response name="error" type="view" value="addWeeklyTimesheet"/>
+    </request-map>
+    <request-map uri="createMyWeeklyTimesheet">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createTimesheetForThisWeek"/>
+        <response name="success" type="view" value="MyTimesheet"/>
+        <response name="error" type="view" value="MyTimesheet"/>
+    </request-map>
+    <request-map uri="MyTimesheet">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="MyTimesheet"/>
+        <response name="error" type="view" value="MyTimesheet"/>
+    </request-map>
+    <request-map uri="EditTimeEntries">
+        <security https="true" auth="true"/>        
+        <response name="success" type="view" value="EditTimeEntries"/>
+        <response name="error" type="view" value="EditTimeEntries"/>    
+    </request-map>
+    <request-map uri="createTimeEntry">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createTimeEntryInTimesheet"/>
+        <response name="success" type="view" value="EditTimeEntries"/>
+        <response name="error" type="view" value="EditTimeEntries"/>
+    </request-map>
+    <request-map uri="updateMyTimesheet">
+        <security https="true" auth="true"/>
+        <event type="service-multi" invoke="updateTimeEntryByWorkeffort"/>
+        <response name="success" type="view" value="MyTimesheet"/>
+        <response name="error" type="view" value="MyTimesheet"/>
+    </request-map>
+    <request-map uri="updateTimesheet">
+        <security https="true" auth="true"/>
+        <event type="service-multi" invoke="updateTimeEntryByWorkeffort"/>
+        <response name="success" type="view" value="Timesheet"/>
+        <response name="error" type="view" value="Timesheet"/>
+    </request-map>
     <request-map uri="updateTimeEntry">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateTimeEntry"/>
         <response name="success" type="view" value="EditTimeEntries"/>
         <response name="error" type="view" value="EditTimeEntries"/>
     </request-map>
-    <request-map uri="deleteTimeEntry">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="deleteTimeEntry"/>
-        <response name="success" type="view" value="EditTimeEntries"/>
-        <response name="error" type="view" value="EditTimeEntries"/>
-    </request-map>
-    <request-map uri="FindTimeSheet">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="FindTimeSheet"/>
-        <response name="error" type="view" value="FindTimeSheet"/>
-    </request-map>
-    <request-map uri="EditTimeSheet">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditTimeSheet"/>
-        <response name="error" type="view" value="FindTimeSheet"/>
-    </request-map>
-    <request-map uri="createTimesheets">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createTimesheets"/>
-        <response name="success" type="view" value="FindTimeSheet"/>
-        <response name="error" type="view" value="FindTimeSheet"/>
-    </request-map>
-    <request-map uri="deleteTimeSheet">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="deleteTimesheet"/>
-        <response name="success" type="view" value="FindTimeSheet"/>
-        <response name="error" type="view" value="FindTimeSheet"/>
-    </request-map>
-    <request-map uri="EditTaskNotes">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditTaskNotes"/>
-        <response name="error" type="view" value="EditTaskNotes"/>
-    </request-map>
-    <request-map uri="createTaskNote">
-        <security https="true" auth="true"/>
-        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
-        <response name="success" type="view" value="EditTaskNotes"/>
-        <response name="error" type="view" value="EditTaskNotes"/>
-    </request-map>
-    <request-map uri="updateTaskNote">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffortNote"/>
-        <response name="success" type="view" value="EditTaskNotes"/>
-        <response name="error" type="view" value="EditTaskNotes"/>
-    </request-map>
-    <request-map uri="updateTaskNoteSummary">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffortNote"/>
-        <response name="success" type="view" value="taskView"/>
-        <response name="error" type="view" value="taskView"/>
-    </request-map>
-    <request-map uri="updateProjectNote">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWorkEffortNote"/>
-        <response name="success" type="view" value="projectView"/>
-        <response name="error" type="view" value="projectView"/>
-    </request-map>
-    <request-map uri="taskView">
-        <security https="true" auth="true"/>        
-        <response name="success" type="view" value="taskView"/>
-        <response name="error" type="view" value="taskView"/>
-    </request-map>
-    <request-map uri="newNotesForProject">
-        <security https="true" auth="true"/>        
-        <response name="success" type="view" value="projectView"/>
-        <response name="error" type="view" value="projectView"/>
-    </request-map>
-    <request-map uri="createNewNotesForProject">
-        <security https="true" auth="true"/>
-        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
-        <response name="success" type="view" value="projectView"/>
-        <response name="error" type="view" value="projectView"/>
-    </request-map>
-    <request-map uri="newNotesForTask">
-        <security https="true" auth="true"/>        
-        <response name="success" type="view" value="taskView"/>
-        <response name="error" type="view" value="taskView"/>
-    </request-map>
-    <request-map uri="createNewNotesForTask">
-        <security https="true" auth="true"/>
-        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
-        <response name="success" type="view" value="taskView"/>
-        <response name="error" type="view" value="taskView"/>
-    </request-map>
-    <request-map uri="MyStatusToComplete">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateTimesheet"/>
-        <response name="success" type="view" value="MyTimesheet"/>
-        <response name="error" type="view" value="MyTimesheet"/>
-    </request-map>
-    <request-map uri="StatusToComplete">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateTimesheet"/>
-        <response name="success" type="view" value="Timesheet"/>
-        <response name="error" type="view" value="Timesheet"/>
-    </request-map>
+    <request-map uri="deleteTimeEntry">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteTimeEntry"/>
+        <response name="success" type="view" value="EditTimeEntries"/>
+        <response name="error" type="view" value="EditTimeEntries"/>
+    </request-map>
+    <request-map uri="FindTimeSheet">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="FindTimeSheet"/>
+        <response name="error" type="view" value="FindTimeSheet"/>
+    </request-map>
+    <request-map uri="EditTimeSheet">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditTimeSheet"/>
+        <response name="error" type="view" value="FindTimeSheet"/>
+    </request-map>
+    <request-map uri="createTimesheets">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createTimesheets"/>
+        <response name="success" type="view" value="FindTimeSheet"/>
+        <response name="error" type="view" value="FindTimeSheet"/>
+    </request-map>
+    <request-map uri="deleteTimeSheet">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteTimesheet"/>
+        <response name="success" type="view" value="FindTimeSheet"/>
+        <response name="error" type="view" value="FindTimeSheet"/>
+    </request-map>
+    <request-map uri="EditTaskNotes">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditTaskNotes"/>
+        <response name="error" type="view" value="EditTaskNotes"/>
+    </request-map>
+    <request-map uri="createTaskNote">
+        <security https="true" auth="true"/>
+        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
+        <response name="success" type="view" value="EditTaskNotes"/>
+        <response name="error" type="view" value="EditTaskNotes"/>
+    </request-map>
+    <request-map uri="updateTaskNote">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffortNote"/>
+        <response name="success" type="view" value="EditTaskNotes"/>
+        <response name="error" type="view" value="EditTaskNotes"/>
+    </request-map>
+    <request-map uri="updateTaskNoteSummary">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffortNote"/>
+        <response name="success" type="view" value="taskView"/>
+        <response name="error" type="view" value="taskView"/>
+    </request-map>
+    <request-map uri="updateProjectNote">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateWorkEffortNote"/>
+        <response name="success" type="view" value="projectView"/>
+        <response name="error" type="view" value="projectView"/>
+    </request-map>
+    <request-map uri="taskView">
+        <security https="true" auth="true"/>        
+        <response name="success" type="view" value="taskView"/>
+        <response name="error" type="view" value="taskView"/>
+    </request-map>
+    <request-map uri="newNotesForProject">
+        <security https="true" auth="true"/>        
+        <response name="success" type="view" value="projectView"/>
+        <response name="error" type="view" value="projectView"/>
+    </request-map>
+    <request-map uri="createNewNotesForProject">
+        <security https="true" auth="true"/>
+        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
+        <response name="success" type="view" value="projectView"/>
+        <response name="error" type="view" value="projectView"/>
+    </request-map>
+    <request-map uri="newNotesForTask">
+        <security https="true" auth="true"/>        
+        <response name="success" type="view" value="taskView"/>
+        <response name="error" type="view" value="taskView"/>
+    </request-map>
+    <request-map uri="createNewNotesForTask">
+        <security https="true" auth="true"/>
+        <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
+        <response name="success" type="view" value="taskView"/>
+        <response name="error" type="view" value="taskView"/>
+    </request-map>
+    <request-map uri="MyStatusToComplete">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateTimesheet"/>
+        <response name="success" type="view" value="MyTimesheet"/>
+        <response name="error" type="view" value="MyTimesheet"/>
+    </request-map>
+    <request-map uri="StatusToComplete">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateTimesheet"/>
+        <response name="success" type="view" value="Timesheet"/>
+        <response name="error" type="view" value="Timesheet"/>
+    </request-map>
     <request-map uri="FindTask">
         <security https="true" auth="true"/>        
         <response name="success" type="view" value="FindTask"/>
-    </request-map>
-    <request-map uri="Timesheet">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="Timesheet"/>
-        <response name="error" type="view" value="Timesheet"/>
-    </request-map>
-    <request-map uri="TimeSheetStatustoComplete">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateTimesheet"/>
-        <response name="success" type="view" value="Timesheet"/>
-        <response name="error" type="view" value="Timesheet"/>
-    </request-map>
-    <request-map uri="myTimeSheetStatustoComplete">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateTimesheet"/>
-        <response name="success" type="view" value="MyTimesheet"/>
-        <response name="error" type="view" value="MyTimesheet"/>
-    </request-map>
-    <request-map uri="TimeSheetStatustoProgress">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateTimesheetToInProcess"/>
-        <response name="success" type="view" value="Timesheet"/>
-        <response name="error" type="view" value="Timesheet"/>
-    </request-map>
-    <request-map uri="CreateTaskbyRequest">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="CreateTaskbyRequest"/>
-        </request-map>
-    <request-map uri="CreateTaskbyRequests">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createWorkEffort"/>
-        <response name="success" type="request" value="createTaskListForms"/>
-        <response name="error" type="view" value="CreateTaskbyRequest"/>
-        </request-map>
-    <request-map uri="createTaskListForms">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createWorkEffortRequest"/>
-        <response name="success" type="request" value="updaterequeststatus"/>
-        <response name="error" type="view" value="RequestList"/>
-        </request-map>
-    <request-map uri="newrequest">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditRequest"/>
-        </request-map>
-    <request-map uri="ViewRequest">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ViewRequest"/>
-    </request-map>
-    <!-- New request-map -->
-    <request-map uri="viewprofile">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="viewprofile"/>
-    </request-map>
-    <request-map uri="listResourcesTask">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="listResourcesTask"/>
-        <response name="error" type="view" value="listResourcesTask"/>
-    </request-map>
-    <request-map uri="listResourcesProject">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="listResourcesProject"/>
-        <response name="error" type="view" value="listResourcesProject"/>
-    </request-map>
-    <request-map uri="ListResourcesUnBilledHours">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ListResourcesUnBilledHours"/>
-        <response name="error" type="view" value="ListResourcesUnBilledHours"/>
-    </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>
-    <request-map uri="editperson"><security https="true" auth="true"/><response name="success" type="view" value="EditPerson"/></request-map>
-    <request-map uri="updatePerson">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="updatePerson"/>
-        <response name="success" type="request-redirect" value="viewprofile"/>
-        <response name="error" type="view" value="EditPerson"/>
-    </request-map>
-    <request-map uri="AddPartyNote"><security https="true" auth="true"/><response name="success" type="view" value="AddPartyNote"/></request-map>
-    <request-map uri="createPartyNote">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createPartyNote"/>
-        <response name="success" type="view" value="viewprofile"/>
-        <response name="error" type="view" value="AddPartyNote"/>
-    </request-map>
-    <request-map uri="editcontactmech"><security https="true" auth="true"/><response name="success" type="view" value="editcontactmech"/></request-map>
-    <request-map uri="createContactMech">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createPartyContactMech"/>
-        <response name="success" type="view" value="editcontactmech"/>
-        <response name="error" type="view" value="editcontactmech"/>
-    </request-map>
-    <request-map uri="updateContactMech">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updatePartyContactMech"/>
-        <response name="success" type="view" value="editcontactmech"/>
-        <response name="error" type="view" value="editcontactmech"/>
-    </request-map>
-    <request-map uri="deleteContactMech">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="deletePartyContactMech"/>
-        <response name="success" type="view" value="editcontactmech"/>
-        <response name="error" type="view" value="editcontactmech"/>
-    </request-map>
-    <request-map uri="createEmailAddress">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createPartyEmailAddress"/>
-        <response name="success" type="view" value="editcontactmech"/>
-        <response name="error" type="view" value="editcontactmech"/>
-    </request-map>
-    <request-map uri="updateEmailAddress">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updatePartyEmailAddress"/>
-        <response name="success" type="view" value="editcontactmech"/>
-        <response name="error" type="view" value="editcontactmech"/>
-    </request-map>
-    <request-map uri="EditCommunicationEvent"><security https="true" auth="true"/>
-        <response name="success" type="view" value="EditCommunicationEvent"/>
-    </request-map>
-    <request-map uri="EditPartyRates"><security https="true" auth="true"/><response name="success" type="view" value="EditPartyRates"/></request-map>
-    <request-map uri="createPartyRate">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createPartyRate"/>
-        <response name="success" type="view" value="EditPartyRates"/>
-        <response name="error" type="view" value="EditPartyRates"/>
-    </request-map>
-    <request-map uri="updatePartyRate">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updatePartyRate"/>
-        <response name="success" type="view" value="EditPartyRates"/>
-        <response name="error" type="view" value="EditPartyRates"/>
-    </request-map>
-    <request-map uri="deletePartyRate">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="deletePartyRate"/>
-        <response name="success" type="view" value="EditPartyRates"/>
-        <response name="error" type="view" value="EditPartyRates"/>
-    </request-map>
-    <request-map uri="createnewlogin"><security https="true" auth="true"/><response name="success" type="view" value="createnewlogin"/></request-map>
-    <request-map uri="createUserLogin">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="createUserLogin"/>
-        <response name="success" type="view" value="viewprofile"/>
-        <response name="error" type="view" value="createnewlogin"/>
-    </request-map>
-    <request-map uri="showvisits"><security https="true" auth="true"/><response name="success" type="view" value="showvisits"/></request-map>
-    <request-map uri="visitdetail"><security https="true" auth="true"/><response name="success" type="view" value="visitdetail"/></request-map>
-    <request-map uri="editlogin"><security https="true" auth="true"/><response name="success" type="view" value="EditUserLogin"/></request-map>
-    <request-map uri="updatePassword">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="updatePassword"/>
-        <response name="success" type="view" value="EditUserLogin"/>
-        <response name="error" type="view" value="EditUserLogin"/>
-    </request-map>
-    <request-map uri="updateUserLoginSecurity">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="updateUserLoginSecurity"/>
-        <response name="success" type="view" value="EditUserLogin"/>
-        <response name="error" type="view" value="EditUserLogin"/>
-    </request-map>
-    
-    <request-map uri="EditUserLoginSecurityGroups"><security https="true" auth="true"/><response name="success" type="view" value="EditUserLoginSecurityGroups"/></request-map>
-    <request-map uri="userLogin_addUserLoginToSecurityGroup">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="addUserLoginToSecurityGroup"/>
-        <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
-        <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
-    </request-map>
-    <request-map uri="userLogin_updateUserLoginToSecurityGroup">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/>
-        <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
-        <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
-    </request-map>
-    <request-map uri="userLogin_removeUserLoginFromSecurityGroup">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/>
-        <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
-        <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
-    </request-map>
-    <request-map uri="addWorkEffortPartyAssign">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="assignPartyToWorkEffort"/>
-        <response name="success" type="view" value="listResourcesProject"/>
-        <response name="error" type="view" value="listResourcesProject"/>
-    </request-map>
-    <request-map uri="addTaskPartyAssign">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="assignPartyToWorkEffort"/>
-        <response name="success" type="view" value="listResourcesTask"/>
-        <response name="error" type="view" value="listResourcesTask"/>
-    </request-map>
-    <request-map uri="updateResourcesTaskAssigment">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateTaskAssigment"/>
-        <response name="success" type="view" value="listResourcesTask"/>
-        <response name="error" type="view" value="listResourcesTask"/>
-    </request-map>
-    <request-map uri="editpartygroup"><security https="true" auth="true"/><response name="success" type="view" value="EditPartyGroup"/></request-map>
-    <request-map uri="createPartyGroup">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="createPartyGroup"/>
-        <response name="success" type="request-redirect" value="viewprofile"/>
-        <response name="error" type="view" value="EditPartyGroup"/>
-    </request-map>
-    <request-map uri="updatePartyGroup">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="updatePartyGroup"/>
-        <response name="success" type="request-redirect" value="viewprofile"/>
-        <response name="error" type="view" value="EditPartyGroup"/>
-    </request-map>
-    <request-map uri="editperson"><security https="true" auth="true"/><response name="success" type="view" value="EditPerson"/></request-map>
-    <request-map uri="createPerson">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="createPerson"/>
-        <response name="success" type="request-redirect" value="viewprofile"/>
-        <response name="error" type="view" value="EditPerson"/>
-    </request-map>
-    <request-map uri="updatePerson">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="updatePerson"/>
-        <response name="success" type="request-redirect" value="viewprofile"/>
-        <response name="error" type="view" value="EditPerson"/>
-    </request-map>
-    <request-map uri="createnewlogin"><security https="true" auth="true"/><response name="success" type="view" value="createnewlogin"/></request-map>
-    <request-map uri="createUserLogin">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="createUserLogin"/>
-        <response name="success" type="view" value="viewprofile"/>
-        <response name="error" type="view" value="createnewlogin"/>
-    </request-map>
-    <request-map uri="showvisits"><security https="true" auth="true"/><response name="success" type="view" value="showvisits"/></request-map>
-    <request-map uri="AddPartyNote"><security https="true" auth="true"/><response name="success" type="view" value="AddPartyNote"/></request-map>
-    <request-map uri="createPartyNote">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createPartyNote"/>
-        <response name="success" type="view" value="viewprofile"/>
-        <response name="error" type="view" value="AddPartyNote"/>
-    </request-map>
-    <request-map uri="EditPartyRates"><security https="true" auth="true"/><response name="success" type="view" value="EditPartyRates"/></request-map>
-    <request-map uri="createPartyRate">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createPartyRate"/>
-        <response name="success" type="view" value="EditPartyRates"/>
-        <response name="error" type="view" value="EditPartyRates"/>
-    </request-map>
-    <request-map uri="updatePartyRate">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updatePartyRate"/>
-        <response name="success" type="view" value="EditPartyRates"/>
-        <response name="error" type="view" value="EditPartyRates"/>
-    </request-map>
-    <request-map uri="deletePartyRate">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="deletePartyRate"/>
-        <response name="success" type="view" value="EditPartyRates"/>
-        <response name="error" type="view" value="EditPartyRates"/>
-    </request-map>
-    
-    <!-- end of request mappings -->
-
-    <!-- View Mappings -->
-    <view-map name="viewprofile" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#viewprofile"/>
-    <view-map name="listResourcesTask" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#listResourcesTask"/>
-    <view-map name="listResourcesProject" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#listResourcesProject"/>
-    <view-map name="EditPartyGroup" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartyGroup"/>
-    <view-map name="EditPerson" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPerson"/>
-    <view-map name="createnewlogin" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#CreateUserLogin"/>
-    <view-map name="showvisits" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#showvisits"/>
-    <view-map name="AddPartyNote" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#AddPartyNote"/>
-    <view-map name="editcontactmech" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#editcontactmech"/>
-    <view-map name="EditPartyRates" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartyRates"/>
-    
-    <view-map name="main" type="screen" page="component://projectmgr/widget/CommonScreens.xml#Main"/>
+    </request-map>
+    <request-map uri="Timesheet">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="Timesheet"/>
+        <response name="error" type="view" value="Timesheet"/>
+    </request-map>
+    <request-map uri="TimeSheetStatustoComplete">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateTimesheet"/>
+        <response name="success" type="view" value="Timesheet"/>
+        <response name="error" type="view" value="Timesheet"/>
+    </request-map>
+    <request-map uri="myTimeSheetStatustoComplete">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateTimesheet"/>
+        <response name="success" type="view" value="MyTimesheet"/>
+        <response name="error" type="view" value="MyTimesheet"/>
+    </request-map>
+    <request-map uri="TimeSheetStatustoProgress">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateTimesheetToInProcess"/>
+        <response name="success" type="view" value="Timesheet"/>
+        <response name="error" type="view" value="Timesheet"/>
+    </request-map>
+    <request-map uri="CreateTaskbyRequest">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="CreateTaskbyRequest"/>
+        </request-map>
+    <request-map uri="CreateTaskbyRequests">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createWorkEffort"/>
+        <response name="success" type="request" value="createTaskListForms"/>
+        <response name="error" type="view" value="CreateTaskbyRequest"/>
+        </request-map>
+    <request-map uri="createTaskListForms">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createWorkEffortRequest"/>
+        <response name="success" type="request" value="updaterequeststatus"/>
+        <response name="error" type="view" value="RequestList"/>
+        </request-map>
+    <request-map uri="newrequest">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditRequest"/>
+        </request-map>
+    <request-map uri="ViewRequest">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ViewRequest"/>
+    </request-map>
+    <!-- New request-map -->
+    <request-map uri="viewprofile">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="viewprofile"/>
+    </request-map>
+    <request-map uri="listResourcesTask">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="listResourcesTask"/>
+        <response name="error" type="view" value="listResourcesTask"/>
+    </request-map>
+    <request-map uri="listResourcesProject">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="listResourcesProject"/>
+        <response name="error" type="view" value="listResourcesProject"/>
+    </request-map>
+    <request-map uri="ListResourcesUnBilledHours">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ListResourcesUnBilledHours"/>
+        <response name="error" type="view" value="ListResourcesUnBilledHours"/>
+    </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>
+    <request-map uri="editperson"><security https="true" auth="true"/><response name="success" type="view" value="EditPerson"/></request-map>
+    <request-map uri="updatePerson">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="updatePerson"/>
+        <response name="success" type="request-redirect" value="viewprofile"/>
+        <response name="error" type="view" value="EditPerson"/>
+    </request-map>
+    <request-map uri="AddPartyNote"><security https="true" auth="true"/><response name="success" type="view" value="AddPartyNote"/></request-map>
+    <request-map uri="createPartyNote">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createPartyNote"/>
+        <response name="success" type="view" value="viewprofile"/>
+        <response name="error" type="view" value="AddPartyNote"/>
+    </request-map>
+    <request-map uri="editcontactmech"><security https="true" auth="true"/><response name="success" type="view" value="editcontactmech"/></request-map>
+    <request-map uri="createContactMech">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createPartyContactMech"/>
+        <response name="success" type="view" value="editcontactmech"/>
+        <response name="error" type="view" value="editcontactmech"/>
+    </request-map>
+    <request-map uri="updateContactMech">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updatePartyContactMech"/>
+        <response name="success" type="view" value="editcontactmech"/>
+        <response name="error" type="view" value="editcontactmech"/>
+    </request-map>
+    <request-map uri="deleteContactMech">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deletePartyContactMech"/>
+        <response name="success" type="view" value="editcontactmech"/>
+        <response name="error" type="view" value="editcontactmech"/>
+    </request-map>
+    <request-map uri="createEmailAddress">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createPartyEmailAddress"/>
+        <response name="success" type="view" value="editcontactmech"/>
+        <response name="error" type="view" value="editcontactmech"/>
+    </request-map>
+    <request-map uri="updateEmailAddress">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updatePartyEmailAddress"/>
+        <response name="success" type="view" value="editcontactmech"/>
+        <response name="error" type="view" value="editcontactmech"/>
+    </request-map>
+    <request-map uri="EditCommunicationEvent"><security https="true" auth="true"/>
+        <response name="success" type="view" value="EditCommunicationEvent"/>
+    </request-map>
+    <request-map uri="EditPartyRates"><security https="true" auth="true"/><response name="success" type="view" value="EditPartyRates"/></request-map>
+    <request-map uri="createPartyRate">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createPartyRate"/>
+        <response name="success" type="view" value="EditPartyRates"/>
+        <response name="error" type="view" value="EditPartyRates"/>
+    </request-map>
+    <request-map uri="updatePartyRate">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updatePartyRate"/>
+        <response name="success" type="view" value="EditPartyRates"/>
+        <response name="error" type="view" value="EditPartyRates"/>
+    </request-map>
+    <request-map uri="deletePartyRate">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deletePartyRate"/>
+        <response name="success" type="view" value="EditPartyRates"/>
+        <response name="error" type="view" value="EditPartyRates"/>
+    </request-map>
+    <request-map uri="createnewlogin"><security https="true" auth="true"/><response name="success" type="view" value="createnewlogin"/></request-map>
+    <request-map uri="createUserLogin">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="createUserLogin"/>
+        <response name="success" type="view" value="viewprofile"/>
+        <response name="error" type="view" value="createnewlogin"/>
+    </request-map>
+    <request-map uri="showvisits"><security https="true" auth="true"/><response name="success" type="view" value="showvisits"/></request-map>
+    <request-map uri="visitdetail"><security https="true" auth="true"/><response name="success" type="view" value="visitdetail"/></request-map>
+    <request-map uri="editlogin"><security https="true" auth="true"/><response name="success" type="view" value="EditUserLogin"/></request-map>
+    <request-map uri="updatePassword">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="updatePassword"/>
+        <response name="success" type="view" value="EditUserLogin"/>
+        <response name="error" type="view" value="EditUserLogin"/>
+    </request-map>
+    <request-map uri="updateUserLoginSecurity">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="updateUserLoginSecurity"/>
+        <response name="success" type="view" value="EditUserLogin"/>
+        <response name="error" type="view" value="EditUserLogin"/>
+    </request-map>
+    
+    <request-map uri="EditUserLoginSecurityGroups"><security https="true" auth="true"/><response name="success" type="view" value="EditUserLoginSecurityGroups"/></request-map>
+    <request-map uri="userLogin_addUserLoginToSecurityGroup">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="addUserLoginToSecurityGroup"/>
+        <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
+        <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
+    </request-map>
+    <request-map uri="userLogin_updateUserLoginToSecurityGroup">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/>
+        <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
+        <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
+    </request-map>
+    <request-map uri="userLogin_removeUserLoginFromSecurityGroup">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/>
+        <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
+        <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
+    </request-map>
+    <request-map uri="addWorkEffortPartyAssign">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="assignPartyToWorkEffort"/>
+        <response name="success" type="view" value="listResourcesProject"/>
+        <response name="error" type="view" value="listResourcesProject"/>
+    </request-map>
+    <request-map uri="addTaskPartyAssign">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="assignPartyToWorkEffort"/>
+        <response name="success" type="view" value="listResourcesTask"/>
+        <response name="error" type="view" value="listResourcesTask"/>
+    </request-map>
+    <request-map uri="updateResourcesTaskAssigment">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateTaskAssigment"/>
+        <response name="success" type="view" value="listResourcesTask"/>
+        <response name="error" type="view" value="listResourcesTask"/>
+    </request-map>
+    <request-map uri="editpartygroup"><security https="true" auth="true"/><response name="success" type="view" value="EditPartyGroup"/></request-map>
+    <request-map uri="createPartyGroup">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="createPartyGroup"/>
+        <response name="success" type="request-redirect" value="viewprofile"/>
+        <response name="error" type="view" value="EditPartyGroup"/>
+    </request-map>
+    <request-map uri="updatePartyGroup">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="updatePartyGroup"/>
+        <response name="success" type="request-redirect" value="viewprofile"/>
+        <response name="error" type="view" value="EditPartyGroup"/>
+    </request-map>
+    <request-map uri="editperson"><security https="true" auth="true"/><response name="success" type="view" value="EditPerson"/></request-map>
+    <request-map uri="createPerson">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="createPerson"/>
+        <response name="success" type="request-redirect" value="viewprofile"/>
+        <response name="error" type="view" value="EditPerson"/>
+    </request-map>
+    <request-map uri="updatePerson">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="updatePerson"/>
+        <response name="success" type="request-redirect" value="viewprofile"/>
+        <response name="error" type="view" value="EditPerson"/>
+    </request-map>
+    <request-map uri="createnewlogin"><security https="true" auth="true"/><response name="success" type="view" value="createnewlogin"/></request-map>
+    <request-map uri="createUserLogin">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="createUserLogin"/>
+        <response name="success" type="view" value="viewprofile"/>
+        <response name="error" type="view" value="createnewlogin"/>
+    </request-map>
+    <request-map uri="showvisits"><security https="true" auth="true"/><response name="success" type="view" value="showvisits"/></request-map>
+    <request-map uri="AddPartyNote"><security https="true" auth="true"/><response name="success" type="view" value="AddPartyNote"/></request-map>
+    <request-map uri="createPartyNote">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createPartyNote"/>
+        <response name="success" type="view" value="viewprofile"/>
+        <response name="error" type="view" value="AddPartyNote"/>
+    </request-map>
+    <request-map uri="EditPartyRates"><security https="true" auth="true"/><response name="success" type="view" value="EditPartyRates"/></request-map>
+    <request-map uri="createPartyRate">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createPartyRate"/>
+        <response name="success" type="view" value="EditPartyRates"/>
+        <response name="error" type="view" value="EditPartyRates"/>
+    </request-map>
+    <request-map uri="updatePartyRate">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updatePartyRate"/>
+        <response name="success" type="view" value="EditPartyRates"/>
+        <response name="error" type="view" value="EditPartyRates"/>
+    </request-map>
+    <request-map uri="deletePartyRate">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deletePartyRate"/>
+        <response name="success" type="view" value="EditPartyRates"/>
+        <response name="error" type="view" value="EditPartyRates"/>
+    </request-map>
+    
+    <!-- end of request mappings -->
+
+    <!-- View Mappings -->
+    <view-map name="viewprofile" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#viewprofile"/>
+    <view-map name="listResourcesTask" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#listResourcesTask"/>
+    <view-map name="listResourcesProject" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#listResourcesProject"/>
+    <view-map name="EditPartyGroup" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartyGroup"/>
+    <view-map name="EditPerson" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPerson"/>
+    <view-map name="createnewlogin" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#CreateUserLogin"/>
+    <view-map name="showvisits" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#showvisits"/>
+    <view-map name="AddPartyNote" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#AddPartyNote"/>
+    <view-map name="editcontactmech" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#editcontactmech"/>
+    <view-map name="EditPartyRates" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartyRates"/>
+    
+    <view-map name="main" type="screen" page="component://projectmgr/widget/CommonScreens.xml#Main"/>
     <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="projectBilling" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#projectBilling"/>
-    <view-map name="ListResourcesUnBilledHours" type="screen" page="component://projectmgr/widget/ResourceScreens.xml#ListUnBilledHours"/>
-    <view-map name="EditWorkEffort" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProject"/>
-    <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="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="projectBilling" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#projectBilling"/>
+    <view-map name="ListResourcesUnBilledHours" type="screen" page="component://projectmgr/widget/ResourceScreens.xml#ListUnBilledHours"/>
+    <view-map name="EditWorkEffort" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProject"/>
+    <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="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"/>
-    <view-map name="Dependencies" type="screen" page="component://projectmgr/widget/TaskScreens.xml#Dependencies"/>
+    <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"/>
+    <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="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"/>
-    <view-map name="FindPhase" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#FindPhase"/>
-    <view-map name="EditProjectSkills" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectSkills"/>
-    <view-map name="EditTaskSkills" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskSkills"/>
-    <view-map name="projectView" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#ProjectView"/>
-    <view-map name="EditPartySkills" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartySkills"/>
-    <view-map name="EditTimeEntries" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTimeEntries"/>
-    <view-map name="FindTimeSheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#FindTimeSheet"/>
-    <view-map name="EditTimeSheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#EditTimeSheet"/>
-    <view-map name="addWeeklyTimesheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#addWeeklyTimesheet"/>
+    <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"/>
+    <view-map name="FindPhase" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#FindPhase"/>
+    <view-map name="EditProjectSkills" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectSkills"/>
+    <view-map name="EditTaskSkills" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskSkills"/>
+    <view-map name="projectView" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#ProjectView"/>
+    <view-map name="EditPartySkills" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartySkills"/>
+    <view-map name="EditTimeEntries" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTimeEntries"/>
+    <view-map name="FindTimeSheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#FindTimeSheet"/>
+    <view-map name="EditTimeSheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#EditTimeSheet"/>
+    <view-map name="addWeeklyTimesheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#addWeeklyTimesheet"/>
     <view-map name="EditTimesheetEntries" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#EditTimeSheetEntries"/>
     <view-map name="EditTimesheetRoles" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#EditTimesheetRoles"/>
     <view-map name="MyTimesheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#MyTimesheet"/>
-    <view-map name="EditSkillTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditSkillTypes"/>
-    <view-map name="EditPartySkills" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartySkills"/>
-    <view-map name="EditWorkEffortNotes" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectNotes"/>
-    <view-map name="EditTaskNotes" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskNotes"/>
-    <view-map name="taskView" type="screen" page="component://projectmgr/widget/TaskScreens.xml#TaskView"/>
-    <view-map name="Timesheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#Timesheet"/>
-    <view-map name="CreateTaskbyRequest" type="screen" page="component://projectmgr/widget/TaskScreens.xml#CreateTaskbyRequest"/>
-    <view-map name="RequestList" type="screen" page="component://projectmgr/widget/RequestScreens.xml#RequestList"/>
-    <view-map name="EditRequest" type="screen" page="component://projectmgr/widget/RequestScreens.xml#EditRequest"/>
-    <view-map name="ViewRequest" type="screen" page="component://projectmgr/widget/RequestScreens.xml#ViewRequest"/>
-    <!-- end of view mappings -->
-</site-conf>
+    <view-map name="EditSkillTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditSkillTypes"/>
+    <view-map name="EditPartySkills" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartySkills"/>
+    <view-map name="EditWorkEffortNotes" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectNotes"/>
+    <view-map name="EditTaskNotes" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskNotes"/>
+    <view-map name="taskView" type="screen" page="component://projectmgr/widget/TaskScreens.xml#TaskView"/>
+    <view-map name="Timesheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#Timesheet"/>
+    <view-map name="CreateTaskbyRequest" type="screen" page="component://projectmgr/widget/TaskScreens.xml#CreateTaskbyRequest"/>
+    <view-map name="RequestList" type="screen" page="component://projectmgr/widget/RequestScreens.xml#RequestList"/>
+    <view-map name="EditRequest" type="screen" page="component://projectmgr/widget/RequestScreens.xml#EditRequest"/>
+    <view-map name="ViewRequest" type="screen" page="component://projectmgr/widget/RequestScreens.xml#ViewRequest"/>
+    <!-- end of view mappings -->
+</site-conf>