Author: hansbak
Date: Fri Oct 31 05:24:50 2008 New Revision: 709396 URL: http://svn.apache.org/viewvc?rev=709396&view=rev Log: create/edit task now use all the same form Modified: 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/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=709396&r1=709395&r2=709396&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Fri Oct 31 05:24:50 2008 @@ -149,10 +149,6 @@ <security https="true" auth="true"/> <response name="success" type="view" value="EditTask"/> </request-map> - <request-map uri="addProjectTask"> - <security https="true" auth="true"/> - <response name="success" type="view" value="AddProjectTask"/> - </request-map> <request-map uri="EditTaskPartyAssigns"> <security https="true" auth="true"/> <response name="success" type="view" value="EditTaskPartyAssigns"/> @@ -215,12 +211,6 @@ <response name="success" type="view" value="EditProjectTasks"/> <response name="error" type="view" value="EditProjectTasks"/> </request-map> - <request-map uri="createProjectTask"> - <security https="true" auth="true"/> - <event type="service" invoke="createProjectTask"/> - <response name="success" type="request-redirect" value="EditProjectTasks"/> - <response name="error" type="view" value="AddProjectTask"/> - </request-map> <request-map uri="createProjectPhase"> <security https="true" auth="true"/> <event type="service" invoke="createWorkEffort"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=709396&r1=709395&r2=709396&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Fri Oct 31 05:24:50 2008 @@ -94,6 +94,7 @@ <screen name="CommonTaskDecorator"> <section> <actions> + <set field="headerItem" value="task"/> <entity-one entity-name="WorkEffort" value-name="workEffort"/> <service service-name="getProjectIdAndNameFromTask" result-map-name="result"> <field-map field-name="taskId" env-name="parameters.workEffortId"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=709396&r1=709395&r2=709396&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Fri Oct 31 05:24:50 2008 @@ -309,8 +309,17 @@ </menu-item> </menu> <menu name="TaskSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected"> - <menu-item name="new" title="${uiLabelMap.CommonNew}" > - <link target="addProjectTask"/> + <menu-item name="new" title="${uiLabelMap.CommonNew}"> + <condition> + <or> + <not><if-empty field-name="workEffort"/></not> + <and> + <if-empty field-name="workEffort"/> + <if-compare field-name="tabButtonItem" operator="equals" value="find"/> + </and> + </or> + </condition> + <link target="EditTask"/> </menu-item> <menu-item name="setonhold" title="${uiLabelMap.ProjectMgrSetOnHold}" > <condition> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=709396&r1=709395&r2=709396&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Fri Oct 31 05:24:50 2008 @@ -246,8 +246,8 @@ <widgets> <label style="h3" text="${uiLabelMap.ProjectMgrNoPhasesYet}"/> </widgets> - <fail-widgets> - <include-form name="AddProjectTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <fail-widgets> + <include-form name="EditTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> </fail-widgets> </section> </container> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=709396&r1=709395&r2=709396&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Fri Oct 31 05:24:50 2008 @@ -160,6 +160,7 @@ <actions> <set field="titleProperty" value="PageTitleFindTask"/> <set field="headerItem" value="task"/> + <set field="tabButtonItem" value="find"/> <set field="labelTitleProperty" value="ProjectMgrListTasks"/> </actions> <widgets> @@ -216,25 +217,6 @@ </widgets> </section> </screen> - <screen name="AddProjectTask"> - <section> - <actions> - <set field="headerItem" value="task"/> - <set field="titleProperty" value="PageTitleEditTask"/> - <set field="tabButtonItem" value="edittask"/> - <set field="labelTitleProperty" value="PageTitleEditTaskList"/> - </actions> - <widgets> - <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleEditTask} #${task.workEffortId} ${uiLabelMap.CommonInformation}"> - <include-form name="AddProjectTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="EditTaskListAndAssoc"> <section> <actions> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=709396&r1=709395&r2=709396&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Fri Oct 31 05:24:50 2008 @@ -27,18 +27,18 @@ <service service-name="getProjectTask" result-map-name="result"> <field-map field-name="taskId" env-name="workEffortId"/> </service> - <set field="statusId" from-field="result.taskInfo.currentStatusId"/> </actions> <alt-target use-when="myTask!=void && parameters.get("workEffortParentId")!=null" target="createMyTask"/> <alt-target use-when="myTask!=void && parameters.get("workEffortParentId")==null" target="MyTasks"/> - <alt-target use-when="myTask==void&&task==null" target="createTask"/> + <alt-target use-when="myTask==void&&task==null&&projectId==void" target="createTask"/> + <alt-target use-when="myTask==void&&task==void&&projectId!=null" target="createProjectTaskOrPhase"/> + <field name="workEffortId" use-when="task!=null"><hidden value="${task.workEffortId}"/></field> <field name="statusId"><hidden value="PAS_ASSIGNED"/></field> <field name="partyId" use-when="myTask!=void"><hidden value="${userLogin.partyId}"/></field> <field name="projectId"><hidden value="${parameters.projectId}"/></field> - <field name="workEffortTypeId"><hidden value="TASK"/></field> - <field name="workEffortId" use-when="task!=null" title="${uiLabelMap.ProjectMgrWorkEffortId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> + <field name="workEffortTypeId" use-when="task==null||task==void"><hidden value="TASK"/></field> <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field> - <field name="workEffortParentId" use-when="myTask==void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}"> + <field name="workEffortParentId" use-when="myTask==void&&projectId!=void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}"> <drop-down allow-empty="true"> <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}[${workEffortId}]"> <entity-constraint name="workEffortTypeId" value="PHASE"/> @@ -47,6 +47,15 @@ </entity-options> </drop-down> </field> + <field name="workEffortParentId" use-when="myTask==void&&projectId==void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}"> + <drop-down allow-empty="true"> + <entity-options entity-name="ProjectPartyAndPhase" key-field-name="phaseId" description="${projectName} -- ${phaseName}"> + <entity-constraint name="partyId" env-name="userLogin.partyId"/> + <entity-order-by field-name="projectName"/> + <entity-order-by field-name="phaseName"/> + </entity-options> + </drop-down> + </field> <field name="workEffortParentId" use-when="myTask!=void&&parameters.get("workEffortParentId")!=null" title="${uiLabelMap.ProjectMgrTaskPhase}*"> <display-entity entity-name="WorkEffort" description="${workEffortName}[${workEffortId}]" key-field-name="workEffortId"> <sub-hyperlink target="MyTasks" description="[${uiLabelMap.CommonChange}]"/> @@ -76,8 +85,8 @@ <entity-options entity-name="SkillType" description="${description}"/> </drop-down> </field> - <field name="currentStatusId" use-when="myTask!=null||task==null" ><hidden value="PTS_CREATED"/></field> - <field name="statusId" use-when="task!=null"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> + <field name="currentStatusId" use-when="task!=null" entry-name="result.taskInfo.currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> + <field name="currentStatusId" use-when="task==null||task==void"><hidden value="PTS_CREATED"/></field> <field name="priority" title="${uiLabelMap.CommonPriority}"> <drop-down allow-empty="true" current="selected"> <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/> @@ -104,71 +113,6 @@ <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}" position="2"><date-time type="date"/></field> <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field> </form> - <form name="AddProjectTask" type="single" target="createProjectTask" - header-row-style="header-row" default-table-style="basic-table"> - <field name="workEffortTypeId"><hidden value="TASK"/></field> - <field name="currentStatusId"><hidden value="PTS_CREATED"/></field> - <field name="projectId"><hidden value="${parameters.projectId}"/></field> - <field name="taskName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field> - <field name="taskDescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text/></field> - <field name="phaseName" use-when="projectId!=void" parameter-name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"> - <drop-down allow-empty="false"> - <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"> - <entity-constraint name="workEffortTypeId" value="PHASE"/> - <entity-constraint name="workEffortParentId" value="${projectId}"/> - <entity-order-by field-name="workEffortName"/> - </entity-options> - </drop-down> - </field> - <field name="childWorkEffortId" use-when="projectId==void" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*" parameter-name="workEffortParentId" required-field="true" tooltip="${uiLabelMap.CommonRequired}"> - <drop-down allow-empty="true"> - <entity-options entity-name="WorkEffortAndChild" description="${workEffortName} : ${childWorkEffortName}"> - <entity-constraint name="childWorkEffortTypeId" value="PHASE"/> - <entity-order-by field-name="workEffortName"/> - <entity-order-by field-name="childWorkEffortName"/> - </entity-options> - </drop-down> - </field> - <field name="estimatedHours" title="${uiLabelMap.ProjectMgrEstimatedHours}"><text size="5"/></field> - <field name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}"> - <drop-down allow-empty="true"> - <entity-options entity-name="SkillType" description="${description}"/> - </drop-down> - </field> - <field name="taskPriority" parameter-name="priority" title="${uiLabelMap.CommonPriority}"> - <drop-down allow-empty="true" current="selected"> - <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/> - <option key="2" description="2"/> - <option key="3" description="3"/> - <option key="4" description="4"/> - <option key="5" description="5"/> - <option key="6" description="6"/> - <option key="7" description="7"/> - <option key="8" description="8"/> - <option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/> - </drop-down> - </field> - <field name="taskScopeEnumId" parameter-name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}"> - <drop-down allow-empty="false"> - <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> - <entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/> - <entity-order-by field-name="description"/> - </entity-options> - </drop-down> - </field> - <field name="phaseName" use-when="projectId!=void" parameter-name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}"> - <drop-down allow-empty="false"> - <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"> - <entity-constraint name="workEffortTypeId" value="PHASE"/> - <entity-constraint name="workEffortParentId" value="${projectId}"/> - <entity-order-by field-name="workEffortName"/> - </entity-options> - </drop-down> - </field> - <field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><date-time type="date"/></field> - <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><date-time type="date"/></field> - <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field> - </form> <form name="AddProjectPhase" type="single" target="createProjectTaskOrPhase" header-row-style="header-row" default-table-style="basic-table"> <field name="projectId"><hidden value="${parameters.projectId}"/></field> @@ -522,10 +466,10 @@ <field name="taskDescription" title="${uiLabelMap.CommonDescription}"><display/></field> <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"></display-entity></field> <field name="priority" title="${uiLabelMap.CommonPriority}"><display type="date"/></field> - <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field> - <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field> - <field name="actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field> - <field name="actualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field> + <field name="estimatedStartDate"><display type="date"/></field> + <field name="estimatedCompletionDate"><display type="date"/></field> + <field name="actualStartDate"><display type="date"/></field> + <field name="actualCompletionDate"><display type="date"/></field> <field name="plannedHours"><display/></field> <field name="actualHours"><display/></field> <field name="createdDate"><display type="date"/></field> |
Free forum by Nabble | Edit this page |