svn commit: r609865 - in /ofbiz/trunk/specialpurpose/projectmgr: config/ webapp/projectmgr/WEB-INF/ webapp/projectmgr/WEB-INF/actions/ widget/ widget/forms/

[ha...@apache.org]

Author: hansbak
Date: Mon Jan  7 20:23:33 2008
New Revision: 609865

URL: http://svn.apache.org/viewvc?rev=609865&view=rev
Log:
corrected errors in timesheet, 'set to comlete' wrong link'

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=609865&r1=609864&r2=609865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Mon Jan  7 20:23:33 2008
@@ -38,6 +38,7 @@
 PageTitleAddTimeEntry=Add Time Entry
 PageTitleDependencies=Task dependencies
 PageTitleEditCurrentTimesheet=Edit current timesheet
+PageTitleCurrentTimesheet=Current timesheet
 PageTitleEditProject=Edit Project
 PageTitleProjectGanttChart=Project Gantt Chart
 PageTitleEditPhase=Edit Phase

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh?rev=609865&r1=609864&r2=609865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh Mon Jan  7 20:23:33 2008
@@ -179,6 +179,7 @@
     entry.put("4", day4Total);
     entry.put("5", day5Total);
     entry.put("6", day6Total);
+    entry.put("phaseName", "Totals");
     entry.put("workEffortId", "Totals");
     entry.put("total", day0Total+day1Total+day2Total+day3Total+day4Total+day5Total+day6Total);
     entries.add(entry);

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=609865&r1=609864&r2=609865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Mon Jan  7 20:23:33 2008
@@ -521,6 +521,12 @@
         <response name="success" type="view" value="Timesheet"/>
         <response name="error" type="view" value="Timesheet"/>
     </request-map>
+    <request-map uri="myTimeSheetStatustoComplete">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateTimesheet"/>
+        <response name="success" type="view" value="MyTimesheet"/>
+        <response name="error" type="view" value="MyTimesheet"/>
+    </request-map>
     <request-map uri="TimeSheetStatustoProgress">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateTimesheetToInProcess"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=609865&r1=609864&r2=609865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Mon Jan  7 20:23:33 2008
@@ -315,14 +315,14 @@
         </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}" >
+        <menu-item name="TimeSheetStatustoComplete" 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}&amp;statusId=TIMESHEET_COMPLETED"/>
+            <link target="myTimeSheetStatustoComplete?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
         </menu-item>
     </menu>
     <menu name="ResourcesTabBar" menu-container-style="button-bar tab-bar" default-menu-item-name="edittimesheet" default-selected-style="selected">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=609865&r1=609864&r2=609865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Mon Jan  7 20:23:33 2008
@@ -160,7 +160,7 @@
                 <decorator-screen name="CommonMyTimeDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">                                                  
                         <container style="screenlet">
-                            <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditCurrentTimesheet} # ${timesheet.timesheetId} week: ${weekNumber}</label></container>                                
+                            <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleCurrentTimesheet} # ${timesheet.timesheetId} week: ${weekNumber}</label></container>                                
                             <container style="screenlet-body"> 
                                 <section>
                                     <condition>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=609865&r1=609864&r2=609865&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Mon Jan  7 20:23:33 2008
@@ -231,15 +231,12 @@
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
-    <form name="WeekTimesheet" type="multi" list-name="timeEntries" use-row-submit="true" 
-        separate-columns="true" target="" >
+    <form name="WeekTimesheet" type="list" list-name="timeEntries" separate-columns="true">
         <field name="timesheetId"><hidden/></field>
         <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}">
             <hyperlink target="taskView?workEffortId=${workEffortId} " description="${workEffortName}"/>
         </field>
-        <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}">
-            <hyperlink target="FindPhase?projectId=${projectId}" description="${phaseName}"/>
-        </field>
+        <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display/></field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
             <hyperlink target="projectView?projectId=${projectId} " description="${projectName}"/>
         </field>
@@ -252,8 +249,6 @@
         <field name="6" parameter-name="hoursDay6" title="Sat"><display/></field>
         <field name="total" title="Act Total"><display/></field>
         <field name="plannedHours" title="Plan.Hrs"><display/></field>
-        <!--field name="update"><submit button-type="button"/></field-->
-        <!--field name="_rowSubmit"><hidden value="Y"/></field-->
     </form>   
     
 </forms>