[OFBiz] SVN: r5970 - in trunk: applications/workeffort
applications/workeffort/config applications/workeffort/entitydef
applications/workeffort/script/org/ofbiz/workeffort
applications/workeffort/script/org/ofbiz/workeffort/timesheet
applications/workeffort/script/org/ofbiz/workeffort/workeffort
applications/workeffort/servicedef
applications/workeffort/webapp/workeffort/WEB-INF
applications/workeffort/widget framework/common/config
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Mon Oct 17 01:49:22 EDT 2005
Author: jonesde
Date: 2005-10-17 00:49:07 -0500 (Mon, 17 Oct 2005)
New Revision: 5970
Added:
trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/
trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/RateServices.xml
trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
trunk/applications/workeffort/servicedef/services_timesheet.xml
trunk/applications/workeffort/widget/TimesheetForms.xml
trunk/applications/workeffort/widget/TimesheetMenus.xml
trunk/applications/workeffort/widget/TimesheetScreens.xml
Removed:
trunk/applications/workeffort/script/org/ofbiz/workeffort/project/
trunk/applications/workeffort/servicedef/services_project.xml
Modified:
trunk/applications/workeffort/config/WorkEffortUiLabels.properties
trunk/applications/workeffort/entitydef/entitygroup.xml
trunk/applications/workeffort/entitydef/entitymodel.xml
trunk/applications/workeffort/ofbiz-component.xml
trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
trunk/applications/workeffort/servicedef/services.xml
trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
trunk/applications/workeffort/widget/LookupForms.xml
trunk/applications/workeffort/widget/WorkEffortForms.xml
trunk/applications/workeffort/widget/WorkEffortMenus.xml
trunk/applications/workeffort/widget/WorkEffortScreens.xml
trunk/framework/common/config/CommonUiLabels.properties
Log:
A first pass at the Timesheet implementation, partially complete at this point; also some misc cleanups including removal of old project services
Modified: trunk/applications/workeffort/config/WorkEffortUiLabels.properties
===================================================================
--- trunk/applications/workeffort/config/WorkEffortUiLabels.properties 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/config/WorkEffortUiLabels.properties 2005-10-17 05:49:07 UTC (rev 5970)
@@ -43,6 +43,13 @@
PageTitleListWorkEffortOrderHeaders=Work Effort Orders
PageTitleAddWorkEffortOrderHeader=Add Order to Work Effort
+PageTitleFindTimesheet=Find Timesheet
+PageTitleEditTimesheet=Edit Timesheet
+PageTitleAddTimesheet=Add Timesheet
+
+PageTitleEditTimesheetRoles=Edit Timesheet Roles
+PageTitleEditTimesheetEntries=Edit Timesheet Entries
+
PartyAddressLine1=Address Line 1
PartyAddressLine2=Address Line 2
PartyAddContactInformationParty=Add this contact information to party
@@ -80,6 +87,12 @@
PartyToName=To Name
PartyZipPostalCode=Zip/Postal Code
+Timesheet=Timesheet
+TimesheetCreate=Create Timesheet
+TimesheetMyTime=My Time
+TimesheetRateType=Rate Type
+TimesheetTimesheetId=Timesheet ID
+
WorkEffort=Work Effort
WorkEffortAcceptAssignment=Accept Assignment
WorkEffortActivityDetail=Activity Detail
Modified: trunk/applications/workeffort/entitydef/entitygroup.xml
===================================================================
--- trunk/applications/workeffort/entitydef/entitygroup.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/entitydef/entitygroup.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -31,7 +31,6 @@
<entity-group group="org.ofbiz" entity="PartyRate" />
<entity-group group="org.ofbiz" entity="RateType" />
<entity-group group="org.ofbiz" entity="TimeEntry" />
- <entity-group group="org.ofbiz" entity="TimeEntryBilling" />
<entity-group group="org.ofbiz" entity="Timesheet" />
<entity-group group="org.ofbiz" entity="TimesheetRole" />
<entity-group group="org.ofbiz" entity="WorkEffortAssignmentRate" />
Modified: trunk/applications/workeffort/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/workeffort/entitydef/entitymodel.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/entitydef/entitymodel.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -83,6 +83,8 @@
<field name="rateTypeId" type="id"></field>
<field name="workEffortId" type="id"></field>
<field name="timesheetId" type="id"></field>
+ <field name="invoiceId" type="id"></field>
+ <field name="invoiceItemSeqId" type="id"></field>
<field name="hours" type="floating-point"></field>
<field name="comments" type="comment"></field>
<prim-key field="timeEntryId"/>
@@ -98,23 +100,10 @@
<relation type="one" fk-name="TIME_ENT_TSHT" rel-entity-name="Timesheet">
<key-map field-name="timesheetId"/>
</relation>
- </entity>
- <entity entity-name="TimeEntryBilling"
- package-name="org.ofbiz.workeffort.timesheet"
- title="Time Entry Billing Entity">
- <field name="timeEntryId" type="id-ne"></field>
- <field name="invoiceId" type="id-ne"></field>
- <field name="invoiceItemSeqId" type="id-ne"></field>
- <prim-key field="timeEntryId"/>
- <prim-key field="invoiceId"/>
- <prim-key field="invoiceItemSeqId"/>
- <relation type="one" fk-name="TIME_ENTBL_TENT" rel-entity-name="TimeEntry">
- <key-map field-name="timeEntryId"/>
- </relation>
<relation type="one-nofk" rel-entity-name="Invoice">
<key-map field-name="invoiceId"/>
</relation>
- <relation type="one" fk-name="TIME_ENTBL_INVITM" rel-entity-name="InvoiceItem">
+ <relation type="one" fk-name="TIME_ENT_INVIT" rel-entity-name="InvoiceItem">
<key-map field-name="invoiceId"/>
<key-map field-name="invoiceItemSeqId"/>
</relation>
Modified: trunk/applications/workeffort/ofbiz-component.xml
===================================================================
--- trunk/applications/workeffort/ofbiz-component.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/ofbiz-component.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -34,7 +34,7 @@
<entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortSecurityData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
- <service-resource type="model" loader="main" location="servicedef/services_project.xml"/>
+ <service-resource type="model" loader="main" location="servicedef/services_timesheet.xml"/>
<service-resource type="eca" loader="main" location="servicedef/secas.xml"/>
<service-resource type="group" loader="main" location="servicedef/service_groups.xml"/>
<webapp name="workeffort"
Added: trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/RateServices.xml
===================================================================
--- trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/RateServices.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/RateServices.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ * Copyright (c) 2005-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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @author David E. Jones (jonesde at ofbiz.org)
+ * @version $Rev$
+-->
+
+<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
+
+ <!-- PartyRate Services -->
+ <simple-method method-name="createPartyRate" short-description="Create PartyRate">
+ <check-permission permission="WORKEFFORTMGR" action="_CREATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <make-value value-name="newEntity" entity-name="PartyRate"/>
+ <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <if-empty field-name="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
+ <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <create-value value-name="newEntity"/>
+ </simple-method>
+ <simple-method method-name="updatePartyRate" short-description="Update PartyRate">
+ <check-permission permission="WORKEFFORTMGR" action="_UPDATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <entity-one entity-name="PartyRate" value-name="lookedUpValue"/>
+ <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <store-value value-name="lookedUpValue"/>
+ </simple-method>
+ <simple-method method-name="deletePartyRate" short-description="Delete PartyRate">
+ <check-permission permission="WORKEFFORTMGR" action="_DELETE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <entity-one entity-name="PartyRate" value-name="lookedUpValue"/>
+ <remove-value value-name="lookedUpValue"/>
+ </simple-method>
+
+ <!-- WorkEffortAssignmentRate Services -->
+ <simple-method method-name="createWorkEffortAssignmentRate" short-description="Create WorkEffortAssignmentRate">
+ <check-permission permission="WORKEFFORTMGR" action="_CREATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <make-value value-name="newEntity" entity-name="WorkEffortAssignmentRate"/>
+ <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <if-empty field-name="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
+ <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <create-value value-name="newEntity"/>
+ </simple-method>
+ <simple-method method-name="updateWorkEffortAssignmentRate" short-description="Update WorkEffortAssignmentRate">
+ <check-permission permission="WORKEFFORTMGR" action="_UPDATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <entity-one entity-name="WorkEffortAssignmentRate" value-name="lookedUpValue"/>
+ <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <store-value value-name="lookedUpValue"/>
+ </simple-method>
+ <simple-method method-name="deleteWorkEffortAssignmentRate" short-description="Delete WorkEffortAssignmentRate">
+ <check-permission permission="WORKEFFORTMGR" action="_DELETE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <entity-one entity-name="WorkEffortAssignmentRate" value-name="lookedUpValue"/>
+ <remove-value value-name="lookedUpValue"/>
+ </simple-method>
+</simple-methods>
Property changes on: trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/RateServices.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Added: trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
===================================================================
--- trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ * Copyright (c) 2005-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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @author David E. Jones (jonesde at ofbiz.org)
+ * @version $Rev$
+-->
+
+<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
+
+ <!-- Timesheet Services -->
+ <simple-method method-name="createTimesheet" short-description="Create Timesheet">
+ <check-permission permission="WORKEFFORTMGR" action="_CREATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <make-value value-name="newEntity" entity-name="Timesheet"/>
+ <sequenced-id-to-env sequence-name="Timesheet" env-name="newEntity.timesheetId"/>
+ <field-to-result field-name="newEntity.timesheetId" result-name="timesheetId"/>
+
+ <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <create-value value-name="newEntity"/>
+ </simple-method>
+ <simple-method method-name="updateTimesheet" short-description="Update Timesheet">
+ <check-permission permission="WORKEFFORTMGR" action="_UPDATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <entity-one entity-name="Timesheet" value-name="lookedUpValue"/>
+ <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <store-value value-name="lookedUpValue"/>
+ </simple-method>
+ <simple-method method-name="deleteTimesheet" short-description="Delete Timesheet">
+ <check-permission permission="WORKEFFORTMGR" action="_DELETE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <entity-one entity-name="Timesheet" value-name="lookedUpValue"/>
+ <remove-value value-name="lookedUpValue"/>
+ </simple-method>
+
+ <!-- TimesheetRole Services -->
+ <simple-method method-name="createTimesheetRole" short-description="Create TimesheetRole">
+ <check-permission permission="WORKEFFORTMGR" action="_CREATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <make-value value-name="newEntity" entity-name="TimesheetRole"/>
+ <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <create-value value-name="newEntity"/>
+ </simple-method>
+ <simple-method method-name="deleteTimesheetRole" short-description="Delete TimesheetRole">
+ <check-permission permission="WORKEFFORTMGR" action="_DELETE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <entity-one entity-name="TimesheetRole" value-name="lookedUpValue"/>
+ <remove-value value-name="lookedUpValue"/>
+ </simple-method>
+
+ <!-- TimeEntry Services -->
+ <simple-method method-name="createTimeEntry" short-description="Create TimeEntry">
+ <check-permission permission="WORKEFFORTMGR" action="_CREATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <make-value value-name="newEntity" entity-name="TimeEntry"/>
+ <sequenced-id-to-env sequence-name="TimeEntry" env-name="newEntity.timeEntryId"/>
+ <field-to-result field-name="newEntity.timeEntryId" result-name="timeEntryId"/>
+
+ <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <create-value value-name="newEntity"/>
+ </simple-method>
+ <simple-method method-name="updateTimeEntry" short-description="Update TimeEntry">
+ <check-permission permission="WORKEFFORTMGR" action="_UPDATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <entity-one entity-name="TimeEntry" value-name="lookedUpValue"/>
+ <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <store-value value-name="lookedUpValue"/>
+ </simple-method>
+ <simple-method method-name="deleteTimeEntry" short-description="Delete TimeEntry">
+ <check-permission permission="WORKEFFORTMGR" action="_DELETE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+ <check-errors/>
+
+ <entity-one entity-name="TimeEntry" value-name="lookedUpValue"/>
+ <remove-value value-name="lookedUpValue"/>
+ </simple-method>
+</simple-methods>
Property changes on: trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Modified: trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
===================================================================
--- trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
- * Copyright (c) 2002-2004 The Open For Business Project - www.ofbiz.org
+ * Copyright (c) 2002-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"),
@@ -30,10 +30,8 @@
<simple-method method-name="createWorkEffort" short-description="Create Work Effort">
<make-value value-name="newEntity" entity-name="WorkEffort"/>
- <sequenced-id-to-env sequence-name="WorkEffort" env-name="workEffortId"/>
- <to-string field-name="workEffortId"/>
- <set from-field="workEffortId" field="newEntity.workEffortId"/>
- <field-to-result field-name="workEffortId" result-name="workEffortId"/>
+ <sequenced-id-to-env sequence-name="WorkEffort" env-name="newEntity.workEffortId"/>
+ <field-to-result field-name="newEntity.workEffortId" result-name="workEffortId"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
@@ -75,9 +73,7 @@
<check-errors/>
</if-empty>-->
- <make-value value-name="lookupPKMap" entity-name="WorkEffort"/>
- <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
- <find-by-primary-key entity-name="WorkEffort" map-name="lookupPKMap" value-name="lookedUpValue"/>
+ <entity-one entity-name="WorkEffort" value-name="lookedUpValue"/>
<clone-value value-name="lookedUpValue" new-value-name="savedValue"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
Modified: trunk/applications/workeffort/servicedef/services.xml
===================================================================
--- trunk/applications/workeffort/servicedef/services.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/servicedef/services.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -206,14 +206,14 @@
<attribute name="workEffortIdFrom" type="java.lang.String" mode="INOUT" optional="true"/>
<attribute name="workEffortIdTo" type="java.lang.String" mode="INOUT" optional="true"/>
</service>
- <service name="createWorkEffortAndAssoc" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortAssoc" auth="true" >
+ <service name="createWorkEffortAndAssoc" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortAssoc" auth="true">
<description>Creates a WorkEffort entity and WorkEffortAssoc</description>
<auto-attributes include="pk" mode="INOUT" optional="true" entity-name="WorkEffort"/>
<auto-attributes include="nonpk" mode="IN" optional="true" entity-name="WorkEffort"/>
<auto-attributes include="pk" mode="INOUT" optional="true" entity-name="WorkEffortAssoc"/>
<auto-attributes include="nonpk" mode="IN" optional="true" entity-name="WorkEffortAssoc"/>
</service>
- <service name="updateWorkEffortAndAssoc" engine="group" location="updateWorkEffortAndAssoc" invoke="" auth="true" >
+ <service name="updateWorkEffortAndAssoc" engine="group" location="updateWorkEffortAndAssoc" invoke="" auth="true">
<description>Creates a WorkEffort entity and WorkEffortAssoc</description>
<auto-attributes include="pk" mode="INOUT" optional="true" entity-name="WorkEffort"/>
<auto-attributes include="nonpk" mode="IN" optional="true" entity-name="WorkEffort"/>
@@ -253,98 +253,103 @@
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="createCommunicationEventWorkEff" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="makeCommunicationEventWorkEffort" auth="true" >
+ <service name="createCommunicationEventWorkEff" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="makeCommunicationEventWorkEffort" auth="true">
<description>Creates a CommunicationEvent entity and CommunicationEventWorkEff</description>
<auto-attributes include="pk" mode="INOUT" optional="true" entity-name="CommunicationEvent"/>
<auto-attributes include="nonpk" mode="IN" optional="true" entity-name="CommunicationEvent"/>
<auto-attributes include="pk" mode="INOUT" optional="true" entity-name="CommunicationEventWorkEff"/>
<auto-attributes include="nonpk" mode="IN" optional="true" entity-name="CommunicationEventWorkEff"/>
</service>
- <service name="updateCommunicationEventWorkEff" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="updateCommunicationEventWorkEff" auth="true" >
+ <service name="updateCommunicationEventWorkEff" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="updateCommunicationEventWorkEff" auth="true">
<description>Updates CommunicationEventWorkEff</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="CommunicationEventWorkEff"/>
<auto-attributes include="nonpk" mode="IN" optional="true" entity-name="CommunicationEventWorkEff"/>
</service>
- <service name="deleteCommunicationEventWorkEff" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteCommunicationEventWorkEff" auth="true" >
+ <service name="deleteCommunicationEventWorkEff" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteCommunicationEventWorkEff" auth="true">
<description>Deletes CommunicationEventWorkEff</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="CommunicationEventWorkEff"/>
</service>
- <service name="createWorkEffortRequest" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortRequest" auth="true" >
+ <service name="createWorkEffortRequest" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortRequest" auth="true">
<description>Creates a CustRequestWorkEffort</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestWorkEffort"/>
<auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequest"/>
<override name="custRequestId" optional="true" mode="INOUT"/>
</service>
- <service name="deleteWorkEffortRequest" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortRequest" auth="true" >
+ <service name="deleteWorkEffortRequest" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortRequest" auth="true">
<description>Deletes a CustRequestWorkEffort</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestWorkEffort"/>
</service>
- <service name="createWorkEffortRequestItemAndRequestItem" engine="group" location="createWorkEffortRequestItemAndRequestItem" invoke="" auth="true" >
+ <service name="createWorkEffortRequestItemAndRequestItem" engine="group" location="createWorkEffortRequestItemAndRequestItem" invoke="" auth="true">
<description>Creates a CustRequestItem entity and CustRequestItemWorkEffort</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestItemWorkEffort"/>
<auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequestItem"/>
<attribute name="custRequestItemExists" type="java.lang.String" mode="OUT" optional="true"/>
</service>
- <service name="createWorkEffortRequestItem" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortRequestItem" auth="true" >
+ <service name="createWorkEffortRequestItem" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortRequestItem" auth="true">
<description>Creates a CustRequestItemWorkEffort</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestItemWorkEffort"/>
<auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequestItem"/>
<attribute name="custRequestItemExists" type="java.lang.String" mode="IN" optional="true"/>
</service>
- <service name="deleteWorkEffortRequestItem" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortRequestItem" auth="true" >
+ <service name="deleteWorkEffortRequestItem" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortRequestItem" auth="true">
<description>Deletes a CustRequestItemWorkEffort</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestItemWorkEffort"/>
</service>
- <service name="checkCustRequestItemExists" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="checkCustRequestItemExists" auth="true" >
+ <service name="checkCustRequestItemExists" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="checkCustRequestItemExists" auth="true">
<description>Checks to see if a CustRequestItem exists</description>
<auto-attributes include="pk" mode="IN" optional="true" entity-name="CustRequestItem"/>
<attribute name="custRequestItemExists" type="java.lang.String" mode="OUT" optional="true"/>
</service>
- <service name="createWorkEffortQuote" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortQuote" auth="true" >
+ <service name="createWorkEffortQuote" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortQuote" auth="true">
<description>Creates a QuoteWorkEffort</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="QuoteWorkEffort"/>
<auto-attributes include="all" mode="IN" optional="true" entity-name="Quote"/>
<override name="quoteId" optional="true" mode="INOUT"/>
</service>
- <service name="deleteWorkEffortQuote" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortQuote" auth="true" >
+ <service name="deleteWorkEffortQuote" default-entity-name="QuoteWorkEffort" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortQuote">
<description>Deletes a QuoteWorkEffort</description>
- <auto-attributes include="pk" mode="IN" optional="false" entity-name="QuoteWorkEffort"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
</service>
- <service name="createWorkRequirementFulfillment" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkRequirementFulfillment" auth="true" >
+ <service name="createWorkRequirementFulfillment" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkRequirementFulfillment">
<description>Creates a WorkRequirementFulfillment</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="WorkRequirementFulfillment"/>
<auto-attributes include="nonpk" mode="IN" optional="true" entity-name="WorkRequirementFulfillment"/>
<auto-attributes include="all" mode="IN" optional="true" entity-name="Requirement"/>
<override name="requirementId" optional="true" mode="INOUT"/>
</service>
- <service name="deleteWorkRequirementFulfillment" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkRequirementFulfillment" auth="true" >
+ <service name="deleteWorkRequirementFulfillment" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkRequirementFulfillment">
<description>Deletes a WorkRequirementFulfillment</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="WorkRequirementFulfillment"/>
</service>
- <service name="createShoppingListWorkEffort" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createShoppingListWorkEffort" auth="true" >
+ <service name="createShoppingListWorkEffort" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createShoppingListWorkEffort" auth="true">
<description>Creates a ShoppingListWorkEffort</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="ShoppingListWorkEffort"/>
<auto-attributes include="nonpk" mode="IN" optional="true" entity-name="ShoppingListWorkEffort"/>
<auto-attributes include="all" mode="IN" optional="true" entity-name="ShoppingList"/>
<override name="shoppingListId" optional="true" mode="INOUT"/>
</service>
- <service name="deleteShoppingListWorkEffort" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteShoppingListWorkEffort" auth="true" >
+ <service name="deleteShoppingListWorkEffort" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteShoppingListWorkEffort" auth="true">
<description>Deletes a ShoppingListWorkEffort</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="ShoppingListWorkEffort"/>
</service>
- <service name="createOrderHeaderWorkEffort" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createOrderHeaderWorkEffort" auth="true" >
+
+ <service name="createOrderHeaderWorkEffort" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createOrderHeaderWorkEffort">
<description>Creates a OrderHeaderWorkEffort</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="OrderHeaderWorkEffort"/>
<auto-attributes include="nonpk" mode="IN" optional="true" entity-name="OrderHeaderWorkEffort"/>
<auto-attributes include="all" mode="IN" optional="true" entity-name="OrderHeader"/>
<override name="orderId" optional="true" mode="INOUT"/>
</service>
- <service name="deleteOrderHeaderWorkEffort" engine="simple" location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteOrderHeaderWorkEffort" auth="true" >
+ <service name="deleteOrderHeaderWorkEffort" default-entity-name="OrderHeaderWorkEffort" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteOrderHeaderWorkEffort">
<description>Deletes a OrderHeaderWorkEffort</description>
- <auto-attributes include="pk" mode="IN" optional="false" entity-name="OrderHeaderWorkEffort"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
</service>
-
</services>
Deleted: trunk/applications/workeffort/servicedef/services_project.xml
===================================================================
--- trunk/applications/workeffort/servicedef/services_project.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/servicedef/services_project.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- * Copyright (c) 2001-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"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--->
-
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/services.xsd">
- <description>Common Application Shared Project Services</description>
- <vendor>OFBiz</vendor>
- <version>1.0</version>
-
- <!-- Project services -->
- <service name="createPhase" engine="simple"
- location="org/ofbiz/workeffort/project/ProjectSimpleServices.xml" invoke="createPhase">
- <description>Create a WorkEffort which is a phase in a project</description>
- <implements service="interfaceWorkEffort"/>
- <attribute name="quickAssignPartyId" type="String" mode="IN" optional="true"/>
- <attribute name="projectWorkEffortId" type="String" mode="IN" optional="false"/>
- </service>
- <service name="createPhaseTask" engine="simple"
- location="org/ofbiz/workeffort/project/ProjectSimpleServices.xml" invoke="createPhaseTask">
- <description>Create a WorkEffort Entity which is a task in a phase</description>
- <implements service="interfaceWorkEffort"/>
- <attribute name="quickAssignPartyId" type="String" mode="IN" optional="true"/>
- <attribute name="phaseWorkEffortId" type="String" mode="IN" optional="false"/>
- </service>
-
-</services>
Added: trunk/applications/workeffort/servicedef/services_timesheet.xml
===================================================================
--- trunk/applications/workeffort/servicedef/services_timesheet.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/servicedef/services_timesheet.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ * Copyright (c) 2005-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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/services.xsd">
+ <description>WorkEffort Timesheet Services</description>
+ <vendor>OFBiz</vendor>
+ <version>1.0</version>
+
+ <!-- Timesheet Services -->
+ <service name="createTimesheet" default-entity-name="Timesheet" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/TimesheetServices.xml" invoke="createTimesheet">
+ <description>Creates Timesheet</description>
+ <auto-attributes include="pk" mode="OUT" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updateTimesheet" default-entity-name="Timesheet" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/TimesheetServices.xml" invoke="updateTimesheet">
+ <description>Updates Timesheet</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="deleteTimesheet" default-entity-name="Timesheet" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/TimesheetServices.xml" invoke="deleteTimesheet">
+ <description>Deletes Timesheet</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+
+ <!-- TimesheetRole Services -->
+ <service name="createTimesheetRole" default-entity-name="TimesheetRole" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/TimesheetServices.xml" invoke="createTimesheetRole">
+ <description>Creates TimesheetRole</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="deleteTimesheetRole" default-entity-name="TimesheetRole" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/TimesheetServices.xml" invoke="deleteTimesheetRole">
+ <description>Deletes TimesheetRole</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+
+ <!-- TimeEntry Services -->
+ <service name="createTimeEntry" default-entity-name="TimeEntry" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/TimesheetServices.xml" invoke="createTimeEntry">
+ <description>Creates TimeEntry</description>
+ <auto-attributes include="pk" mode="OUT" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updateTimeEntry" default-entity-name="TimeEntry" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/TimesheetServices.xml" invoke="updateTimeEntry">
+ <description>Updates TimeEntry</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="deleteTimeEntry" default-entity-name="TimeEntry" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/TimesheetServices.xml" invoke="deleteTimeEntry">
+ <description>Deletes TimeEntry</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+
+ <!-- PartyRate Services -->
+ <service name="createPartyRate" default-entity-name="PartyRate" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/RateServices.xml" invoke="createPartyRate">
+ <description>Creates PartyRate</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="fromDate" optional="true"/>
+ </service>
+ <service name="updatePartyRate" default-entity-name="PartyRate" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/RateServices.xml" invoke="updatePartyRate">
+ <description>Updates PartyRate</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="deletePartyRate" default-entity-name="PartyRate" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/RateServices.xml" invoke="deletePartyRate">
+ <description>Deletes PartyRate</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+
+ <!-- RateType Services -->
+ <service name="createRateType" default-entity-name="RateType" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/RateServices.xml" invoke="createRateType">
+ <description>Creates RateType</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="fromDate" optional="true"/>
+ </service>
+
+ <!-- WorkEffortAssignmentRate Services -->
+ <service name="createWorkEffortAssignmentRate" default-entity-name="WorkEffortAssignmentRate" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/RateServices.xml" invoke="createWorkEffortAssignmentRate">
+ <description>Creates WorkEffortAssignmentRate</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="fromDate" optional="true"/>
+ </service>
+ <service name="updateWorkEffortAssignmentRate" default-entity-name="WorkEffortAssignmentRate" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/RateServices.xml" invoke="updateWorkEffortAssignmentRate">
+ <description>Updates WorkEffortAssignmentRate</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="deleteWorkEffortAssignmentRate" default-entity-name="WorkEffortAssignmentRate" engine="simple" auth="true"
+ location="org/ofbiz/workeffort/timesheet/RateServices.xml" invoke="deleteWorkEffortAssignmentRate">
+ <description>Deletes WorkEffortAssignmentRate</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+</services>
Property changes on: trunk/applications/workeffort/servicedef/services_timesheet.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Modified: trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -133,6 +133,12 @@
<response name="success" type="view" value="upcoming"/>
</request-map>
+ <!-- WorkEffort Related Summary request mappings -->
+ <request-map uri="WorkEffortSummary">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="WorkEffortSummary"/>
+ </request-map>
+
<request-map uri="FindWorkEffort">
<security https="true" auth="true"/>
<response name="success" type="view" value="FindWorkEffort"/>
@@ -334,7 +340,6 @@
<response name="error" type="view" value="ListWorkEffortShopLists"/>
</request-map>
-
<!-- WorkEffort OrderHeader request mappings -->
<request-map uri="ListWorkEffortOrderHeaders">
<security https="true" auth="true"/>
@@ -352,14 +357,59 @@
<response name="success" type="view" value="ListWorkEffortOrderHeaders"/>
<response name="error" type="view" value="ListWorkEffortOrderHeaders"/>
</request-map>
-
-
- <!-- WorkEffort Related Summary request mappings -->
- <request-map uri="WorkEffortSummary">
+
+ <!-- Timesheet Requests -->
+ <request-map uri="MyTimesheets"><security https="true" auth="true"/><response name="success" type="view" value="MyTimesheets"/></request-map>
+
+ <request-map uri="FindTimesheet"><security https="true" auth="true"/><response name="success" type="view" value="FindTimesheet"/></request-map>
+ <request-map uri="EditTimesheet"><security https="true" auth="true"/><response name="success" type="view" value="EditTimesheet"/></request-map>
+ <request-map uri="createTimesheet">
<security https="true" auth="true"/>
- <response name="success" type="view" value="WorkEffortSummary"/>
+ <event type="service" invoke="createTimesheet"/>
+ <response name="success" type="view" value="EditTimesheet"/>
+ <response name="error" type="view" value="EditTimesheet"/>
</request-map>
+ <request-map uri="updateTimesheet">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateTimesheet"/>
+ <response name="success" type="view" value="EditTimesheet"/>
+ <response name="error" type="view" value="EditTimesheet"/>
+ </request-map>
+ <request-map uri="EditTimesheetRoles"><security https="true" auth="true"/><response name="success" type="view" value="EditTimesheetRoles"/></request-map>
+ <request-map uri="createTimesheetRole">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createTimesheetRole"/>
+ <response name="success" type="view" value="EditTimesheetRoles"/>
+ <response name="error" type="view" value="EditTimesheetRoles"/>
+ </request-map>
+ <request-map uri="updateTimesheetRole">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateTimesheetRole"/>
+ <response name="success" type="view" value="EditTimesheetRoles"/>
+ <response name="error" type="view" value="EditTimesheetRoles"/>
+ </request-map>
+
+ <request-map uri="EditTimesheetEntries"><security https="true" auth="true"/><response name="success" type="view" value="EditTimesheetEntries"/></request-map>
+ <request-map uri="createTimesheetEntry">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createTimeEntry"/>
+ <response name="success" type="view" value="EditTimesheetEntries"/>
+ <response name="error" type="view" value="EditTimesheetEntries"/>
+ </request-map>
+ <request-map uri="updateTimesheetEntry">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateTimeEntry"/>
+ <response name="success" type="view" value="EditTimesheetEntries"/>
+ <response name="error" type="view" value="EditTimesheetEntries"/>
+ </request-map>
+ <request-map uri="deleteTimesheetEntry">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteTimeEntry"/>
+ <response name="success" type="view" value="EditTimesheetEntries"/>
+ <response name="error" type="view" value="EditTimesheetEntries"/>
+ </request-map>
+
<!-- Lookup request mappings -->
<request-map uri="LookupPartyName">
<security https="true" auth="true"/>
@@ -467,6 +517,12 @@
<view-map name="ListWorkEffortRequirements" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortRequirements"/>
<view-map name="ListWorkEffortQuotes" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortQuotes"/>
<view-map name="ListWorkEffortOrderHeaders" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortOrderHeaders"/>
+
+ <view-map name="MyTimesheets" type="screen" page="component://workeffort/widget/TimesheetScreens.xml#MyTimesheets"/>
+ <view-map name="FindTimesheet" type="screen" page="component://workeffort/widget/TimesheetScreens.xml#FindTimesheet"/>
+ <view-map name="EditTimesheet" type="screen" page="component://workeffort/widget/TimesheetScreens.xml#EditTimesheet"/>
+ <view-map name="EditTimesheetRoles" type="screen" page="component://workeffort/widget/TimesheetScreens.xml#EditTimesheetRoles"/>
+ <view-map name="EditTimesheetEntries" type="screen" page="component://workeffort/widget/TimesheetScreens.xml#EditTimesheetEntries"/>
<view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
<view-map name="LookupPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"/>
Modified: trunk/applications/workeffort/widget/LookupForms.xml
===================================================================
--- trunk/applications/workeffort/widget/LookupForms.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/widget/LookupForms.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -23,7 +23,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
- <!-- Person Lookup forms -->
+ <!-- WorkEffort Lookup forms -->
<form name="lookupWorkEffort" target="LookupWorkEffort" title="" type="single"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<auto-fields-entity entity-name="WorkEffort" default-field-type="find"/>
Added: trunk/applications/workeffort/widget/TimesheetForms.xml
===================================================================
--- trunk/applications/workeffort/widget/TimesheetForms.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/widget/TimesheetForms.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+* 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"),
+* to deal in the Software without restriction, including without limitation
+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included
+* in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+
+ <form name="ListMyTimesheets" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
+ target="" title="" type="list" paginate-target="MyTimesheets" paginate="true" list-name="timesheets">
+ <actions>
+ <entity-and entity-name="Timesheet" list-name="timesheets">
+ <field-map field-name="partyId" env-name="userLogin.partyId"/>
+ <order-by field-name="-fromDate"/>
+ </entity-and>
+ </actions>
+ <auto-fields-entity entity-name="Timesheet"/>
+ <field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
+ <hyperlink description="${timesheetId}" target="EditTimesheet?timesheetId=${timesheetId}" also-hidden="false"/>
+ </field>
+ <field name="partyId" title="${uiLabelMap.PartyParty}"><hidden/></field>
+ </form>
+
+ <form name="FindTimesheet" default-map-name="timesheet" target="FindTimesheet" title="" type="single"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <auto-fields-entity entity-name="Timesheet" default-field-type="find"/>
+
+ <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName"/></field>
+
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="ListFindTimesheet" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
+ target="" title="" type="list" paginate-target="FindTimesheet" paginate="true">
+ <actions>
+ <service result-map-list-iterator-name="listIt" result-map-name="result" service-name="performFind">
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName" value="Timesheet"/>
+ </service>
+ </actions>
+ <auto-fields-entity entity-name="Timesheet"/>
+ <field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
+ <hyperlink description="${timesheetId}" target="EditTimesheet?timesheetId=${timesheetId}" also-hidden="false"/>
+ </field>
+ <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field>
+ </form>
+
+ <form name="EditTimesheet" default-map-name="timesheet" target="updateTimesheet" title="" type="single"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <alt-target target="createTimesheet" use-when="timesheet==null"/>
+ <auto-fields-service service-name="updateTimesheet"/>
+
+ <field name="timesheetId" use-when="timesheet!=null" title="${uiLabelMap.TimesheetTimesheetId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+ <field name="timesheetId" use-when="timesheet==null&&timesheetId==null" title="${uiLabelMap.TimesheetTimesheetId}"><ignored/></field>
+ <field name="timesheetId" use-when="timesheet==null&&timesheetId!=null" title="${uiLabelMap.TimesheetTimesheetId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${timesheetId}]" widget-style="tabletext"><display also-hidden="false"/></field>
+
+ <field name="partyId" title="${uiLabelMap.PartyParty}*"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <!-- TimesheetRole -->
+ <form name="ListTimesheetRoles" type="list" list-name="timesheetRoles" target=""
+ default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+ <actions>
+ <entity-condition entity-name="TimesheetRole">
+ <condition-expr field-name="timesheetId" env-name="timesheetId"/>
+ <order-by field-name="roleTypeId"/>
+ </entity-condition>
+ </actions>
+
+ <field name="timesheetId"><hidden/></field>
+ <field name="roleTypeId" title="${uiLabelMap.PartyRole}"><display-entity entity-name="RoleType"/></field>
+ <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field>
+
+ <field name="deleteLink" title=" " widget-style="buttontext">
+ <hyperlink target="deleteTimesheetRole?timesheetId=${timesheetId}&partyId=${partyId}&roleTypeId=${roleTypeId}"
+ description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+ </field>
+ </form>
+ <form name="AddTimesheetRole" type="single" target="createTimesheetRole" title=""
+ default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <auto-fields-service service-name="createTimesheetRole"/>
+
+ <field name="timesheetId"><hidden/></field>
+ <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="roleTypeId" title="${uiLabelMap.PartyRole}" widget-style="selectBox">
+ <drop-down>
+ <entity-options entity-name="RoleType" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <!-- TimesheetEntry -->
+ <form name="ListTimesheetEntries" type="list" list-name="timesheetRoles" target="updateTimesheetEntry"
+ default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+ <actions>
+ <entity-condition entity-name="TimeEntry">
+ <condition-expr field-name="timesheetId" env-name="timesheetId"/>
+ <order-by field-name="partyId"/>
+ <order-by field-name="rateTypeId"/>
+ <order-by field-name="-fromDate"/>
+ </entity-condition>
+ </actions>
+ <auto-fields-service service-name="updateTimeEntry"/>
+
+ <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
+ <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox">
+ <drop-down>
+ <entity-options entity-name="RateType" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+
+ <field name="workEffortId"><lookup target-form-name="LookWorkEffort"/></field>
+ <field name="timesheetId"><hidden/></field>
+
+ <field name="invoiceId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
+ <field name="invoiceItemSeqId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
+
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+
+ <field name="deleteLink" title=" " widget-style="buttontext">
+ <hyperlink target="deleteTimesheetEntry?timesheetId=${timesheetId}&timeEntryId=${timeEntryId}"
+ description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+ </field>
+ </form>
+ <form name="AddTimesheetEntry" type="single" target="createTimesheetEntry" title=""
+ default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <auto-fields-service service-name="createTimeEntry"/>
+
+ <field name="timeEntryId"><ignored/><!-- don't pass, will be sequenced --></field>
+
+ <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
+ <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox">
+ <drop-down>
+ <entity-options entity-name="RateType" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+
+ <field name="workEffortId"><lookup target-form-name="LookWorkEffort"/></field>
+ <field name="timesheetId"><hidden/></field>
+
+ <field name="invoiceId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
+ <field name="invoiceItemSeqId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
+
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+</forms>
+<!--
+ <field name="timeEntryId" type="id-ne"></field>
+ <field name="partyId" type="id"></field>
+ <field name="fromDate" type="date-time"></field>
+ <field name="thruDate" type="date-time"></field>
+ <field name="rateTypeId" type="id"></field>
+ <field name="workEffortId" type="id"></field>
+ <field name="timesheetId" type="id"></field>
+ <field name="invoiceId" type="id"></field>
+ <field name="invoiceItemSeqId" type="id"></field>
+ <field name="hours" type="floating-point"></field>
+ <field name="comments" type="comment"></field>
+-->
\ No newline at end of file
Property changes on: trunk/applications/workeffort/widget/TimesheetForms.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Added: trunk/applications/workeffort/widget/TimesheetMenus.xml
===================================================================
--- trunk/applications/workeffort/widget/TimesheetMenus.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/widget/TimesheetMenus.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2005-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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * $Id: ProductScreens.xml 4990 2005-05-14 10:00:28Z jacopo $
+-->
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
+
+ <menu name="TimesheetTabBar" default-menu-item-name="Timesheet" default-selected-style="tabButtonSelected"
+ default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton"
+ orientation="horizontal" type="simple">
+ <menu-item name="Timesheet" title="${uiLabelMap.Timesheet}">
+ <link target="EditTimesheet?timesheetId=${timesheetId}"/>
+ </menu-item>
+ <menu-item name="TimesheetRoles" title="${uiLabelMap.PartyParties}">
+ <link target="EditTimesheetRoles?timesheetId=${timesheetId}"/>
+ </menu-item>
+ <menu-item name="TimesheetEntries" title="${uiLabelMap.CommonEntries}">
+ <link target="EditTimesheetEntries?timesheetId=${timesheetId}"/>
+ </menu-item>
+ </menu>
+</menus>
Property changes on: trunk/applications/workeffort/widget/TimesheetMenus.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Added: trunk/applications/workeffort/widget/TimesheetScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/TimesheetScreens.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/widget/TimesheetScreens.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2004-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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * $Id: CommonScreens.xml 5462 2005-08-05 18:35:48Z jonesde $
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+ <screen name="MyTimesheets">
+ <section>
+ <actions>
+ <set field="headerItem" value="mytime"/>
+ <set field="title" value="My Timesheets"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="component://workeffort/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <container><label text="My Timesheets" style="head2"/></container>
+ <container><link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet?partyId=${userLogin.partyId}" style="buttontext"/></container>
+ <include-form name="ListMyTimesheets" location="component://workeffort/widget/TimesheetForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="FindTimesheet">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleFindTimesheet"/>
+ <set field="tabButtonItem" value="Timesheet"/>
+ <set field="labelTitleProperty" value="PageTitleFindTimesheet"/>
+
+ <set field="timesheetId" from-field="parameters.timesheetId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonTimesheetDecorator">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <container><label style="head1">${uiLabelMap.PageTitleFindTimesheet}</label></container>
+ <container><link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="linktext"/></container>
+ <include-form name="FindTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/>
+ <include-form name="ListFindTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="CommonTimesheetDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="timesheet"/>
+ <set field="timesheetId" from-field="parameters.timesheetId"/>
+ <entity-one entity-name="Timesheet" value-name="timesheet"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="component://workeffort/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition><not><if-empty field-name="timesheetId"/></not></condition>
+ <widgets>
+ <include-menu name="TimesheetTabBar" location="component://workeffort/widget/TimesheetMenus.xml"/>
+ <container><label style="head1">TimesheetId: ${timesheetId}</label></container>
+ </widgets>
+ </section>
+
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditTimesheet">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditTimesheet"/>
+ <set field="tabButtonItem" value="Timesheet"/>
+ <set field="labelTitleProperty" value="PageTitleEditTimesheet"/>
+
+ <set field="timesheetId" from-field="parameters.timesheetId"/>
+ <entity-one entity-name="Timesheet" value-name="timesheet"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonTimesheetDecorator">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-empty field-name="timesheet"/>
+ </condition>
+ <widgets>
+ <label style="head1">${uiLabelMap.PageTitleAddTimesheet}</label>
+ <include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/>
+ </widgets>
+ <fail-widgets>
+ <container><label style="head1">${uiLabelMap.PageTitleEditTimesheet}</label></container>
+ <container><link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="linktext"/></container>
+ <include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditTimesheetRoles">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditTimesheetRoles"/>
+ <set field="tabButtonItem" value="TimesheetRoles"/>
+ <set field="labelTitleProperty" value="PageTitleEditTimesheetRoles"/>
+
+ <set field="timesheetId" from-field="parameters.timesheetId"/>
+ <entity-one entity-name="Timesheet" value-name="timesheet"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonTimesheetDecorator">
+ <decorator-section name="body">
+ <container><label style="head1">${uiLabelMap.PageTitleEditTimesheetRoles}</label></container>
+ <container><link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="linktext"/></container>
+ <include-form name="ListTimesheetRoles" location="component://workeffort/widget/TimesheetForms.xml"/>
+ <include-form name="AddTimesheetRole" location="component://workeffort/widget/TimesheetForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditTimesheetEntries">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditTimesheetEntries"/>
+ <set field="tabButtonItem" value="TimesheetEntries"/>
+ <set field="labelTitleProperty" value="PageTitleEditTimesheetEntries"/>
+
+ <set field="timesheetId" from-field="parameters.timesheetId"/>
+ <entity-one entity-name="Timesheet" value-name="timesheet"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonTimesheetDecorator">
+ <decorator-section name="body">
+ <container><label style="head1">${uiLabelMap.PageTitleEditTimesheetEntries}</label></container>
+ <container><link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="linktext"/></container>
+ <include-form name="ListTimesheetEntries" location="component://workeffort/widget/TimesheetForms.xml"/>
+ <include-form name="AddTimesheetEntry" location="component://workeffort/widget/TimesheetForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
Property changes on: trunk/applications/workeffort/widget/TimesheetScreens.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Modified: trunk/applications/workeffort/widget/WorkEffortForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortForms.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/widget/WorkEffortForms.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -28,7 +28,7 @@
<field name="workEffortId" use-when="workEffort!=null" title="${uiLabelMap.WorkEffortWorkEffortId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
<field name="workEffortId" use-when="workEffort==null&&workEffortId==null" title="${uiLabelMap.WorkEffortWorkEffortId}"><ignored/></field>
- <field name="workEffortId" use-when="workEffort==null&&workEffortId!=null" title="${uiLabelMap.WorkEffortWorkEffortId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${workEffortId}]" widget-style="tabletext"><display/></field>
+ <field name="workEffortId" use-when="workEffort==null&&workEffortId!=null" title="${uiLabelMap.WorkEffortWorkEffortId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${workEffortId}]" widget-style="tabletext"><display also-hidden="false"/></field>
<field name="workEffortName" title="${uiLabelMap.CommonName}*"/>
<field name="workEffortTypeId" title="${uiLabelMap.CommonType}*" position="1">
@@ -207,13 +207,15 @@
<field name="recurrenceInfoId"><ignored/></field>
<field name="runtimeDataId"><ignored/></field>
<field name="noteId"><ignored/></field>
+
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
<form name="ListLookupWorkEffort" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext" target="" title="" type="list">
<actions>
<service result-map-list-iterator-name="listIt" result-map-name="result" service-name="performFind">
- <field-map env-name="parameters" field-name="inputFields"/>
- <field-map env-name="entityName" field-name="entityName"/>
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName" value="WorkEffort"/>
</service>
</actions>
<field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">
@@ -308,7 +310,6 @@
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffort?workEffortId=${workEffortId}"/>
</field>
</form>
-
<form name="WorkEffortTreeLine" hide-header="true" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext" target="ListWorkEfforts" title="" type="list" list-iterator-name="listIt">
<field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditWorkEffort?workEffortId=${workEffortId}"/>
Modified: trunk/applications/workeffort/widget/WorkEffortMenus.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortMenus.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/widget/WorkEffortMenus.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -30,8 +30,10 @@
orientation="horizontal" type="simple" selected-menuitem-context-field-name="headerItem">
<menu-item name="task" title="${uiLabelMap.WorkEffortTaskList}"><link target="mytasks"/></menu-item>
<menu-item name="calendar" title="${uiLabelMap.WorkEffortCalendar}"><link target="day"/></menu-item>
+ <menu-item name="mytime" title="${uiLabelMap.TimesheetMyTime}"><link target="MyTimesheets"/></menu-item>
<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="Logout" title="Logout" align-style="col-right" widget-style="headerButtonRight" selected-style="headerButtonRightSelected">
<condition><not><if-empty field-name="userLogin"/></not></condition>
Modified: trunk/applications/workeffort/widget/WorkEffortScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortScreens.xml 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/applications/workeffort/widget/WorkEffortScreens.xml 2005-10-17 05:49:07 UTC (rev 5970)
@@ -131,15 +131,14 @@
<set field="tabButtonItem" value="WorkEffort"/>
<set field="labelTitleProperty" value="PageTitleFindWorkEffort"/>
- <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
</actions>
<widgets>
<decorator-screen name="CommonWorkEffortDecorator">
<decorator-section name="body">
- <container><label style="head1">${uiLabelMap.PageTitleFindWorkEffort}</label></container>
- <container><link text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort?DONE_PAGE=${donePage}" style="linktext"/></container>
- <include-form name="FindWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/>
+ <container><label style="head1">${uiLabelMap.PageTitleFindWorkEffort}</label></container>
+ <container><link text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort?DONE_PAGE=${donePage}" style="linktext"/></container>
+ <include-form name="FindWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -153,17 +152,15 @@
<set field="tabButtonItem" value="WorkEffort"/>
<set field="labelTitleProperty" value="PageTitleListWorkEffort"/>
- <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
- <set field="entityName" value="WorkEffort"/>
</actions>
<widgets>
<decorator-screen name="CommonWorkEffortDecorator">
<decorator-section name="body">
- <container><label style="head1">${uiLabelMap.PageTitleListWorkEfforts}</label></container>
- <container><link text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort?DONE_PAGE=${donePage}" style="linktext"/></container>
- <container><link text="${uiLabelMap.CommonFind}" target="FindWorkEffort" style="linktext"/></container>
- <include-form name="ListWorkEfforts" location="component://workeffort/widget/WorkEffortForms.xml"/>
+ <container><label style="head1">${uiLabelMap.PageTitleListWorkEfforts}</label></container>
+ <container><link text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort?DONE_PAGE=${donePage}" style="linktext"/></container>
+ <container><link text="${uiLabelMap.CommonFind}" target="FindWorkEffort" style="linktext"/></container>
+ <include-form name="ListWorkEfforts" location="component://workeffort/widget/WorkEffortForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: trunk/framework/common/config/CommonUiLabels.properties
===================================================================
--- trunk/framework/common/config/CommonUiLabels.properties 2005-10-16 08:44:36 UTC (rev 5969)
+++ trunk/framework/common/config/CommonUiLabels.properties 2005-10-17 05:49:07 UTC (rev 5970)
@@ -135,6 +135,8 @@
CommonEnabled=Enabled
CommonEndDate=End date
CommonEndDateTime=End Date/Time
+CommonEntry=Entry
+CommonEntries=Entries
CommonEventDate=EventDate
CommonExpectation=Expectation
CommonExpire=Expire
More information about the Svn
mailing list