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 2009/06/19 11:21:45 UTC
svn commit: r786422 - in /ofbiz/trunk: applications/workeffort/data/
applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/
applications/workeffort/webapp/workeffort/calendar/
applications/workeffort/widget/ specialpurpose/myportal/data/ s...
Author: hansbak
Date: Fri Jun 19 09:21:44 2009
New Revision: 786422
URL: http://svn.apache.org/viewvc?rev=786422&view=rev
Log:
convert ftl menus, added celendar to myportal first page
Removed:
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/CalendarTabBar.ftl
Modified:
ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml?rev=786422&r1=786421&r2=786422&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml Fri Jun 19 09:21:44 2009
@@ -26,5 +26,14 @@
screenLocation="component://workeffort/widget/WorkEffortScreens.xml"
description="My Company Comms From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW"/>
<PortletPortletCategory portalPortletId="mycompanycomms" portletCategoryId="EVENTSTASKS"/>
+
+ <PortalPortlet portalPortletId="Calendar"
+ portletName="Event Calendar"
+ screenName="Calendar"
+ screenLocation="component://workeffort/widget/CalendarScreens.xml"
+ description="My Calendar"/>
+ <PortletPortletCategory portalPortletId="Calendar" portletCategoryId="EVENTSTASKS"/>
+
+
</entity-engine-xml>
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy?rev=786422&r1=786421&r2=786422&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy Fri Jun 19 09:21:44 2009
@@ -58,7 +58,9 @@
}
Timestamp prev = UtilDateTime.getDayStart(start, -1, timeZone, locale);
+context.prevMillis = new Long(prev.getTime()).toString();
Timestamp next = UtilDateTime.getDayStart(start, 1, timeZone, locale);
+context.nextMillis = new Long(next.getTime()).toString();
Map serviceCtx = UtilMisc.toMap("userLogin", userLogin,"start",start,"numPeriods",new Integer(24),"periodType",new Integer(Calendar.HOUR));
serviceCtx.putAll(UtilMisc.toMap("partyId", partyId, "facilityId", facilityId, "fixedAssetId", fixedAssetId, "workEffortTypeId", workEffortTypeId, "locale", locale, "timeZone", timeZone));
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy?rev=786422&r1=786421&r2=786422&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy Fri Jun 19 09:21:44 2009
@@ -62,7 +62,9 @@
numDays = tempCal.getActualMaximum(Calendar.DAY_OF_MONTH);
prev = UtilDateTime.getMonthStart(start, -1, timeZone, locale);
+context.prevMillis = new Long(prev.getTime()).toString();
next = UtilDateTime.getDayStart(start, numDays+1, timeZone, locale);
+context.nextMillis = new Long(next.getTime()).toString();
end = UtilDateTime.getDayStart(start, numDays, timeZone, locale);
//Find out what date to get from
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy?rev=786422&r1=786421&r2=786422&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy Fri Jun 19 09:21:44 2009
@@ -58,7 +58,9 @@
}
Timestamp prev = UtilDateTime.getDayStart(start, -7, timeZone, locale);
+context.prevMillis = new Long(prev.getTime()).toString();
Timestamp next = UtilDateTime.getDayStart(start, 7, timeZone, locale);
+context.nextMillis = new Long(next.getTime()).toString();
Timestamp end = UtilDateTime.getDayStart(start, 6, timeZone, locale);
Map serviceCtx = UtilMisc.toMap("userLogin", userLogin,"start",start,"numPeriods",new Integer(7),"periodType",new Integer(Calendar.DATE));
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl?rev=786422&r1=786421&r2=786422&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl Fri Jun 19 09:21:44 2009
@@ -16,15 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
- <div class="screenlet-title-bar">
- <ul>
- <li class="h3">${start?date?string("EEEE")?cap_first} ${start?date?string.long}</li>
- <li><a href="<@ofbizUrl>day?start=${next.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>">${uiLabelMap.WorkEffortNextDay}</a></li>
- <li><a href="<@ofbizUrl>day?start=${nowTimestamp.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>">${uiLabelMap.CommonToday}</a></li>
- <li><a href="<@ofbizUrl>day?start=${prev.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>">${uiLabelMap.WorkEffortPreviousDay}</a></li>
- </ul>
- <br class="clear"/>
- </div>
<#if periods?has_content>
<#if (maxConcurrentEntries < 2)>
<#assign entryWidth = 100>
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl?rev=786422&r1=786421&r2=786422&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl Fri Jun 19 09:21:44 2009
@@ -28,15 +28,6 @@
}
</style>
- <div class="screenlet-title-bar">
- <ul>
- <li class="h3">${start?date?string("MMMM yyyy")?cap_first}</li>
- <li><a href='<@ofbizUrl>month?start=${next.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>'>${uiLabelMap.WorkEffortNextMonth}</a></li>
- <li><a href='<@ofbizUrl>month?start=${nowTimestamp.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>'>${uiLabelMap.WorkEffortThisMonth}</a></li>
- <li><a href='<@ofbizUrl>month?start=${prev.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>'>${uiLabelMap.WorkEffortPreviousMonth}</a></li>
- </ul>
- <br class="clear"/>
- </div>
<#if periods?has_content>
<table cellspacing="0" class="basic-table calendar">
<tr class="header-row">
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl?rev=786422&r1=786421&r2=786422&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl Fri Jun 19 09:21:44 2009
@@ -17,10 +17,6 @@
under the License.
-->
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <h3>${uiLabelMap.WorkEffortCalendarUpComingEventsView}</h3>
- </div>
<#if days?has_content>
<table class="basic-table hover-bar" cellspacing="0">
<tr class="header-row">
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl?rev=786422&r1=786421&r2=786422&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl Fri Jun 19 09:21:44 2009
@@ -16,15 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
- <div class="screenlet-title-bar">
- <ul>
- <li class="h3">${uiLabelMap.CommonWeek} ${start?date?string("w")}</li>
- <li><a href="<@ofbizUrl>week?start=${next.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>">${uiLabelMap.WorkEffortNextWeek}</a></li>
- <li><a href="<@ofbizUrl>week?start=${nowTimestamp.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>">${uiLabelMap.WorkEffortThisWeek}</a></li>
- <li><a href="<@ofbizUrl>week?start=${prev.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>">${uiLabelMap.WorkEffortPreviousWeek}</a></li>
- </ul>
- <br class="clear"/>
- </div>
<#if periods?has_content>
<#if (maxConcurrentEntries < 2)>
<#assign entryWidth = 100>
Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=786422&r1=786421&r2=786422&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Fri Jun 19 09:21:44 2009
@@ -21,6 +21,51 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+ <screen name="Calendar">
+ <section>
+ <widgets>
+ <include-menu name="CalendarPortlet" location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <section>
+ <condition>
+ <if-compare field="parameters.period" operator="equals" value="day"/>
+ </condition>
+ <widgets>
+ <include-screen name="CalendarDay"/>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <if-compare field="parameters.period" operator="equals" value="week"/>
+ </condition>
+ <widgets>
+ <include-screen name="CalendarWeek"/>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <or>
+ <if-compare field="parameters.period" operator="equals" value="month"/>
+ <if-empty field="parameters.period"/>
+ </or>
+ </condition>
+ <widgets>
+ <include-screen name="CalendarMonth"/>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <or>
+ <if-compare field="parameters.period" operator="equals" value="upcoming"/>
+ </or>
+ </condition>
+ <widgets>
+ <include-screen name="CalendarUpcoming"/>
+ </widgets>
+ </section>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="CalendarDay">
<section>
<actions>
@@ -32,9 +77,12 @@
<widgets>
<decorator-screen name="CommonCalendarDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific>
+ <screenlet title="${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "EEEE MMMM d, yyyy", timeZone, locale)}" navigation-menu-name="Day">
+ <include-menu name="Day" location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/day.ftl"/></html>
- </platform-specific>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -52,9 +100,12 @@
<widgets>
<decorator-screen name="CommonCalendarDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/calendar/week.ftl"/></html>
- </platform-specific>
+ <screenlet title="${uiLabelMap.CommonWeek} ${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "w", timeZone, locale)}" navigation-menu-name="Week">
+ <include-menu name="Week" location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <platform-specific>
+ <html><html-template location="component://workeffort/webapp/workeffort/calendar/week.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -72,9 +123,12 @@
<widgets>
<decorator-screen name="CommonCalendarDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific>
+ <screenlet title="${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "MMMM yyyy", timeZone, locale)}" navigation-menu-name="Month">
+ <include-menu name="Month" location="component://workeffort/widget/WorkEffortMenus.xml"/>
+ <platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/month.ftl"/></html>
- </platform-specific>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -92,9 +146,11 @@
<widgets>
<decorator-screen name="CommonCalendarDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific>
+ <screenlet title="${uiLabelMap.WorkEffortCalendarUpComingEventsView}">
+ <platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/upcoming.ftl"/></html>
- </platform-specific>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=786422&r1=786421&r2=786422&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Fri Jun 19 09:21:44 2009
@@ -152,9 +152,7 @@
<platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/eventsByForms.ftl"/></html>
</platform-specific>
- <platform-specific>
- <html><html-template location="component://workeffort/webapp/workeffort/calendar/CalendarTabBar.ftl"/></html>
- </platform-specific>
+ <include-menu name="Calendar" location="component://workeffort/widget/WorkEffortMenus.xml"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=786422&r1=786421&r2=786422&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Fri Jun 19 09:21:44 2009
@@ -144,5 +144,65 @@
<link target="newEvent"/>
</menu-item>
</menu>
-
+ <menu name="Day">
+ <menu-item name="next" title="${uiLabelMap.WorkEffortNextDay}">
+ <link target="week?start=${nextMillis}"/>
+ </menu-item>
+ <menu-item name="toDay" title="${uiLabelMap.CommonToday}">
+ <link target="day"/>
+ </menu-item>
+ <menu-item name="prev" title="${uiLabelMap.WorkEffortPreviousDay}">
+ <link target="week?start=${prevMillis}"/>
+ </menu-item>
+ </menu>
+ <menu name="Week">
+ <menu-item name="next" title="${uiLabelMap.WorkEffortNextWeek}">
+ <link target="week?start=${nextMillis}"/>
+ </menu-item>
+ <menu-item name="thisWeek" title="${uiLabelMap.WorkEffortThisWeek}">
+ <link target="week"/>
+ </menu-item>
+ <menu-item name="prev" title="${uiLabelMap.WorkEffortPreviousWeek}">
+ <link target="week?start=${prevMillis}"/>
+ </menu-item>
+ </menu>
+ <menu name="Month">
+ <menu-item name="next" title="${uiLabelMap.WorkEffortNextMonth}">
+ <link target="week?start=${nextMillis}"/>
+ </menu-item>
+ <menu-item name="thisMonth" title="${uiLabelMap.WorkEffortThisMonth}">
+ <link target="month"/>
+ </menu-item>
+ <menu-item name="prev" title="${uiLabelMap.WorkEffortPreviousMonth}">
+ <link target="week?start=${prevMillis}"/>
+ </menu-item>
+ </menu>
+ <menu name="Calendar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="day" title="${uiLabelMap.WorkEffortDayView}">
+ <link target="day"/>
+ </menu-item>
+ <menu-item name="week" title="${uiLabelMap.WorkEffortWeekView}">
+ <link target="week"/>
+ </menu-item>
+ <menu-item name="month" title="${uiLabelMap.WorkEffortMonthView}">
+ <link target="month"/>
+ </menu-item>
+ <menu-item name="upcoming" title="${uiLabelMap.WorkEffortUpcomingEvents}">
+ <link target="upcoming"/>
+ </menu-item>
+ </menu>
+ <menu name="CalendarPortlet" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="day" title="${uiLabelMap.WorkEffortDayView}">
+ <link target="${parameters._LAST_VIEW_NAME_}?period=day"/>
+ </menu-item>
+ <menu-item name="week" title="${uiLabelMap.WorkEffortWeekView}">
+ <link target="${parameters._LAST_VIEW_NAME_}?period=week"/>
+ </menu-item>
+ <menu-item name="month" title="${uiLabelMap.WorkEffortMonthView}">
+ <link target="${parameters._LAST_VIEW_NAME_}?period=month"/>
+ </menu-item>
+ <menu-item name="upcoming" title="${uiLabelMap.WorkEffortUpcomingEvents}">
+ <link target="${parameters._LAST_VIEW_NAME_}?period=upcoming"/>
+ </menu-item>
+ </menu>
</menus>
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=786422&r1=786421&r2=786422&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Fri Jun 19 09:21:44 2009
@@ -88,6 +88,7 @@
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="SystemInfoNotes" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="SystemInfoStatus" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="Calendar" portletSeqId="00001" columnSeqId="00001" sequenceNum="2"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE0" portalPortletId="INCOM_CUST_REQUESTS" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE0" portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
@@ -110,6 +111,7 @@
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="SystemInfoNotes" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="SystemInfoStatus" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="Calendar" portletSeqId="00001" columnSeqId="00001" sequenceNum="2"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML0" portalPortletId="INCOM_CUST_REQUESTS" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML0" portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="2"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=786422&r1=786421&r2=786422&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml Fri Jun 19 09:21:44 2009
@@ -173,7 +173,7 @@
<!-- Publish the staff meeting calendar event -->
<WorkEffort workEffortId="CALENDAR_PUB_DEMO" workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED" scopeEnumId="WES_PUBLIC" description="Demo Project 1 Customer 1" workEffortName="iCalendar Publish Demonstration"/>
<WorkEffortAssoc workEffortIdFrom="CALENDAR_PUB_DEMO" workEffortIdTo="STAFF_MTG" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" fromDate="2008-01-01 00:00:00.0"/>
- <WorkEffort workEffortId="OneOffMeeting" workEffortTypeId="MEETING" currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" scopeEnumId="WES_PUBLIC" workEffortName="One off Meeting june 14" description="Staff Meeting" estimatedStartDate="2009-06-14 09:00:00.0" estimatedMilliSeconds="3600000"/>
+ <WorkEffort workEffortId="OneOffMeeting" workEffortTypeId="MEETING" currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" scopeEnumId="WES_PUBLIC" workEffortName="One off Meeting june 14" description="Staff Meeting" estimatedStartDate="2009-06-14 09:00:00.0" estimatedCompletionDate="2009-06-14 10:00:00.0"/>
<WorkEffortAssoc workEffortIdFrom="CALENDAR_PUB_DEMO" workEffortIdTo="OneOffMeeting" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" fromDate="2008-01-01 00:00:00.0"/>
<WorkEffortPartyAssignment workEffortId="OneOffMeeting" partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
<WorkEffortPartyAssignment workEffortId="OneOffMeeting" partyId="DemoEmployee2" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>