You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2007/12/28 10:12:43 UTC
svn commit: r607193 - in /ofbiz/trunk/specialpurpose/projectmgr:
config/ProjectMgrUiLabels.properties
webapp/projectmgr/WEB-INF/controller.xml widget/TimeSheetScreens.xml
widget/forms/TimeSheetForms.xml
Author: hansbak
Date: Fri Dec 28 01:12:42 2007
New Revision: 607193
URL: http://svn.apache.org/viewvc?rev=607193&view=rev
Log:
add the possibility to create any weekly timesheet
Modified:
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
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/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=607193&r1=607192&r2=607193&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Fri Dec 28 01:12:42 2007
@@ -22,6 +22,7 @@
nl=Dutch
# Override Page and Label title
+PageTitleAddATimesheet=Add a new weekly Timesheet
PageTitleAddDependencyAfter=Add Dependency After the current Task
PageTitleAddDependencyBefore=Add Dependency before the current Task
PageTitleAddPartyAssign=Add Resource Assignment
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=607193&r1=607192&r2=607193&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Fri Dec 28 01:12:42 2007
@@ -365,6 +365,12 @@
<response name="success" type="view" value="projectView"/>
<response name="error" type="view" value="projectView"/>
</request-map>
+ <request-map uri="createWeeklyTimesheet">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createTimesheetForThisWeek"/>
+ <response name="success" type="view" value="MyTimesheets"/>
+ <response name="error" type="view" value="MyTimesheets"/>
+ </request-map>
<request-map uri="EditTimeEntries">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditTimeEntries"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=607193&r1=607192&r2=607193&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Fri Dec 28 01:12:42 2007
@@ -84,39 +84,34 @@
<widgets>
<decorator-screen name="CommonMyTimeDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <section>
- <condition>
- <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
- </condition>
- <widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditCurrentTimesheet} # ${timesheet.timesheetId} week: ${weekNumber}</label></container>
- <container style="screenlet-body">
- <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleMyTimesheets}</label></container>
- <container style="screenlet-body">
- <include-form name="ListTimeSheets" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
- </container>
- </container>
- </widgets>
- <fail-widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditCurrentTimesheet} # ${timesheet.timesheetId} week: ${weekNumber}</label></container>
- <container style="screenlet-body">
+ <container style="screenlet">
+ <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditCurrentTimesheet} # ${timesheet.timesheetId} week: ${weekNumber}</label></container>
+ <container style="screenlet-body">
+ <section>
+ <condition>
+ <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
+ </condition>
+ <widgets>
+ <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+ </widgets>
+ <fail-widgets>
<include-form name="EditWeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
- </container>
+ </fail-widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddATimesheet}</label></container>
+ <container style="screenlet-body">
+ <include-form name="AddWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
</container>
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleMyTimesheets} # ${timesheet.timesheetId}</label></container>
- <container style="screenlet-body">
- <include-form name="ListTimeSheets" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
- </container>
- </container>
- </fail-widgets>
- </section>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleMyTimesheets} # ${timesheet.timesheetId}</label></container>
+ <container style="screenlet-body">
+ <include-form name="ListTimeSheets" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=607193&r1=607192&r2=607193&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Fri Dec 28 01:12:42 2007
@@ -70,7 +70,13 @@
<hyperlink target="deleteTimeSheet?timesheetId=${timesheetId}&findAll=Y"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
- </form>
+ </form>
+
+ <form name="AddWeeklyTimesheet" type="single" target="createWeeklyTimesheet" title="">
+ <field name="partyId"><hidden value="${userLogin.partyId}"/></field>
+ <field entry-name="dummy" name="requiredDate"><date-time type="date"/></field>
+ <field name="addButton"><submit/></field>
+ </form>
<form name="AddTimesheetEntry" type="single" target="createTimesheetEntry" title="">
<auto-fields-service service-name="createTimeEntry"/>