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/22 10:27:26 UTC
svn commit: r787161 - in /ofbiz/trunk: applications/workeffort/config/
applications/workeffort/webapp/workeffort/WEB-INF/
applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/
applications/workeffort/webapp/workeffort/calendar/ applicatio...
Author: hansbak
Date: Mon Jun 22 08:27:26 2009
New Revision: 787161
URL: http://svn.apache.org/viewvc?rev=787161&view=rev
Log:
add add/show event inside the calendar portlet, this replaces the 'company events' in my portal: entering a public event can be seen by all users of the system
Modified:
ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
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/week.ftl
ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=787161&r1=787160&r2=787161&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Mon Jun 22 08:27:26 2009
@@ -1558,12 +1558,6 @@
<value xml:lang="th">à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸</value>
<value xml:lang="zh">è¯è®º</value>
</property>
- <property key="WorkEffortCompanyEvents">
- <value xml:lang="en">Company events</value>
- <value xml:lang="fr">Evènements de l'entreprise</value>
- <value xml:lang="it">Eventi aziendali</value>
- <value xml:lang="th">à¹à¸«à¸à¸¸à¸à¸²à¸£à¸à¹à¸à¸£à¸´à¸©à¸±à¸</value>
- </property>
<property key="WorkEffortCompanyName">
<value xml:lang="en">OFBiz: WorkEffort Manager</value>
<value xml:lang="es">OFBiz: Administración de tareas</value>
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=787161&r1=787160&r2=787161&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 Mon Jun 22 08:27:26 2009
@@ -48,7 +48,7 @@
}
Timestamp start = null;
-if (startParam != null) {
+if (UtilValidate.isNotEmpty(startParam)) {
start = new Timestamp(Long.parseLong(startParam));
}
if (start == null) {
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=787161&r1=787160&r2=787161&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 Mon Jun 22 08:27:26 2009
@@ -48,8 +48,9 @@
}
Timestamp start = null;
-if (startParam != null)
+if (UtilValidate.isNotEmpty(startParam)) {
start = new Timestamp(Long.parseLong(startParam));
+}
if (start == null) {
start = UtilDateTime.getWeekStart(nowTimestamp, timeZone, locale);
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=787161&r1=787160&r2=787161&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Mon Jun 22 08:27:26 2009
@@ -83,6 +83,12 @@
<response name="success" type="view" value="EditWorkEffort"/>
<response name="error" type="view" value="EditWorkEffort"/>
</request-map>
+ <request-map uri="createWorkEffortAndPartyAssign">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createWorkEffortAndPartyAssign"/>
+ <response name="success" type="view-home"/>
+ <response name="error" type="view-last"/>
+ </request-map>
<request-map uri="createWorkEffortAssoc">
<security https="true" auth="true"/>
<event type="service" invoke="createWorkEffortAssoc"/>
@@ -657,27 +663,6 @@
<response name="success" type="view" value="ListWorkEffortEventReminders"/>
</request-map>
- <!-- COMPANY Events -->
- <request-map uri="myCompanyComms">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="myCompanyComms" save-current-view="true"/>
- </request-map>
- <request-map uri="newEvent">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="newEvent"/>
- </request-map>
- <request-map uri="createEvent">
- <security https="true" auth="true"/>
- <event type="service" invoke="createWorkEffort"/>
- <response name="success" type="view-last" value="myCompanyComms"/>
- <response name="error" type="view" value="newEvent"/>
- </request-map>
- <request-map uri="deleteEvent">
- <security https="true" auth="true"/>
- <event type="service" invoke="deleteWorkEffort"/>
- <response name="success" type="view-last" value="myCompanyComms"/>
- </request-map>
-
<!-- end of request mappings -->
<!-- View Mappings -->
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=787161&r1=787160&r2=787161&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl Mon Jun 22 08:27:26 2009
@@ -33,7 +33,7 @@
<tr<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
<td class="label">
${period.start?time?string.short}<br/>
- <a href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam?if_exists}</...@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+ <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&form=edit&start=${parameters.start?if_exists}¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam?if_exists}</...@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
</td>
<#list period.calendarEntries as calEntry>
<#if calEntry.workEffort.actualStartDate?exists>
@@ -66,7 +66,7 @@
<#else>
${startDate?time?string.short}-${completionDate?time?string.short}
</#if>
- <br/><a href="<@o...@ofbizUrl>">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td>
+ <br/><a href="<@o...@ofbizUrl>">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td>
</#if>
</#list>
<#if (period.calendarEntries?size < maxConcurrentEntries)>
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=787161&r1=787160&r2=787161&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl Mon Jun 22 08:27:26 2009
@@ -49,7 +49,7 @@
</#if>
<td<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
<span class="h1"><a href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&start=${period.start.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span>
- <a class="add-new" href='<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam?if_exists}</...@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
+ <a class="add-new" href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=month&form=edit&start=${parameters.start?if_exists}¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam?if_exists}</...@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
<br class="clear"/>
<#list period.calendarEntries as calEntry>
<#if calEntry.workEffort.actualStartDate?exists>
@@ -81,7 +81,7 @@
${startDate?time?string.short}-${completionDate?time?string.short}
</#if>
<br/>
- <a href="<@o...@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> ${calEntry.eventStatus?default(" ")}
+ <a href="<@o...@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> ${calEntry.eventStatus?default(" ")}
<br/>
</#list>
</td>
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=787161&r1=787160&r2=787161&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl Mon Jun 22 08:27:26 2009
@@ -32,8 +32,8 @@
<#if (nowTimestamp >= period.start) && (nowTimestamp <= period.end)><#assign currentPeriod = true/></#if>
<tr<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
<td class="centered" width="1%">
- <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&start=${period.start.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br/>
- <a href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam?if_exists}</...@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+ <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&start=${period.start.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br/>
+ <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&form=edit&start=${parameters.start?if_exists}&workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam?if_exists}</...@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
</td>
<#list period.calendarEntries as calEntry>
<#if calEntry.workEffort.actualStartDate?exists>
@@ -68,7 +68,7 @@
<#else>
${startDate?time?string.short}-${completionDate?time?string.short}
</#if>
- <br/><a href="<@o...@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td>
+ <br/><a href="<@o...@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td>
</#if>
</#list>
<#if (period.calendarEntries?size < maxConcurrentEntries)>
Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=787161&r1=787160&r2=787161&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Mon Jun 22 08:27:26 2009
@@ -26,10 +26,7 @@
<widgets>
<section>
<condition>
- <or>
- <if-compare field="parameters.period" operator="equals" value="day"/>
- <if-empty field="parameters.period"/>
- </or>
+ <if-compare field="parameters.period" operator="equals" value="day"/>
</condition>
<actions>
<set field="titleProperty" value="PageTitleCalendarDay"/>
@@ -39,6 +36,8 @@
<widgets>
<screenlet title="${uiLabelMap.WorkEffortDayView}: ${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"/>
+ <include-screen name="addEvent"/>
+ <include-screen name="showEvent"/>
<platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/day.ftl"/></html>
</platform-specific>
@@ -47,7 +46,10 @@
</section>
<section>
<condition>
- <if-compare field="parameters.period" operator="equals" value="week"/>
+ <or>
+ <if-compare field="parameters.period" operator="equals" value="week"/>
+ <if-empty field="parameters.period"/>
+ </or>
</condition>
<actions>
<set field="titleProperty" value="PageTitleCalendarWeek"/>
@@ -57,6 +59,8 @@
<widgets>
<screenlet title="${uiLabelMap.WorkEffortWeekView}: ${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"/>
+ <include-screen name="addEvent"/>
+ <include-screen name="showEvent"/>
<platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/week.ftl"/></html>
</platform-specific>
@@ -75,6 +79,8 @@
<widgets>
<screenlet title="${uiLabelMap.WorkEffortMonthView}: ${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"/>
+ <include-screen name="addEvent"/>
+ <include-screen name="showEvent"/>
<platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/calendar/month.ftl"/></html>
</platform-specific>
@@ -116,4 +122,30 @@
</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">
+ <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"/>
+ </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=787161&r1=787160&r2=787161&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Mon Jun 22 08:27:26 2009
@@ -1354,14 +1354,45 @@
<field name="delete" title="${uiLabelMap.CommonDelete}"><submit button-type="text-link"/></field>
</form>
- <form name="newEvent" type="single" target="createEvent">
- <field name="portalPageId"><hidden/></field>
- <field name="workEffortTypeId"><hidden value="COMPANY_EVENT"/></field>
- <field name="currentStatusId"><hidden value="_NA_"/></field>
+ <form name="addCalEvent" type="single" target="createWorkEffortAndPartyAssign">
+ <field name="partyId"><hidden value="${parameters.userLogin.partyId}"/></field>
+ <field name="roleTypeId"><hidden value="CAL_OWNER"/></field>
+ <field name="workEffortTypeId"><hidden value="EVENT"/></field>
+ <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}"><text/></field>
- <field name="actualStartDate"><date-time type="date"/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}" position="2"><text/></field>
+ <field name="workEffortTypeId" position="1">
+ <drop-down no-current-selected-key="MEETING">
+ <entity-options entity-name="WorkEffortType" description="${description}">
+ <entity-constraint name="parentTypeId" value="EVENT"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="scopeEnumId" position="2">
+ <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"/>
+ <entity-order-by field-name="description"/>
+ </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="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">
+ <display-entity entity-name="WorkEffortType" description="${description}"/>
+ </field>
+ <field name="scopeEnumId" position="2">
+ <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>
+ </form>
+
</forms>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=787161&r1=787160&r2=787161&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Mon Jun 22 08:27:26 2009
@@ -828,37 +828,4 @@
</widgets>
</section>
</screen>
- <screen name="newCompanyEvent">
- <section>
- <widgets>
- <section>
- <widgets>
- <decorator-screen name="main-decorator"
- location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet>
- <include-form name="newEvent"
- location="component://workeffort/widget/WorkEffortForms.xml"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </widgets>
- </section>
- </screen>
- <screen name="MyCompanyComms">
- <section>
- <actions>
- <set field="portalPageId" from-field="parameters.portalPageId"/>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.WorkEffortCompanyEvents}" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
- <include-menu name="MyCompanyCommsMenu" location="component://workeffort/widget/WorkEffortMenus.xml"/>
- <include-form name="MyCompanyComms" location="component://workeffort/widget/WorkEffortForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </screen>
-
</screens>
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=787161&r1=787160&r2=787161&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Mon Jun 22 08:27:26 2009
@@ -19,7 +19,6 @@
-->
<entity-engine-xml>
- <WorkEffortType description="Company Events" hasTable="N" parentTypeId="EVENT" workEffortTypeId="COMPANY_EVENT"/>
<RoleType description="Email Administrator" hasTable="N" parentTypeId="PERSON_ROLE" roleTypeId="EMAIL_ADMIN"/>
<!-- ProductStoreEmailSetting for send auto email to customer when CustRequest completed -->
@@ -34,7 +33,6 @@
<PortalPage portalPageId="MYPORTAL_EMPLOYEE0" sequenceNum="50" portalPageName="My Comms" description="The OFBiz My Communications page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
<PortalPage portalPageId="MYPORTAL_EMPLOYEE1" sequenceNum="100" portalPageName="My Profile" description="The OFBiz My Portal Profile page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
<PortalPage portalPageId="MYPORTAL_EMPLOYEE2" sequenceNum="200" portalPageName="Other Party Comms" description="The OFBiz My Portal other commmunication page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE3" sequenceNum="300" portalPageName="Company Events" description="The OFBiz My Portal Company Events page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
<PortalPage portalPageId="MYPORTAL_EMPLOYEE4" sequenceNum="400" portalPageName="My Time Sheet" description="The OFBiz My Portal Timesheet page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
<PortalPage portalPageId="MYPORTAL_EMPLOYEE5" sequenceNum="500" portalPageName="My Tasks" description="The OFBiz My Portal My Task page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
@@ -42,7 +40,6 @@
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML0" sequenceNum="50" portalPageName="My Comms" description="The OFBiz My Communications page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML1" sequenceNum="100" portalPageName="My Profile" description="The OFBiz My Portal Profile page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML2" sequenceNum="200" portalPageName="Other Party Comms" description="The OFBiz My Portal other commmunication page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
- <PortalPage portalPageId="MYPORTAL_EMPL-NOEML3" sequenceNum="300" portalPageName="Company Events" description="The OFBiz My Portal Company Events page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML4" sequenceNum="400" portalPageName="My Time Sheet" description="The OFBiz My Portal Timesheet page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML5" sequenceNum="500" portalPageName="My Tasks" description="The OFBiz My Portal My Task page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
@@ -60,7 +57,6 @@
<PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE1" columnSeqId="00001" columnWidthPercentage="50"/>
<PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE1" columnSeqId="00002" columnWidthPercentage="50"/>
<PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE2" columnSeqId="00001"/>
- <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE3" columnSeqId="00001"/>
<PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE4" columnSeqId="00001"/>
<PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE5" columnSeqId="00001"/>
@@ -69,7 +65,6 @@
<PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML1" columnSeqId="00001" columnWidthPercentage="50"/>
<PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML1" columnSeqId="00002" columnWidthPercentage="50"/>
<PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML2" columnSeqId="00001"/>
- <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML3" columnSeqId="00001"/>
<PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML4" columnSeqId="00001"/>
<PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML5" columnSeqId="00001"/>
@@ -105,7 +100,6 @@
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" sequenceNum="11"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE2" portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortletAttribute portalPageId="MYPORTAL_EMPLOYEE2" portalPortletId="MyCommunications" portletSeqId="00001" attrName="communicationPartyId" attrValue="Company"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE3" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE4" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE5" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
@@ -124,7 +118,6 @@
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" sequenceNum="7"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML2" portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortletAttribute portalPageId="MYPORTAL_EMPL-NOEML2" portalPortletId="MyCommunications" portletSeqId="00001" attrName="communicationPartyId" attrValue="Company"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML3" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML4" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML5" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>