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/24 09:03:20 UTC
svn commit: r671044 - in /ofbiz/trunk/specialpurpose/projectmgr/widget:
TimeSheetScreens.xml forms/TimeSheetForms.xml
Author: hansbak
Date: Tue Jun 24 00:03:20 2008
New Revision: 671044
URL: http://svn.apache.org/viewvc?rev=671044&view=rev
Log:
convert to screenlet and do not show checkboxes on timesheet
Modified:
ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=671044&r1=671043&r2=671044&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Tue Jun 24 00:03:20 2008
@@ -185,44 +185,15 @@
<set field="titleProperty" value="TimesheetMyTime"/>
<set field="tabButtonItem" value="edittimesheet"/>
<set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
- <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/>
<set field="my" value="My"/><!-- change link and target -->
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonMyTimeDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${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)}"/>
- </container>
- </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"/>
- </fail-widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleAddATimesheet}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="AddMyWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
- </container>
- </container>
+ <decorator-section name="body">
+ <include-screen name="CurrentTimesheet"/>
+ <include-screen name="AddTimesheet"/>
<include-screen name="ListTimesheets"/>
</decorator-section>
</decorator-screen>
@@ -293,6 +264,37 @@
</widgets>
</section>
</screen>
+ <screen name="CurrentTimesheet">
+ <section>
+ <actions>
+ <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)}">
+ <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"/>
+ </fail-widgets>
+ </section>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="AddTimesheet">
+ <section>
+ <widgets>
+ <screenlet title="${uiLabelMap.PageTitleAddATimesheet}">
+ <include-form name="AddMyWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
<screen name="ListTimesheets">
<section>
<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=671044&r1=671043&r2=671044&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Tue Jun 24 00:03:20 2008
@@ -52,7 +52,7 @@
<field name="total" 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}"><check all-checked="true"/></field>
+ <field name="_rowSubmit" title="${uiLabelMap.ProjectMgrRowSubmit}"><hidden value="Y"/></field>
</form>
<form name="ListTimeSheets" type="list" list-name="timesheets" paginate-target="MyTimesheet"