svn commit: r596529 - in /ofbiz/trunk/specialpurpose/pr
Locked
 
|
Author: hansbak
Date: Mon Nov 19 19:39:59 2007 New Revision: 596529 URL: http://svn.apache.org/viewvc?rev=596529&view=rev Log: replase edittask ftl with form, and the ability to link to a phase and correcting dateformat problems Removed: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittask.ftl Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.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=596529&r1=596528&r2=596529&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original) +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Mon Nov 19 19:39:59 2007 @@ -100,6 +100,7 @@ ProjectMgrPartyRoleTypeId=Role Type Id ProjectMgrProjectNoNotes=No Notes for this Project ProjectMgrTaskNoNotes=No Notes for this Task +ProjectMgrTaskPhase=Parent Phase ProjectMgrTaskSummary=Task Summary ProjectMgrTaskNotAssignedPhase=Task not assigned to Phase/Iteration ProjectMgrToFindTask=To Find Task Give Range Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=596529&r1=596528&r2=596529&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Mon Nov 19 19:39:59 2007 @@ -110,9 +110,12 @@ <section> <!-- To add a new Project --> <widgets> - <platform-specific> - <html><html-template location="component://projectmgr/webapp/projectmgr/project/edittask.ftl"/></html> - </platform-specific> + <container style="screenlet"> + <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditTask} #${task.workEffortId} ${uiLabelMap.CommonInformation}</label></container> + <container style="screenlet-body"> + <include-form name="EditTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </container> + </container> </widgets> </section> </decorator-section> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=596529&r1=596528&r2=596529&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Mon Nov 19 19:39:59 2007 @@ -21,6 +21,71 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> + <form name="EditTask" type="single" target="updateTask" default-map-name="task"> + <actions> + <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false"> + <field-map field-name="statusId" env-name="task.statusId"/> + </entity-one> + </actions> + <alt-target use-when="task==null" target="createTask"/> + <field name="DONE_PAGE"><hidden value="${donePage}"/></field> + <field name="workEffortTypeId"><hidden value="TASK"/></field> + <field use-when="task!=null" name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> + <field use-when="task==null&&taskId==null" name="taskId" title="${uiLabelMap.ProjectMgrWorkEffortId}"><ignored/></field> + <field use-when="task==null&&taskId!=null" name="workEffortName" title="${uiLabelMap.CommonName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field> + <field use-when="task!=null" name="workEffortName" title="${uiLabelMap.CommonName}*"><display/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> + <field use-when="task!=null" name="statusId" title="${uiLabelMap.CommonStatus}"> + <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" env-name="task.currentStatusId"/> + <entity-order-by field-name="sequenceId"/> + </entity-options> + </drop-down> + </field> + <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="CALENDAR_STATUS"/> + <entity-order-by field-name="sequenceId"/> + </entity-options> + </drop-down> + </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="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"> + <drop-down allow-empty="true"> + <entity-options entity-name="WorkEffort" description="${workEffortName}[${workEffortId}](project:${workEffortParentId})"> + <entity-constraint name="workEffortTypeId" value="PHASE"/> + <entity-order-by field-name="workEffortParentId"/> + </entity-options> + </drop-down> + </field> + <field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><date-time/></field> + <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><date-time/></field> + <field name="actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><date-time/></field> + <field name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><date-time/></field> + <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field> + </form> + <form name="listtasksbydaterange" type="single" target="FindTaskByRange?workEffortTypeId=TASK&findAll=Y"> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |