svn commit: r608737 - in /ofbiz/trunk/specialpurpose/projectmgr: config/ webapp/projectmgr/ webapp/projectmgr/WEB-INF/ webapp/projectmgr/WEB-INF/actions/ widget/ widget/forms/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r608737 - in /ofbiz/trunk/specialpurpose/projectmgr: config/ webapp/projectmgr/ webapp/projectmgr/WEB-INF/ webapp/projectmgr/WEB-INF/actions/ widget/ widget/forms/

hansbak-2
Author: hansbak
Date: Thu Jan  3 19:52:29 2008
New Revision: 608737

URL: http://svn.apache.org/viewvc?rev=608737&view=rev
Log:
add request detail, create request and create task from a request, first version to be improved

Added:
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/RequestTabBar.ftl
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh
    ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
Modified:
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
    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=608737&r1=608736&r2=608737&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Thu Jan  3 19:52:29 2008
@@ -148,4 +148,7 @@
 ProjectMgrQuickAssignPartyId=Quick Assign Party Id
 CommonStatustoComplete=Status to 'complete'
 ProjectMgrStatusId = Status Id
-
+PageTitleCreateTaskbyRequest=Create Task by Request
+ProjectMgrCreateTaskFromRequest=Create Task From Request
+ProjectMgrProjectAndPhaseName=Project and Phase Name
+ProjectMgrCustRequestWorkEffort=CustRequest WorkEffort

Added: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/RequestTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/RequestTabBar.ftl?rev=608737&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/RequestTabBar.ftl (added)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/RequestTabBar.ftl Thu Jan  3 19:52:29 2008
@@ -0,0 +1,39 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#assign unselectedClassName = "tabButton">
+<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+
+<#if custRequest?exists>
+<div class="tabContainer">
+  <a href="<@ofbizUrl>ViewRequest?custRequestId=${custRequest.custRequestId}</@ofbizUrl>" class="${selectedClassMap.ViewRequest?default(unselectedClassName)}">${uiLabelMap.OrderViewRequest}</a>
+  <a href="<@ofbizUrl>EditRequest?custRequestId=${custRequest.custRequestId}</@ofbizUrl>" class="${selectedClassMap.request?default(unselectedClassName)}">${uiLabelMap.OrderRequest}</a>
+</div>
+<#if custRequestItem?exists>
+  <div class="tabContainer">
+    <a href="<@ofbizUrl>EditRequestItem?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitem?default(unselectedClassName)}">${uiLabelMap.OrderRequestItem}</a>
+    <a href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemnotes?default(unselectedClassName)}">${uiLabelMap.OrderNotes}</a>
+    <#if custRequest.custRequestTypeId = "RF_QUOTE">
+    <a href="<@ofbizUrl>RequestItemQuotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemquotes?default(unselectedClassName)}">${uiLabelMap.OrderOrderQuotes}</a>
+    </#if>
+    <a href="<@ofbizUrl>requestitemrequirements?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemrequirements?default(unselectedClassName)}">${uiLabelMap.OrderRequirements}</a>
+    <a href="<@ofbizUrl>EditRequestItemWorkEfforts?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.EditRequestItemWorkEfforts?default(unselectedClassName)}">${uiLabelMap.WorkEffortWorkEfforts}</a>
+  </div>
+</#if>
+</#if>

Added: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh?rev=608737&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh (added)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh Thu Jan  3 19:52:29 2008
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.lang.*;
+import java.util.*;
+import org.ofbiz.base.util.*;
+import org.ofbiz.entity.*;
+import org.ofbiz.entity.util.*;
+import org.ofbiz.entity.condition.*;
+
+
+custRequestWorkEffortList = delegator.findByAnd("CustRequestWorkEffort", UtilMisc.toMap("custRequestId", custRequestId), UtilMisc.toList("workEffortId"));
+if (UtilValidate.isNotEmpty(custRequestWorkEffortList)) {
+ custRequestWorkEffort = custRequestWorkEffortList.get(0);
+ context.put("workEffortId", custRequestWorkEffort.getString("workEffortId"));
+ }
+

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=608737&r1=608736&r2=608737&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Thu Jan  3 19:52:29 2008
@@ -527,6 +527,30 @@
         <response name="success" type="view" value="Timesheet"/>
         <response name="error" type="view" value="Timesheet"/>
     </request-map>
+    <request-map uri="CreateTaskbyRequest">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="CreateTaskbyRequest"/>
+        </request-map>
+    <request-map uri="CreateTaskbyRequests">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createWorkEffort"/>
+        <response name="success" type="request" value="createTaskListForms"/>
+        <response name="error" type="view" value="CreateTaskbyRequest"/>
+        </request-map>
+    <request-map uri="createTaskListForms">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createWorkEffortRequest"/>
+        <response name="success" type="view" value="RequestList"/>
+        <response name="error" type="view" value="RequestList"/>
+        </request-map>
+    <request-map uri="newrequest">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditRequest"/>
+        </request-map>
+    <request-map uri="ViewRequest">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ViewRequest"/>
+    </request-map>
     <!-- end of request mappings -->
 
     <!-- View Mappings -->
@@ -570,5 +594,9 @@
     <view-map name="EditTaskNotes" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskNotes"/>
     <view-map name="taskView" type="screen" page="component://projectmgr/widget/TaskScreens.xml#TaskView"/>
     <view-map name="Timesheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#Timesheet"/>
+    <view-map name="CreateTaskbyRequest" type="screen" page="component://projectmgr/widget/TaskScreens.xml#CreateTaskbyRequest"/>
+    <view-map name="RequestList" type="screen" page="component://projectmgr/widget/RequestScreens.xml#RequestList"/>
+    <view-map name="EditRequest" type="screen" page="component://projectmgr/widget/RequestScreens.xml#EditRequest"/>
+    <view-map name="ViewRequest" type="screen" page="component://projectmgr/widget/RequestScreens.xml#ViewRequest"/>
     <!-- end of view mappings -->
 </site-conf>

Added: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=608737&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (added)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Thu Jan  3 19:52:29 2008
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+    <screen name="RequestList">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleListWorkEffortRequests"/>
+                <set field="tabButtonItem" value="requestlist"/>
+                <set field="headerItem" value="request"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
+
+                <set field="custRequestId" from-field="parameters.custRequestId"/>
+                <entity-and entity-name="CustRequest" list-name="requests">
+                    <field-map field-name="statusId" value="CRQ_SUBMITTED"/>
+                </entity-and>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container>
+                            <label style="head1">${uiLabelMap.WorkEffortMyRequestList}</label>
+                        </container>
+                        <container style="screenlet-body">
+                            <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
+                        </container>
+                        <include-form name="ListRequests" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditRequest">
+        <section>
+            <actions>
+                <set field="titleProperty" value="OrderRequest"/>
+                <set field="tabButtonItem" value="request"/>
+                <set field="headerItem" value="request"/>
+                
+                <set field="custRequestId" from-field="parameters.custRequestId"/>
+                <entity-one entity-name="CustRequest" value-name="custRequest"/>
+                
+                <set field="statusId" from-field="custRequest.statusId"/>
+                <entity-one entity-name="StatusItem" value-name="currentStatus"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonRequestDecorator">
+                    <decorator-section name="body">
+                        <include-form name="EditCustRequest" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="CommonRequestDecorator">
+        <section>
+            <actions>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <widgets>
+                                <platform-specific>
+                                    <html><html-template location="component://projectmgr/webapp/projectmgr/RequestTabBar.ftl"/></html>
+                                </platform-specific>
+                                <container>
+                                    <label style="head1">[${uiLabelMap.CommonId}:${custRequest.custRequestId}] ${custRequest.custRequestName}</label>
+                                </container>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="ViewRequest">
+        <section>
+            <actions>
+                <set field="MainColumnStyle" value="rightonly"/>
+                <set field="tabButtonItem" value="ViewRequest"/>
+                <set field="headerItem" value="request"/>
+                <set field="titleProperty" value="PageTitleViewRequest"/>
+                <set field="showRequestManagementLinks" value="Y"/>
+                <set field="custRequestId" from-field="parameters.custRequestId"/>
+                <entity-one entity-name="CustRequest" value-name="custRequest"/>
+                <get-related-one value-name="custRequest" relation-name="CustRequestType" to-value-name="custRequestType"/>
+                <get-related-one value-name="custRequest" relation-name="StatusItem" to-value-name="statusItem"/>
+                <get-related-one value-name="custRequest" relation-name="Uom" to-value-name="currency"/>
+                <get-related value-name="custRequest" relation-name="CustRequestWorkEffort" list-name="requestInfo"/>
+                <set field="orderBy[]" value="sequenceNum"/>
+                <get-related value-name="custRequest" relation-name="CustRequestRole" list-name="requestRoles"/>
+                <get-related value-name="custRequest" relation-name="CustRequestItem" list-name="requestItems" order-by-list-name="orderBy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonRequestDecorator">
+                    <decorator-section name="body">
+                        <include-screen name="ViewRequestTemplate"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="ViewRequestTemplate">
+        <section>
+            <condition>
+                <not><if-empty field-name="custRequest"/></not>
+            </condition>
+            <widgets>
+                <include-screen name="ViewRequestInfo"/>
+            </widgets>
+            <fail-widgets>
+                <label style="head3">${uiLabelMap.OrderErrorRequestNotFound}</label>
+            </fail-widgets>
+        </section>
+    </screen>
+    <screen name="ViewRequestInfo">
+        <section>
+            <widgets>
+                <container style="lefthalf">
+                    <include-screen name="requestInfo"/>
+                </container>
+                <container style="righthalf">
+                    <include-screen name="requestDate"/>
+                    <include-screen name="requestRoles"/>
+                </container>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="requestInfo">
+        <section>
+            <actions>
+                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh"/>
+            </actions>
+                <widgets>
+                <container style="screenlet">
+                    <container style="screenlet-title-bar"><label style="boxhead" text="${custRequest.custRequestName} [${custRequestId}] ${uiLabelMap.CommonInformation}"/></container>
+                    <container style="screenlet-body">
+                        <include-form name="RequestInfo" location="component://projectmgr/widget/forms/RequestForms.xml"/>                  
+                    </container>
+                </container>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="requestDate">
+        <section>
+            <widgets>
+                <container style="screenlet">
+                    <container style="screenlet-title-bar"><label style="boxhead" text="${uiLabelMap.CommonDate}"/></container>
+                    <container style="screenlet-body">
+                        <include-form name="RequestDateInfo" location="component://projectmgr/widget/forms/RequestForms.xml"/>                  
+                    </container>
+                </container>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="requestRoles">
+        <section>
+            <widgets>
+                <container style="screenlet">
+                    <container style="screenlet-title-bar"><label style="boxhead" text="${uiLabelMap.OrderRequestRoles}"/></container>
+                    <container style="screenlet-body">
+                        <include-form name="RequestRolesInfo" location="component://projectmgr/widget/forms/RequestForms.xml"/>                  
+                    </container>
+                </container>
+            </widgets>
+        </section>
+    </screen>
+</screens>
+

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=608737&r1=608736&r2=608737&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Thu Jan  3 19:52:29 2008
@@ -578,4 +578,32 @@
             </widgets>
         </section>
     </screen>                  
+    <screen name="CreateTaskbyRequest">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditTaskList"/>
+                <set field="tabButtonItem" value="edittask"/>                
+                <set field="labelTitleProperty" value="PageTitleEditTaskList"/>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>                
+                <entity-one entity-name="WorkEffort" value-name="task"/>    
+                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh"/>
+                </actions>
+            <widgets>
+                <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
+                    <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>        
+                                    </container>
+                                </widgets>                            
+                            </section>
+                        </decorator-section>
+                    </decorator-screen>
+                </widgets>
+            </section>
+    </screen>    
 </screens>

Added: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=608737&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (added)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Thu Jan  3 19:52:29 2008
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+    <form name="ListRequests" type="list" use-row-submit="true" title="" list-name="requests">
+        <row-actions>
+            <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh"/>
+        </row-actions>
+        <field name="custRequestName" widget-style="buttontext">
+            <hyperlink description="${custRequestName}[${custRequestId}]" target-type="inter-app" target="/projectmgr/control/ViewRequest?custRequestId=${custRequestId}"/>
+        </field>
+        <field name="workEffortId">
+            <hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortId}"/>
+        </field>
+        <field name="priority"><display/></field>
+        <field name="createdDate"><display type="date"/></field>
+        <field name="partyId"><display/></field>
+        <field name="statusId">
+            <display-entity also-hidden="false" entity-name="StatusItem"/>
+        </field>
+        <field name="description"><display/></field>
+        <field name="createTaskFromRequest" widget-style="buttontext">
+            <hyperlink description="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" target-type="inter-app" target="CreateTaskbyRequest?custRequestId=${custRequestId}"/>
+        </field>
+    </form>
+    <form name="EditCustRequest" type="single" target="updaterequest" title="Request" default-map-name="custRequest"
+        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <alt-target use-when="custRequest==null" target="createrequest"/>
+        <auto-fields-service service-name="updateCustRequest" default-field-type="edit"/>
+        <field name="custRequestId"><hidden/></field>
+        <field name="custRequestName"/>
+        <field name="custRequestTypeId">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="CustRequestType" description="${description}"/>
+            </drop-down>
+        </field>
+        <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}" widget-style="selectBox"><ignored/></field>
+        <field name="custRequestCategoryId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="CustRequestCategory" description="${description}"/>
+            </drop-down>
+        </field>
+        
+        <field use-when="custRequest==null" name="statusId" widget-style="selectBox">
+            <drop-down allow-empty="false" current="first-in-list">
+                <entity-options entity-name="StatusItem" description="${description}">
+                    <entity-constraint name="statusTypeId" value="CUSTREQ_STTS"/>
+                    <entity-order-by field-name="sequenceId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field use-when="custRequest!=null" name="statusId" widget-style="selectBox">
+            <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}">
+                <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
+                    <entity-constraint name="statusId" value="${custRequest.statusId}"/>
+                    <entity-order-by field-name="sequenceId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="priority" widget-style="selectBox">
+            <drop-down allow-empty="false">
+                <option key="9"/>
+                <option key="8"/>
+                <option key="7"/>
+                <option key="6"/>
+                <option key="5"/>
+                <option key="4"/>
+                <option key="3"/>
+                <option key="2"/>
+                <option key="1"/>
+            </drop-down>
+        </field>
+        <field name="maximumAmountUomId" title="${uiLabelMap.CommonCurrency}"><ignored/></field>
+        <field name="productStoreId" title="${uiLabelMap.ProductProductStore}"><ignored/></field>
+        <field name="custRequestDate" title="${uiLabelMap.OrderRequestDate}"><date-time type="timestamp"/></field>
+        <field name="responseRequiredDate"><date-time type="timestamp"/></field>
+        <field name="fromPartyId" title="${uiLabelMap.OrderRequestingParty}">
+            <lookup target-form-name="LookupPartyName"/>
+        </field>
+        <field name="fulfillContactMechId"><ignored/></field>
+        <field name="createdDate"><ignored/></field>
+        <field name="createdByUserLogin"><hidden/></field>
+        <field name="lastModifiedDate"><hidden/></field>
+        <field name="lastModifiedByUserLogin"><hidden/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="RequestInfo" type="single" use-row-submit="true">
+        <actions>
+            <entity-one entity-name="CustRequestWorkEffort" value-name="custRequestWorkEffort">
+                <field-map field-name="workEffortId" env-name="workEffortId"/>
+            </entity-one>
+            <entity-one entity-name="WorkEffort" value-name="workEffort">
+                <field-map field-name="workEffortId" env-name="workEffortId"/>
+            </entity-one>
+            <service service-name="getProjectIdAndName" result-map-name="result">
+                <field-map field-name="taskId" env-name="workEffortId"/>
+            </service>
+            <set field="projectId" from-field="result.projectId"/>
+            <set field="projectName" from-field="result.projectName"/>
+            <set field="phaseId" from-field="result.phaseId"/>
+            <set field="phaseName" from-field="result.phaseName"/>
+        </actions>
+        <field name="custRequestType"><display description="${custRequest.custRequestTypeId}"/></field>
+        <field name="statusItem"><display description="${custRequest.statusId}"/></field>
+        <field name="fromPartyId"><display description="${custRequest.fromPartyId}"/></field>
+        <field name="custRequestName"><display description="${custRequest.custRequestName}"/></field>
+        <field name="description"><display description="${custRequest.description}"/></field>
+        <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
+            <hyperlink also-hidden="false" description="${projectName}" target="projectView?projectId=${projectId}"/>
+        </field>
+        <field name="phaseName"><hyperlink target="FindPhase?projectId=${projectId}" description="${phaseName}"/></field>
+        <field name="taskName">
+            <hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffort.workEffortName}"/>
+        </field>
+    </form>
+    <form name="RequestDateInfo" type="single">
+        <field name="RequestDate"><display description="${custRequest.custRequestDate}"/></field>
+        <field name="createdDate"><display description="${custRequest.createdDate}"/></field>
+        <field name="lastModifiedDate"><display description="${custRequest.lastModifiedDate}"/></field>
+    </form>
+    <form name="RequestRolesInfo" type="list">
+        <actions>
+            <entity-and entity-name="CustRequestRole">
+                <field-map field-name="custRequestId" env-name="custRequestId"/>
+            </entity-and>
+        </actions>
+        <row-actions>
+            <entity-one entity-name="Person" value-name="person">
+                <field-map field-name="partyId" env-name="partyId"/>
+            </entity-one>
+        </row-actions>
+        <field name="partyId" widget-style="buttontext">
+            <hyperlink description="${partyId}" target-type="inter-app" target="/partymgr/control/viewprofile?partyId=${partyId}"/>
+        </field>
+        <field name="RequestTaker"><display description="${person.personalTitle} ${person.firstName} ${person.middleName} ${person.lastName}"/></field>
+    </form>
+</forms>
+

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=608737&r1=608736&r2=608737&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Thu Jan  3 19:52:29 2008
@@ -509,5 +509,55 @@
         <field name="estimatedCompletionDate"  entry-name="workEffortToEstimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
         <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
         <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
-    </form>                      
+    </form>    
+    <form name="createTaskbyRequest" type="single" target="CreateTaskbyRequests">
+        <actions>
+            <entity-and entity-name="WorkEffortCustRequestView">
+                <field-map field-name="workEffortId"/>
+                </entity-and>
+            </actions>
+        <field name="custRequestId"><hidden value="${parameters.custRequestId}"/></field>
+        <field name="projectId"><hidden value="${parameters.projectId}"/></field>
+        <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="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*" parameter-name="workEffortParentId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="ProjectAndPhaseAndTask" description="${projectName} : ${phaseName}">    
+                    <entity-order-by field-name="workEffortParentId"/>
+                    </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"/>
+                <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-options>
+                </drop-down>
+            </field>
+        <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="ProjectAndPhaseAndTask" description="${projectName} : ${phaseName}">    
+                    <entity-order-by field-name="phaseName"/>
+                    </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>                            
 </forms>