Author: hansbak
Date: Mon Nov 19 19:16:23 2007
New Revision: 596525
URL:
http://svn.apache.org/viewvc?rev=596525&view=revLog:
replace ftl with form and fix find error and create task error
Removed:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/listtasksbydaterange.ftl
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=596525&r1=596524&r2=596525&view=diff==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Mon Nov 19 19:16:23 2007
@@ -93,7 +93,7 @@
</request-map>
<request-map uri="createTask">
<security https="true" auth="true"/>
- <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
+ <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffort"/>
<response name="success" type="view" value="EditTask"/>
<response name="error" type="view" value="EditTask"/>
</request-map>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=596525&r1=596524&r2=596525&view=diff==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Mon Nov 19 19:16:23 2007
@@ -75,10 +75,13 @@
<decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
- <widgets>
- <platform-specific>
- <html><html-template location="component://projectmgr/webapp/projectmgr/project/listtasksbydaterange.ftl"/></html>
- </platform-specific>
+ <widgets>
+ <container style="screenlet">
+ <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleFindTask}</label></container>
+ <container style="screenlet-body">
+ <include-form name="listtasksbydaterange" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </container>
+ </container>
<container style="button-bar"><link target="EditTask?workEffortTypeId=Task" text="${uiLabelMap.ProjectMgrNewTask}" style="buttontext"/></container>
<include-form name="ListTaskLists" location="component://projectmgr/widget/forms/TaskForms.xml"/>
</widgets>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=596525&r1=596524&r2=596525&view=diff==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Mon Nov 19 19:16:23 2007
@@ -19,7 +19,13 @@
-->
<forms xmlns:xsi="
http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="
http://ofbiz.apache.org/dtds/widget-form.xsd">
+ xsi:noNamespaceSchemaLocation="
http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+ <form name="listtasksbydaterange" type="single" target="FindTaskByRange?workEffortTypeId=TASK&findAll=Y">
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
+ <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>
+ </form>
<!--================ UnAssigned Tasks Lists==============-->
<form name="ListTaskLists" type="list" list-name="tasks" paginate-target="FindTaskList">
<field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}" widget-style="buttontext">
Locked
