You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/05/26 11:05:38 UTC
svn commit: r778628 - in /ofbiz/trunk/specialpurpose/projectmgr:
entitydef/entitymodel.xml widget/CommonScreens.xml widget/TaskScreens.xml
widget/forms/TaskForms.xml
Author: hansbak
Date: Tue May 26 09:05:35 2009
New Revision: 778628
URL: http://svn.apache.org/viewvc?rev=778628&view=rev
Log:
taskslist did not show, made is sortable and reformatted it
Modified:
ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml?rev=778628&r1=778627&r2=778628&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml Tue May 26 09:05:35 2009
@@ -153,7 +153,7 @@
<view-link entity-alias="WEPH" rel-entity-alias="WET">
<key-map field-name="workEffortId" rel-field-name="workEffortParentId"/>
</view-link>
- <view-link entity-alias="WET" rel-entity-alias="WEPA">
+ <view-link entity-alias="WET" rel-entity-alias="WEPA" rel-optional="true"><!-- has to be true because all tasks should be should shown in the task findlist screen even when not connected to a party -->
<key-map field-name="workEffortId"/>
</view-link>
<relation type="one-nofk" rel-entity-name="PartyNameView">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=778628&r1=778627&r2=778628&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Tue May 26 09:05:35 2009
@@ -100,6 +100,7 @@
<screen name="CommonTaskDecorator">
<section>
<actions>
+ <set field="headerItem" value="task"/>
<entity-one entity-name="WorkEffort" value-field="workEffort"/>
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy"/>
</actions>
@@ -138,6 +139,9 @@
</screen>
<screen name="CommonMyTaskDecorator">
<section>
+ <actions>
+ <set field="headerItem" value="mytasks"/>
+ </actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=778628&r1=778627&r2=778628&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Tue May 26 09:05:35 2009
@@ -166,9 +166,6 @@
<widgets>
<decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.PageTitleFindTask}" collapsible="true" id="findTask">
- <include-form name="FindTask" location="component://projectmgr/widget/forms/TaskForms.xml"/>
- </screenlet>
<section>
<condition>
<or>
@@ -176,11 +173,9 @@
<if-has-permission permission="PROJECTMGR_VIEW"/>
</or>
</condition>
- <actions>
- <set field="entityName" value="ProjectAndPhaseAndTaskParty"/>
- </actions>
<widgets>
- <screenlet title="${uiLabelMap.PageTitleListTaskSearchResult}" navigation-form-name="ListTasks">
+ <screenlet title="${uiLabelMap.PageTitleFindTask}" collapsible="true" id="findTask">
+ <include-form name="FindTask" location="component://projectmgr/widget/forms/TaskForms.xml"/>
<include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/>
</screenlet>
</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=778628&r1=778627&r2=778628&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Tue May 26 09:05:35 2009
@@ -130,6 +130,7 @@
</form>
<form name="FindTask" type="single" target="FindTask"
header-row-style="header-row" default-table-style="basic-table">
+ <field name="noConditionFind"><hidden value="Y"/></field>
<field name="workEffortTypeId"><hidden value="TASK"/></field>
<field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskId}"><text-find default-option="contains" ignore-case="true"/></field>
<field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}"><text-find default-option="contains" ignore-case="true"/></field>
@@ -159,12 +160,13 @@
<field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>
</form>
<form name="ListTasks" type="list" separate-columns="true" title="Task List" list-name="listIt" paginate-target="FindTask"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
+ <set field="parameters.sortField" from-field="parameters.sortField" default-value="-lastStatusUpdate"/>
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
- <field-map field-name="entityName" value="${entityName}"/>
- <field-map field-name="orderBy" value="lastStatusUpdate DESC"/>
+ <field-map field-name="entityName" value="ProjectAndPhaseAndTaskParty"/>
+ <field-map field-name="orderBy" from-field="parameters.sortField"/>
</service>
</actions>
<row-actions>
@@ -182,7 +184,7 @@
</hyperlink>
</field>
<field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display/></field>
- <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext">
+ <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext" sort-field="true">
<hyperlink also-hidden="false" description="${projectName}" target="projectView">
<parameter param-name="projectId"/>
</hyperlink>
@@ -190,9 +192,9 @@
<field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="priority"><display/></field>
<field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
- <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}" red-when="before-now"><display type="date"/></field>
+ <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}" red-when="before-now" sort-field="true"><display type="date"/></field>
<field name="actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
- <field name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}" red-when="before-now"><display type="date"/></field>
+ <field name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}" red-when="before-now" sort-field="true"><display type="date"/></field>
<field name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field>
<field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
</form>