svn commit: r607391 - in /ofbiz/trunk/specialpurpose/projectmgr: webapp/projectmgr/WEB-INF/controller.xml widget/Menus.xml widget/TimeSheetScreens.xml widget/forms/TimeSheetForms.xml

[hansbak-2]

Author: hansbak
Date: Fri Dec 28 23:30:30 2007
New Revision: 607391

URL: http://svn.apache.org/viewvc?rev=607391&view=rev
Log:
refactoring of names to re-use more forms/screens

Modified:
    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/webapp/projectmgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=607391&r1=607390&r2=607391&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Fri Dec 28 23:30:30 2007
@@ -368,8 +368,8 @@
     <request-map uri="createWeeklyTimesheet">
         <security https="true" auth="true"/>
         <event type="service" invoke="createTimesheetForThisWeek"/>
-        <response name="success" type="view" value="ShowTimesheet"/>
-        <response name="error" type="view" value="ShowTimesheet"/>
+        <response name="success" type="view" value="Timesheet"/>
+        <response name="error" type="view" value="Timesheet"/>
     </request-map>
     <request-map uri="addWeeklyTimesheet">
         <security https="true" auth="true"/>
@@ -379,8 +379,13 @@
     <request-map uri="createMyWeeklyTimesheet">
         <security https="true" auth="true"/>
         <event type="service" invoke="createTimesheetForThisWeek"/>
-        <response name="success" type="view" value="MyTimesheets"/>
-        <response name="error" type="view" value="MyTimesheets"/>
+        <response name="success" type="view" value="MyTimesheet"/>
+        <response name="error" type="view" value="MyTimesheet"/>
+    </request-map>
+    <request-map uri="MyTimesheet">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="MyTimesheet"/>
+        <response name="error" type="view" value="MyTimesheet"/>
     </request-map>
     <request-map uri="EditTimeEntries">
         <security https="true" auth="true"/>        
@@ -396,8 +401,8 @@
     <request-map uri="updateMyTimesheet">
         <security https="true" auth="true"/>
         <event type="service-multi" invoke="updateTimeEntryByWorkeffort"/>
-        <response name="success" type="view" value="MyTimesheets"/>
-        <response name="error" type="view" value="MyTimesheets"/>
+        <response name="success" type="view" value="MyTimesheet"/>
+        <response name="error" type="view" value="MyTimesheet"/>
     </request-map>
     <request-map uri="updateTimeEntry">
         <security https="true" auth="true"/>
@@ -495,38 +500,38 @@
         <response name="success" type="view" value="taskView"/>
         <response name="error" type="view" value="taskView"/>
     </request-map>
-    <request-map uri="StatustoComplete">
+    <request-map uri="MyStatustoComplete">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateTimesheet"/>
-        <response name="success" type="view" value="MyTimesheets"/>
-        <response name="error" type="view" value="MyTimesheets"/>
+        <response name="success" type="view" value="MyTimesheet"/>
+        <response name="error" type="view" value="MyTimesheet"/>
     </request-map>
-    <request-map uri="TimesheetToComplete">
+    <request-map uri="StatusToComplete">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateTimesheet"/>
-        <response name="success" type="view" value="ShowTimesheet"/>
-        <response name="error" type="view" value="ShowTimesheet"/>
+        <response name="success" type="view" value="Timesheet"/>
+        <response name="error" type="view" value="Timesheet"/>
     </request-map>
     <request-map uri="FindTask">
         <security https="true" auth="true"/>        
         <response name="success" type="view" value="FindTask"/>
     </request-map>
-    <request-map uri="ShowTimesheet">
+    <request-map uri="Timesheet">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="ShowTimesheet"/>
-        <response name="error" type="view" value="ShowTimesheet"/>
+        <response name="success" type="view" value="Timesheet"/>
+        <response name="error" type="view" value="Timesheet"/>
     </request-map>
     <request-map uri="TimeSheetStatustoComplete">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateTimesheet"/>
-        <response name="success" type="view" value="ShowTimesheet"/>
-        <response name="error" type="view" value="ShowTimesheet"/>
+        <response name="success" type="view" value="Timesheet"/>
+        <response name="error" type="view" value="Timesheet"/>
     </request-map>
     <request-map uri="TimeSheetStatustoProgress">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateTimesheetToInProcess"/>
-        <response name="success" type="view" value="ShowTimesheet"/>
-        <response name="error" type="view" value="ShowTimesheet"/>
+        <response name="success" type="view" value="Timesheet"/>
+        <response name="error" type="view" value="Timesheet"/>
     </request-map>
     <!-- end of request mappings -->
 
@@ -564,12 +569,12 @@
     <view-map name="addWeeklyTimesheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#addWeeklyTimesheet"/>
     <view-map name="EditTimesheetEntries" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#EditTimeSheetEntries"/>
     <view-map name="EditTimesheetRoles" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#EditTimesheetRoles"/>
-    <view-map name="MyTimesheets" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#MyTimesheets"/>
+    <view-map name="MyTimesheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#MyTimesheet"/>
     <view-map name="EditSkillTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditSkillTypes"/>
     <view-map name="EditPartySkills" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartySkills"/>
     <view-map name="EditWorkEffortNotes" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectNotes"/>
     <view-map name="EditTaskNotes" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskNotes"/>
     <view-map name="taskView" type="screen" page="component://projectmgr/widget/TaskScreens.xml#TaskView"/>
-    <view-map name="ShowTimesheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#ShowTimesheet"/>
+    <view-map name="Timesheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#Timesheet"/>
     <!-- end of view mappings -->
 </site-conf>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=607391&r1=607390&r2=607391&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Fri Dec 28 23:30:30 2007
@@ -23,7 +23,7 @@
     <menu name="ProjectMgrAppBar" default-menu-item-name="task" id="app-navigation" type="simple" selected-menuitem-context-field-name="headerItem" default-selected-style="selected" title="${uiLabelMap.ProjectManagerApplication}" menu-container-style="button-bar tab-bar">
     
         <menu-item name="mytasks" title="${uiLabelMap.WorkEffortMyTasks}"><link target="MyTasks"/></menu-item>
-        <menu-item name="mytime" title="${uiLabelMap.TimesheetMyTime}"><link target="MyTimesheets"/></menu-item>
+        <menu-item name="mytime" title="${uiLabelMap.TimesheetMyTime}"><link target="MyTimesheet"/></menu-item>
         <menu-item name="projects" title="${uiLabelMap.WorkEffortProjects}"><link target="FindProject"/></menu-item>
         <menu-item name="task" title="${uiLabelMap.ProjectMgrTasks}"><link target="FindTask"/></menu-item>
         <menu-item name="resources" title="${uiLabelMap.ProjectMgrResources}"><link target="FindResource"/></menu-item>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=607391&r1=607390&r2=607391&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Fri Dec 28 23:30:30 2007
@@ -51,7 +51,7 @@
             </widgets>
         </section>
     </screen>
-    <screen name="ShowTimesheet">
+    <screen name="Timesheet">
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleFindTimeSheet"/>
@@ -147,13 +147,14 @@
         </section>
     </screen>
     
-    <screen name="MyTimesheets">
+    <screen name="MyTimesheet">
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleFindTimesheet"/>
                 <set field="tabButtonItem" value="edittimesheet"/>
                 <set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
-                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/>
+                <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/>
+                <set field="my" value="My"/><!-- change link in list -->
             </actions>
             <widgets>
                 <decorator-screen name="CommonMyTimeDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=607391&r1=607390&r2=607391&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Fri Dec 28 23:30:30 2007
@@ -47,9 +47,9 @@
         <field name="_rowSubmit"><hidden value="Y"/></field>
     </form>
 
-    <form name="ListTimeSheets" type="list" list-name="timesheets" paginate-target="EditTimesheet">
+    <form name="ListTimeSheets" type="list" list-name="timesheets" paginate-target="FindTimeSheet">
         <field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${timesheetId}" target="MyTimesheets?timesheetId=${timesheetId}"/>
+            <hyperlink also-hidden="false" description="${timesheetId}" target="${my}Timesheet?timesheetId=${timesheetId}"/>
         </field>
         <field name="weekNumber"><display/></field>
         <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
@@ -58,7 +58,7 @@
         <field name="hours"><display/></field>
         <field name="comments" title="${uiLabelMap.CommonComments}"><display/></field>
         <field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
-            <hyperlink target="TimesheetToComplete?timesheetId=${timesheetId}&amp;statusId=TIMESHEET_COMPLETED"
+            <hyperlink target="${my}StatusToComplete?timesheetId=${timesheetId}&amp;statusId=TIMESHEET_COMPLETED"
                 description="${bsh:statusId.equals(&quot;TIMESHEET_IN_PROCESS&quot;)?&quot;To complete&quot;:&quot;&quot;}" also-hidden="false"/>
         </field>
     </form>
@@ -83,7 +83,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="fromDate"><date-find /></field>
+        <field name="fromDate"><date-find/></field>
         <field name="${uiLabelMap.CommonFind}" title="${uiLabelMap.CommonFind}"><submit/></field>    
     </form>
     <form name="ListFindTimeSheet" type="list" list-name="listIt" paginate-target="FindTimeSheet">
@@ -95,7 +95,7 @@
             </service>
         </actions>
         <field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${timesheetId}" target="ShowTimesheet?timesheetId=${timesheetId}"/>
+            <hyperlink also-hidden="false" description="${timesheetId}" target="Timesheet?timesheetId=${timesheetId}"/>
         </field>
         <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
@@ -116,7 +116,7 @@
     
     <form name="AddWeeklyTimesheet" type="single" target="createWeeklyTimesheet" title="">
         <field name="partyId" title="${uiLabelMap.PartyParty}">
-            <drop-down allow-empty="true">
+            <drop-down allow-empty="true" no-current-selected-key="${timesheet.partyId}">
                 <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${lastName}">
                     <entity-constraint name="roleTypeId" value="PROJECT_TEAM"/>
                     <entity-order-by field-name="lastName"/>