Author: hansbak
Date: Tue Feb 23 10:47:21 2010 New Revision: 915275 URL: http://svn.apache.org/viewvc?rev=915275&view=rev Log: add optional sequenceNum to be able to order phases and tasks within a project Modified: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl 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/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml?rev=915275&r1=915274&r2=915275&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml Tue Feb 23 10:47:21 2010 @@ -28,6 +28,13 @@ <copyright>Copyright 2001-2009 The Apache Software Foundation</copyright> <author>None</author> <version>1.0</version> + + <extend-entity entity-name="WorkEffort"> + <field name="sequenceNum" type="numeric"> + <description>To order the workefforts under a workeffort parent</description> + </field> + </extend-entity> + <view-entity entity-name="ProjectPartyAndPhase" package-name="org.ofbiz.specialpurpose.project" title="To listr all the phases of project the logged user is part off"> @@ -42,6 +49,7 @@ <alias entity-alias="WEP" field="workEffortName" name="projectName"/> <alias entity-alias="WEPH" field="workEffortId" name="phaseId"/> <alias entity-alias="WEPH" field="workEffortName" name="phaseName"/> + <alias entity-alias="WEPH" field="sequenceNum" name="phaseSeqNum"/> <view-link entity-alias="WEPA" rel-entity-alias="WEP"> <key-map field-name="workEffortId"/> </view-link> @@ -65,6 +73,7 @@ <alias entity-alias="WEP" field="currentStatusId" name="projectStatusId"/> <alias entity-alias="WEP" field="workEffortName" name="projectName"/> <alias entity-alias="WEPH" field="workEffortId" name="phaseId"/> + <alias entity-alias="WEPH" field="sequenceNum" name="phaseSeqNum"/> <alias entity-alias="WEPH" field="workEffortName" name="phaseName"/> <view-link entity-alias="WEPA" rel-entity-alias="WEP"> <key-map field-name="workEffortId"/> @@ -98,6 +107,7 @@ <member-entity entity-alias="WET" entity-name="WorkEffort"/> <alias entity-alias="WEPH" field="workEffortParentId" name="projectId"/> <alias entity-alias="WEPH" field="workEffortId" name="phaseId"/> + <alias entity-alias="WEPH" field="sequenceNum" name="phaseSeqNum"/> <alias entity-alias="WET" field="workEffortId" name="taskId"/> <alias entity-alias="WEPA" name="partyId"/> <alias entity-alias="WEPA" name="roleTypeId"/> @@ -121,6 +131,7 @@ <member-entity entity-alias="WEPH" entity-name="WorkEffort"/> <alias entity-alias="WEPH" field="workEffortParentId" name="projectId"/> <alias entity-alias="WEPH" field="workEffortId" name="phaseId"/> + <alias entity-alias="WEPH" field="sequenceNum" name="phaseSeqNum"/> <alias entity-alias="WEPA" name="partyId"/> <alias entity-alias="WEPA" name="roleTypeId"/> <alias entity-alias="RT" name="description"/> @@ -147,6 +158,7 @@ <alias entity-alias="WEP" field="workEffortId" name="projectId"/> <alias entity-alias="WEP" field="workEffortName" name="projectName"/> <alias entity-alias="WEPH" field="workEffortId" name="phaseId"/> + <alias entity-alias="WEPH" field="sequenceNum" name="phaseSeqNum"/> <alias entity-alias="WEPH" field="workEffortName" name="phaseName"/> <view-link entity-alias="WEP" rel-entity-alias="WEPH"> <key-map field-name="workEffortId" rel-field-name="workEffortParentId"/> @@ -181,6 +193,7 @@ <alias entity-alias="WEP" field="workEffortId" name="projectId"/> <alias entity-alias="WEP" field="workEffortName" name="projectName"/> <alias entity-alias="WEPH" field="workEffortId" name="phaseId"/> + <alias entity-alias="WEPH" field="sequenceNum" name="phaseSeqNum"/> <alias entity-alias="WEPH" field="workEffortName" name="phaseName"/> <view-link entity-alias="WEP" rel-entity-alias="WEPH"> <key-map field-name="workEffortId" rel-field-name="workEffortParentId"/> @@ -214,6 +227,7 @@ <alias entity-alias="WEP" field="workEffortId" name="projectId"/> <alias entity-alias="WEP" field="workEffortName" name="projectName"/> <alias entity-alias="WEPH" field="workEffortId" name="phaseId"/> + <alias entity-alias="WEPH" field="sequenceNum" name="phaseSeqNum"/> <alias entity-alias="WEPH" field="workEffortName" name="phaseName"/> <alias entity-alias="TS" field="statusId" name="timesheetStatusId"/> <alias entity-alias="TS" field="partyId" name="timesheetPartyId"/> @@ -275,5 +289,5 @@ <key-map field-name="rateTypeId"/> </relation> </view-entity> - + </entitymodel> 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=915275&r1=915274&r2=915275&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Feb 23 10:47:21 2010 @@ -777,6 +777,7 @@ <entity-and entity-name="WorkEffort" list="phases"> <field-map field-name="workEffortTypeId" value="PHASE"/> <field-map field-name="workEffortParentId" from-field="parameters.projectId"/> + <order-by field-name="sequenceNum"/> <order-by field-name="workEffortName"/> </entity-and> <if-not-empty field="phases"> @@ -788,6 +789,7 @@ <clear-field field="highInfo"/> <set field="highInfo.sequenceId" from-field="highSeq.sequenceId"/> <set field="highInfo.phaseId" from-field="phase.workEffortId"/> + <set field="highInfo.phaseSeqNum" from-field="phase.sequenceNum"/> <set field="highInfo.phaseName" from-field="phase.workEffortName"/> <set field="highInfo.phaseDescription" from-field="phase.description"/> <set field="highInfo.scopeEnumId" from-field="phase.scopeEnumId"/> @@ -809,7 +811,7 @@ <!-- merge estimated and actual dates --> <call-simple-method method-name="createDates"/> - <!-- translate squenceId back into statusId --> + <!-- translate sequenceId back into statusId --> <entity-and entity-name="StatusItem" list="statusses"> <field-map field-name="sequenceId" from-field="highInfo.sequenceId"/> <field-map field-name="statusTypeId" value="PROJECT_TASK_STATUS"/> @@ -851,12 +853,15 @@ </if-empty> <entity-and entity-name="ProjectAndPhaseAndTask" list="tasks"> <field-map field-name="projectId" from-field="parameters.projectId"/> + <order-by field-name="phaseSeqNum"/> <order-by field-name="phaseName"/> + <order-by field-name="sequenceNum"/> <order-by field-name="workEffortName"/> </entity-and> <if-not-empty field="tasks"> <iterate entry="lowInfo" list="tasks"> <set field="highInfo.phaseName" from-field="lowInfo.phaseName"/> + <set field="highInfo.phaseSeqNum" from-field="lowInfo.phaseSeqNum"/> <call-simple-method method-name="combineInfo"/> <clear-field field="highInfo.sequenceId"/> <set field="highInfo.currentStatusId" from-field="lowInfo.currentStatusId"/> @@ -864,6 +869,7 @@ <call-simple-method method-name="getHours" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/> <set field="highInfo.workEffortId" from-field="lowInfo.workEffortId"/> <set field="highInfo.workEffortName" from-field="lowInfo.workEffortName"/> + <set field="highInfo.sequenceNum" from-field="lowInfo.sequenceNum"/> <field-to-list field="highInfo" list="taskList"/> <clear-field field="highInfo"/> </iterate> @@ -878,6 +884,7 @@ <field-map field-name="workEffortId" from-field="parameters.taskId"/> </entity-one> <set field="highInfo.taskId" from-field="lowInfo.workEffortId"/> + <set field="highInfo.taskSeqNum" from-field="lowInfo.sequenceNum"/> <set field="highInfo.taskName" from-field="lowInfo.workEffortName"/> <set field="highInfo.taskDescription" from-field="lowInfo.description"/> <set field="highInfo.scopeEnumId" from-field="lowInfo.scopeEnumId"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy?rev=915275&r1=915274&r2=915275&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy Tue Feb 23 10:47:21 2010 @@ -71,7 +71,7 @@ EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "PTS_CANCELLED"), EntityCondition.makeCondition("workEffortParentId", EntityOperator.EQUALS, phase.phaseId) ], EntityOperator.AND); - tasks = delegator.findList("WorkEffort", cond, null, ["workEffortName"], null, false); + tasks = delegator.findList("WorkEffort", cond, null, ["sequenceNum","workEffortName"], null, false); if (tasks) { tasks.each { task -> resultTaskInfo = dispatcher.runSync("getProjectTask", [userLogin : userLogin , taskId : task.workEffortId]); Modified: 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=915275&r1=915274&r2=915275&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl Tue Feb 23 10:47:21 2010 @@ -30,10 +30,10 @@ <#list phaseTaskList as t> <#if t.workEffortTypeId == "PHASE"> - g.AddTaskItem(new JSGantt.TaskItem(${t.phaseNr}, "${t.phaseName}", "", "", "00ff00", "", 0, "", 0, 1, 0, 1)); + g.AddTaskItem(new JSGantt.TaskItem(${t.phaseNr}, "${t.phaseSeqNum?if_exists}. ${t.phaseName}", "", "", "00ff00", "", 0, "", 0, 1, 0, 1)); </#if> <#if t.workEffortTypeId == "TASK"> - g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedCompletionDate)}","009900", "${t.url}", 0 , "${t.resource?if_exists}", ${t.completion?if_exists} , 0, ${t.phaseNr}, 1<#if t.preDecessor?exists>, ${t.preDecessor}</#if>)); + g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskSeqNum?if_exists}. ${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedCompletionDate)}","009900", "${t.url}", 0 , "${t.resource?if_exists}", ${t.completion?if_exists} , 0, ${t.phaseNr}, 1<#if t.preDecessor?exists>, ${t.preDecessor}</#if>)); </#if> </#list> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=915275&r1=915274&r2=915275&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Tue Feb 23 10:47:21 2010 @@ -136,7 +136,9 @@ <set field="projectId" from-field="parameters.projectId"/> <entity-and entity-name="ProjectAndPhaseAndTask" list="tasks"> <field-map field-name="projectId" from-field="parameters.projectId"/> + <order-by field-name="phaseSeqNum"/> <order-by field-name="phaseName"/> + <order-by field-name="sequenceNum"/> <order-by field-name="workEffortName"/> </entity-and> <entity-and entity-name="WorkEffort" list="phases"> @@ -393,16 +395,16 @@ <screenlet title="${uiLabelMap.PageTitleProjectInformation}"> <include-form name="ProjectInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/> </screenlet> + <include-screen name="SubProjectsInfo"/> <include-screen name="PhasesInfo"/> - <include-screen name="TasksInfo"/> </container> <container style="righthalf"> - <include-screen name="SubProjectsInfo"/> - <include-screen name="PartiesInfo"/> - <include-screen name="NoteInfo"/> - <include-screen name="ListProjectContent"/> + <include-screen name="PartiesInfo"/> + <include-screen name="NoteInfo"/> + <include-screen name="ListProjectContent"/> <include-screen name="OrderInfo"/> </container> + <include-screen name="TasksInfo"/> </decorator-section> </decorator-screen> </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=915275&r1=915274&r2=915275&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Tue Feb 23 10:47:21 2010 @@ -302,23 +302,25 @@ <field name="VIEW_INDEX"><hidden value="${viewIndex}"/></field> <field name="workEffortId"><hidden value="${workEffortId}"/></field> <field name="projectId"><hidden/></field> - <field entry-name="workEffortName" name="taskName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}"> - <hyperlink target="taskView" description="${workEffortName}"> - <parameter param-name="workEffortId"/> - </hyperlink> - </field> - <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}" also-hidden="false"></display-entity></field> - <field name="plannedHours" parameter-name="estimatedDuration" title="${uiLabelMap.ProjectMgrPlannedHours}"><text/></field> - <field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field> <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"> <drop-down allow-empty="false"> - <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}[${workEffortId}]"> + <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${projectId}.${sequenceNum} ${workEffortName}[${workEffortId}]"> <entity-constraint name="workEffortTypeId" value="PHASE"/> <entity-constraint name="workEffortParentId" value="${projectId}"/> + <entity-order-by field-name="sequenceNum"/> <entity-order-by field-name="workEffortName"/> </entity-options> </drop-down> </field> + <field entry-name="sequenceNum" name="taskSeqNum" parameter-name="sequenceNum"><text size="3"/></field> + <field entry-name="workEffortName" name="taskName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}"> + <text/> + </field> + <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"> + <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}" also-hidden="false"/> + </field> + <field name="plannedHours" parameter-name="estimatedDuration" title="${uiLabelMap.ProjectMgrPlannedHours}"><text size="3"/></field> + <field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field> <field name="priority" title="${uiLabelMap.CommonPriority}"> <drop-down allow-empty="true"> <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/> @@ -334,6 +336,9 @@ </field> <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><date-time type="date"/></field> <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><date-time type="date"/></field> + <field name="edit" title=" "> + <hyperlink target="EditTask?workEffortId=${workEffortId}" description="${uiLabelMap.CommonEdit}"></hyperlink> + </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> <form name="ListUnassignedTasks" target="updateTaskAndAssoc" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTask" @@ -378,6 +383,7 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <field name="projectId"><hidden value="${parameters.projectId}"/></field> <field name="phaseId" parameter-name="workEffortId"><hidden/></field> + <field name="phaseSeqNum" parameter-name="sequenceNum"><text size="3"/></field> <field name="phaseName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}*"><text/></field> <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field> @@ -392,7 +398,7 @@ </form> <form name="ListPhaseInfo" type="list" list-name="phases" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="projectId"><hidden value="parameters.projectId"/></field> + <field name="wbsId"><display description="${projectId}.${phaseSeqNum}"/></field> <field name="phase"> <hyperlink target="FindPhase" description="${phaseName}"> <parameter param-name="projectId"/> @@ -407,7 +413,7 @@ </form> <form name="ListTaskInfo" type="list" list-name="tasks" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="projectId"><hidden value="parameters.projectId"/></field> + <field name="wbsId"><display description="${projectId}.${phaseSeqNum}.${sequenceNum}"/></field> <field name="task"> <hyperlink target="taskView" description="${workEffortName}"> <parameter param-name="workEffortId"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=915275&r1=915274&r2=915275&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Tue Feb 23 10:47:21 2010 @@ -34,10 +34,11 @@ <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></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="WorkEffort" key-field-name="workEffortId" description="${workEffortName}[${workEffortId}]"> + <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${projectId}.${sequenceNum} ${workEffortName}[${workEffortId}]"> <entity-constraint name="workEffortTypeId" value="PHASE"/> <entity-constraint name="workEffortParentId" value="${projectId}"/> - <entity-order-by field-name="workEffortParentId"/> + <entity-order-by field-name="sequenceNum"/> + <entity-order-by field-name="workEffortName"/> </entity-options> </drop-down> </field> @@ -64,6 +65,7 @@ </entity-options> </drop-down> </field> + <field name="taskSeqId" entry-name="sequenceNum" parameter-name="sequenceNum"><text size="3"/></field> <field name="roleTypeId" use-when="myTask!=void" title="${uiLabelMap.ProjectMgrMyRoleForThisTask}"> <drop-down current="selected" allow-empty="false"> <entity-options entity-name="ProjectIdPartyRoleAndPhase" description="${description}"> @@ -105,7 +107,7 @@ </field> <field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}" position="1"><date-time type="date"/></field> <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}" position="2"><date-time type="date"/></field> - <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field> + <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field> </form> <form name="AssignTaskOtherProject" type="single" target="updateTask" default-map-name="task"> @@ -129,14 +131,16 @@ <field name="workEffortTypeId"><hidden value="PHASE"/></field> <field name="currentStatusId"><hidden value="_NA_"/></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> + <field name="phaseSeqId" entry-name="sequenceNum" parameter-name="sequenceNum"><text size="3"/></field> + <field name="phaseDdescription" parameter-name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonMax250Chars}"><textarea/></field> + <field name="add" title="${uiLabelMap.CommonAdd}"><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="_NA_"/></field> + <field name="sequenceNum"><text size="3"/></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> |
Free forum by Nabble | Edit this page |