svn commit: r813277 - in /ofbiz/trunk/applications/manufacturing/webapp/manufacturing: WEB-INF/actions/jobshopmgt/ jobshopmgt/

[jacopoc]

Author: jacopoc
Date: Thu Sep 10 07:35:09 2009
New Revision: 813277

URL: http://svn.apache.org/viewvc?rev=813277&view=rev
Log:
Misc enhancements to the production run's content display.

Modified:
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunContent.groovy
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunContent.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunContent.groovy?rev=813277&r1=813276&r2=813277&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunContent.groovy (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunContent.groovy Thu Sep 10 07:35:09 2009
@@ -23,7 +23,7 @@
 productionRunId = parameters.productionRunId ?: parameters.workEffortId;
 context.productionRunId = productionRunId;
 
-delivGoodStandard = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("WorkEffortGoodStandard", [workEffortId : productionRunId, workEffortGoodStdTypeId : "PRUN_PROD_DELIV"], ["-fromDate"])));
+delivGoodStandard = EntityUtil.getFirst(delegator.findByAnd("WorkEffortGoodStandard", [workEffortId : productionRunId, workEffortGoodStdTypeId : "PRUN_PROD_DELIV", statusId : "WEGS_CREATED"], ["-fromDate"]));
 if (delivGoodStandard) {
     context.delivProductId = delivGoodStandard.productId;
 }

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=813277&r1=813276&r2=813277&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Thu Sep 10 07:35:09 2009
@@ -222,6 +222,9 @@
                 }
             }
         }
+        // Content
+        productionRunContents = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortContentAndInfo", [workEffortId : productionRunId], ["-fromDate"]));
+        context.productionRunContents = productionRunContents;
         context.productionRunComponentsData = productionRunComponentsData;
         context.productionRunComponentsDataReadyForIssuance = productionRunComponentsDataReadyForIssuance;
         context.productionRunComponentsAlreadyIssued = productionRunComponentsAlreadyIssued;

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl?rev=813277&r1=813276&r2=813277&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl Thu Sep 10 07:35:09 2009
@@ -74,13 +74,13 @@
                 <fo:table-body>
                     <fo:table-row>
                         <fo:table-cell padding="2pt">
-                            <fo:block> title="${uiLabelMap.ManufacturingStartDate}":</fo:block>
+                            <fo:block>${uiLabelMap.ManufacturingStartDate}:</fo:block>
                         </fo:table-cell>
                         <fo:table-cell padding="2pt">
                             <fo:block><#if productionRunData.estimatedStartDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.estimatedStartDate, "dd/MM/yyyy")}</#if></fo:block>
                         </fo:table-cell>
                         <fo:table-cell padding="2pt">
-                            <fo:block>${uiLabelMap.FormFieldTitle_actualStartDate}:</fo:block>
+                            <fo:block>${uiLabelMap.CommonStartDate}:</fo:block>
                         </fo:table-cell>
                         <fo:table-cell padding="2pt">
                             <fo:block><#if productionRunData.actualStartDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.actualStartDate, "dd/MM/yyyy")}</#if></fo:block>
@@ -94,7 +94,7 @@
                             <fo:block><#if productionRunData.estimatedCompletionDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.estimatedCompletionDate, "dd/MM/yyyy")}</#if></fo:block>
                         </fo:table-cell>
                         <fo:table-cell padding="2pt">
-                            <fo:block>${uiLabelMap.FormFieldTitle_actualCompletionDate}:</fo:block>
+                            <fo:block>${uiLabelMap.ManufacturingActualCompletionDate}:</fo:block>
                         </fo:table-cell>
                         <fo:table-cell padding="2pt">
                             <fo:block><#if productionRunData.actualCompletionDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.actualCompletionDate, "dd/MM/yyyy")}</#if></fo:block>
@@ -184,7 +184,7 @@
               <fo:table-column column-width="3.0cm"/>
                 <fo:table-header>
                     <fo:table-row background-color="${dimColor}">
-                        <fo:table-cell><fo:block>${uiLabelMap.FormFieldTitle_fixedAssetId}</fo:block></fo:table-cell>
+                        <fo:table-cell><fo:block>${uiLabelMap.FixedAsset}</fo:block></fo:table-cell>
                         <fo:table-cell><fo:block>${uiLabelMap.ManufacturingRoutingTask}</fo:block></fo:table-cell>
                         <fo:table-cell><fo:block>${uiLabelMap.CommonDescription}</fo:block></fo:table-cell>
                         <fo:table-cell><fo:block>${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}</fo:block></fo:table-cell>
@@ -214,6 +214,33 @@
                     </#list>
                 </fo:table-body>
             </fo:table>
+
+            <#if productionRunContents?has_content>
+            <fo:block space-after.optimum="0.3cm"></fo:block>
+            <fo:table>
+              <fo:table-column column-width="9cm"/>
+              <fo:table-column column-width="9cm"/>
+                <fo:table-header>
+                    <fo:table-row background-color="${dimColor}">
+                        <fo:table-cell><fo:block>Documents</fo:block></fo:table-cell>
+                        <fo:table-cell><fo:block>Link</fo:block></fo:table-cell>
+                    </fo:table-row>
+                </fo:table-header>
+                <fo:table-body>
+                    <#assign rowColor = "white">
+                    <#list productionRunContents as productionRunContent>
+                        <fo:table-row>
+                            <fo:table-cell padding="2pt">
+                                <fo:block>${productionRunContent.contentName?if_exists}</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell padding="2pt">
+                                <fo:block><fo:basic-link background-color="lightblue" external-destination="<@ofbizContentUrl>/content/control/ViewBinaryDataResource?dataResourceId=${productionRunContent.drDataResourceId}</@ofbizContentUrl>">${uiLabelMap.CommonView}</fo:basic-link></fo:block>
+                            </fo:table-cell>
+                        </fo:table-row>
+                    </#list>
+                </fo:table-body>
+            </fo:table>
+            </#if>
         </fo:flow>
         </fo:page-sequence>
 </#if>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=813277&r1=813276&r2=813277&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Thu Sep 10 07:35:09 2009
@@ -531,9 +531,7 @@
     </form>
     <form name="FindDelivProductContent" type="single" target="ProductionRunContent">
         <field name="productionRunId"><hidden/></field>
-        <field name="productId" entry-name="delivProductId">
-            <display/>
-        </field>
+        <field name="productId" entry-name="delivProductId"><hidden/></field>
         <field name="contentLocale">
             <text default-value="${locale}"/>
         </field>