svn commit: r597072 - in /ofbiz/trunk: applications/workeffort/entitydef/ specialpurpose/projectmgr/ specialpurpose/projectmgr/entitydef/ specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/ specialpurpose/projectmgr/widget/ specialpurpose/projectmgr/w...

[hansbak-2]

Author: hansbak
Date: Wed Nov 21 05:27:53 2007
New Revision: 597072

URL: http://svn.apache.org/viewvc?rev=597072&view=rev
Log:
moved project views from workeffort in the projmgr, change the time entry screens to enter only time on tasks, an in the option 'mytime' only on tasks in project of which the logged on user is member of.

Added:
    ofbiz/trunk/specialpurpose/projectmgr/entitydef/
    ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitygroup.xml   (with props)
    ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml   (with props)
Modified:
    ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml
    ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml
    ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml?rev=597072&r1=597071&r2=597072&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml Wed Nov 21 05:27:53 2007
@@ -44,7 +44,6 @@
     <entity-group group="org.ofbiz" entity="WorkEffortAndFulfillment" />
     <entity-group group="org.ofbiz" entity="WorkEffortAndPartyAssign" />
     <entity-group group="org.ofbiz" entity="WorkEffortAndSalesOpportunity" />
-    <entity-group group="org.ofbiz" entity="WorkEffortParentPartyAndChild" />  
     <entity-group group="org.ofbiz" entity="WorkEffortAssoc" />
     <entity-group group="org.ofbiz" entity="WorkEffortAssocView" />
     <entity-group group="org.ofbiz" entity="WorkEffortAssocAttribute" />

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml?rev=597072&r1=597071&r2=597072&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml Wed Nov 21 05:27:53 2007
@@ -353,49 +353,6 @@
       </relation>
     </view-entity>
 
-  <view-entity entity-name="WorkEffortParentPartyAndChild"
-    package-name="org.ofbiz.workeffort.workeffort"
-    title="WorkEffort for use in party -> project -> phase -> task">
-    <member-entity entity-alias="WEP" entity-name="WorkEffort"/>
-    <member-entity entity-alias="WEPA" entity-name="WorkEffortPartyAssignment"/>
-    <member-entity entity-alias="WE" entity-name="WorkEffort"/>
-    <alias-all entity-alias="WE"/>
-    <alias-all entity-alias="WEPA">
-      <exclude field="facilityId"/>
-    </alias-all>
-    <alias entity-alias="WEP" field="workEffortParentId" name="projectId"/>
-    <alias entity-alias="WEP" field="workEffortId" name="phaseId"/>
-    <alias entity-alias="WEP" field="workEffortName" name="phaseName"/>
-    <alias entity-alias="WEPA" name="partyAssignFacilityId" field="facilityId"/>
-    <view-link entity-alias="WEP" rel-entity-alias="WE">
-      <key-map field-name="workEffortId" rel-field-name="workEffortParentId"/>
-    </view-link>
-    <view-link entity-alias="WEP" rel-entity-alias="WEPA">
-      <key-map field-name="workEffortParentId" rel-field-name="workEffortId"/>
-    </view-link>
-    <relation type="one-nofk" rel-entity-name="WorkEffort">
-      <key-map field-name="workEffortId"/>
-    </relation>
-    <relation type="one-nofk" rel-entity-name="WorkEffortPartyAssignment">
-      <key-map field-name="workEffortId"/>
-      <key-map field-name="partyId"/>
-      <key-map field-name="roleTypeId"/>
-      <key-map field-name="fromDate"/>
-    </relation>
-    <relation type="one-nofk" rel-entity-name="Party">
-      <key-map field-name="partyId"/>
-    </relation>
-    <relation type="one-nofk" rel-entity-name="Person">
-      <key-map field-name="partyId"/>
-    </relation>
-    <relation type="one-nofk" rel-entity-name="PartyRole">
-      <key-map field-name="partyId"/>
-      <key-map field-name="roleTypeId"/>
-    </relation>
-    <relation type="one-nofk" rel-entity-name="RoleType">
-      <key-map field-name="roleTypeId"/>
-    </relation>
-  </view-entity>
   
   <view-entity entity-name="WorkEffortAndGoods" package-name="org.ofbiz.workeffort.workeffort"
         title="WorkEffort and related WorkEffortGoodStandard">
@@ -411,7 +368,8 @@
         <key-map field-name="workEffortId"></key-map>
       </view-link>
     </view-entity>
-    <view-entity entity-name="WorkEffortAndInventoryAssign" package-name="org.ofbiz.workeffort.workeffort"
+
+  <view-entity entity-name="WorkEffortAndInventoryAssign" package-name="org.ofbiz.workeffort.workeffort"
         title="Inventory Item and Product assigned for WorkEffort">
       <description>Inventory Item and Product assigned for WorkEffort</description>
       <member-entity entity-alias="WEIA" entity-name="WorkEffortInventoryAssign"></member-entity>

Added: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitygroup.xml?rev=597072&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitygroup.xml (added)
+++ ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitygroup.xml Wed Nov 21 05:27:53 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entitygroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitygroup.xsd">
+
+  <!-- ========================================================= -->
+  <!-- org.ofbiz.workeffort.project -->
+  <!-- ========================================================= -->
+
+    <entity-group group="org.ofbiz" entity="ProjectPartyAndPhaseAndTask"/>
+    <entity-group group="org.ofbiz" entity="ProjectAndPhaseAndTask"/>  
+</entitygroup>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitygroup.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitygroup.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitygroup.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml?rev=597072&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml (added)
+++ ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml Wed Nov 21 05:27:53 2007
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
+  <!-- ========================================================= -->
+  <!-- ======================== Defaults ======================= -->
+  <!-- ========================================================= -->
+    <title>Entity of an Open For Business Project Component</title>
+    <description>None</description>
+    <copyright>Copyright 2001-2006 The Apache Software Foundation</copyright>
+    <author>None</author>
+    <version>1.0</version>
+  <view-entity entity-name="ProjectPartyAndPhaseAndTask"
+    package-name="org.ofbiz.workeffort.project"
+    title="WorkEffort for use in party -> project -> phase -> task">
+    <member-entity entity-alias="WEPA" entity-name="WorkEffortPartyAssignment"/>
+    <member-entity entity-alias="WEP" entity-name="WorkEffort"/>
+    <member-entity entity-alias="WEPH" entity-name="WorkEffort"/>
+    <member-entity entity-alias="WET" entity-name="WorkEffort"/>
+    <alias-all entity-alias="WEPA">
+      <exclude field="facilityId"/>
+    </alias-all>
+    <alias-all entity-alias="WET">
+      <exclude field="workEffortId"/>
+      <exclude field="workEffortName"/>
+    </alias-all>
+    <alias entity-alias="WEPA" name="partyAssignFacilityId" field="facilityId"/>
+    <alias entity-alias="WEP" field="workEffortId" name="projectId"/>
+    <alias entity-alias="WEP" field="workEffortName" name="projectName"/>
+    <alias entity-alias="WEPH" field="workEffortId" name="phaseId"/>
+    <alias entity-alias="WEPH" field="workEffortName" name="phaseName"/>
+    <alias entity-alias="WET" field="workEffortId" name="taskId"/>
+    <alias entity-alias="WET" field="workEffortName" name="taskName"/>
+    <view-link entity-alias="WEPA" rel-entity-alias="WEP">
+      <key-map field-name="workEffortId"/>
+    </view-link>
+    <view-link entity-alias="WEP" rel-entity-alias="WEPH">
+      <key-map field-name="workEffortId" rel-field-name="workEffortParentId"/>
+    </view-link>
+    <view-link entity-alias="WEPH" rel-entity-alias="WET">
+      <key-map field-name="workEffortId" rel-field-name="workEffortParentId"/>
+    </view-link>
+    <relation type="one-nofk" rel-entity-name="PartyNameView">
+      <key-map field-name="partyId"/>
+    </relation>
+    <relation type="many" rel-entity-name="TimeEntry">
+      <key-map field-name="taskId" rel-field-name="workEffortId"/>
+    </relation>
+  </view-entity>
+  
+  <view-entity entity-name="ProjectAndPhaseAndTask"
+    package-name="org.ofbiz.workeffort.project"
+    title="WorkEffort for use in project -> phase -> task">
+    <member-entity entity-alias="WEP" entity-name="WorkEffort"/><!--project -->
+    <member-entity entity-alias="WEPH" entity-name="WorkEffort"/><!-- phase -->
+    <member-entity entity-alias="WET" entity-name="WorkEffort"/><!-- task -->
+    <alias-all entity-alias="WET">
+      <exclude field="workEffortId"/>
+      <exclude field="workEffortName"/>
+    </alias-all>
+    <alias entity-alias="WEP" field="workEffortId" name="projectId"/>
+    <alias entity-alias="WEP" field="workEffortName" name="projectName"/>
+    <alias entity-alias="WEPH" field="workEffortId" name="phaseId"/>
+    <alias entity-alias="WEPH" field="workEffortName" name="phaseName"/>
+    <alias entity-alias="WET" field="workEffortId" name="taskId"/>
+    <alias entity-alias="WET" field="workEffortName" name="taskName"/>
+    <view-link entity-alias="WEP" rel-entity-alias="WEPH">
+      <key-map field-name="workEffortId" rel-field-name="workEffortParentId"/>
+    </view-link>
+    <view-link entity-alias="WEPH" rel-entity-alias="WET">
+      <key-map field-name="workEffortId" rel-field-name="workEffortParentId"/>
+    </view-link>
+    <relation type="many" rel-entity-name="TimeEntry">
+      <key-map field-name="taskId" rel-field-name="workEffortId"/>
+    </relation>
+  </view-entity>
+  </entitymodel>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml?rev=597072&r1=597071&r2=597072&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/ofbiz-component.xml Wed Nov 21 05:27:53 2007
@@ -25,6 +25,8 @@
     <classpath type="dir" location="script"/>
     <classpath type="dir" location="config"/>
     <classpath type="jar" location="build/lib/*"/>
+    <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
+    <entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrSecurityData.xml"/>
     <!-- service-resource type="model" loader="main" location="servicedef/services.xml"/-->

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=597072&r1=597071&r2=597072&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Wed Nov 21 05:27:53 2007
@@ -372,6 +372,8 @@
     <view-map name="EditTimeEntries" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditTimeEntries"/>
     <view-map name="FindTimeSheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#FindTimeSheet"/>
     <view-map name="EditTimeSheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#EditTimeSheet"/>
+    <view-map name="EditTimesheetEntries" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#EditTimeSheetEntries"/>
+    <view-map name="MyTimesheets" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#MyTimesheets"/>
     <view-map name="EditSkillTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditSkillTypes"/>
     <view-map name="EditPartySkills" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartySkills"/>
     <view-map name="EditWorkEffortNotes" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectNotes"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=597072&r1=597071&r2=597072&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Wed Nov 21 05:27:53 2007
@@ -72,4 +72,116 @@
             </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" location="${parameters.mainDecoratorLocation}">
+                    <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://projectmgr/widget/forms/TimeSheetForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="MyTimesheets">
+        <section>
+            <actions>
+                <set field="headerItem" value="mytime"/>
+                <set field="titleProperty" value="WorkEffortMyTimesheets"/>
+                
+                <set field="queryString" from-field="result.queryString"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+                <entity-condition entity-name="Timesheet" list-name="currentTimesheetList">
+                    <condition-list combine="and">
+                        <condition-expr field-name="partyId" env-name="userLogin.partyId"/>
+                        <condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
+                        <condition-list combine="or">
+                            <condition-expr field-name="thruDate" operator="greater-equals" env-name="nowTimestamp"/>
+                            <condition-expr field-name="thruDate" env-name="null"/>
+                        </condition-list>
+                    </condition-list>
+                </entity-condition>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container><label text="${uiLabelMap.WorkEffortMyCurrentTimesheets}" style="head2"/></container>
+                        <container>
+                            <link text="${uiLabelMap.PageTitleCreateWeekTimesheet}" target="createTimesheetForThisWeek?partyId=${userLogin.partyId}" style="buttontext"/>
+                            <link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet?partyId=${userLogin.partyId}" style="buttontext"/>
+                        </container>
+                        <iterate-section entry-name="currentTimesheet" list-name="currentTimesheetList">
+                            <section>
+                                <actions>
+                                    <entity-condition entity-name="TimeEntry" list-name="currentTimeEntryList">
+                                        <condition-list combine="and">
+                                            <condition-expr field-name="partyId" env-name="userLogin.partyId"/>
+                                            <condition-expr field-name="timesheetId" env-name="currentTimesheet.timesheetId"/>
+                                        </condition-list>
+                                    </entity-condition>
+                                </actions>
+                                <widgets>
+                                    <container>
+                                        <label style="tableheadtext" text="${uiLabelMap.Timesheet}: ${currentTimesheet.fromDate} ${uiLabelMap.CommonThru} ${currentTimesheet.thruDate} ${currentTimesheet.comments}"/>
+                                        <link target="EditTimesheet?timesheetId=${currentTimesheet.timesheetId}" text="${currentTimesheet.timesheetId}" style="buttontext"></link>
+                                    </container>
+                                    <iterate-section entry-name="currentTimeEntry" list-name="currentTimeEntryList">
+                                        <section>
+                                            <actions>
+                                                <entity-one entity-name="RateType" value-name="currentRateType" auto-field-map="false">
+                                                    <field-map field-name="rateTypeId" env-name="currentTimeEntry.rateTypeId"/>
+                                                </entity-one>
+                                            </actions>
+                                            <widgets>
+                                                <container>
+                                                    <label style="tabletext" text="${uiLabelMap.TimesheetTimeEntry} ${uiLabelMap.CommonFor} ${currentTimeEntry.fromDate} "/>
+                                                    <label style="tableheadtext" text="${currentTimeEntry.hours} ${uiLabelMap.TimesheetHours} "/>
+                                                    <label style="tabletext" text="${currentTimeEntry.comments} [${currentRateType.description}]"/>
+                                                    <section>
+                                                        <condition><not><if-empty field-name="currentTimeEntry.workEffortId"/></not></condition>
+                                                        <widgets><link target="WorkEffortSummary?workEffortId=${currentTimeEntry.workEffortId}" text="${uiLabelMap.WorkEffortWorkEffort}: ${currentTimeEntry.workEffortId}" style="linktext"/></widgets>
+                                                    </section>
+                                                </container>
+                                            </widgets>
+                                        </section>
+                                    </iterate-section>
+                                    <section>
+                                        <condition><if-compare-field field-name="parameters.showQuickEntry" operator="equals" to-field-name="currentTimesheet.timesheetId"/></condition>
+                                        <widgets>
+                                            <include-form name="QuickCreateTimeEntry" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+                                        </widgets>
+                                        <fail-widgets>
+                                            <container>
+                                                <link target="MyTimesheets?showQuickEntry=${currentTimesheet.timesheetId}" text="${uiLabelMap.TimesheetQuickTimeEntry}" style="buttontext"></link>
+                                                <link target="EditTimesheetEntries?timesheetId=${currentTimesheet.timesheetId}" text="${uiLabelMap.TimesheetTimeEntries}" style="buttontext"></link>
+                                            </container>
+                                        </fail-widgets>
+                                    </section>
+                                </widgets>
+                            </section>
+                        </iterate-section>
+                        
+                        <!-- createQuickTimeEntry -->
+                        
+                        <container><label text="${uiLabelMap.WorkEffortMyRates}" style="head2"/></container>
+                        <include-form name="ListMyRates" location="component://workeffort/widget/TimesheetForms.xml"/>
+                        <container><label text="${uiLabelMap.WorkEffortMyTimesheets}" style="head2"/></container>
+                        <include-form name="ListMyTimesheets" location="component://workeffort/widget/TimesheetForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=597072&r1=597071&r2=597072&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Wed Nov 21 05:27:53 2007
@@ -33,5 +33,63 @@
             <hyperlink target="deleteTimeSheet?timesheetId=${timesheetId}&amp;findAll=Y"
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
-    </form>
+    </form>
+
+    <form name="AddTimesheetEntry" type="single" target="createTimesheetEntry" title="">
+        <auto-fields-service service-name="createTimeEntry"/>
+        
+        <field name="timeEntryId"><ignored/><!-- don't pass, will be sequenced --></field>
+        <field name="timesheetId"><hidden/></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 no-current-selected-key="STANDARD">
+                <entity-options entity-name="RateType" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="workEffortId">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="ProjectAndPhaseAndTask" key-field-name="taskId" description="${projectName}--${phaseName}--${taskName}">
+                    <entity-order-by field-name="projectName"/>
+                    <entity-order-by field-name="phaseName"/>
+                    <entity-order-by field-name="taskName"/>
+                </entity-options>
+            </drop-down>
+        </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>
+    <form name="QuickCreateTimeEntry" target="createQuickTimeEntry" title="" type="single">
+        <actions>
+            <entity-one entity-name="WorkEffort">
+                <field-map field-name="workEffortId" env-name=""/>
+            </entity-one>
+        </actions>
+        <field name="timesheetId" map-name="currentTimesheet"><hidden/></field>
+        <field name="partyId" map-name="userLogin"><hidden/></field>
+        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox">
+            <drop-down no-current-selected-key="STANDARD" >
+                <entity-options entity-name="RateType" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="workEffortId"><drop-down allow-empty="false">
+            <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${projectName}--${phaseName}--${taskName}">
+                <entity-constraint name="partyId" env-name="userLogin.partyId"/>
+                <entity-order-by field-name="projectName"/>
+                <entity-order-by field-name="phaseName"/>
+                <entity-order-by field-name="taskName"/>
+            </entity-options>
+        </drop-down></field>
+        <field name="hours"><text size="5"/></field>
+        <field name="comments"><text size="40"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    
+    
 </forms>