Author: adrianc
Date: Tue Feb  2 00:32:01 2010
New Revision: 905475

URL: http://svn.apache.org/viewvc?rev=905475&view=rev
Log:
Fix work effort demo data that was broken in rev 786756. The recurring event 
demo and iCalendar demo work now. Also changed deprecated temporal expression 
to the new version.

Modified:
    ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml

Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml?rev=905475&r1=905474&r2=905475&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml Tue Feb  2 
00:32:01 2010
@@ -18,37 +18,42 @@
 under the License.
 -->
 <entity-engine-xml>
-    <Party partyId="DemoEmployee1"/><!-- further defined in the projectmanager 
-->
-    <Party partyId="DemoEmployee2"/>
-    <Party partyId="DemoEmployee3"/>
     <!-- Recurring calendar event demo - set up a staff meeting on the first 
Monday of each month -->
     <TemporalExpression tempExprId="STAFF_MTG" tempExprTypeId="INTERSECTION"/>
-    <TemporalExpression tempExprId="10AM" tempExprTypeId="TIME_OF_DAY_RANGE" 
string1="10:00" string2="10:00"/>
     <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" 
toTempExprId="1ST_MONDAY_IN_MONTH"/>
-    <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" toTempExprId="10AM"/>
+    <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" 
toTempExprId="MINUTE_00"/>
+    <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" 
toTempExprId="HOUR_10"/>
+    <WorkEffort workEffortId="STAFF_MTG" workEffortTypeId="MEETING" 
currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" 
scopeEnumId="WES_PUBLIC" workEffortName="Staff Meeting" description="Staff 
Meeting" tempExprId="STAFF_MTG" estimatedStartDate="2008-01-01 00:00:00.0" 
estimatedMilliSeconds="3600000"/>
     <FixedAsset fixedAssetId="DEMO_PROJECTOR" fixedAssetName="Overhead 
Projector" fixedAssetTypeId="EQUIPMENT" purchaseCost="2000" 
purchaseCostUomId="USD"/>
-    <WorkEffort workEffortId="STAFF_MTG" workEffortTypeId="MEETING" 
currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" 
scopeEnumId="WES_PRIVATE" workEffortName="Staff Meeting first monday of the 
month" description="Staff Meeting" tempExprId="STAFF_MTG" 
estimatedStartDate="2008-01-01 00:00:00.0" estimatedMilliSeconds="3600000"/>
     <WorkEffortFixedAssetAssign workEffortId="STAFF_MTG" 
fixedAssetId="DEMO_PROJECTOR" statusId="FA_ASGN_REQUESTED" 
availabilityStatusId="WEFA_IN_USE" fromDate="2008-01-01 00:00:00.0"/>
+    
+    <!-- Publish the staff meeting calendar event in iCalendar format -->
+    <WorkEffort workEffortId="CALENDAR_PUB_DEMO" 
workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED" 
scopeEnumId="WES_PUBLIC" description="Demo Project 1 Customer 1" 
workEffortName="iCalendar Publish Demonstration"/>
+    <WorkEffortPartyAssignment workEffortId="CALENDAR_PUB_DEMO" 
partyId="admin" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" 
fromDate="2008-01-01 00:00:00.0"/>
+    <WorkEffortAssoc workEffortIdFrom="CALENDAR_PUB_DEMO" 
workEffortIdTo="STAFF_MTG" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" 
fromDate="2008-01-01 00:00:00.0"/>
+
+    <!--  Project Manager demo data -->
+    <Party partyId="DemoEmployee1"/><!-- further defined in the projectmanager 
-->
+    <Party partyId="DemoEmployee2"/>
+    <Party partyId="DemoEmployee3"/>
+    <WorkEffort workEffortId="PROJECT_PUB_DEMO" 
workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED" 
scopeEnumId="WES_PRIVATE" description="Demo Project 1 Customer 1" 
workEffortName="Project iCalendar Publish Demonstration"/>
+    <WorkEffortPartyAssignment workEffortId="PROJECT_PUB_DEMO" 
partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" 
fromDate="2008-01-01 00:00:00.0"/>
     <WorkEffortPartyAssignment workEffortId="STAFF_MTG" 
partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" 
availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
     <WorkEffortPartyAssignment workEffortId="STAFF_MTG" 
partyId="DemoEmployee2" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" 
availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
     <WorkEffortPartyAssignment workEffortId="STAFF_MTG" 
partyId="DemoEmployee3" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" 
availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
     <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="admin" 
statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" 
availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
-    
-    <!-- Publish the staff meeting calendar event -->
-    <WorkEffort workEffortId="CALENDAR_PUB_DEMO" 
workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED" 
scopeEnumId="WES_PRIVATE" 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"/>
     <!-- one off event -->
     <WorkEffort workEffortId="OneOffMeeting" workEffortTypeId="MEETING" 
currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" 
scopeEnumId="WES_PRIVATE" workEffortName="One off Meeting june 12" 
description="Staff Meeting" estimatedStartDate="2009-06-12 09:00:00.0" 
estimatedCompletionDate="2009-06-12 10:00:00.0"/>
-    <WorkEffortAssoc workEffortIdFrom="CALENDAR_PUB_DEMO" 
workEffortIdTo="OneOffMeeting" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" 
fromDate="2008-01-01 00:00:00.0"/>
+    <WorkEffortAssoc workEffortIdFrom="PROJECT_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"/>
     <WorkEffortPartyAssignment workEffortId="OneOffMeeting" partyId="admin" 
statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" 
availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
     <!-- private one off event for employee1 should not show with admin-->
     <WorkEffort workEffortId="PrivateDemoEmployee1" workEffortTypeId="MEETING" 
currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" 
scopeEnumId="WES_PRIVATE" workEffortName="My Wifes birthday june 29" 
description="The birthday i should never forget" estimatedStartDate="2009-06-29 
00:00:00.0" estimatedCompletionDate="2009-06-29 23:00:00.0"/>
-    <WorkEffortAssoc workEffortIdFrom="CALENDAR_PUB_DEMO" 
workEffortIdTo="PrivateDemoEmployee1" 
workEffortAssocTypeId="WORK_EFF_DEPENDENCY" fromDate="2008-01-01 00:00:00.0"/>
+    <WorkEffortAssoc workEffortIdFrom="PROJECT_PUB_DEMO" 
workEffortIdTo="PrivateDemoEmployee1" 
workEffortAssocTypeId="WORK_EFF_DEPENDENCY" fromDate="2008-01-01 00:00:00.0"/>
     <WorkEffortPartyAssignment workEffortId="PrivateDemoEmployee1" 
partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" 
availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
     <!-- public event -->
     <WorkEffort workEffortId="PublicEvent" workEffortTypeId="MEETING" 
currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" 
scopeEnumId="WES_PUBLIC" workEffortName="The general company party june 17" 
description="General Party" locationDesc="Tom's Banquet Hall" 
estimatedStartDate="2009-06-17 19:00:00.0" estimatedCompletionDate="2009-06-17 
23:00:00.0"/>
-    <WorkEffortAssoc workEffortIdFrom="CALENDAR_PUB_DEMO" 
workEffortIdTo="PublicEvent" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" 
fromDate="2008-01-01 00:00:00.0"/>
+    <WorkEffortAssoc workEffortIdFrom="PROJECT_PUB_DEMO" 
workEffortIdTo="PublicEvent" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" 
fromDate="2008-01-01 00:00:00.0"/>
     
 </entity-engine-xml>


Reply via email to