svn commit: r789058 - in /ofbiz/trunk/applications: commonext/script/org/ofbiz/ workeffort/data/ workeffort/script/ workeffort/webapp/workeffort/W
Locked
 
|
Author: hansbak
Date: Sun Jun 28 06:49:25 2009 New Revision: 789058 URL: http://svn.apache.org/viewvc?rev=789058&view=rev Log: moved calendar forms to own file, removed not used companyevents portlet, can update and cancel calendar events within the portlet calendar, removed sysinfo warnings from log Added: ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy (with props) Modified: ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml 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/CalendarForms.xml ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Modified: ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml?rev=789058&r1=789057&r2=789058&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml (original) +++ ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml Sun Jun 28 06:49:25 2009 @@ -233,12 +233,16 @@ <order-by field-name="-noteDateTime"/> </entity-and> <if-not-empty field="systemInfoNotes"> - <set field="lastSystemInfoNote1" from-field="systemInfoNotes[0]" default-value=""/> + <set field="lastSystemInfoNote1" from-field="systemInfoNotes[0]"/> <field-to-result field="lastSystemInfoNote1"/> - <set field="lastSystemInfoNote2" from-field="systemInfoNotes[1]" default-value=""/> - <field-to-result field="lastSystemInfoNote2"/> - <set field="lastSystemInfoNote3" from-field="systemInfoNotes[2]" default-value=""/> - <field-to-result field="lastSystemInfoNote3"/> + <if-not-empty field="systemInfoNotes[2]"> + <set field="lastSystemInfoNote2" from-field="systemInfoNotes[1]"/> + <field-to-result field="lastSystemInfoNote2"/> + </if-not-empty> + <if-not-empty field="systemInfoNotes[3]"> + <set field="lastSystemInfoNote3" from-field="systemInfoNotes[2]"/> + <field-to-result field="lastSystemInfoNote3"/> + </if-not-empty> </if-not-empty> </simple-method> Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml?rev=789058&r1=789057&r2=789058&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml (original) +++ ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml Sun Jun 28 06:49:25 2009 @@ -18,14 +18,7 @@ under the License. --> <entity-engine-xml> - <!-- company events --> <PortletCategory portletCategoryId="EVENTSTASKS" description="Events and Tasks"/> - <PortalPortlet portalPortletId="mycompanycomms" - portletName="My Company Comms" - screenName="MyCompanyComms" - 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" Added: ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy?rev=789058&view=auto ============================================================================== --- ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy (added) +++ ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy Sun Jun 28 06:49:25 2009 @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + +import org.ofbiz.entity.util.*; + + +partyAssign = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : parameters.workEffortId, "partyId" : parameters.userLogin.partyId])); + +if (partyAssign) { + if (partyAssign.get(0).roleTypeId.equals("CAL_OWNER")) { + context.isCalOwner = new Boolean(true); + } else{ + context.isCalOwner = new Boolean(false); + } +} Propchange: ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/workeffort/script/isCalOwner.groovy ------------------------------------------------------------------------------ svn:mime-type = text/plain 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=789058&r1=789057&r2=789058&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Sun Jun 28 06:49:25 2009 @@ -116,13 +116,13 @@ <request-map uri="updateWorkEffort"> <security https="true" auth="true"/> <event type="service" invoke="updateWorkEffort"/> - <response name="success" type="view" value="EditWorkEffort"/> + <response name="success" type="view-home" value="EditWorkEffort"/> <response name="error" type="view" value="EditWorkEffort"/> </request-map> <request-map uri="deleteWorkEffort"> <security https="true" auth="true"/> <event type="service" invoke="deleteWorkEffort"/> - <response name="success" type="view" value="ListWorkEfforts"/> + <response name="success" type="view-home" value="ListWorkEfforts"/> <response name="error" type="view" value="ListWorkEfforts"/> </request-map> @@ -749,7 +749,6 @@ <view-map name="EditAgreementWorkEffortAppls" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditAgreementWorkEffortAppls"/> <view-map name="LookupAgreement" page="component://accounting/widget/LookupScreens.xml#LookupAgreement" type="screen"/> <view-map name="LookupAgreementItem" page="component://accounting/widget/LookupScreens.xml#LookupAgreementItem" type="screen"/> - <view-map name="myCompanyComms" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#MyCompanyComms"/> <view-map name="newEvent" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#newCompanyEvent"/> <!-- end of view mappings --> </site-conf> 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=789058&r1=789057&r2=789058&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl Sun Jun 28 06:49:25 2009 @@ -66,7 +66,7 @@ <#else> ${startDate?time?string.short}-${completionDate?time?string.short} </#if> - <br/><a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?form=show&period=day&start=${parameters.start?if_exists}&workEffortId=${calEntry.workEffort.workEffortId}${addlParam?if_exists}</@ofbizUrl>">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td> + <br/><a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?form=edit&period=day&start=${parameters.start?if_exists}&workEffortId=${calEntry.workEffort.workEffortId}${addlParam?if_exists}</@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=789058&r1=789057&r2=789058&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl Sun Jun 28 06:49:25 2009 @@ -81,7 +81,7 @@ ${startDate?time?string.short}-${completionDate?time?string.short} </#if> <br/> - <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?form=show&period=month&start=${parameters.start?if_exists}&workEffortId=${calEntry.workEffort.workEffortId}${addlParam?if_exists}</@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> ${calEntry.eventStatus?default(" ")} + <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?form=edit&period=month&start=${parameters.start?if_exists}&workEffortId=${calEntry.workEffort.workEffortId}${addlParam?if_exists}</@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=789058&r1=789057&r2=789058&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl Sun Jun 28 06:49:25 2009 @@ -68,7 +68,7 @@ <#else> ${startDate?time?string.short}-${completionDate?time?string.short} </#if> - <br/><a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?form=show&period=week&start=${parameters.start?if_exists}&workEffortId=${calEntry.workEffort.workEffortId}${addlParam?if_exists}</@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td> + <br/><a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?form=edit&period=week&start=${parameters.start?if_exists}&workEffortId=${calEntry.workEffort.workEffortId}${addlParam?if_exists}</@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td> </#if> </#list> <#if (period.calendarEntries?size < maxConcurrentEntries)> Modified: ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml?rev=789058&r1=789057&r2=789058&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml Sun Jun 28 06:49:25 2009 @@ -31,4 +31,83 @@ </field> <field name="updateButton"><submit/></field> </form> + <form name="editCalEvent" type="single" target="createWorkEffortAndPartyAssign" default-map-name="workEffort"> + <alt-target use-when="workEffort!=null" target="updateWorkEffort"/> + <field name="workEffortId" use-when="workEffort!=null"><hidden/></field> + <field name="partyId"><hidden value="${parameters.userLogin.partyId}"/></field> + <field name="roleTypeId" use-when="workEffort==null"><hidden value="CAL_OWNER"/></field> + <field name="workEffortTypeId"><hidden value="EVENT"/></field> + <field name="statusId" use-when="workEffort==null"><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="workEffortTypeId"> + <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"> + <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"><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="cancelEvent" type="single" target="updateWorkEffort"> + <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field> + <field name="currentStatusId"><hidden value="CAL_CANCELLED"/></field> + <field name="cancel" title="Cancel the Event"><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}"><display/></field> + <field name="workEffortTypeId"> + <display-entity entity-name="WorkEffortType" description="${description}"/> + </field> + <field name="scopeEnumId"> + <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/> + </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" size="10"></lookup></field> + <field name="roleTypeId" position="2"> + <drop-down no-current-selected-key="CAL_ATTENDEE"> + <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> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=789058&r1=789057&r2=789058&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Sun Jun 28 06:49:25 2009 @@ -122,48 +122,71 @@ <section> <actions> <entity-one entity-name="WorkEffort" value-field="workEffort"/> + <script location="component://workeffort/script/isCalOwner.groovy"/> </actions> <widgets> <section> <condition> - <if-compare field="parameters.form" operator="equals" value="edit"/> + <and> + <or> + <and> + <not><if-empty field="workEffort"/></not> + <if-compare field="workEffort.currentStatusId" operator="not-equals" value="CAL_CANCELLED"/> + </and> + <if-empty field="workEffort"/> + </or> + <if-compare field="parameters.form" operator="equals" value="edit"/> + </and> </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> + <condition> + <or> + <if-compare field="isCalOwner" operator="equals" value="true" type="Boolean"/> + <if-empty field="workEffort"/> + </or> + </condition> + <widgets><!-- edit section --> + <container style="lefthalf"> + <label style="h1" text="Add/Edit a Calendar Event"/> + <include-form name="editCalEvent" location="component://workeffort/widget/CalendarForms.xml"/> + </container> + <container style="righthalf"> + <label style="h1" text="Participants"/> + <include-form name="showCalEventRolesDel" location="component://workeffort/widget/CalendarForms.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/CalendarForms.xml"/> + <section> + <condition> + <not><if-empty field="workEffort"/></not> + </condition> + <widgets> + <include-form name="cancelEvent" location="component://workeffort/widget/CalendarForms.xml"/> + </widgets> + </section> + </widgets> + </section> + </container> + </widgets> + <fail-widgets><!-- view section --> + <container style="lefthalf"> + <label style="h1" text="Calendar Event Summary"/> + <include-form name="showCalEvent" location="component://workeffort/widget/CalendarForms.xml"/> + </container> + <container style="righthalf"> + <label style="h1" text="Participants"/> + <include-form name="showCalEventRoles" location="component://workeffort/widget/CalendarForms.xml"/> + </container> + </fail-widgets> + </section> + </widgets> </section> </widgets> </section> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=789058&r1=789057&r2=789058&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sun Jun 28 06:49:25 2009 @@ -1335,95 +1335,4 @@ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="MyCompanyComms" type="list" list-name="events" target="deleteEvent" paginate-target="FindTask" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <actions> - <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> - <entity-condition entity-name="WorkEffort"> - <condition-list combine="and"> - <condition-expr field-name="workEffortTypeId" operator="equals" value="COMPANY_EVENT"/> - <condition-expr field-name="actualStartDate" operator="greater-equals" from-field="nowDate"/> - </condition-list> - <order-by field-name="actualStartDate"/> - </entity-condition> - </actions> - <field name="workEffortId"><hidden/></field> - <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><display/></field> - <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> - <field name="actualStartDate" title="${uiLabelMap.CommonActualStartDate}"><display type="date"/></field> - <field name="delete" title="${uiLabelMap.CommonDelete}"><submit button-type="text-link"/></field> - </form> - - <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="workEffortTypeId"> - <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"> - <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"><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}"><display/></field> - <field name="workEffortTypeId"> - <display-entity entity-name="WorkEffortType" description="${description}"/> - </field> - <field name="scopeEnumId"> - <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/> - </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/applications/workeffort/widget/WorkEffortMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=789058&r1=789057&r2=789058&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Sun Jun 28 06:49:25 2009 @@ -139,11 +139,6 @@ </link> </menu-item> </menu> - <menu name="MyCompanyCommsMenu"> - <menu-item name="newEvent" title="${uiLabelMap.WorkEffortNewEvent}"> - <link target="newEvent"/> - </menu-item> - </menu> <menu name="Day" extends="Calendar"> <menu-item name="next" title="${uiLabelMap.WorkEffortNextDay}"> <link target="${parameters._LAST_VIEW_NAME_}?period=day&start=${nextMillis}&fixedAssetId=${parameters.fixedAssetId}"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |