svn commit: r929072 - in /ofbiz/trunk/applications/workeffort: webapp/workeffort/calendar/calendarEventContent.ftl widget/CalendarScreens.xml

[jacopoc]

Author: jacopoc
Date: Tue Mar 30 10:41:48 2010
New Revision: 929072

URL: http://svn.apache.org/viewvc?rev=929072&view=rev
Log:
Added information about order ship dates for production runs (or tasks) associated to an order.

Modified:
    ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl
    ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl?rev=929072&r1=929071&r2=929072&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl Tue Mar 30 10:41:48 2010
@@ -22,11 +22,33 @@ under the License.
     ${workEffort.workEffortId}
   </a>
   &nbsp;${workEffort.workEffortName?default("Undefined")}
+  <#if workOrderItemFulfillments?has_content>
+    <#list workOrderItemFulfillments as workOrderItemFulfillment>
+      <br/>${uiLabelMap.OrderOrderId}: <a href="/ordermgr/control/orderview?orderId=${workOrderItemFulfillment.orderId}" class="event">${workOrderItemFulfillment.orderId} / ${workOrderItemFulfillment.orderItemSeqId}</a>
+      <#assign orderItemAndShipGroupAssocs = delegator.findByAnd("OrderHeaderItemAndShipGroup", {"orderId", workOrderItemFulfillment.orderId, "orderItemSeqId", workOrderItemFulfillment.orderItemSeqId})?if_exists/>
+      <#list orderItemAndShipGroupAssocs as orderItemAndShipGroupAssoc>
+        <#if orderItemAndShipGroupAssoc.shipByDate?has_content>
+          ${uiLabelMap.OrderShipBeforeDate}: ${orderItemAndShipGroupAssoc.shipByDate}
+        </#if>
+      </#list>
+    </#list>
+  </#if>
 <#elseif workEffort.workEffortTypeId == "PROD_ORDER_TASK">
   <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}" class="event">
     ${workEffort.workEffortParentId} / ${workEffort.workEffortId}
   </a>
   &nbsp;${workEffort.workEffortName?default("Undefined")}<#if workEffort.reservPersons?exists>&nbsp;Persons:${workEffort.reservPersons}</#if>
+  <#if parentWorkOrderItemFulfillments?has_content>
+    <#list parentWorkOrderItemFulfillments as parentWorkOrderItemFulfillment>
+      <br/>${uiLabelMap.OrderOrderId}: <a href="/ordermgr/control/orderview?orderId=${parentWorkOrderItemFulfillment.orderId}" class="event">${parentWorkOrderItemFulfillment.orderId} / ${parentWorkOrderItemFulfillment.orderItemSeqId}</a>
+      <#assign orderItemAndShipGroupAssocs = delegator.findByAnd("OrderHeaderItemAndShipGroup", {"orderId", parentWorkOrderItemFulfillment.orderId, "orderItemSeqId", parentWorkOrderItemFulfillment.orderItemSeqId})?if_exists/>
+      <#list orderItemAndShipGroupAssocs as orderItemAndShipGroupAssoc>
+        <#if orderItemAndShipGroupAssoc.shipByDate?has_content>
+          ${uiLabelMap.OrderShipBeforeDate}: ${orderItemAndShipGroupAssoc.shipByDate}
+        </#if>
+      </#list>
+    </#list>
+  </#if>
 <#else>
   <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?form=edit&amp;parentTypeId=${parentTypeId?if_exists}&amp;period=${periodType?if_exists}&amp;start=${parameters.start?if_exists}&amp;workEffortId=${workEffort.workEffortId}${addlParam?if_exists}${urlParam?if_exists}</@ofbizUrl>" class="event">
     ${workEffort.workEffortId}

Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=929072&r1=929071&r2=929072&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Tue Mar 30 10:41:48 2010
@@ -229,6 +229,9 @@ under the License.
                 <set field="periodType" value="${groovy: request.getAttribute('periodType');}"/>
                 <set field="workEffortId" value="${groovy: request.getAttribute('workEffortId');}"/>
                 <entity-one entity-name="WorkEffort" value-field="workEffort"/>
+                <get-related-one value-field="workEffort" relation-name="ParentWorkEffort" to-value-field="parentWorkEffort"/>
+                <get-related value-field="workEffort" relation-name="WorkOrderItemFulfillment" list="workOrderItemFulfillments"/>
+                <get-related value-field="parentWorkEffort" relation-name="WorkOrderItemFulfillment" list="parentWorkOrderItemFulfillments"/>
             </actions>
             <widgets>
                 <platform-specific><html><html-template location="component://workeffort/webapp/workeffort/calendar/calendarEventContent.ftl"/></html></platform-specific>