svn commit: r610300 - in /ofbiz/trunk/specialpurpose/projectmgr: config/ProjectMgrUiLabels.properties widget/TaskScreens.xml widget/forms/RequestForms.xml widget/forms/TaskForms.xml

[hansbak-2]

Author: hansbak
Date: Wed Jan  9 00:07:00 2008
New Revision: 610300

URL: http://svn.apache.org/viewvc?rev=610300&view=rev
Log:
connect a request to an existing task

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
    ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.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=610300&r1=610299&r2=610300&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Wed Jan  9 00:07:00 2008
@@ -153,8 +153,9 @@
 ProjectMgrQuickAssignPartyId=Quick Assign Party Id
 CommonStatustoComplete=Status to 'complete'
 ProjectMgrStatusId = Status Id
-PageTitleCreateTaskbyRequest=Create Task by Request
+PageTitleCreateTaskbyRequest=Create a new Task for this Request
 ProjectMgrCreateTaskFromRequest=Create Task From Request
 ProjectMgrProjectAndPhaseName=Project and Phase Name
 ProjectMgrCustRequestWorkEffort=CustRequest WorkEffort
-ProjectMgrViewPermissionError=You need at least PROJECTMGR_READ permission to view this screen.
\ No newline at end of file
+ProjectMgrViewPermissionError=You need at least PROJECTMGR_READ permission to view this screen.
+ProjectMgrCreateByExistingTask=Link to an existing Task
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=610300&r1=610299&r2=610300&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Wed Jan  9 00:07:00 2008
@@ -582,9 +582,11 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleEditTaskList"/>
+                <set field="headerItem" value="request"/>
                 <set field="tabButtonItem" value="edittask"/>                
                 <set field="labelTitleProperty" value="PageTitleEditTaskList"/>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>                
+                <set field="workEffortId" from-field="parameters.workEffortId"/>    
+                <entity-one entity-name="CustRequest" value-name="custRequest"></entity-one>            
                 <entity-one entity-name="WorkEffort" value-name="task"/>    
                 <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh"/>
                 </actions>
@@ -593,12 +595,22 @@
                     <decorator-section name="body">
                         <section>                                                      
                             <widgets>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleCreateTaskbyRequest}</label></container>                                
-                                    <container style="screenlet-body">
-                                        <include-form name="createTaskbyRequest" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+                                <container style="lefthalf">
+                                    <container style="screenlet">
+                                        <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleCreateTaskbyRequest}</label></container>                                
+                                        <container style="screenlet-body">
+                                            <include-form name="createTaskbyRequest" location="component://projectmgr/widget/forms/TaskForms.xml"/>
                                         </container>        
                                     </container>
+                                </container>
+                                <container style="righthalf">
+                                    <container style="screenlet">
+                                        <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.ProjectMgrCreateByExistingTask}</label></container>
+                                        <container style="screenlet-body">
+                                            <include-form name="CreateCustRequestWorkEffortByExistingTaskForm" location="component://projectmgr/widget/forms/TaskForms.xml"/>                  
+                                        </container>
+                                    </container>
+                                </container>  
                                 </widgets>                            
                             </section>
                         </decorator-section>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=610300&r1=610299&r2=610300&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Wed Jan  9 00:07:00 2008
@@ -32,7 +32,7 @@
         </field>
         <field name="priority"><display/></field>
         <field name="createdDate"><display type="date"/></field>
-        <field name="partyId"><display/></field>
+        <field name="fromPartyId"><display/></field>
         <field name="statusId">
             <display-entity also-hidden="false" entity-name="StatusItem"/>
         </field>
@@ -125,7 +125,7 @@
         <field name="taskName">
             <hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffort.workEffortName}"/>
         </field>
-        <field name="RequestDate"><display type="date"/></field>
+        <field name="custRequestDate" title="${uiLabelMap.OrderRequestDate}"><display type="date"/></field>
         <field name="createdDate"><display type="date"/></field>
         <field name="lastModifiedDate"><display type="date"/></field>
     </form>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=610300&r1=610299&r2=610300&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed Jan  9 00:07:00 2008
@@ -501,7 +501,7 @@
         <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="taskDescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text default-value="${custRequest.description}"/></field>
         <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*" parameter-name="workEffortParentId">
             <drop-down allow-empty="true">
                 <entity-options entity-name="ProjectAndPhaseAndTask" description="${projectName} : ${phaseName}">    
@@ -540,4 +540,16 @@
         <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><date-time type="date"/></field>
         <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
     </form>                            
+    <form name="CreateCustRequestWorkEffortByExistingTaskForm" type="single" target="createTaskListForms">
+        <field name="custRequestId"><hidden/></field>
+        <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${workEffortName} (${phaseName}-${projectName})">
+                    <entity-constraint name="partyId" env-name="userLogin.partyId"/>
+                    <entity-constraint name="workEffortTypeId" value="TASK"/>
+                    </entity-options>                
+                </drop-down>
+            </field>
+        <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
+    </form>    
 </forms>