Author: hansbak
Date: Sat Dec 1 18:32:27 2007 New Revision: 600226 URL: http://svn.apache.org/viewvc?rev=600226&view=rev Log: cleanup of project task and phaselist Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=600226&r1=600225&r2=600226&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original) +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Sat Dec 1 18:32:27 2007 @@ -94,7 +94,6 @@ ProjectMgrTaskList=List of Project Tasks ProjectMgrTaskName=Task Name ProjectMgrTasks=Tasks -ProjectMgrTaskList=List of Task ProjectMgrTreeDetails=TreeDetails ProjectMgrParties=Parties ProjectMgrWorkEffortAssocTypeId=Association Type Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=600226&r1=600225&r2=600226&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Sat Dec 1 18:32:27 2007 @@ -32,7 +32,6 @@ <set field="highInfo.projectId" from-field="project.workEffortId"/> <set field="highInfo.projectName" from-field="project.workEffortName"/> <set field="highInfo.projectDescription" from-field="project.description"/> - <set field="highInfo.priority" from-field="project.priority"/> <set field="highInfo.currentStatusId" from-field="project.currentStatusId"/> <set field="highInfo.scopeEnumId" from-field="project.scopeEnumId"/> <entity-one entity-name="StatusItem" value-name="highSeq"> @@ -86,10 +85,9 @@ <set field="highInfo.phaseId" from-field="phase.workEffortId"/> <set field="highInfo.phaseName" from-field="phase.workEffortName"/> <set field="highInfo.phaseDescription" from-field="phase.description"/> - <set field="highInfo.priority" from-field="phase.priority"/> <set field="highInfo.scopeEnumId" from-field="phase.scopeEnumId"/> - <!-- loop through the related tasks --> + <!-- loop through the related tasks and combine information --> <get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/> <iterate entry-name="lowInfo" list-name="tasks"> <call-simple-method method-name="combineInfo"/> @@ -138,9 +136,9 @@ <set field="highInfo.workEffortId" from-field="task.workEffortId"/> <set field="highInfo.workEffortName" from-field="task.workEffortName"/> <set field="highInfo.workEffortDescription" from-field="workEffortDescription"/> - <set field="highInfo.priority" from-field="task.priority"/> <set field="highInfo.currentStatusId" from-field="task.currentStatusId"/> <set field="highInfo.scopeEnumId" from-field="task.scopeEnumId"/> + <set field="highInfo.priority" from-field="task.priority"/> <set field="highInfo.estimatedStartDate" from-field="task.estimatedStartDate"/> <set field="highInfo.estimatedCompletionDate" from-field="task.estimatedCompletionDate"/> <set field="highInfo.actualStartDate" from-field="task.actualStartDate"/> @@ -164,7 +162,6 @@ <set field="highInfo.taskId" from-field="lowInfo.worEffortId"/> <set field="highInfo.taskName" from-field="lowInfo.workEffortName"/> <set field="highInfo.taskDescription" from-field="lowInfo.description"/> - <set field="highInfo.priority" from-field="lowInfo.priority"/> <set field="highInfo.scopeEnumId" from-field="lowInfo.scopeEnumId"/> <call-simple-method method-name="combineInfo"/> <clear-field field-name="highInfo.sequenceId"/> @@ -278,6 +275,18 @@ <else> <if-compare-field map-name="highInfo" to-map-name="lowInfo" field-name="actualCompletionDate" operator="less"> <set field="highInfo.actualCompletionDate" from-field="lowInfo.actualCompletionDate" /> + </if-compare-field> + </else> + </if-empty> + </if-not-empty> + + <!-- combine the priorities --> + <if-not-empty field-name="lowInfo.priority"> + <if-empty field-name="highInfo.priority"> + <set field="highInfo.priority" from-field="lowInfo.priority" /> + <else> + <if-compare-field map-name="highInfo" to-map-name="lowInfo" field-name="priority" operator="less"> + <set field="highInfo.priority" from-field="lowInfo.priority" /> </if-compare-field> </else> </if-empty> 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=600226&r1=600225&r2=600226&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Sat Dec 1 18:32:27 2007 @@ -98,19 +98,19 @@ </request-map> <request-map uri="createTask"> <security https="true" auth="true"/> - <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffort"/> + <event type="service" invoke="createWorkEffort"/> <response name="success" type="view" value="EditTask"/> <response name="error" type="view" value="EditTask"/> </request-map> <request-map uri="createProjectTaskOrPhase"> <security https="true" auth="true"/> - <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffort"/> + <event type="service" invoke="createWorkEffort"/> <response name="success" type="view" value="FindTask"/> <response name="error" type="view" value="FindTask"/> </request-map> <request-map uri="createProjectPhase"> <security https="true" auth="true"/> - <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffort"/> + <event type="service" invoke="createWorkEffort"/> <response name="success" type="view" value="FindPhase"/> <response name="error" type="view" value="FindPhase"/> </request-map> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=600226&r1=600225&r2=600226&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Sat Dec 1 18:32:27 2007 @@ -22,8 +22,8 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> <menu name="ProjectMgrAppBar" default-menu-item-name="task" id="app-navigation" type="simple" selected-menuitem-context-field-name="headerItem" default-selected-style="selected" title="${uiLabelMap.ProjectManagerApplication}" menu-container-style="button-bar tab-bar"> + <menu-item name="mytasks" title="${uiLabelMap.WorkEffortMyTasks}"><link target="MyTasks"/></menu-item> <menu-item name="mytime" title="${uiLabelMap.TimesheetMyTime}"><link target="MyTimesheets"/></menu-item> - <menu-item name="mytasks" title="${uiLabelMap.WorkEffortMyTasks}"><link target="MyTasks"/></menu-item> <menu-item name="projects" title="${uiLabelMap.WorkEffortProjects}"><link target="FindProject?workEffortTypeId=PROJECT"/></menu-item> <menu-item name="timesheet" title="${uiLabelMap.Timesheet}"><link target="FindTimeSheet?findAll=N"/></menu-item> <menu-item name="SkillType" title="${uiLabelMap.ProjectMgrSkillType}"><link target="findSkillTypes"/></menu-item> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=600226&r1=600225&r2=600226&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sat Dec 1 18:32:27 2007 @@ -200,7 +200,6 @@ <order-by field-name="phaseName"/> <order-by field-name="workEffortName"/> </entity-and> - <set field="task" value=""/> </actions> <widgets> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> @@ -217,7 +216,7 @@ <container style="screenlet"> <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddTask}</label></container> <container style="screenlet-body"> - <include-form name="EditTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <include-form name="AddProjectTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> </container> </container> </container> @@ -225,7 +224,7 @@ <container style="screenlet"> <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddPhase}</label></container> <container style="screenlet-body"> - <include-form name="AddPhase" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <include-form name="AddProjectPhase" location="component://projectmgr/widget/forms/TaskForms.xml"/> </container> </container> </container> @@ -303,10 +302,6 @@ <field-map field-name="projectId" env-name="projectId"/> </service> <set field="phases" from-field="result.phaseList"/> - <!--entity-and entity-name="WorkEffort" list-name="phases"> - <field-map field-name="workEffortParentId" env-name="projectId"/> - <field-map field-name="workEffortTypeId" value="PHASE"/> - </entity-and--> </actions> <widgets> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> @@ -323,7 +318,7 @@ <container style="screenlet"> <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddPhase}</label></container> <container style="screenlet-body"> - <include-form name="AddProjectPhase" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <include-form name="AddPhase" location="component://projectmgr/widget/forms/TaskForms.xml"/> </container> </container> </widgets> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=600226&r1=600225&r2=600226&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Dec 1 18:32:27 2007 @@ -169,9 +169,9 @@ <field use-when="actualCompletionDate==null" name="CompletionDate" entry-name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortCompletionDate}" parameter-name="estimatedCompletionDate"><date-time type="date"/></field> <!--field name="description" title="${uiLabelMap.CommonDescription}"><textarea cols="6"/></field--> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="timeEntries" title="${uiLabelMap.ProjectMgrTimeEntries}" widget-style="buttontext"> + <!--field name="timeEntries" title="${uiLabelMap.ProjectMgrTimeEntries}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.ProjectMgrTimeEntries}" target="EditTimeEntries?workEffortId=${workEffortId}"/> - </field> + </field--> </form> <form name="ListUnassignedTasks" target="updateTaskAndAssoc" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTask"> <row-actions> @@ -208,26 +208,8 @@ <field name="phaseId" parameter-name="workEffortId"><hidden/></field> <field name="phaseName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}*"><text/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> - <field 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="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-options> - </drop-down> - </field> + <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field> + <field name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field> <field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><display type="date"/></field> <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><display type="date"/></field> <field name="actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=600226&r1=600225&r2=600226&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sat Dec 1 18:32:27 2007 @@ -27,8 +27,7 @@ <field-map field-name="statusId" env-name="task.statusId"/> </entity-one> </actions> - <alt-target use-when="headerItem=="projects"" target="createProjectTaskOrPhase"/> - <alt-target use-when="task==null&&projectId==null" target="createTask"/> + <alt-target use-when="task==null" target="createTask"/> <field name="projectId"><hidden value="${parameters.projectId}"/></field> <field name="DONE_PAGE"><hidden value="${donePage}"/></field> <field name="workEffortTypeId"><hidden value="TASK"/></field> @@ -44,14 +43,14 @@ </entity-options> </drop-down> </field> - <field use-when="task==null" name="currentStatusId" title="${uiLabelMap.CommonStatus}"> + <!--field use-when="task==null" name="currentStatusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="false"> - <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId"> - <entity-constraint name="statusTypeId" value="TASK_STATUS"/> - <entity-order-by field-name="sequenceId"/> - </entity-options> + <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId"> + <entity-constraint name="statusTypeId" value="TASK_STATUS"/> + <entity-order-by field-name="sequenceId"/> + </entity-options> </drop-down> - </field> + </field--> <field name="priority" title="${uiLabelMap.CommonPriority}"> <drop-down allow-empty="true" current="selected"> <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/> @@ -95,14 +94,22 @@ <field name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><date-time/></field> <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field> </form> - <form name="AddPhase" type="single" target="createProjectTaskOrPhase"> + <form name="AddProjectTask" type="single" target="createProjectTaskOrPhase"> <field name="projectId"><hidden value="${parameters.projectId}"/></field> - <field name="workEffortParentId"><hidden value="${parameters.projectId}"/></field> - <field name="workEffortTypeId"><hidden value="PHASE"/></field> - <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field> - <field name="phaseName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrPhaseName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field> - <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> - <field name="priority" title="${uiLabelMap.CommonPriority}"> + <field name="workEffortTypeId"><hidden value="TASK"/></field> + <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field> + <field name="taskName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field> + <field name="taskDescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text/></field> + <field name="phaseName" 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="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"/> @@ -115,42 +122,42 @@ <option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/> </drop-down> </field> - <field name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}"> + <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-options> </drop-down> </field> + <field name="phaseName" 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="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="createProjectPhase"> + <form name="AddProjectPhase" type="single" target="createProjectTaskOrPhase"> <field name="projectId"><hidden value="${parameters.projectId}"/></field> <field name="workEffortParentId"><hidden value="${parameters.projectId}"/></field> <field name="workEffortTypeId"><hidden value="PHASE"/></field> - <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field> + <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field> <field name="phaseName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrPhaseName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field> - <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> - <field 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="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-options> - </drop-down> - </field> + <field name="phaseDdescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text/></field> + <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field> + </form> + <form name="AddPhase" type="single" target="createProjectPhase"> + <field name="projectId"><hidden value="${parameters.projectId}"/></field> + <field name="workEffortParentId"><hidden value="${parameters.projectId}"/></field> + <field name="workEffortTypeId"><hidden value="PHASE"/></field> + <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field> + <field name="phaseName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrPhaseName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field> + <field name="phaseDdescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text/></field> <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field> </form> |
Free forum by Nabble | Edit this page |