svn commit: r787584 - in /ofbiz/trunk: applications/workeffort/webapp/workeffort/WEB-INF/controller.xml applications/workeffort/widget/CalendarScreens.xml applications/workeffort/widget/WorkEffortForms.xml specialpurpose/myportal/widget/CommonScreens.xml

[hansbak]

Author: hansbak
Date: Tue Jun 23 08:23:35 2009
New Revision: 787584

URL: http://svn.apache.org/viewvc?rev=787584&view=rev
Log:
add the ability to show and add participants in the calendar portlet

Modified:
    ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
    ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
    ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml

Modified: 
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=787584&r1=787583&r2=787584&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 
(original)
+++ 
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 
Tue Jun 23 08:23:35 2009
@@ -148,13 +148,15 @@
         <response name="success" type="view" 
value="ListWorkEffortFixedAssetAssigns"/>
         <response name="error" type="view" 
value="ListWorkEffortFixedAssetAssigns"/>
     </request-map>
-
-    <request-map uri="ListWorkEffortPartyAssigns"><security https="true" 
auth="true"/><response name="success" type="view" 
value="ListWorkEffortPartyAssigns"/></request-map>
+    <request-map uri="ListWorkEffortPartyAssigns">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" 
value="ListWorkEffortPartyAssigns"/>
+    </request-map>
     <request-map uri="createWorkEffortPartyAssign">
         <security https="true" auth="true"/>
         <event type="service" invoke="assignPartyToWorkEffort"/>
-        <response name="success" type="view" 
value="ListWorkEffortPartyAssigns"/>
-        <response name="error" type="view" value="ListWorkEffortPartyAssigns"/>
+        <response name="success" type="view-home" 
value="ListWorkEffortPartyAssigns"/>
+        <response name="error" type="view-home" 
value="ListWorkEffortPartyAssigns"/>
     </request-map>
     <request-map uri="updateWorkEffortPartyAssign">
         <security https="true" auth="true"/>
@@ -165,8 +167,8 @@
     <request-map uri="deleteWorkEffortPartyAssign">
         <security https="true" auth="true"/>
         <event type="service" invoke="deletePartyToWorkEffortAssignment"/>
-        <response name="success" type="view" 
value="ListWorkEffortPartyAssigns"/>
-        <response name="error" type="view" value="ListWorkEffortPartyAssigns"/>
+        <response name="success" type="view-home" 
value="ListWorkEffortPartyAssigns"/>
+        <response name="error" type="view-home" 
value="ListWorkEffortPartyAssigns"/>
     </request-map>
 
     <request-map uri="EditWorkEffortRates">

Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=787584&r1=787583&r2=787584&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Tue Jun 23 
08:23:35 2009
@@ -23,6 +23,9 @@
 
     <screen name="Calendar">
         <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleCalendar"/>
+            </actions>
             <widgets>
                 <section>
                     <condition>
@@ -36,8 +39,7 @@
                     <widgets>
                         <screenlet title="${uiLabelMap.WorkEffortDayView}: 
${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, &quot;EEEE MMMM 
d, yyyy&quot;, timeZone, locale)}" navigation-menu-name="Day">
                             <include-menu name="Day" 
location="component://workeffort/widget/WorkEffortMenus.xml"/>
-                            <include-screen name="addEvent"/>
-                            <include-screen name="showEvent"/>
+                            <include-screen name="eventDetail"/>
                             <platform-specific>
                                 <html><html-template 
location="component://workeffort/webapp/workeffort/calendar/day.ftl"/></html>
                             </platform-specific>
@@ -52,15 +54,12 @@
                         </or>
                     </condition>
                     <actions>
-                        <set field="titleProperty" 
value="PageTitleCalendarWeek"/>
-                        <set field="tabButtonItem" value="week"/>
                         <script 
location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy"/>
                     </actions>
                     <widgets>
                         <screenlet title="${uiLabelMap.WorkEffortWeekView}: 
${uiLabelMap.CommonWeek} 
${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, &quot;w&quot;, 
timeZone, locale)}" navigation-menu-name="Week">
                             <include-menu name="Week" 
location="component://workeffort/widget/WorkEffortMenus.xml"/>
-                            <include-screen name="addEvent"/>
-                            <include-screen name="showEvent"/>
+                            <include-screen name="eventDetail"/>
                             <platform-specific>
                                 <html><html-template 
location="component://workeffort/webapp/workeffort/calendar/week.ftl"/></html>
                             </platform-specific>
@@ -72,15 +71,12 @@
                         <if-compare field="parameters.period" 
operator="equals" value="month"/>
                     </condition>
                     <actions>
-                        <set field="titleProperty" 
value="PageTitleCalendarMonth"/>
-                        <set field="tabButtonItem" value="month"/>
                         <script 
location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy"/>
                     </actions>
                     <widgets>
                         <screenlet title="${uiLabelMap.WorkEffortMonthView}: 
${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, &quot;MMMM 
yyyy&quot;, timeZone, locale)}" navigation-menu-name="Month">
                             <include-menu name="Month" 
location="component://workeffort/widget/WorkEffortMenus.xml"/>
-                            <include-screen name="addEvent"/>
-                            <include-screen name="showEvent"/>
+                            <include-screen name="eventDetail"/>
                             <platform-specific>
                                 <html><html-template 
location="component://workeffort/webapp/workeffort/calendar/month.ftl"/></html>
                             </platform-specific>
@@ -92,9 +88,6 @@
                         <if-compare field="parameters.period" 
operator="equals" value="upcoming"/>
                     </condition>
                     <actions>
-                        <set field="titleProperty" 
value="PageTitleCalendarUpcoming"/>
-                        <set field="headerItem" value="calendar"/>
-                        <set field="tabButtonItem" value="upcoming"/>
                         <script 
location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Upcoming.groovy"/>
                     </actions>
                     <widgets>
@@ -122,30 +115,57 @@
         </section>
     </screen>
 
-    <screen name="addEvent">
-        <section>
-            <condition>
-                <if-compare field="parameters.form" operator="equals" 
value="edit"/>
-            </condition>
-            <widgets>
-                <label style="h2" text="Add a Calendar Event"/>
-                <include-form name="addCalEvent" 
location="component://workeffort/widget/WorkEffortForms.xml"/>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="showEvent">
+
+    <screen name="eventDetail">
         <section>
-            <condition>
-                <if-compare field="parameters.form" operator="equals" 
value="show"/>
-            </condition>
             <actions>
                 <entity-one entity-name="WorkEffort" value-field="workEffort"/>
             </actions>
             <widgets>
-                <label style="h2" text="Calendar Event Summary"/>
-                <include-form name="showCalEvent" 
location="component://workeffort/widget/WorkEffortForms.xml"/>
+                <section>
+                    <condition>
+                        <if-compare field="parameters.form" operator="equals" 
value="edit"/>
+                    </condition>
+                    <widgets>
+                        <container style="lefthalf">
+                            <label style="h2" text="Add a Calendar Event"/>
+                            <include-form name="addCalEvent" 
location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        </container>
+                        <container style="righthalf">
+                            <label style="h2" text="Participants"/>
+                            <include-form name="showCalEventRolesDel" 
location="component://workeffort/widget/WorkEffortForms.xml"/>
+                            <section>
+                                <condition>
+                                    <and>
+                                        <not><if-empty 
field="workEffort"/></not>
+                                        <if-compare field="workEffortTypeId" 
operator="not-equals" value="WES_PUBLIC"/>
+                                    </and>
+                                </condition>
+                                <widgets>
+                                    <include-form name="addCalEventRole" 
location="component://workeffort/widget/WorkEffortForms.xml"/>
+                                </widgets>
+                            </section>
+                        </container>
+                    </widgets>
+                </section>
+                <section>
+                    <condition>
+                        <if-compare field="parameters.form" operator="equals" 
value="show"/>
+                    </condition>
+                    <widgets>
+                        <container style="lefthalf">
+                            <label style="h2" text="Calendar Event Summary"/>
+                            <include-form name="showCalEvent" 
location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        </container>
+                        <container style="righthalf">
+                            <label style="h2" text="Participants"/>
+                            <include-form name="showCalEventRoles" 
location="component://workeffort/widget/WorkEffortForms.xml"/>
+                        </container>
+                    </widgets>
+                </section>
             </widgets>
         </section>
     </screen>
     
+    
 </screens>
\ No newline at end of file

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=787584&r1=787583&r2=787584&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Tue Jun 23 
08:23:35 2009
@@ -1361,8 +1361,8 @@
         <field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field>
         <field name="currentStatusId"><hidden value="CAL_TENTATIVE"/></field>
         <field name="workEffortName" 
title="${uiLabelMap.WorkEffortEventName}"><text/></field>
-        <field name="description" title="${uiLabelMap.CommonDescription}" 
position="2"><text/></field>
-        <field name="workEffortTypeId" position="1">
+        <field name="description" 
title="${uiLabelMap.CommonDescription}"><text/></field>
+        <field name="workEffortTypeId">
             <drop-down no-current-selected-key="MEETING">
                 <entity-options entity-name="WorkEffortType" 
description="${description}">
                     <entity-constraint name="parentTypeId" value="EVENT"/>
@@ -1370,7 +1370,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="scopeEnumId" position="2">
+        <field name="scopeEnumId">
             <drop-down no-current-selected-key="WES_PRIVATE">
                 <entity-options entity-name="Enumeration" 
key-field-name="enumId" description="${description}">
                     <entity-constraint name="enumTypeId" 
value="WORK_EFF_SCOPE"/>
@@ -1378,21 +1378,52 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="estimatedStartDate" position="1"><date-time 
input-method="time-dropdown"/></field>
-        <field name="estimatedCompletionDate" position="2"><date-time 
input-method="time-dropdown"/></field>
+        <field name="estimatedStartDate"><date-time 
input-method="time-dropdown"/></field>
+        <field name="estimatedCompletionDate"><date-time 
input-method="time-dropdown"/></field>
         <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field>
     </form>
     <form name="showCalEvent" type="single" default-map-name="workEffort">
         <field name="workEffortName" 
title="${uiLabelMap.WorkEffortEventName}"><display/></field>
-        <field name="description" title="${uiLabelMap.CommonDescription}" 
position="2"><display/></field>
-        <field name="workEffortTypeId" position="1">
+        <field name="description" 
title="${uiLabelMap.CommonDescription}"><display/></field>
+        <field name="workEffortTypeId">
             <display-entity entity-name="WorkEffortType" 
description="${description}"/>
         </field>
-        <field name="scopeEnumId" position="2">
+        <field name="scopeEnumId">
             <display-entity entity-name="Enumeration" key-field-name="enumId" 
description="${description}"/>
         </field>
-        <field name="estimatedStartDate" position="1"><display 
type="date-time"></display></field>
-        <field name="estimatedCompletionDate" position="2"><display 
type="date-time"></display></field>
+        <field name="estimatedStartDate"><display 
type="date-time"></display></field>
+        <field name="estimatedCompletionDate"><display 
type="date-time"></display></field>
+    </form>
+    <form name="showCalEventRoles" type="list" list-name="roles" 
+        odd-row-style="alternate-row" header-row-style="header-row-2" 
default-table-style="basic-table hover-bar">
+        <actions>
+            <entity-and entity-name="WorkEffortPartyAssignment" list="roles" 
filter-by-date="true">
+                <field-map field-name="workEffortId" 
from-field="parameters.workEffortId"/>
+            </entity-and>
+        </actions>
+        <field name="workEffortId"><hidden 
value="${parameters.workEffortId}"/></field>
+        <field name="fromDate"><hidden/></field>
+        <field name="partyId" >
+            <display-entity entity-name="PartyNameView" 
key-field-name="partyId" description="${groupName}${lastName} ${firstName} 
${middleName}"/>
+        </field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType" 
description="${description}"/></field>
+    </form>
+    <form name="showCalEventRolesDel" type="list" extends="showCalEventRoles" 
target="deleteWorkEffortPartyAssign">
+        <field name="remove"><submit/></field>
+    </form>
+    <form name="addCalEventRole" type="single" 
target="createWorkEffortPartyAssign">
+        <field name="workEffortId"><hidden 
value="${parameters.workEffortId}"/></field>
+        <field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field>
+        <field name="partyId" position="1"><lookup 
target-form-name="LookupPartyName"></lookup></field>
+        <field name="roleTypeId" position="2">
+            <drop-down>
+                <entity-options entity-name="RoleType" 
description="${description}">
+                    <entity-constraint name="parentTypeId" 
value="CALENDAR_ROLE"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="add"><submit/></field>
     </form>
     
 </forms>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=787584&r1=787583&r2=787584&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Tue Jun 23 
08:23:35 2009
@@ -217,7 +217,18 @@
             </widgets>
         </section>
     </screen>
-
+    <screen name="CommonProjectDecorator">
+        <section>
+            <widgets>
+                <decorator-screen name="CommonRequestDecorator" 
location="component://order/widget/ordermgr/CommonScreens.xml">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
     <screen name="reloadCaptchaImage">
         <section>
             <actions>