Author: hansbak
Date: Sat Aug 9 18:20:47 2008
New Revision: 684393
URL: http://svn.apache.org/viewvc?rev=684393&view=rev
Log:
add requestlist on a task. Also added content list on a taskoverview
Modified:
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=684393&r1=684392&r2=684393&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Sat Aug
9 18:20:47 2008
@@ -245,6 +245,9 @@
<value
xml:lang="th">à¹à¸ªà¸à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸²à¸à¹à¸à¸¢à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value>
<value xml:lang="zh">æä¼åååºä»»å¡</value>
</property>
+ <property key="PageTitleListTaskContent">
+ <value xml:lang="en">List Task Content Items</value>
+ </property>
<property key="PageTitleListTaskNotes">
<value xml:lang="en">List Task Notes</value>
<value xml:lang="it">Lista Note Compito</value>
Modified:
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=684393&r1=684392&r2=684393&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Sat Aug 9 18:20:47 2008
@@ -304,7 +304,13 @@
<entity-one entity-name="WorkEffort" value-name="task">
<field-map field-name="workEffortId"
env-name="parameters.taskId"/>
</entity-one>
- <get-related-one value-name="task"
relation-name="ParentWorkEffort" to-value-name="phase"/>
+ <if-not-empty field="task">
+ <get-related-one value-name="task"
relation-name="ParentWorkEffort" to-value-name="phase"/>
+ <else>
+ <log level="error" message="Requested taskId
(workEffortId): ${parameters.taskId} not found"/>
+ <return response-code="error"/>
+ </else>
+ </if-not-empty>
<else>
<entity-one entity-name="WorkEffort" value-name="phase">
<field-map field-name="workEffortId"
env-name="parameters.phaseId"/>
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=684393&r1=684392&r2=684393&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
Sat Aug 9 18:20:47 2008
@@ -542,23 +542,17 @@
<request-map uri="CreateTaskbyRequest">
<security https="true" auth="true"/>
<response name="success" type="view" value="CreateTaskbyRequest"/>
- </request-map>
+ </request-map>
<request-map uri="CreateTaskbyRequests">
<security https="true" auth="true"/>
<event type="service" invoke="createWorkEffort"/>
- <response name="success" type="request" value="createTaskListForms"/>
- <response name="error" type="view" value="CreateTaskbyRequest"/>
- </request-map>
- <request-map uri="createTaskListForms">
- <security https="true" auth="true"/>
- <event type="service" invoke="createWorkEffortRequest"/>
<response name="success" type="request" value="updaterequeststatus"/>
- <response name="error" type="view" value="RequestList"/>
- </request-map>
+ <response name="error" type="view" value="CreateTaskbyRequest"/>
+ </request-map>
<request-map uri="newrequest">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditRequest"/>
- </request-map>
+ </request-map>
<request-map uri="ViewRequest">
<security https="true" auth="true"/>
<response name="success" type="view" value="ViewRequest"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=684393&r1=684392&r2=684393&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Sat Aug 9
18:20:47 2008
@@ -84,50 +84,55 @@
<section>
<actions>
<set field="MainColumnStyle" value="rightonly"/>
- <set field="tabButtonItem" value="viewRequest"/>
+ <set field="tabButtonItem" value="ViewRequest"/>
<set field="headerItem" value="request"/>
<set field="titleProperty" value="PageTitleViewRequest"/>
+ <!--<set field="headerItem" value="Shopping List"/>-->
<set field="showRequestManagementLinks" value="Y"/>
<set field="custRequestId"
from-field="parameters.custRequestId"/>
<entity-one entity-name="CustRequest"
value-name="custRequest"/>
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh"/>
- <set field="viewIndex" from-field="parameters.VIEW_INDEX"
type="Integer"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE"
type="Integer" default-value="10"/>
+ <get-related-one value-name="custRequest"
relation-name="CustRequestType" to-value-name="custRequestType"/>
+ <get-related-one value-name="custRequest"
relation-name="StatusItem" to-value-name="statusItem"/>
+ <get-related-one value-name="custRequest"
relation-name="CurrencyUom" to-value-name="currency"/>
+ <get-related-one value-name="custRequest"
relation-name="ProductStore" to-value-name="store"/>
+ <get-related-one value-name="custRequest"
relation-name="FulfillContactMech" to-value-name="fulfillContactMech"/>
+ <entity-and list-name="requestWorkEfforts"
entity-name="CustRequestAndWorkEffort">
+ <field-map field-name="custRequestId"
env-name="parameters.custRequestId"/>
+ </entity-and>
+ <get-related value-name="custRequest"
relation-name="CustRequestRole" list-name="requestRoles"/>
+ <set field="orderBy[]" value="sequenceNum"/>
+ <get-related value-name="custRequest"
relation-name="CustRequestItem" list-name="custRequestItems"
order-by-list-name="orderBy"/>
+ <entity-and list-name="commEvents"
entity-name="CommunicationEventAndCustRequest">
+ <field-map field-name="custRequestId"
env-name="parameters.custRequestId"/>
+ </entity-and>
</actions>
<widgets>
<decorator-screen name="CommonRequestDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="lefthalf">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${custRequest.custRequestName} ${custRequestId}
${uiLabelMap.CommonInformation}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="RequestInfo"
location="component://projectmgr/widget/forms/RequestForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <platform-specific>
+ <html><html-template
location="component://order/webapp/ordermgr/request/requestInfo.ftl"/></html>
+ </platform-specific>
+ <screenlet
title="${uiLabelMap.PageTitleRequestItems}">
+ <include-form name="OverviewRequestItems"
location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </screenlet>
</container>
<container style="righthalf">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.OrderRequestRoles}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="RequestRolesInfo"
location="component://projectmgr/widget/forms/RequestForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <platform-specific>
+ <html><html-template
location="component://order/webapp/ordermgr/request/requestDate.ftl"/></html>
+ </platform-specific>
+ <platform-specific>
+ <html><html-template
location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html>
+ </platform-specific>
+ <platform-specific>
+ <html><html-template
location="component://order/webapp/ordermgr/request/requestRoles.ftl"/></html>
+ </platform-specific>
+ <screenlet
title="${uiLabelMap.PartyListCommunicationEvents}"
navigation-form-name="ViewRequestCommunicationEvents">
+ <include-form
name="ViewRequestCommunicationEvents"
location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.WorkEffortWorkEfforts}"
navigation-form-name="ViewRequestWorkEfforts">
+ <include-form name="ViewRequestWorkEfforts"
location="component://projectmgr/widget/forms/RequestForms.xml"/>
+ </screenlet>
</container>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=684393&r1=684392&r2=684393&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Sat Aug 9
18:20:47 2008
@@ -484,6 +484,7 @@
</container>
<container style="righthalf">
<include-screen name="TaskTeamInfo"/>
+ <include-screen name="ListTaskContent"/>
<include-screen name="NoteInfo"/>
<include-screen
name="ListWorkEffortRequests"/>
</container>
@@ -511,14 +512,20 @@
<script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh"/>
</actions>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <label
style="boxhead">${uiLabelMap.ProjectMgrSubTasks}</label>
- </container>
- <container style="screenlet-body">
- <include-form name="ListTasks"
location="component://projectmgr/widget/forms/TaskForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.ProjectMgrSubTasks}">
+ <include-form name="ListTasks"
location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="ListTaskContent">
+ <section>
+ <actions>
+ </actions>
+ <widgets>
+ <screenlet title="${uiLabelMap.PageTitleListTaskContent}">
+ <include-form name="ListTaskContent"
location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </screenlet>
</widgets>
</section>
</screen>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=684393&r1=684392&r2=684393&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Sat Aug
9 18:20:47 2008
@@ -156,4 +156,9 @@
</field>
<field name="description"><display/></field>
</form>
+ <form name="ViewRequestWorkEfforts" extends="ViewRequestWorkEfforts"
extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
+ <field name="workEffortId">
+ <hyperlink target="taskView?workEffortId=${workEffortId}"
description="${workEffortName} [${workEffortId}]"/>
+ </field>
+ </form>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=684393&r1=684392&r2=684393&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sat Aug 9
18:20:47 2008
@@ -537,6 +537,21 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display
type="date"/></field>
<field name="actualHours"><display/></field>
</form>
+ <form name="ListTaskContent" type="list" paginate-target="/ListCommContent"
+ odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
+ <actions>
+ <entity-and entity-name="WorkEffortAndContentDataResource">
+ <field-map field-name="workEffortId"
env-name="parameters.workEffortId"/>
+ </entity-and>
+ </actions>
+ <field name="contentName" widget-style="smallSubmit">
+ <hyperlink also-hidden="false" description="${contentName}
[${contentId}]"
target="ViewSimpleContent?contentId=${contentId}&dataResourceId=${dataResourceId}&communicationEventId=${communicationEventId}&fromDate=${fromDate}"/>
+ </field>
+ <field name="contentTypeId"><display-entity entity-name="ContentType"
description="${description}"/></field>
+ <field name="workEffortContentTypeId"><display-entity
entity-name="workEffortContentType" description="${description}"/></field>
+ <field name="fromDate"><display/></field>
+ <field name="drMimeTypeId"><display-entity entity-name="MimeType"
description="${description}" key-field-name="mimeTypeId"/></field>
+ </form>
<form name="ListWorkEffortRequests" type="list"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
