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/17 10:31:43 UTC
svn commit: r604803 - in /ofbiz/trunk/specialpurpose/projectmgr:
config/ProjectMgrUiLabels.properties
webapp/projectmgr/WEB-INF/controller.xml widget/CommonScreens.xml
widget/Menus.xml
Author: hansbak
Date: Mon Dec 17 01:31:42 2007
New Revision: 604803
URL: http://svn.apache.org/viewvc?rev=604803&view=rev
Log:
add a 'set to complete' button on a timesheet entry screen
Modified:
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=604803&r1=604802&r2=604803&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Mon Dec 17 01:31:42 2007
@@ -128,6 +128,6 @@
ProjectMgrTimeEntries=Add/Edit Time Entries
PageTitleListTimeEntries=List Time Entries for
ProjectMgrQuickAssignPartyId=Quick Assign Party Id
-
+CommonStatustoComplete=Status to 'complete'
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=604803&r1=604802&r2=604803&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Mon Dec 17 01:31:42 2007
@@ -427,6 +427,12 @@
<response name="success" type="view" value="taskView"/>
<response name="error" type="view" value="taskView"/>
</request-map>
+ <request-map uri="StatustoComplete">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateTimesheet"/>
+ <response name="success" type="view" value="MyTimesheets"/>
+ <response name="error" type="view" value="MyTimesheets"/>
+ </request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=604803&r1=604802&r2=604803&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Mon Dec 17 01:31:42 2007
@@ -230,7 +230,9 @@
<condition>
<if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/>
</condition>
- <widgets>
+ <widgets>
+ <include-menu name="MyTimeSubTabBar" location="component://projectmgr/widget/Menus.xml"/>
+ <label style="head2" text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonId}:[${paymentId}] ${${extraFunctionName}}"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=604803&r1=604802&r2=604803&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Mon Dec 17 01:31:42 2007
@@ -77,4 +77,15 @@
<link target="EditTimesheetEntries?timesheetId=${timesheetId}"/>
</menu-item>
</menu>
+ <menu name="MyTimeSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+ <menu-item name="StatustoComplete" title="${uiLabelMap.CommonStatustoComplete}" >
+ <condition>
+ <and>
+ <not><if-empty field-name="timesheet"/></not>
+ <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
+ </and>
+ </condition>
+ <link target="StatustoComplete?timesheetId=${timesheet.timesheetId}&statusId=TIMESHEET_COMPLETED"/>
+ </menu-item>
+ </menu>
</menus>