[OFBiz] SVN: r5020 - in trunk/applications/workeffort: config
webapp/workeffort/WEB-INF webapp/workeffort/WEB-INF/actions/request
webapp/workeffort/includes webapp/workeffort/request widget
jacopo at svn.ofbiz.org
jacopo at svn.ofbiz.org
Sat May 21 12:25:13 EDT 2005
Author: jacopo
Date: 2005-05-21 11:24:30 -0500 (Sat, 21 May 2005)
New Revision: 5020
Removed:
trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/request/requestitemnotes.bsh
trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/request/requestitemrequirements.bsh
trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/request/setRequestQuote.bsh
trunk/applications/workeffort/webapp/workeffort/request/QuoteLinks.ftl
trunk/applications/workeffort/webapp/workeffort/request/RequestTabBar.ftl
trunk/applications/workeffort/webapp/workeffort/request/requestitemnotes.ftl
trunk/applications/workeffort/webapp/workeffort/request/requestitemrequirements.ftl
trunk/applications/workeffort/widget/RequestMenus.xml
Modified:
trunk/applications/workeffort/config/WorkEffortUiLabels.properties
trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
trunk/applications/workeffort/webapp/workeffort/includes/header.ftl
trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml
trunk/applications/workeffort/widget/RequestScreens.xml
Log:
Removed most of the request stuff from the WorkEffort component: everything is managed in the Order component now.
Modified: trunk/applications/workeffort/config/WorkEffortUiLabels.properties
===================================================================
--- trunk/applications/workeffort/config/WorkEffortUiLabels.properties 2005-05-21 16:03:48 UTC (rev 5019)
+++ trunk/applications/workeffort/config/WorkEffortUiLabels.properties 2005-05-21 16:24:30 UTC (rev 5020)
@@ -100,8 +100,6 @@
WorkEffortNewNote=New Note
WorkEffortNewPhase=New Phase
WorkEffortNewProject=New Project
-WorkEffortNewRequest=New Request
-WorkEffortNewRequestItem=New Request Item
WorkEffortNewRequirement=New Requirement
WorkEffortNewTask=New Task
WorkEffortNextDay=Next Day
@@ -110,14 +108,11 @@
WorkEffortNoContactInformationOnFile=No Contact Information On File
WorkEffortNoEventsFound=No Events Found
WorkEffortNoItemsCreated=No Items Created
-WorkEffortNoNotesForThisRequestItem=No Notes For This Request Item
WorkEffortNoOpenRequirementsFound=No Open Requirements Found
WorkEffortNoRequestFound=No Request Found
WorkEffortNoRequirementsCreated=No Requirements Created
-WorkEffortNoRolesAssociatedRequest=No Roles Associated With This Customer Request
WorkEffortNoTasksAssociatedRequirement=No Tasks currently associated with this Requirement
WorkEffortNotes=Notes
-WorkEffortNotesForRequestItem=Notes For Request Item
WorkEffortOrganizer=Organizer
WorkEffortOpenApplication=WorkEffortOpenApplication
WorkEffortOpenPageInNewWindow=Open Page In New Window
@@ -139,13 +134,9 @@
WorkEffortProjectStatus=Project Status
WorkEffortQuantity=Quantity
WorkEffortRegisteredUserLogin=Registered User Login
-WorkEffortRequest=Request
-WorkEffortRequestingParty=Requesting Party
-WorkEffortRequestItems=Request Items
WorkEffortRequestList=Request List
WorkEffortRequestManager=Request Manager
WorkEffortRequestName=Request Name
-WorkEffortRequestRoles=Request Roles
WorkEffortRequestTaker=Request Taker
WorkEffortRequests=Requests
WorkEffortRequiredBy=Required By
Deleted: trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/request/requestitemnotes.bsh
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/request/requestitemnotes.bsh 2005-05-21 16:03:48 UTC (rev 5019)
+++ trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/request/requestitemnotes.bsh 2005-05-21 16:24:30 UTC (rev 5020)
@@ -1,47 +0,0 @@
-/*
- * 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);
-}
Deleted: trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/request/requestitemrequirements.bsh
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/request/requestitemrequirements.bsh 2005-05-21 16:03:48 UTC (rev 5019)
+++ trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/request/requestitemrequirements.bsh 2005-05-21 16:24:30 UTC (rev 5020)
@@ -1,23 +0,0 @@
-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);
Deleted: trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/request/setRequestQuote.bsh
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/request/setRequestQuote.bsh 2005-05-21 16:03:48 UTC (rev 5019)
+++ trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/request/setRequestQuote.bsh 2005-05-21 16:24:30 UTC (rev 5020)
@@ -1,36 +0,0 @@
-/*
- * 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"));
- }
-}
Modified: trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-05-21 16:03:48 UTC (rev 5019)
+++ trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-05-21 16:24:30 UTC (rev 5020)
@@ -196,107 +196,7 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="RequestList"/>
</request-map>
- <request-map uri="request">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditRequest"/>
- </request-map>
- <request-map uri="createrequest">
- <security https="true" auth="true"/>
- <event type="service" invoke="createCustRequest"/>
- <response name="success" type="view" value="EditRequest"/>
- <response name="error" type="view" value="EditRequest"/>
- </request-map>
- <request-map uri="updaterequest">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateCustRequest"/>
- <response name="success" type="view" value="EditRequest"/>
- <response name="error" type="view" value="EditRequest"/>
- </request-map>
-
- <request-map uri="requestroles">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="RequestRoles"/>
- </request-map>
- <request-map uri="createrequestrole">
- <security https="true" auth="true"/>
- <event type="service" invoke="createCustRequestRole"/>
- <response name="success" type="view" value="RequestRoles"/>
- <response name="error" type="view" value="RequestRoles"/>
- </request-map>
- <request-map uri="removerequestrole">
- <security https="true" auth="true"/>
- <event type="service" invoke="removeCustRequestRole"/>
- <response name="success" type="view" value="RequestRoles"/>
- <response name="error" type="view" value="RequestRoles"/>
- </request-map>
-
- <request-map uri="requestitems">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="RequestItems"/>
- </request-map>
- <request-map uri="requestitem">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditRequestItem"/>
- </request-map>
- <request-map uri="createrequestitem">
- <security https="true" auth="true"/>
- <event type="service" invoke="createCustRequestItem"/>
- <response name="success" type="view" value="RequestItems"/>
- <response name="error" type="view" value="RequestItems"/>
- </request-map>
- <request-map uri="updaterequestitem">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateCustRequestItem"/>
- <response name="success" type="view" value="RequestItems"/>
- <response name="error" type="view" value="RequestItems"/>
- </request-map>
- <request-map uri="requestitemnotes">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="RequestItemNotes"/>
- </request-map>
- <request-map uri="createrequestitemnote">
- <security https="true" auth="true"/>
- <event type="service" invoke="createCustRequestItemNote"/>
- <response name="success" type="view" value="RequestItemNotes"/>
- <response name="error" type="view" value="RequestItemNotes"/>
- </request-map>
- <request-map uri="RequestItemQuotes">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="RequestItemQuotes"/>
- </request-map>
- <request-map uri="requestitemrequirements">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="RequestItemRequirements"/>
- </request-map>
- <request-map uri="EditRequestItemWorkEffort">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditRequestItemWorkEffort"/>
- </request-map>
- <request-map uri="CreateQuoteAndQuoteItemForRequest">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="CreateQuoteAndQuoteItemForRequest"/>
- </request-map>
- <request-map uri="createQuoteAndQuoteItemForRequest">
- <security https="true" auth="true"/>
- <event type="service" invoke="createQuoteAndQuoteItemForRequest"/>
- <response name="success" type="view" value="RequestItemQuotes"/>
- </request-map>
- <request-map uri="EditQuoteItemForRequest">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditQuoteItemForRequest"/>
- </request-map>
- <request-map uri="createQuoteItemForRequest">
- <security https="true" auth="true"/>
- <event type="service" invoke="createQuoteItem"/>
- <response name="success" type="view" value="RequestItemQuotes"/>
- </request-map>
- <request-map uri="updateQuoteItemForRequest">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateQuoteItem"/>
- <response name="success" type="view" value="RequestItemQuotes"/>
- </request-map>
-
<request-map uri="openApplication">
<security https="false" auth="false"/>
<response name="success" type="view" value="openapplication"/>
@@ -604,17 +504,7 @@
<view-map name="LookupVariantProduct" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct" type="screen"/>
<view-map name="LookupProductFeature" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature" type="screen"/>
- <view-map name="EditRequest" type="screen" page="component://workeffort/widget/RequestScreens.xml#EditRequest"/>
- <view-map name="EditRequestItem" type="screen" page="component://workeffort/widget/RequestScreens.xml#EditRequestItem"/>
<view-map name="RequestList" type="screen" page="component://workeffort/widget/RequestScreens.xml#RequestList"/>
- <view-map name="RequestItems" type="screen" page="component://workeffort/widget/RequestScreens.xml#RequestItems"/>
- <view-map name="RequestRoles" type="screen" page="component://workeffort/widget/RequestScreens.xml#RequestRoles"/>
- <view-map name="RequestItemNotes" type="screen" page="component://workeffort/widget/RequestScreens.xml#RequestItemNotes"/>
- <view-map name="RequestItemQuotes" type="screen" page="component://workeffort/widget/RequestScreens.xml#RequestItemQuotes"/>
- <view-map name="RequestItemRequirements" type="screen" page="component://workeffort/widget/RequestScreens.xml#RequestItemRequirements"/>
- <view-map name="EditRequestItemWorkEffort" type="screen" page="component://workeffort/widget/RequestScreens.xml#EditRequestItemWorkEffort"/>
- <view-map name="CreateQuoteAndQuoteItemForRequest" type="screen" page="component://workeffort/widget/RequestScreens.xml#CreateQuoteAndQuoteItemForRequest"/>
- <view-map name="EditQuoteItemForRequest" type="screen" page="component://workeffort/widget/RequestScreens.xml#EditQuoteItemForRequest"/>
<view-map name="requirementlist" type="jpublish" page="/requirement/requirementlist.ftl"/>
<view-map name="requirement" type="region"/>
Modified: trunk/applications/workeffort/webapp/workeffort/includes/header.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/includes/header.ftl 2005-05-21 16:03:48 UTC (rev 5019)
+++ trunk/applications/workeffort/webapp/workeffort/includes/header.ftl 2005-05-21 16:24:30 UTC (rev 5020)
@@ -40,7 +40,7 @@
<div class="col"><a href="<@ofbizUrl>/mytasks</@ofbizUrl>" class="${selectedLeftClassMap.task?default(unselectedLeftClassName)}">${uiLabelMap.WorkEffortTaskList}</a></div>
<div class="col"><a href="<@ofbizUrl>/day</@ofbizUrl>" class="${selectedLeftClassMap.calendar?default(unselectedLeftClassName)}">${uiLabelMap.WorkEffortCalendar}</a></div>
<div class="col"><a href="<@ofbizUrl>/projectlist</@ofbizUrl>" class="${selectedLeftClassMap.project?default(unselectedLeftClassName)}">${uiLabelMap.WorkEffortProjects}</a></div>
- <div class="col"><a href="<@ofbizUrl>/requestlist</@ofbizUrl>" class="${selectedLeftClassMap.request?default(unselectedLeftClassName)}">${uiLabelMap.WorkEffortRequests}</a></div>
+ <div class="col"><a href="<@ofbizUrl>/requestlist</@ofbizUrl>" class="${selectedLeftClassMap.request?default(unselectedLeftClassName)}">${uiLabelMap.WorkEffortRequestList}</a></div>
<#if userLogin?has_content>
<div class="col-right"><a href="<@ofbizUrl>/logout</@ofbizUrl>" class="${selectedRightClassMap.logout?default(unselectedRightClassName)}">${uiLabelMap.CommonLogout}</a></div>
<#else>
Deleted: trunk/applications/workeffort/webapp/workeffort/request/QuoteLinks.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/request/QuoteLinks.ftl 2005-05-21 16:03:48 UTC (rev 5019)
+++ trunk/applications/workeffort/webapp/workeffort/request/QuoteLinks.ftl 2005-05-21 16:24:30 UTC (rev 5020)
@@ -1,30 +0,0 @@
-<#--
- * 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>
Modified: trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml 2005-05-21 16:03:48 UTC (rev 5019)
+++ trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml 2005-05-21 16:24:30 UTC (rev 5020)
@@ -29,56 +29,11 @@
<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}"/>
+ <hyperlink description="${custRequestId}" target-type="inter-app" target="/ordermgr/control/request?custRequestId=${custRequestId}"/>
</field>
<field name="custRequestName"><display/></field>
<field name="priority"><display/></field>
@@ -91,252 +46,5 @@
<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}&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}&custRequestItemSeqId=${custRequestItemSeqId}&quoteId=${quoteId}&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}&partyId=${partyId}&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>
Deleted: trunk/applications/workeffort/webapp/workeffort/request/RequestTabBar.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/request/RequestTabBar.ftl 2005-05-21 16:03:48 UTC (rev 5019)
+++ trunk/applications/workeffort/webapp/workeffort/request/RequestTabBar.ftl 2005-05-21 16:24:30 UTC (rev 5020)
@@ -1,42 +0,0 @@
-<#--
- * 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>
Deleted: trunk/applications/workeffort/webapp/workeffort/request/requestitemnotes.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/request/requestitemnotes.ftl 2005-05-21 16:03:48 UTC (rev 5019)
+++ trunk/applications/workeffort/webapp/workeffort/request/requestitemnotes.ftl 2005-05-21 16:24:30 UTC (rev 5020)
@@ -1,32 +0,0 @@
-<#--
- * 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>
Deleted: trunk/applications/workeffort/webapp/workeffort/request/requestitemrequirements.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/request/requestitemrequirements.ftl 2005-05-21 16:03:48 UTC (rev 5019)
+++ trunk/applications/workeffort/webapp/workeffort/request/requestitemrequirements.ftl 2005-05-21 16:24:30 UTC (rev 5020)
@@ -1,97 +0,0 @@
-<#--
- * 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> </td>
- <td align='right'><div class="tableheadtext">${uiLabelMap.OrderEstBudget}</div></td>
- <td> </td>
- <td><div class="tableheadtext">${uiLabelMap.OrderRequiredByDate}</div></td>
- <td> </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> </td>
- <td align='right'><div class="tabletext">${requirement.estimatedBudget?default(0)}</div></td>
- <td> </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"> <b>${uiLabelMap.OrderNoRequirementsCreated}.</b></div></TD>
- </TR>
- </#if>
- </TABLE>
- </td>
- </tr>
- </table>
- </TD>
- </TR>
-</TABLE>
-
Deleted: trunk/applications/workeffort/widget/RequestMenus.xml
===================================================================
--- trunk/applications/workeffort/widget/RequestMenus.xml 2005-05-21 16:03:48 UTC (rev 5019)
+++ trunk/applications/workeffort/widget/RequestMenus.xml 2005-05-21 16:24:30 UTC (rev 5020)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (c) 2003-2004 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.
--->
-
-<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
-
- <menu name="editRequest" default-title-style="tabButton"
- default-selected-style="tabButtonSelected"
- default-menu-item-name="content"
- orientation="horizontal"
- menu-width="100%"
- default-tooltip-style="tabletext" default-widget-style="tabButton"
- default-associated-content-id="${userLogin.userLoginId}"
- selected-menuitem-context-field-name="currentRequestMenuItemName"
- title="" type="simple">
-
- <menu-item name="request" title="Request" >
- <link id="requestheader" target="request?custRequestId=${custRequest.custRequestId}"/>
- </menu-item>
- <menu-item name="requestroles" title="Request Roles" >
- <link id="requestroles" target="requestroles?custRequestId=${custRequest.custRequestId}"/>
- </menu-item>
- <menu-item name="requestitems" title="Request Items" >
- <link id="requestitems" target="/requestitems?custRequestId=${custRequest.custRequestId}">
- </link>
- </menu-item>
- </menu>
-
- <menu name="editrequestitemmenu" default-title-style="tabButton"
- default-selected-style="tabButtonSelected"
- default-menu-item-name="content"
- orientation="horizontal"
- menu-width="100%"
- default-tooltip-style="tabletext" default-widget-style="tabButton"
- default-associated-content-id="${userLogin.userLoginId}"
- title="" type="simple">
-
- <menu-item name="requestitem" title="Request Item" >
- <link id="requestitem" target="requestitem?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}"/>
- </menu-item>
- <menu-item name="requestitemnotes" title="Request Item Notes" >
- <link id="requestitemnotes" target="requestitemnotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}"/>
- </menu-item>
- <menu-item name="requestitemquotes" title="Request Item Quotes" >
- <link id="requestitemquotes" target="RequestItemQuotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}"/>
- </menu-item>
- <menu-item name="workeffortrequirements" title="WorkEffort Requirements" >
- <link id="workeffortrequirements" target="requestitemrequirements?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}"/>
- </menu-item>
- </menu>
-</menus>
-
Modified: trunk/applications/workeffort/widget/RequestScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/RequestScreens.xml 2005-05-21 16:03:48 UTC (rev 5019)
+++ trunk/applications/workeffort/widget/RequestScreens.xml 2005-05-21 16:24:30 UTC (rev 5020)
@@ -25,41 +25,6 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
- <screen name="CommonRequestDecorator">
- <section>
- <actions>
- <!-- <set field="leftbarScreenName" value="leftbar"/> -->
- <!-- <set field="leftbarScreenLocation" value=""/> -->
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="component://workeffort/widget/CommonScreens.xml">
- <decorator-section name="body">
- <section>
- <!--
- <condition>
- <if-has-permission permission="WORKEFFORT" action="_VIEW"/>
- </condition>
- -->
- <widgets>
- <platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/request/RequestTabBar.ftl"/></html>
- </platform-specific>
- <container>
- <label style="head1">[${uiLabelMap.CommonId}:${custRequest.custRequestId}] ${custRequest.custRequestName}</label>
- </container>
- <decorator-section-include name="body"/>
- </widgets>
- <!--
- <fail-widgets>
- <label style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label>
- </fail-widgets>
- -->
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="RequestList">
<section>
<actions>
@@ -79,289 +44,11 @@
<container>
<label style="head1">${uiLabelMap.WorkEffortMyRequestList}</label>
</container>
- <container>
- <link target="request" text="[${uiLabelMap.WorkEffortNewRequest}]" style="buttontext"/>
- </container>
<include-form name="ListRequests" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
- <screen name="EditRequest">
- <section>
- <actions>
- <set field="title" value="Request"/>
- <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">
- <container>
- <link target="request" text="[${uiLabelMap.WorkEffortNewRequest}]" style="buttontext"/>
- </container>
- <include-form name="EditCustRequest" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
- <!--
- <platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/request/request.ftl"/></html>
- </platform-specific>
- -->
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="RequestRoles">
- <section>
- <actions>
- <set field="title" value="Request Roles"/>
- <set field="tabButtonItem" value="requestroles"/>
- <set field="headerItem" value="request"/>
- <set field="custRequestId" from-field="parameters.custRequestId"/>
- <entity-one entity-name="CustRequest" value-name="custRequest"/>
- <entity-and entity-name="CustRequestRole" list-name="custRequestRoles">
- <field-map env-name="custRequestId" field-name="custRequestId"/>
- </entity-and>
- </actions>
- <widgets>
- <decorator-screen name="CommonRequestDecorator">
- <decorator-section name="body">
- <include-form name="ListRequestRoles" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
- <include-form name="EditRequestRole" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="RequestItems">
- <section>
- <actions>
- <set field="title" value="Request Items"/>
- <set field="tabButtonItem" value="requestitems"/>
- <set field="headerItem" value="request"/>
- <set field="custRequestId" from-field="parameters.custRequestId"/>
- <entity-one entity-name="CustRequest" value-name="custRequest"/>
- <entity-and entity-name="CustRequestItem" list-name="custRequestItems">
- <field-map env-name="custRequestId" field-name="custRequestId"/>
- </entity-and>
- </actions>
- <widgets>
- <decorator-screen name="CommonRequestDecorator">
- <decorator-section name="body">
- <container>
- <link target="requestitem?custRequestId=${custRequestId}" text="[${uiLabelMap.WorkEffortNewRequestItem}]" style="buttontext"/>
- </container>
- <include-form name="ListRequestItems" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="EditRequestItem">
- <section>
- <actions>
- <set field="title" value="Edit a Request Item"/>
- <set field="tabButtonItem" value="requestitem"/>
- <set field="headerItem" value="request"/>
- <set field="custRequestId" from-field="parameters.custRequestId"/>
- <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/>
- <entity-one entity-name="CustRequest" value-name="custRequest"/>
- <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/>
- <set field="statusId" from-field="custRequestItem.statusId"/>
- <entity-one entity-name="StatusItem" value-name="currentStatus"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonRequestDecorator">
- <decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <container>
- <link target="requestitem?custRequestId=${custRequestId}" text="[${uiLabelMap.WorkEffortNewRequestItem}]" style="buttontext"/>
- </container>
- <include-form name="EditCustRequestItem" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="EditRequestItemWorkEffort">
- <section>
- <actions>
- <set field="title" value="Edit a Request Item"/>
- <set field="tabButtonItem" value="task"/>
- <set field="headerItem" value="request"/>
- <set field="custRequestId" from-field="parameters.custRequestId"/>
- <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/>
-
- <entity-one entity-name="CustRequest" value-name="custRequest" />
- <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/>
- <entity-one entity-name="CustRequestItemWorkEffort" value-name="custRequestItemWorkEffort"/>
- <entity-one entity-name="WorkEffort" value-name="workEffort"/>
- <set field="statusId" from-field="workEffort.statusId"/>
- <entity-one entity-name="StatusItem" value-name="currentStatus"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonRequestDecorator">
- <decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <container>
- <link target="requestitem?custRequestId=${custRequestId}" text="[${uiLabelMap.WorkEffortNewRequestItem}]" style="buttontext"/>
- </container>
- <include-form name="EditWorkEffort" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
- <screen name="RequestItemNotes">
- <section>
- <actions>
- <set field="title" value="Request Item Notes"/>
- <set field="tabButtonItem" value="requestitemnotes"/>
- <set field="headerItem" value="request"/>
- <set field="custRequestId" from-field="parameters.custRequestId"/>
- <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/>
- <entity-one entity-name="CustRequest" value-name="custRequest"/>
- <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/>
- <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/request/requestitemnotes.bsh"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonRequestDecorator">
- <decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/request/requestitemnotes.ftl"/></html>
- </platform-specific>
- <include-form name="ListRequestItemNotes" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
- <include-form name="EditRequestItemNote" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="RequestItemRequirements">
- <section>
- <actions>
- <set field="title" value="Request Item Requirements"/>
- <set field="tabButtonItem" value="requestitemrequirements"/>
- <set field="headerItem" value="request"/>
- <set field="custRequestId" from-field="parameters.custRequestId"/>
- <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/>
- <entity-one entity-name="CustRequest" value-name="custRequest"/>
- <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/>
- <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/request/requestitemrequirements.bsh"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonRequestDecorator">
- <decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/request/requestitemrequirements.ftl"/></html>
- </platform-specific>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="RequestItemQuotes">
- <section>
- <actions>
- <set field="title" value="Request Item Quotes"/>
- <set field="tabButtonItem" value="requestitemquotes"/>
- <set field="headerItem" value="request"/>
- <set field="custRequestId" from-field="parameters.custRequestId"/>
- <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/>
- <entity-one entity-name="CustRequest" value-name="custRequest"/>
- <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/>
- <entity-and entity-name="QuoteItem" list-name="quotes">
- <field-map env-name="custRequestItem.custRequestId" field-name="custRequestId"/>
- <field-map env-name="custRequestItem.custRequestItemSeqId" field-name="custRequestItemSeqId"/>
- </entity-and>
- <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/request/setRequestQuote.bsh"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonRequestDecorator">
- <decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/request/QuoteLinks.ftl"/></html>
- </platform-specific>
- <include-form name="ListRequestQuoteItems" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="EditQuoteItemForRequest">
- <section>
- <actions>
- <set field="title" value="Edit a QuoteItem For a CustRequest"/>
- <set field="tabButtonItem" value="requestitemquotes"/>
- <set field="headerItem" value="request"/>
-
- <set field="custRequestId" from-field="parameters.custRequestId"/>
- <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/>
- <set field="quoteId" from-field="parameters.quoteId"/>
- <set field="quoteItemSeqId" from-field="parameters.quoteItemSeqId"/>
- <entity-one entity-name="CustRequest" value-name="custRequest"/>
- <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/>
- <entity-one entity-name="QuoteItem" value-name="quoteItem"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonRequestDecorator">
- <decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <include-form name="EditQuoteItemForRequest" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="CreateQuoteAndQuoteItemForRequest">
- <section>
- <actions>
- <set field="title" value="Create a new Quote and QuoteItem for a CustRequest"/>
- <set field="tabButtonItem" value="requestitemquotes"/>
- <set field="headerItem" value="request"/>
-
- <set field="custRequestId" from-field="parameters.custRequestId"/>
- <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/>
- <set field="quoteId" from-field="parameters.quoteId"/>
- <set field="quoteItemSeqId" from-field="parameters.quoteItemSeqId"/>
- <entity-one entity-name="CustRequest" value-name="custRequest"/>
- <entity-one entity-name="CustRequestItem" value-name="custRequestItem"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonRequestDecorator">
- <decorator-section name="body">
- <container>
- <label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
- </container>
- <include-form name="CreateQuoteAndQuoteItemForRequest" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
</screens>
More information about the Svn
mailing list