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 2008/06/25 12:07:21 UTC
svn commit: r671494 - in /ofbiz/trunk/specialpurpose/projectmgr/widget:
Menus.xml TimeSheetScreens.xml
Author: hansbak
Date: Wed Jun 25 03:07:20 2008
New Revision: 671494
URL: http://svn.apache.org/viewvc?rev=671494&view=rev
Log:
fix timesheet list,add button in screenlet
Modified:
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=671494&r1=671493&r2=671494&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Wed Jun 25 03:07:20 2008
@@ -384,4 +384,12 @@
<link target="EditRequest?custRequestId=${parameters.custRequestId}"/>
</menu-item>
</menu>
+ <menu name="TimesheetBar">
+ <menu-item name="setToComplete" title="${uiLabelMap.CommonStatustoComplete}">
+ <condition>
+ <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
+ </condition>
+ <link target="${my}StatusToComplete?timesheetId=${timesheet.timesheetId}&statusId=TIMESHEET_COMPLETED"/>
+ </menu-item>
+ </menu>
</menus>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=671494&r1=671493&r2=671494&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Wed Jun 25 03:07:20 2008
@@ -270,7 +270,9 @@
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/>
</actions>
<widgets>
- <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}">
+ <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"
+ navigation-menu-name="TimesheetBar">
+ <include-menu name="TimesheetBar" location="component://projectmgr/widget/Menus.xml"/>
<section>
<condition>
<if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
@@ -297,6 +299,15 @@
</screen>
<screen name="ListTimesheets">
<section>
+ <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>
+ <entity-one entity-name="PartyNameView" value-name="partyNameView">
+ <field-map field-name="partyId" env-name="userLogin.partyId"/>
+ </entity-one>
+ </actions>
<widgets>
<container style="screenlet">
<container style="screenlet-title-bar">