svn commit: r598947 - in /ofbiz/trunk: applications/workeffort/entity
Locked
svn commit: r598947 - in /ofbiz/trunk: applications/workeffort/entity
 
|
Author: hansbak
Date: Wed Nov 28 02:41:03 2007 New Revision: 598947 URL: http://svn.apache.org/viewvc?rev=598947&view=rev Log: added the task dependency screen, to define the order of execution, renamed some screens to better reflect their function Added: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl (with props) Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml?rev=598947&r1=598946&r2=598947&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml (original) +++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml Wed Nov 28 02:41:03 2007 @@ -212,6 +212,7 @@ <alias entity-alias="WETO" name="workEffortToName" field="workEffortName"/> <alias entity-alias="WETO" name="workEffortToSetup" field="estimatedSetupMillis"/> <alias entity-alias="WETO" name="workEffortToRun" field="estimatedMilliSeconds"/> + <alias entity-alias="WETO" name="workEffortToParentId" field="workEffortParentId"/> <alias entity-alias="WETO" name="workEffortToCurrentStatusId" field="currentStatusId"/> <alias entity-alias="WETO" name="workEffortToWorkEffortPurposeTypeId" field="workEffortPurposeTypeId"/> <alias entity-alias="WETO" name="workEffortToEstimatedStartDate" field="estimatedStartDate"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=598947&r1=598946&r2=598947&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original) +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Wed Nov 28 02:41:03 2007 @@ -48,9 +48,12 @@ PageTitleAddPartyAssign=Add Party Assign PageTitleListPartyAssigns=Party Assigns PageTitleListProjectNotes=List Project Notes +PageTitleTasksAfter=Tasks to be executed before the current task +PageTitleTasksAfter=Tasks to be executed after the current task ProjectMgrActualHours=Actual Hours ProjectMgrCompanyName=Ofbiz Company ProjectMgrCompanySubtitle=Project +ProjectMgrDependencies=Dependencies ProjectMgrEditPatySkill=Edit PatySkill ProjectMgrEditPoject=Edit Project ProjectMgrEditTask=Edit Task 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=598947&r1=598946&r2=598947&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Wed Nov 28 02:41:03 2007 @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -115,6 +114,18 @@ <response name="success" type="view" value="EditTask"/> <response name="error" type="view" value="EditTask"/> </request-map> + <request-map uri="addDependency"> + <security https="true" auth="true"/> + <event type="service" invoke="createWorkEffortAssoc"/> + <response name="success" type="view" value="Dependencies"/> + <response name="error" type="view" value="Dependencies"/> + </request-map> + <request-map uri="removeDependency"> + <security https="true" auth="true"/> + <event type="service" invoke="removeWorkEffortAssoc"/> + <response name="success" type="view" value="Dependencies"/> + <response name="error" type="view" value="Dependencies"/> + </request-map> <request-map uri="updateProjectTaskOrPhase"> <security https="true" auth="true"/> <event type="service" invoke="updateWorkEffort"/> @@ -150,10 +161,10 @@ <response name="success" type="view" value="FindTask"/> <response name="error" type="view" value="FindTask"/> </request-map> - <request-map uri="FindTaskList"> + <request-map uri="Dependencies"> <security https="true" auth="true"/> - <response name="success" type="view" value="FindTaskList"/> - <response name="error" type="view" value="FindTaskList"/> + <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"/> @@ -173,8 +184,8 @@ <request-map uri="deleteTaskList"> <security https="true" auth="true"/> <event type="service" invoke="deleteWorkEffort"/> - <response name="success" type="view" value="FindTaskList"/> - <response name="error" type="view" value="FindTaskList"/> + <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"/> @@ -184,14 +195,14 @@ <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="FindTaskList"/> - <response name="error" type="view" value="FindTaskList"/> + <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="FindTaskList"/> - <response name="error" type="view" value="FindTaskList"/> + <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"/> @@ -383,7 +394,7 @@ <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="FindTaskList" type="screen" page="component://projectmgr/widget/TaskScreens.xml#FindTaskList"/> + <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="EditTaskListAndAssoc" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskListAndAssoc"/> <view-map name="ChildTaskWorkEfforts" type="screen" page="component://projectmgr/widget/TaskScreens.xml#ChildTaskWorkEfforts"/> @@ -391,7 +402,7 @@ <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#ProjectSummary"/> + <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/ProjectScreens.xml#EditTimeEntries"/> <view-map name="FindTimeSheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#FindTimeSheet"/> Added: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl?rev=598947&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl (added) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl Wed Nov 28 02:41:03 2007 @@ -0,0 +1,20 @@ +<#-- +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. +--> +<script language="javascript" src="/projectmgr/js/gantt.js" type="text/javascript"></script> + Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=598947&r1=598946&r2=598947&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Wed Nov 28 02:41:03 2007 @@ -35,11 +35,7 @@ <!-- The two default (global) stylesheets are added to the list of stylesheets to the first and second position --> - <set field="layoutSettings.styleSheets[+0]" value="/images/maincss.css" global="true"/> - <!-- The default (global) java scripts --> - <set field="layoutSettings.javaScripts[]" value="/images/calendar1.js" global="true"/> - <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> - <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/images/dojo/dojo.js" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.ProjectMgrCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ProjectMgrCompanySubtitle" global="true"/> @@ -101,9 +97,9 @@ <screen name="CommonTaskDecorator"> <section> <actions> - <set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/> <set field="headerItem" value="mytasks"/> <entity-one entity-name="WorkEffort" value-name="workEffort"/> + <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -116,12 +112,12 @@ <section> <condition> <not> - <if-empty field-name="workEffortId"/> + <if-empty field-name="workEffort"/> </not> </condition> <widgets> <include-menu name="TaskTabBar" location="component://projectmgr/widget/Menus.xml"/> - <label style="head1" text="${uiLabelMap.ProjectMgrTaskCurrent}: ${workEffort.workEffortName}[${workEffort.workEffortId}]"/> + <label style="head1" text="${uiLabelMap.ProjectMgrTaskCurrent}: ${workEffort.workEffortName}[${workEffort.workEffortId}] Project: ${projectName}"/> </widgets> </section> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=598947&r1=598946&r2=598947&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Wed Nov 28 02:41:03 2007 @@ -43,8 +43,8 @@ <menu-item name="projectView" title="${uiLabelMap.ProjectMgrProjectSummary}"><link target="projectView?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item> <menu-item name="editproject" title="${uiLabelMap.ProjectMgrEditPoject}"><link target="EditProject?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item> <menu-item name="phases" title="${uiLabelMap.ProjectMgrPhases}"><link target="FindPhase?workEffortIdFrom=${parameters.workEffortIdFrom}&workEffortTypeId=PHASE&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item> + <menu-item name="tasks" title="${uiLabelMap.ProjectMgrTasks}"><link target="FindTask?workEffortIdFrom=${parameters.workEffortIdFrom}&workEffortTypeId=TASK&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item> <menu-item name="subprojects" title="${uiLabelMap.ProjectMgrSubProjects}"><link target="FindProject?workEffortIdFrom=${parameters.workEffortIdFrom}&workEffortTypeId=PROJECT&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item> - <menu-item name="tasks" title="${uiLabelMap.ProjectMgrTasks}"><link target="FindTask?workEffortIdFrom=${parameters.workEffortIdFrom}&workEffortTypeId=TASK&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item> <menu-item name="notes" title="${uiLabelMap.CommonNotes}"><link target="EditWorkEffortNotes?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item> <menu-item name="projectskills" title="${uiLabelMap.ProjectMgrSkillStandards}"><link target="EditProjectSkills?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item> <menu-item name="parties" title="${uiLabelMap.ProjectMgrParties}"><link target="ListWorkEffortPartyAssigns?workEffortIdFrom=${parameters.workEffortIdFrom}"/></menu-item> @@ -53,7 +53,7 @@ <menu name="TaskTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected"> <menu-item name="taskView" title="${uiLabelMap.ProjectMgrTaskSummary}"><link target="taskView?workEffortId=${workEffortId}"/></menu-item> <menu-item name="edittask" title="${uiLabelMap.ProjectMgrEditTask}"><link target="EditTask?workEffortId=${workEffortId}"/></menu-item> - <menu-item name="subtasks" title="${uiLabelMap.ProjectMgrSubTasks}"><link target="FindTaskList?workEffortIdFrom=${workEffortId}&workEffortTypeId=TASK&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item> + <menu-item name="dependencies" title="${uiLabelMap.ProjectMgrDependencies}"><link target="Dependencies?workEffortId=${workEffortId}"/></menu-item> <menu-item name="projectskills" title="${uiLabelMap.ProjectMgrSkillStandards}"><link target="EditTaskSkills?workEffortId=${workEffortId}"/></menu-item> <menu-item name="notes" title="${uiLabelMap.CommonNotes}"><link target="EditTaskNotes?workEffortId=${workEffortId}"/></menu-item> <menu-item name="treeDetails" title="${uiLabelMap.ProjectMgrTreeDetails}"><link target="ChildTaskWorkEfforts?workEffortId=${workEffortId}&trail=${workEffortId}&workEffortTypeId=TASK&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=598947&r1=598946&r2=598947&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed Nov 28 02:41:03 2007 @@ -37,7 +37,7 @@ <decorator-section name="body"> <section> <condition> - <if-empty field-name="workEffortId"/> + <!--if-empty field-name="workEffortId"/--> </condition> <!-- This is the code for the List of Projects --> <widgets> @@ -107,7 +107,6 @@ <set field="project" from-field="result.projectInfo"/> </actions> <widgets> - <label text="========${project.estimatedStartDate}"></label> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container style="screenlet"> @@ -512,7 +511,7 @@ </widgets> </section> </screen> - <screen name="ProjectSummary"> + <screen name="ProjectView"> <section> <actions> <set field="tabButtonItem" value="projectView"/> @@ -536,7 +535,8 @@ <include-screen name="SubProjectsInfo"/> <include-screen name="PartiesInfo"/> <include-screen name="NoteInfo"/> - </container> + </container> + <include-screen name="gantChart"/> </widgets> </section> </decorator-section> @@ -544,15 +544,24 @@ </widgets> </section> </screen> - <screen name="ProjectInfo"> - <section> - <widgets> - <platform-specific> - <html><html-template location="component://projectmgr/webapp/projectmgr/project/summary/projectinfo.ftl"/></html> - </platform-specific> - </widgets> - </section> - </screen> + <screen name="gantChart"> + <section> + <widgets> + <platform-specific> + <html><html-template location="component://projectmgr/webapp/projectmgr/project/gantChart.ftl"/></html> + </platform-specific> + </widgets> + </section> + </screen> + <screen name="ProjectInfo"> + <section> + <widgets> + <platform-specific> + <html><html-template location="component://projectmgr/webapp/projectmgr/project/summary/projectinfo.ftl"/></html> + </platform-specific> + </widgets> + </section> + </screen> <screen name="SubProjectsInfo"> <section> <actions> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=598947&r1=598946&r2=598947&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Wed Nov 28 02:41:03 2007 @@ -20,40 +20,67 @@ <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="FindTaskList"> + <screen name="Dependencies"> <section> <actions> <set field="titleProperty" value="PageTitleUnassignedTask"/> - <set field="tabButtonItem" value="subtasks"/> + <set field="tabButtonItem" value="dependencies"/> <set field="labelTitleProperty" value="PageTitleFindTask"/> - <set field="workEffortId" from-field="parameters.workEffortIdFrom"/> - <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/> - <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh"/> + <set field="workEffortId" from-field="parameters.workEffortId"/> + <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/> + <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh"/> </actions> <widgets> <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <if-empty field-name="workEffortId"/> - </condition> - <widgets> - <container><label style="head1">${uiLabelMap.${titleProperty}}</label></container> - <container style="button-bar"><link target="EditTask?workEffortTypeId=TASK" text="${uiLabelMap.ProjectMgrNewTask}" style="buttontext"/></container> - <include-form name="FindTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </widgets> - <fail-widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditSubTask}</label></container> - <container style="screenlet-body"> - <include-form name="ListChildEfforts" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </container> - </container> - <platform-specific> - <html><html-template location="component://projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl"/></html> - </platform-specific> - </fail-widgets> - </section> + <decorator-section name="body"> + <section> + <actions> + <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true"> + <field-map field-name="workEffortIdTo" env-name="parameters.workEffortId"/> + <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/> + </entity-and> + </actions> + <widgets> + <container style="lefthalf"> + <container style="screenlet"> + <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleTasksBefore}</label></container> + <container style="screenlet-body"> + <include-form name="Dependencies" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddDependency}</label></container> + <container style="screenlet-body"> + <include-form name="AddDependencyBefore" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </container> + </container> + </container> + </widgets> + </section> + <section> + <actions> + <entity-and entity-name="WorkEffortAssocView" list-name="depList" filter-by-date="true"> + <field-map field-name="workEffortIdFrom" env-name="parameters.workEffortId"/> + <field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/> + </entity-and> + </actions> + <widgets> + <container style="righthalf"> + <container style="screenlet"> + <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleTasksAfter}</label></container> + <container style="screenlet-body"> + <include-form name="Dependencies" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddDependency}</label></container> + <container style="screenlet-body"> + <include-form name="AddDependencyAfter" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </container> + </container> + </container> + </widgets> + </section> </decorator-section> </decorator-screen> </widgets> @@ -64,7 +91,7 @@ <actions> <set field="titleProperty" value="PageTitleFindTask"/> <set field="labelTitleProperty" value="ProjectMgrTaskName"/> - <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/FindTaskList"/> + <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/Dependencies"/> <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListMyTasks.bsh"/> </actions> <widgets> @@ -93,7 +120,7 @@ <set field="titleProperty" value="PageTitleEditTaskList"/> <set field="tabButtonItem" value="edittask"/> <set field="labelTitleProperty" value="PageTitleEditTaskList"/> - <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/FindTaskList"/> + <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/Dependencies"/> <set field="workEffortId" from-field="parameters.workEffortId"/> <set field="workEffortAssocTypeId" from-field="parameters.workEffortAssocTypeId"/> <entity-one entity-name="WorkEffort" value-name="task"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=598947&r1=598946&r2=598947&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed Nov 28 02:41:03 2007 @@ -162,7 +162,7 @@ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time type="date"/></field> <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field> </form> - <form name="ListTasks" type="list" list-name="tasks" paginate-target="FindTaskList"> + <form name="ListTasks" type="list" list-name="tasks" paginate-target="Dependencies"> <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditTask?workEffortId=${workEffortId}"/> </field> @@ -177,37 +177,52 @@ <field name="actualHours"><display/></field> <field name="createdDate"><display type="date"/></field> </form> - <form name="ListChildEfforts" target="updateTaskListAndAssoc" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTaskList"> - <row-actions> - <entity-one entity-name="StatusItem" value-name="currentStatus"> - <field-map field-name="statusId" env-name="currentStatusId"/> - </entity-one> - </row-actions> - <field name="workEffortTypeId"><hidden/></field> - <field name="workEffortIdTo"><hidden/></field> - <field name="workEffortIdFrom"><hidden/></field> + <form name="Dependencies" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies"> + <field name="workEffortIdTo"><hidden/></field> + <field name="workEffortIdFrom"><hidden/></field> + <field name="workEffortAssocTypeId"><hidden value="WORK_EFF_DEPENDENCY"/></field> <field name="fromDate"><hidden/></field> - <field name="workEffortAssocTypeId"><hidden/></field> - <field name="workEffortId" entry-name="workEffortIdTo"><hidden/></field> - <!--field name="workEffortId" entry-name="workEffortIdTo" position="1" title="${uiLabelMap.CommonName}*" widget-style="buttontext"> - <display-entity entity-name="WorkEffort" description="${workEffortName}"> - <sub-hyperlink target="FindTaskList?workEffortIdFrom=${workEffortIdTo}&workEffortTypeId=TASK&workEffortAssocTypeId=WORK_EFF_BREAKDOWN" description="${workEffortIdTo}" link-style="buttontext"/> - </display-entity> - </field--> - <field name="workEffortName" position="1" title="${uiLabelMap.CommonName}"><display/></field> - <field name="currentStatusId"> - <drop-down allow-empty="false" current-description="${currentStatus.description}"> - <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})"> - <entity-constraint name="statusId" value="${currentStatusId}"/> - <entity-order-by field-name="sequenceId"/> - </entity-options> - </drop-down> - </field> - <field name="description" title="${uiLabelMap.CommonDescription}"><textarea cols="7"/></field> - <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><date-time/></field> - <field name="actualCompletionDate" entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><date-time/></field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - </form> + <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field> + <field name="workEffortToName" title="${uiLabelMap.CommonName}"><display/></field> + <field name="workEffortToParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/>/></field> + <field name="estimatedStartDate" entry-name="workEffortToEstimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/>/></field> + <field name="estimatedCompletionDate" entry-name="workEffortToEstimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field> + <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/>/></field> + <field name="actualCompletionDate" entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field> + <field name="deleteButton"><submit button-type="button"/></field> + </form> + <form name="AddDependencyBefore" type="single" target="addDependency"> + <field name="Copy of ListFilteredTasks.bshworkEffortId"><hidden/></field> + <field name="workEffortIdTo"><hidden value="${parameters.workEffortId}"/></field> + <field name="workEffortAssocTypeId"><hidden value="WORK_EFF_DEPENDENCY"/></field> + <field name="workEffortIdFrom" title="${pr}"> + <drop-down> + <entity-options entity-name="ProjectAndPhaseAndTask" key-field-name="workEffortId" description="${phaseName} -- ${workEffortName}"> + <entity-constraint name="projectId" value="${projectId}"/> + <entity-constraint name="workEffortId" operator="not-equals" env-name="workEffortId"/> + <entity-order-by field-name="phaseName"/> + <entity-order-by field-name="workEffortName"/> + </entity-options> + </drop-down> + </field> + <field name="add"><submit/></field> + </form> + <form name="AddDependencyAfter" type="single" target="addDependency"> + <field name="workEffortId"><hidden/></field> + <field name="workEffortIdFrom"><hidden value="${parameters.workEffortId}"/></field> + <field name="workEffortAssocTypeId"><hidden value="WORK_EFF_DEPENDENCY"/></field> + <field name="workEffortIdTo"> + <drop-down> + <entity-options entity-name="ProjectAndPhaseAndTask" key-field-name="workEffortId" description="${phaseName} -- ${workEffortName}"> + <entity-constraint name="projectId" value="${projectId}"/> + <entity-constraint name="workEffortId" operator="not-equals" env-name="workEffortId"/> + <entity-order-by field-name="phaseName"/> + <entity-order-by field-name="workEffortName"/> + </entity-options> + </drop-down> + </field> + <field name="add"><submit/></field> + </form> <form name="ListTaskSkills" type="list" target="updateTaskSkillStandard" list-name="workEffortSkillStandards" paginate-target="EditTaskSkills"> <field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}"> <display-entity entity-name="WorkEffort" description="${workEffortName} ${workEffortId}"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |