[OFBiz] SVN: r5018 - in trunk/applications/order/webapp/ordermgr: . WEB-INF/actions WEB-INF/actions/request request

jacopo at svn.ofbiz.org jacopo at svn.ofbiz.org
Sat May 21 11:46:20 EDT 2005


Author: jacopo
Date: 2005-05-21 10:45:51 -0500 (Sat, 21 May 2005)
New Revision: 5018

Added:
   trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/
   trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/requestitemnotes.bsh
   trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/requestitemrequirements.bsh
   trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/setRequestQuote.bsh
   trunk/applications/order/webapp/ordermgr/request/
   trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl
   trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
   trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl
   trunk/applications/order/webapp/ordermgr/request/requestitemnotes.ftl
   trunk/applications/order/webapp/ordermgr/request/requestitemrequirements.ftl
Log:
Added some missing files from my previous commit.

Added: trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/requestitemnotes.bsh
===================================================================
--- trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/requestitemnotes.bsh	2005-05-21 15:40:50 UTC (rev 5017)
+++ trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/requestitemnotes.bsh	2005-05-21 15:45:51 UTC (rev 5018)
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a 
+ *  copy of this software and associated documentation files (the "Software"), 
+ *  to deal in the Software without restriction, including without limitation 
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ *  and/or sell copies of the Software, and to permit persons to whom the 
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included 
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT 
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR 
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *@author     Andy Zeneski (jaz at ofbiz.org)
+ *@version    $Rev$
+ *@since      2.2
+ */
+ 
+import org.ofbiz.entity.*;
+import org.ofbiz.base.util.*;
+
+delegator = request.getAttribute("delegator");
+
+String custRequestId = request.getParameter("custRequestId");
+String custRequestItemSeqId = request.getParameter("custRequestItemSeqId");
+String showAll = request.getParameter("showAll");
+if (showAll == null) {
+    showAll = "false";
+}
+context.put("showAll", showAll);
+
+Map fields = UtilMisc.toMap("custRequestId", custRequestId);
+if (showAll.equals("false")) {
+    fields.put("custRequestItemSeqId", custRequestItemSeqId);
+}
+List notes = delegator.findByAnd("CustRequestItemNoteView", fields, UtilMisc.toList("-noteDateTime"));
+if (notes != null && notes.size() > 0) {
+    context.put("notes", notes);
+}


Property changes on: trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/requestitemnotes.bsh
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + "Id Rev Author"
Name: svn:eol-style
   + native

Added: trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/requestitemrequirements.bsh
===================================================================
--- trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/requestitemrequirements.bsh	2005-05-21 15:40:50 UTC (rev 5017)
+++ trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/requestitemrequirements.bsh	2005-05-21 15:45:51 UTC (rev 5018)
@@ -0,0 +1,23 @@
+import java.util.*;
+import org.ofbiz.security.*;
+import org.ofbiz.entity.*;
+import org.ofbiz.base.util.*;
+import org.ofbiz.service.*;
+import org.ofbiz.workeffort.workeffort.*;
+
+delegator = request.getAttribute("delegator");
+
+String custRequestId = request.getParameter("custRequestId");
+String custRequestItemSeqId = request.getParameter("custRequestItemSeqId");
+
+GenericValue custRequestItem = null;
+if (custRequestId != null && custRequestItemSeqId != null) {
+	custRequestItem = delegator.findByPrimaryKey("CustRequestItem", UtilMisc.toMap("custRequestId", custRequestId, "custRequestItemSeqId", custRequestItemSeqId));
+   	if (custRequestItem != null) context.put("custRequestItem", custRequestItem);
+}	
+
+List requirements = delegator.findByAnd("RequirementCustRequestView", UtilMisc.toMap("custRequestId", custRequestId, "custRequestItemSeqId", custRequestItemSeqId));
+if (requirements != null && requirements.size() > 0) context.put("requirements", requirements);	
+
+context.put("custRequestId",custRequestId);
+context.put("custRequestItemSeqId",custRequestItemSeqId);


Property changes on: trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/requestitemrequirements.bsh
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + "Id Rev Author"
Name: svn:eol-style
   + native

Added: trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/setRequestQuote.bsh
===================================================================
--- trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/setRequestQuote.bsh	2005-05-21 15:40:50 UTC (rev 5017)
+++ trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/setRequestQuote.bsh	2005-05-21 15:45:51 UTC (rev 5018)
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a 
+ *  copy of this software and associated documentation files (the "Software"), 
+ *  to deal in the Software without restriction, including without limitation 
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ *  and/or sell copies of the Software, and to permit persons to whom the 
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included 
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT 
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR 
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *@author     Jacopo Cappellato (tiz at sastau.it)
+ *@version    $Rev$
+ */
+
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.entity.util.EntityUtil;
+
+custRequestId = request.getParameter("custRequestId");	
+if (custRequestId != null) {
+    requestQuotes = delegator.findByAnd("QuoteItem", UtilMisc.toMap("custRequestId", custRequestId));
+    requestQuote = EntityUtil.getFirst(requestQuotes);
+    if (requestQuote != null) {
+        context.put("quoteId", requestQuote.getString("quoteId"));
+    }
+}	


Property changes on: trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/setRequestQuote.bsh
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + "Id Rev Author"
Name: svn:eol-style
   + native

Added: trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl	2005-05-21 15:40:50 UTC (rev 5017)
+++ trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl	2005-05-21 15:45:51 UTC (rev 5018)
@@ -0,0 +1,30 @@
+<#--
+ *  Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a 
+ *  copy of this software and associated documentation files (the "Software"), 
+ *  to deal in the Software without restriction, including without limitation 
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ *  and/or sell copies of the Software, and to permit persons to whom the 
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included 
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT 
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR 
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+-->
+
+<#if custRequestItem?exists>
+  <#if quoteId?has_content>
+  <div><a href="<@ofbizUrl>/EditQuoteItemForRequest?quoteId=${quoteId}&custRequestId=${custRequestItem.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.OrderNewQuoteItemForQuote}]</a> [${quoteId}]</div>
+  <#else>
+  <div><a href="<@ofbizUrl>/CreateQuoteAndQuoteItemForRequest?custRequestId=${custRequestItem.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.OrderNewQuoteAndQuoteItem}]</a></div>
+  </#if>
+</#if>


Property changes on: trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + "Id Rev Author"
Name: svn:eol-style
   + native

Added: trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
===================================================================
--- trunk/applications/order/webapp/ordermgr/request/RequestForms.xml	2005-05-21 15:40:50 UTC (rev 5017)
+++ trunk/applications/order/webapp/ordermgr/request/RequestForms.xml	2005-05-21 15:45:51 UTC (rev 5018)
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ *  Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *@author     Nicolas.Malin at librenberry.net
+ *@author     Jacopo Cappellato (tiz at sastau.it)
+ *@author     David E. Jones (jonesde at ofbiz.org)
+ *@version    $Rev$
+ *@since      3.0
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+    <form name="EditWorkEffort" type="single"
+            target="updateworkeffort" title="" default-map-name="workEffort"
+            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <alt-target use-when="workEffort==null" target="createworkeffort"/>
+        <auto-fields-entity entity-name="WorkEffort" default-field-type="edit" />
+        <field name="submitButton" title="Submit" widget-style="standardSubmit">
+            <submit button-type="button"/>
+        </field>
+    </form>
+    <form name="FindRequests" default-title-style="tableheadtext"
+            default-tooltip-style="tabletext" default-widget-style="inputBox"
+            target="FindRequest" title="" type="single">
+        <auto-fields-entity entity-name="CustRequest" default-field-type="find"/>
+        <field name="custRequestTypeId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="CustRequestType" key-field-name="custRequestTypeId"/>
+            </drop-down>
+        </field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="StatusItem" description="${description}">
+                    <entity-constraint name="statusTypeId" operator="equals" value="CUSTREQ_STTS"/>
+                    <entity-order-by field-name="sequenceId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="custRequestCategoryId"><hidden/></field>
+        <field name="priority"><hidden/></field>
+        <field name="description"><hidden/></field>
+        <field name="createdDate"><hidden/></field>
+        <field name="createdByUserLogin"><hidden/></field>
+        <field name="lastModifiedDate"><hidden/></field>
+        <field name="lastModifiedByUserLogin"><hidden/></field>
+        <field name="submitButton" title="Find" widget-style="standardSubmit">
+            <submit button-type="button"/>
+        </field>
+    </form>
+
+    <form name="ListRequests" type="list" use-row-submit="true" 
+            title="" list-name="custRequestAndRoles" paginate-target="requestlist"
+            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+      	<actions>
+          <set field="entityName" value="CustRequest"/>
+          <service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
+            <field-map field-name="inputFields" env-name="requestParameters"/>
+            <field-map field-name="entityName" env-name="entityName"/>
+          </service>
+        </actions>
+        <field name="custRequestId" widget-style="buttontext">
+            <hyperlink description="${custRequestId}" target="request?custRequestId=${custRequestId}"/>
+        </field>
+        <field name="custRequestName"><display/></field>
+        <field name="priority"><display/></field>
+        <field name="responseRequiredDate"><display/></field>
+        <field name="partyId"><display/></field>
+        <field name="statusId">
+            <display-entity also-hidden="false" entity-name="StatusItem"/>
+        </field>
+        <field name="roleTypeId">
+            <display-entity also-hidden="false" entity-name="RoleType"/>
+        </field>
+    </form>
+    <form name="ListRequestItems" type="list" use-row-submit="true" 
+            title="" list-name="custRequestItems" paginate-target="requestitems"
+            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        <auto-fields-entity entity-name="CustRequestItem" default-field-type="display"/>
+        <field name="custRequestId" widget-style="buttontext">
+            <hyperlink description="${custRequestItemSeqId}" target="requestitem?custRequestId=${custRequestId}&amp;custRequestItemSeqId=${custRequestItemSeqId}"/>
+        </field>
+        <field name="custRequestItemSeqId"><hidden/></field>
+        <field name="custRequestResolutionId"><hidden/></field>
+        <field name="story"><hidden/></field>
+        <field name="statusId">
+            <display-entity also-hidden="false" entity-name="StatusItem"/>
+        </field>
+    </form>
+
+    <form name="ListRequestQuoteItems" type="list" use-row-submit="true" 
+            title="" list-name="quotes" paginate-target="RequestItemQuotes"
+            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        <auto-fields-entity entity-name="QuoteItem" default-field-type="display"/>
+        <field name="quoteId" widget-style="buttontext">
+            <hyperlink description="${quoteItemSeqId}" target="EditQuoteItemForRequest?custRequestId=${custRequestId}&amp;custRequestItemSeqId=${custRequestItemSeqId}&amp;quoteId=${quoteId}&amp;quoteItemSeqId=${quoteItemSeqId}"/>
+        </field>
+        <field name="quoteItemSeqId"><hidden/></field>
+        <field name="productFeatureId"><hidden/></field>
+        <field name="skillTypeId"><hidden/></field>
+        <field name="deliverableTypeId"><hidden/></field>
+        <field name="comments"><hidden/></field>
+        <field name="uomId"><hidden/></field>
+        <field name="custRequestId"><hidden/></field>
+        <field name="custRequestItemSeqId"><hidden/></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" title="Request Name"/>
+        <field name="custRequestTypeId" title="Request Type">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="CustRequestType" description="${description}"/>
+            </drop-down>
+        </field>
+        <field name="custRequestCategoryId" title="Request Category">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="CustRequestCategory" description="${description}"/>
+            </drop-down>
+        </field>
+
+        <field use-when="custRequest==null" name="statusId" title="Status" 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" title="Status" 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="custRequestDate" title="Request Date"><date-time type="timestamp"/></field>
+        <field name="responseRequiredDate" title="Response Required Date"><date-time type="timestamp"/></field>
+        
+        <field name="requestPartyId" use-when="custRequest==null" title="Requesting Party"><lookup target-form-name="LookupPartyName"/></field>
+
+        <field name="submitButton" title="Submit" widget-style="standardSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="EditCustRequestItem" type="single"
+            target="updaterequestitem" title="" default-map-name="custRequestItem"
+            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <alt-target use-when="custRequestItem==null" target="createrequestitem"/>
+        <auto-fields-entity entity-name="CustRequestItem" default-field-type="edit"/>
+        <field name="custRequestId"><hidden/></field>
+        <field name="custRequestItemSeqId"><hidden/></field>
+        <field name="custRequestResolutionId"><hidden/></field>
+        <field use-when="custRequestItem==null" name="statusId" title="Status" 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="custRequestItem!=null" name="statusId" title="Status" 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="${custRequestItem.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="productId"><lookup target-form-name="LookupProduct"/></field>
+        <field name="submitButton" title="Submit" widget-style="standardSubmit">
+            <submit button-type="button"/>
+        </field>
+    </form>
+    <form name="EditQuoteItemForRequest" type="single"
+            target="updateQuoteItemForRequest" title="" default-map-name="quoteItem"
+            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <alt-target use-when="quoteItem==null" target="createQuoteItemForRequest"/>
+        <auto-fields-entity entity-name="QuoteItem" default-field-type="edit"/>
+        <field name="quoteId"><display/></field>
+        <field name="quoteItemSeqId"><display/></field>
+        <field name="custRequestId"><hidden/></field>
+        <field name="custRequestItemSeqId"><hidden/></field>
+        <field name="productId">
+            <lookup target-form-name="LookupProduct"/>
+        </field>
+        <field name="productFeatureId">
+            <lookup target-form-name="LookupProductFeature"/>
+        </field>
+        <field name="deliverableTypeId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="DeliverableType" key-field-name="deliverableTypeId"/>
+            </drop-down>
+        </field>
+        <field name="skillTypeId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="SkillType" key-field-name="skillTypeId"/>
+            </drop-down>
+        </field>
+        <field name="uomId">
+            <drop-down allow-empty="true">
+                <entity-options description="${uomId} - ${description}" entity-name="Uom" key-field-name="uomId">
+                    <!--<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>-->
+                </entity-options>
+            </drop-down>
+        </field>
+
+        <field name="submitButton" title="Submit" widget-style="standardSubmit">
+            <submit button-type="button"/>
+        </field>
+    </form>
+    <form name="CreateQuoteAndQuoteItemForRequest" type="single" extends="EditQuoteItemForRequest"
+            target="createQuoteAndQuoteItemForRequest" title="" default-map-name="quoteItem"
+            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <!--
+        <auto-fields-entity entity-name="QuoteItem" default-field-type="edit"/>
+        <field name="custRequestId"><hidden/></field>
+        <field name="custRequestItemSeqId"><hidden/></field>
+        <field name="submitButton" title="Submit" widget-style="standardSubmit">
+            <submit button-type="button"/>
+        </field>
+        -->
+        <field name="quoteId"><hidden/></field>
+        <field name="quoteItemSeqId"><hidden/></field>
+        <field name="attrName"><text/></field>
+        <field name="attrValue"><text/></field>
+    </form>
+
+    <form name="ListRequestItemNotes" type="list" use-row-submit="true" 
+            title="" list-name="notes" paginate-target="requestitemnotes"
+            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        <auto-fields-entity entity-name="CustRequestItemNoteView" default-field-type="display"/>
+        <field name="noteId"><hidden/></field>
+        <field name="noteName"><hidden/></field>
+        <field name="custRequestId"><hidden/></field>
+        <field name="name"><display description="${firstName} ${lastName}"/></field>
+        <field name="firstName"><hidden/></field>
+        <field name="lastName"><hidden/></field>
+    </form>
+    <form name="ListRequestItemWorkEffortReq" type="list" use-row-submit="true" 
+            title="" list-name="requirements" paginate-target="requestitemrequirements"
+            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        <auto-fields-entity entity-name="Requirement" default-field-type="display"/>
+        <field name="requirementId"><hidden/></field>
+    </form>
+    
+    <form name="EditRequestItemNote" type="single"
+            target="createrequestitemnote" title="" default-map-name="quoteItem"
+            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <field name="custRequestId"><hidden/></field>
+        <field name="custRequestItemSeqId"><hidden/></field>
+        <field name="note"><textarea/></field>
+        <field name="submitButton" title="Submit" widget-style="standardSubmit">
+            <submit button-type="button"/>
+        </field>
+    </form>
+
+    <form name="ListRequestRoles" type="list" use-row-submit="true" 
+            title="" list-name="custRequestRoles" paginate-target="requestroles"
+            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+        <auto-fields-entity entity-name="CustRequestRole" default-field-type="display"/>
+        <field name="custRequestId"><hidden/></field>
+        <field name="partyId" widget-style="buttontext">
+            <hyperlink description="${partyId}" target-type="inter-app" target="/partymgr/control/viewprofile?partyId=${partyId}"/>
+        </field>
+        <field name="name" entry-name="partyId">
+            <display-entity also-hidden="false" entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}"/>
+        </field>
+        <field name="roleTypeId" >
+            <display-entity also-hidden="false" entity-name="RoleType"/>
+        </field>
+        <field name="remove" widget-style="buttontext">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removerequestrole?custRequestId=${custRequestId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}"/>
+        </field>
+    </form>
+
+    <form name="EditRequestRole" type="single"
+            target="createrequestrole" title=""
+            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+        <field name="custRequestId"><hidden/></field>
+        <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="roleTypeId">
+            <drop-down allow-empty="false">
+                <option key="REQ_TAKER" description="${uiLabelMap.WorkEffortRequestTaker}"/>
+                <option key="REQ_REQUESTER" description="${uiLabelMap.WorkEffortRequestingParty}"/>
+                <option key="REQ_MANAGER" description="${uiLabelMap.WorkEffortRequestManager}"/>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="Submit" widget-style="standardSubmit">
+            <submit button-type="button"/>
+        </field>
+    </form>
+</forms>
+


Property changes on: trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + "Id Rev Author"
Name: svn:eol-style
   + native

Added: trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl	2005-05-21 15:40:50 UTC (rev 5017)
+++ trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl	2005-05-21 15:45:51 UTC (rev 5018)
@@ -0,0 +1,42 @@
+<#--
+ *  Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a 
+ *  copy of this software and associated documentation files (the "Software"), 
+ *  to deal in the Software without restriction, including without limitation 
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ *  and/or sell copies of the Software, and to permit persons to whom the 
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included 
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT 
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR 
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+-->
+
+<#assign unselectedClassName = "tabButton">
+<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+
+<#if custRequest?exists>
+<div class='tabContainer'>
+  <a href="<@ofbizUrl>/request?custRequestId=${custRequest.custRequestId}</@ofbizUrl>" class="${selectedClassMap.request?default(unselectedClassName)}">${uiLabelMap.OrderRequest}</a>
+  <a href="<@ofbizUrl>/requestroles?custRequestId=${custRequest.custRequestId}</@ofbizUrl>" class="${selectedClassMap.requestroles?default(unselectedClassName)}">${uiLabelMap.OrderRequestRoles}</a>
+  <a href="<@ofbizUrl>/requestitems?custRequestId=${custRequest.custRequestId}</@ofbizUrl>" class="${selectedClassMap.requestitems?default(unselectedClassName)}">${uiLabelMap.OrderRequestItems}</a>
+  <#if custRequestItem?exists>
+    <a href="<@ofbizUrl>/requestitem?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitem?default(unselectedClassName)}">${uiLabelMap.OrderItem}</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>/EditRequestItemWorkEffort?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="tabButton">${uiLabelMap.WorkEffortTasks}</a>
+  </#if>
+</div>
+</#if>


Property changes on: trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + "Id Rev Author"
Name: svn:eol-style
   + native

Added: trunk/applications/order/webapp/ordermgr/request/requestitemnotes.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/request/requestitemnotes.ftl	2005-05-21 15:40:50 UTC (rev 5017)
+++ trunk/applications/order/webapp/ordermgr/request/requestitemnotes.ftl	2005-05-21 15:45:51 UTC (rev 5018)
@@ -0,0 +1,32 @@
+<#--
+ *  Description: None
+ *  Copyright (c) 2002 The Open For Business Project - www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a 
+ *  copy of this software and associated documentation files (the "Software"), 
+ *  to deal in the Software without restriction, including without limitation 
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ *  and/or sell copies of the Software, and to permit persons to whom the 
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included 
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT 
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR 
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *@author     Johan Isacsson (conversion of jsp created by Andy Zeneski)
+ *@author     Eric.Barbier at nereide.biz (migration to uiLabelMap) 
+ *@version    $Rev$
+ *@since      2.1
+-->
+<#if showAll = "false">
+    <a href="<@ofbizUrl>/requestitemnotes?custRequestId=${custRequestId}&custRequestItemSeqId=${custRequestItemSeqId}&showAll=true</@ofbizUrl>" class="buttontext">[${uiLabelMap.OrderShowAllNotes}]</a>
+<#else>
+    <a href="<@ofbizUrl>/requestitemnotes?custRequestId=${custRequestId}&custRequestItemSeqId=${custRequestItemSeqId}&showAll=false</@ofbizUrl>" class="buttontext">[${uiLabelMap.OrderShowThisItemsNotes}]</a>
+</#if>


Property changes on: trunk/applications/order/webapp/ordermgr/request/requestitemnotes.ftl
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + "Id Rev Author"
Name: svn:eol-style
   + native

Added: trunk/applications/order/webapp/ordermgr/request/requestitemrequirements.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/request/requestitemrequirements.ftl	2005-05-21 15:40:50 UTC (rev 5017)
+++ trunk/applications/order/webapp/ordermgr/request/requestitemrequirements.ftl	2005-05-21 15:45:51 UTC (rev 5018)
@@ -0,0 +1,97 @@
+<#--
+ *  Description: None
+ *  Copyright (c) 2002 The Open For Business Project - www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a 
+ *  copy of this software and associated documentation files (the "Software"), 
+ *  to deal in the Software without restriction, including without limitation 
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ *  and/or sell copies of the Software, and to permit persons to whom the 
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included 
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT 
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR 
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *@author     Johan Isacsson (conversion of jsp created by Andy Zeneski) 
+ *@author     Eric.Barbier at nereide.biz (migration to uiLabelMap) 
+ *@version    $Rev$
+ *@since      2.1
+-->
+
+<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
+  <TR>
+    <TD width='100%'>
+      <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
+        <tr>
+          <TD>
+            <div class='boxhead'>${uiLabelMap.OrderRequirementsForRequestItem}: ${custRequestItem.description?if_exists}</div>
+          </TD>
+          <td align="right" valign="middle">
+            <a href="<@ofbizUrl>/requirement?custRequestId=${custRequestId}&custRequestItemSeqId=${custRequestItemSeqId}&productId=${custRequestItem.productId?if_exists}&quantity=${custRequestItem.quantity?if_exists}&donePage=requestitemrequirements</@ofbizUrl>" class="lightbuttontext">[${uiLabelMap.OrderNewRequirement}]</a>
+          </td>
+        </tr>
+      </table>
+    </TD>
+  </TR>
+  <TR>
+    <TD width='100%'>
+      <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
+        <tr>
+          <td>
+              <TABLE width='100%' cellpadding='2' cellspacing='0' border='0'>
+                <#if requirements?has_content>
+                <TR>
+                  <TD>
+                    <table width="100%" cellpadding="2" cellspacing="0" border="0">
+                      <tr>
+                        <td><div class="tableheadtext">${uiLabelMap.OrderRequirementId}</div></td>
+                        <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
+                        <td><div class="tableheadtext">${uiLabelMap.ProductProductId}</div></td>
+                        <td align='right'><div class="tableheadtext">${uiLabelMap.CommonQuantity}</div></td>
+                        <td>&nbsp;&nbsp;</td>
+                        <td align='right'><div class="tableheadtext">${uiLabelMap.OrderEstBudget}</div></td>
+                        <td>&nbsp;&nbsp;</td>
+                        <td><div class="tableheadtext">${uiLabelMap.OrderRequiredByDate}</div></td>
+                        <td>&nbsp;</td>
+                      </tr>
+                      <tr>
+                        <td colspan="9"><hr class="sepbar"></td>
+                      </tr>                      	
+					  <#setting number_format="#.##"/>
+                      <#list requirements as requirement>
+                          <tr>
+                            <td><a href="<@ofbizUrl>/requirement?requirementId=${requirement.requirementId}&custRequestId=${custRequestId}&custRequestItemSeqId=${requirement.custRequestItemSeqId}&donePage=request</@ofbizUrl>" class="buttontext">${requirement.requirementId}</a></td>
+                            <td><div class="tabletext">${requirement.description?if_exists}</div></td>
+                            <td><div class="tabletext">${requirement.productId?if_exists}</div></td>
+                            <td align='right'><div class="tabletext">${requirement.quantity?default(0)?string.number}></div></td>
+                            <td>&nbsp;&nbsp;</td>
+                            <td align='right'><div class="tabletext">${requirement.estimatedBudget?default(0)}</div></td>
+                            <td>&nbsp;&nbsp;</td>
+                            <td><div class="tabletext">${requirement.requiredByDate?if_exists}</div></td>
+                            <td align="right"><div class="tabletext"><a href="<@ofbizUrl>/requirement?requirementId=${requirement.requirementId}&custRequestId=${custRequestId}&custRequestItemSeqId=${requirement.custRequestItemSeqId}&donePage=request</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a></td>
+                          </tr>
+                      </#list>
+                    </table>
+                  </TD>
+                </TR>
+                <#else>
+                <TR>
+                    <TD><div class="tabletext">&nbsp;<b>${uiLabelMap.OrderNoRequirementsCreated}.</b></div></TD>
+                  </TR>
+                </#if>                                 
+              </TABLE>       
+          </td>
+        </tr>
+      </table>
+    </TD>
+  </TR>
+</TABLE>          
+


Property changes on: trunk/applications/order/webapp/ordermgr/request/requestitemrequirements.ftl
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + "Id Rev Author"
Name: svn:eol-style
   + native



More information about the Svn mailing list