Author: jleroux
Date: Sat Jan 22 10:49:57 2011
New Revision: 1062138
URL: http://svn.apache.org/viewvc?rev=1062138&view=rev
Log:
A patch from Pierre Smits "my time screen in project mgr shows wrong labels
with entry field for hours" (https://issues.apache.org/jira/browse/OFBIZ-3942)
- OFBIZ-3942
The my time entry screen for hours in Project Mgr shows labels (in English) for
the hour columns in following order: sun, mon,tue,wen,thu,fri,sat.
However when entering hours on in e.g the mon(day) column the actual date
registered for the hours is for tuesday.
Seems like the week starts on monday, not on sunday
JLR: works well, would need more work for those who prefer to have weeks start
on Monday...
Modified:
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=1062138&r1=1062137&r2=1062138&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Sat
Jan 22 10:49:57 2011
@@ -54,13 +54,13 @@
<entity-options entity-name="RateType"
description="${description}"/>
</drop-down>
</field>
- <field name="d0" parameter-name="hoursDay0"
title="${uiLabelMap.ProjectMgrSun}"><text size="2"/></field>
- <field name="d1" parameter-name="hoursDay1"
title="${uiLabelMap.ProjectMgrMon}"><text size="2"/></field>
- <field name="d2" parameter-name="hoursDay2"
title="${uiLabelMap.ProjectMgrTue}"><text size="2"/></field>
- <field name="d3" parameter-name="hoursDay3"
title="${uiLabelMap.ProjectMgrWen}"><text size="2"/></field>
- <field name="d4" parameter-name="hoursDay4"
title="${uiLabelMap.ProjectMgrThu}"><text size="2"/></field>
- <field name="d5" parameter-name="hoursDay5"
title="${uiLabelMap.ProjectMgrFri}"><text size="2"/></field>
- <field name="d6" parameter-name="hoursDay6"
title="${uiLabelMap.ProjectMgrSat}"><text size="2"/></field>
+ <field name="d0" parameter-name="hoursDay0"
title="${uiLabelMap.ProjectMgrMon}"><text size="2"/></field>
+ <field name="d1" parameter-name="hoursDay1"
title="${uiLabelMap.ProjectMgrTue}"><text size="2"/></field>
+ <field name="d2" parameter-name="hoursDay2"
title="${uiLabelMap.ProjectMgrWen}"><text size="2"/></field>
+ <field name="d3" parameter-name="hoursDay3"
title="${uiLabelMap.ProjectMgrThu}"><text size="2"/></field>
+ <field name="d4" parameter-name="hoursDay4"
title="${uiLabelMap.ProjectMgrFri}"><text size="2"/></field>
+ <field name="d5" parameter-name="hoursDay5"
title="${uiLabelMap.ProjectMgrSat}"><text size="2"/></field>
+ <field name="d6" parameter-name="hoursDay6"
title="${uiLabelMap.ProjectMgrSun}"><text size="2"/></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>
@@ -297,13 +297,13 @@
</field>
<field name="checkComplete"
title="${uiLabelMap.ProjectMgrCheckComplete}"><display/></field>
<field name="rateTypeId"
title="${uiLabelMap.ProjectMgrRateTypeId}"><display-entity
entity-name="RateType" description="${description}"/></field>
- <field name="d0" parameter-name="hoursDay0"
title="${uiLabelMap.ProjectMgrSun}"><display/></field>
- <field name="d1" parameter-name="hoursDay1"
title="${uiLabelMap.ProjectMgrMon}"><display/></field>
- <field name="d2" parameter-name="hoursDay2"
title="${uiLabelMap.ProjectMgrTue}"><display/></field>
- <field name="d3" parameter-name="hoursDay3"
title="${uiLabelMap.ProjectMgrWen}"><display/></field>
- <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="d0" parameter-name="hoursDay0"
title="${uiLabelMap.ProjectMgrMon}"><display/></field>
+ <field name="d1" parameter-name="hoursDay1"
title="${uiLabelMap.ProjectMgrTue}"><display/></field>
+ <field name="d2" parameter-name="hoursDay2"
title="${uiLabelMap.ProjectMgrWen}"><display/></field>
+ <field name="d3" parameter-name="hoursDay3"
title="${uiLabelMap.ProjectMgrThu}"><display/></field>
+ <field name="d4" parameter-name="hoursDay4"
title="${uiLabelMap.ProjectMgrFri}"><display/></field>
+ <field name="d5" parameter-name="hoursDay5"
title="${uiLabelMap.ProjectMgrSat}"><display/></field>
+ <field name="d6" parameter-name="hoursDay6"
title="${uiLabelMap.ProjectMgrSun}"><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>
