You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/03/20 08:24:34 UTC
svn commit: r520301 - in /ofbiz/trunk/applications/workeffort:
config/WorkEffortUiLabels.properties
webapp/workeffort/WEB-INF/controller.xml widget/WorkEffortForms.xml
widget/WorkEffortMenus.xml widget/WorkEffortScreens.xml
Author: jacopoc
Date: Tue Mar 20 00:24:32 2007
New Revision: 520301
URL: http://svn.apache.org/viewvc?view=rev&rev=520301
Log:
Added first version of a screen that the user can visit to monitor the status of the async jobs that he/she has submitted.
Modified:
ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties?view=diff&rev=520301&r1=520300&r2=520301
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties Tue Mar 20 00:24:32 2007
@@ -220,6 +220,7 @@
WorkEffortIncludeAllSubWorkEfforts=Include all Sub-WorkEfforts
WorkEffortInformation=Information
WorkEffortItem=Item
+WorkEffortJobList=Submitted Jobs
WorkEffortKeyword=Keyword
WorkEffortKeywordAllWordsMatch=all words match
WorkEffortKeywordAlreadyExist=WorkEffort - Keyword already exist
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?view=diff&rev=520301&r1=520300&r2=520301
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Tue Mar 20 00:24:32 2007
@@ -99,6 +99,8 @@
<request-map uri="mytasks"><security https="true" auth="true"/><response name="success" type="view" value="mytasks"/></request-map>
+ <request-map uri="UserJobs"><security https="true" auth="true"/><response name="success" type="view" value="UserJobs"/></request-map>
+
<request-map uri="day"><security https="true" auth="true"/><response name="success" type="view" value="day"/></request-map>
<request-map uri="week"><security https="true" auth="true"/><response name="success" type="view" value="week"/></request-map>
<request-map uri="month"><security https="true" auth="true"/><response name="success" type="view" value="month"/></request-map>
@@ -609,7 +611,9 @@
<view-map name="activity" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#activity"/>
<view-map name="mytasks" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#mytasks"/>
-
+
+ <view-map name="UserJobs" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#UserJobs"/>
+
<view-map name="day" type="screen" page="component://workeffort/widget/CalendarScreens.xml#CalendarDay"/>
<view-map name="week" type="screen" page="component://workeffort/widget/CalendarScreens.xml#CalendarWeek"/>
<view-map name="month" type="screen" page="component://workeffort/widget/CalendarScreens.xml#CalendarMonth"/>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?view=diff&rev=520301&r1=520300&r2=520301
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Tue Mar 20 00:24:32 2007
@@ -19,6 +19,34 @@
-->
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+
+ <form name="FilterUserJobs" title="" type="single">
+ <field name="statusId">
+ <drop-down no-current-selected-key="SERVICE_RUNNING">
+ <entity-options description="${description}" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" value="SERVICE_STATUS"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
+ </form>
+ <form name="UserJobsList" list-name="userJobs" title="" type="list">
+ <auto-fields-entity entity-name="JobSandbox" default-field-type="display"/>
+ <field name="statusId">
+ <display-entity entity-name="StatusItem" description="${description}"></display-entity>
+ </field>
+ <field name="poolId"><hidden/></field>
+ <field name="parentJobId"><hidden/></field>
+ <field name="previousJobId"><hidden/></field>
+ <field name="loaderName"><hidden/></field>
+ <field name="runAsUser"><hidden/></field>
+ <field name="authUserLoginId"><hidden/></field>
+ <field name="runByInstanceId"><hidden/></field>
+ <field name="runtimeDataId"><hidden/></field>
+ <field name="recurrenceInfoId"><hidden/></field>
+ </form>
+
<form name="EditWorkEffort" default-map-name="workEffort" target="updateWorkEffort" title="" type="single">
<alt-target target="createWorkEffort" use-when="workEffort==null"/>
<auto-fields-service service-name="updateWorkEffort"/>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?view=diff&rev=520301&r1=520300&r2=520301
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Tue Mar 20 00:24:32 2007
@@ -28,6 +28,7 @@
<menu-item name="request" title="${uiLabelMap.WorkEffortRequestList}"><link target="requestlist"/></menu-item>
<menu-item name="workeffort" title="${uiLabelMap.WorkEffortWorkEffort}"><link target="FindWorkEffort"/></menu-item>
<menu-item name="timesheet" title="${uiLabelMap.Timesheet}"><link target="FindTimesheet"/></menu-item>
+ <menu-item name="userJobs" title="${uiLabelMap.WorkEffortJobList}"><link target="UserJobs"/></menu-item>
<menu-item name="Logout" title="Logout" align-style="col-right" widget-style="headerButtonRight" selected-style="headerButtonRightSelected">
<condition><not><if-empty field-name="userLogin"/></not></condition>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?view=diff&rev=520301&r1=520300&r2=520301
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Tue Mar 20 00:24:32 2007
@@ -20,6 +20,40 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+ <screen name="UserJobs">
+ <section>
+ <actions>
+ <set field="headerItem" value="userJobs"/>
+ <set field="titleProperty" value="WorkEffortJobList"/>
+ <set field="filterByStatusId" from-field="parameters.statusId" default-value="SERVICE_RUNNING"/>
+ <entity-condition entity-name="JobSandbox" list-name="userJobs">
+ <condition-list>
+ <condition-expr field-name="authUserLoginId" env-name="userLogin.userLoginId"/>
+ <condition-expr field-name="statusId" env-name="filterByStatusId"/>
+ </condition-list>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <label style="head1">${uiLabelMap.WorkEffortJobList}</label>
+ <include-form name="FilterUserJobs" location="component://workeffort/widget/WorkEffortForms.xml"/>
+ <include-form name="UserJobsList" location="component://workeffort/widget/WorkEffortForms.xml"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="mytasks">
<section>
<actions>