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 2009/04/26 09:04:49 UTC
svn commit: r768669 - in /ofbiz/trunk/specialpurpose/projectmgr:
webapp/projectmgr/WEB-INF/controller.xml widget/forms/TimeSheetForms.xml
Author: hansbak
Date: Sun Apr 26 07:04:49 2009
New Revision: 768669
URL: http://svn.apache.org/viewvc?rev=768669&view=rev
Log:
various timesheet problems
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.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=768669&r1=768668&r2=768669&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Sun Apr 26 07:04:49 2009
@@ -351,8 +351,8 @@
<request-map uri="updateMyTimesheet">
<security https="true" auth="true"/>
<event type="service-multi" invoke="updateTimeEntryByWorkeffort"/>
- <response name="success" type="view" value="MyTimesheet"/>
- <response name="error" type="view" value="MyTimesheet"/>
+ <response name="success" type="view-home" value="MyTimesheet"/>
+ <response name="error" type="view-home" value="MyTimesheet"/>
</request-map>
<request-map uri="updateTimesheet">
<security https="true" auth="true"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=768669&r1=768668&r2=768669&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Sun Apr 26 07:04:49 2009
@@ -39,7 +39,7 @@
<entity-order-by field-name="phaseName"/>
<entity-order-by field-name="workEffortName"/>
</entity-options>
- <sub-hyperlink target="taskView" description="${workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}">
+ <sub-hyperlink target="taskView" description="${bsh:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}">
<parameter param-name="workEffortId"/>
<parameter param-name="my"/>
</sub-hyperlink>
@@ -58,8 +58,8 @@
<field name="d4" parameter-name="hoursDay4" title="${uiLabelMap.ProjectMgrThu}"><text size="5"/></field>
<field name="d5" parameter-name="hoursDay5" title="${uiLabelMap.ProjectMgrFri}"><text size="5"/></field>
<field name="d6" parameter-name="hoursDay6" title="${uiLabelMap.ProjectMgrSat}"><text size="5"/></field>
- <field name="total" title="${uiLabelMap.ProjectMgrActualTotal}"><display/></field>
- <field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
+ <field name="total" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
+ <field name="actualHours" title="${uiLabelMap.ProjectMgrActualTotal}"><display/></field>
<field name="plannedHours" title="${uiLabelMap.ProjectMgrPlanHours}"><display/></field>
<field name="updateButton"><submit button-type="button"/></field>
<field name="_rowSubmit" title="${uiLabelMap.ProjectMgrRowSubmit}"><hidden value="Y"/></field>
@@ -125,8 +125,8 @@
<set field="complete" value="${uiLabelMap.ProjectMgrToComplete}"/>
</actions>
<row-actions>
- <set field="actualHours" value="${org.ofbiz.project.Various.calculateActualHours(delegator, timesheetId)}"/>
- <set field="completeLink" value="${"TIMESHEET_IN_PROCESS".equals(statusId)?complete:""}"/>
+ <set field="actualHours" value="${bsh:org.ofbiz.project.Various.calculateActualHours(delegator, timesheetId)}"/>
+ <set field="completeLink" value="${bsh:"TIMESHEET_IN_PROCESS".equals(statusId)?complete:""}"/>
</row-actions>
<field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${timesheetId}" target="Timesheet">
@@ -140,7 +140,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
<!--field name="comments" title="${uiLabelMap.CommonComments}"><display/></field-->
<field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
- <hyperlink target="TimeSheetStatusToComplete" description="${completeLink}">
+ <hyperlink target="TimeSheetStatusToComplete" description="${groovy:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}">
<parameter param-name="timesheetId"/>
<parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
</hyperlink>
@@ -297,7 +297,8 @@
<field name="d4" parameter-name="hoursDay4" title="${uiLabelMap.ProjectMgrThu}"><display/></field>
<field name="d5" parameter-name="hoursDay5" title="${uiLabelMap.ProjectMgrFri}"><display/></field>
<field name="d6" parameter-name="hoursDay6" title="${uiLabelMap.ProjectMgrSat}"><display/></field>
- <field name="total" title="${uiLabelMap.ProjectMgrActualTotal}"><display/></field>
+ <field name="total" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
+ <field name="actualHours" title="${uiLabelMap.ProjectMgrActualTotal}"><display/></field>
<field name="plannedHours" title="${uiLabelMap.ProjectMgrPlanHours}"><display/></field>
</form>
</forms>