[OFBiz] SVN: r4960 - in trunk/applications/workeffort:
webapp/workeffort/WEB-INF webapp/workeffort/request widget
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Thu May 5 01:14:26 EDT 2005
Author: jonesde
Date: 2005-05-05 00:14:18 -0500 (Thu, 05 May 2005)
New Revision: 4960
Modified:
trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml
trunk/applications/workeffort/webapp/workeffort/request/RequestTabBar.ftl
trunk/applications/workeffort/widget/RequestScreens.xml
Log:
A few cleanups and some additions, namely the RequestItemWorkEffort screen, based on some contributions from Anil Patel
Modified: trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-05-05 05:11:08 UTC (rev 4959)
+++ trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-05-05 05:14:18 UTC (rev 4960)
@@ -269,6 +269,10 @@
<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"/>
@@ -608,6 +612,7 @@
<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"/>
Modified: trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml 2005-05-05 05:11:08 UTC (rev 4959)
+++ trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml 2005-05-05 05:14:18 UTC (rev 4960)
@@ -29,6 +29,15 @@
<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="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">
@@ -61,50 +70,6 @@
</field>
</form>
- <form name="EditCustRequest" type="single"
- target="updaterequest" title="Customer 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-entity entity-name="CustRequest" default-field-type="edit" />
- <field name="custRequestId"><hidden/></field>
- <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 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="submitButton" title="Submit" widget-style="standardSubmit">
- <submit button-type="button"/>
- </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">
@@ -284,6 +249,13 @@
<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">
@@ -331,3 +303,4 @@
</field>
</form>
</forms>
+
Modified: trunk/applications/workeffort/webapp/workeffort/request/RequestTabBar.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/request/RequestTabBar.ftl 2005-05-05 05:11:08 UTC (rev 4959)
+++ trunk/applications/workeffort/webapp/workeffort/request/RequestTabBar.ftl 2005-05-05 05:14:18 UTC (rev 4960)
@@ -1,5 +1,5 @@
<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ * 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"),
@@ -36,7 +36,7 @@
<a href="<@ofbizUrl>/RequestItemQuotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemquotes?default(unselectedClassName)}">${uiLabelMap.WorkEffortQuotes}</a>
</#if>
<a href="<@ofbizUrl>/requestitemrequirements?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemrequirements?default(unselectedClassName)}">${uiLabelMap.WorkEffortRequirements}</a>
- <a href="#" class="tabButton">${uiLabelMap.WorkEffortTasks}</a>
+ <a href="<@ofbizUrl>/EditRequestItemWorkEffort?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="tabButton">${uiLabelMap.WorkEffortTasks}</a>
</#if>
</div>
</#if>
Modified: trunk/applications/workeffort/widget/RequestScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/RequestScreens.xml 2005-05-05 05:11:08 UTC (rev 4959)
+++ trunk/applications/workeffort/widget/RequestScreens.xml 2005-05-05 05:14:18 UTC (rev 4960)
@@ -97,6 +97,7 @@
<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>
@@ -106,7 +107,7 @@
<container>
<link target="request" text="[${uiLabelMap.WorkEffortNewRequest}]" style="buttontext"/>
</container>
- <include-form name="EditCustRequest" location="component://workeffort/webapp/workeffort/request/RequestForms.xml"/>
+ <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>
@@ -183,7 +184,7 @@
<label style="head2">[${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId}] ${custRequestItem.description}</label>
</container>
<container>
- <link target="requestitem?custRequestId=${custRequestId}" text="[${uiLabelMap.WorkEffortNewRequestItem}]" style="buttontext"/>
+ <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>
@@ -191,6 +192,38 @@
</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>
@@ -310,7 +343,7 @@
<set field="tabButtonItem" value="requestitemquotes"/>
<set field="headerItem" value="request"/>
- <set field="custRequestId" from-field="parameters.custRequestId"/>
+ <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"/>
More information about the Svn
mailing list