svn commit: r990087 - /ofbiz/branches/release10.04/a
Locked
 
|
Author: jacopoc
Date: Fri Aug 27 10:25:58 2010 New Revision: 990087 URL: http://svn.apache.org/viewvc?rev=990087&view=rev Log: Backported from 990086: "Fixed a series of layout issues that were preventing the production run pdf to be really useful (overlapping contents, messed up fields etc...)" Modified: ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl Modified: ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl?rev=990087&r1=990086&r2=990087&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl (original) +++ ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl Fri Aug 27 10:25:58 2010 @@ -18,83 +18,76 @@ under the License. --> <#escape x as x?xml> <#if productionRunId?has_content> - <fo:block>${uiLabelMap.ManufacturingProductionRunId}: ${productionRunData.workEffortId?if_exists}<#if productionRunData.productionRunName?exists> / ${productionRunData.productionRunName}</#if></fo:block> - <fo:block space-after.optimum="0.2cm">${uiLabelMap.ProductProductId}: ${productionRunData.productId?if_exists}<#if productionRunData.product.productName?exists> / ${productionRunData.product.productName}</#if></fo:block> - <#assign dimColor = "#D4D0C8"> + <fo:list-block provisional-distance-between-starts="40mm"> + <fo:list-item> + <fo:list-item-label><fo:block font-size="12">${uiLabelMap.ManufacturingProductionRunId}</fo:block></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"><fo:block><fo:inline font-size="14" font-weight="bold" space-end="5mm">${productionRunData.workEffortId?if_exists}</fo:inline><#if productionRunData.productionRunName?exists> ${productionRunData.productionRunName}</#if></fo:block></fo:list-item-body> + </fo:list-item> + <fo:list-item> + <fo:list-item-label><fo:block font-size="12">${uiLabelMap.ProductProductId}</fo:block></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"><fo:block><fo:inline font-size="14" font-weight="bold" space-end="5mm">${productionRunData.productId?if_exists}</fo:inline><#if productionRunData.product.productName?exists> ${productionRunData.product.productName}</#if></fo:block></fo:list-item-body> + </fo:list-item> + </fo:list-block> + <fo:block><fo:leader leader-length="100%" leader-pattern="rule" rule-style="solid" rule-thickness="0.1mm" color="black"/></fo:block> <fo:table> - <fo:table-column column-width="4.0cm"/> - <fo:table-column column-width="5.5cm"/> - <fo:table-column column-width="4.0cm"/> - <fo:table-column column-width="5.0cm"/> + <fo:table-column column-width="9cm"/> + <fo:table-column column-width="9cm"/> <fo:table-body> <fo:table-row> <fo:table-cell padding="2pt"> - <fo:block>${uiLabelMap.ManufacturingEstimatedStartDate}:</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.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> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell padding="2pt"> - <fo:block>${uiLabelMap.ManufacturingEstimatedCompletionDate}:</fo:block> - </fo:table-cell> - <fo:table-cell padding="2pt"> - <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.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> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell padding="2pt"> - <fo:block>${uiLabelMap.ManufacturingQuantityToProduce}:</fo:block> - </fo:table-cell> - <fo:table-cell padding="2pt"> - <fo:block>${productionRunData.quantityToProduce?if_exists}</fo:block> - </fo:table-cell> - <fo:table-cell padding="2pt"> - <fo:block>${uiLabelMap.ManufacturingQuantityProduced}:</fo:block> - </fo:table-cell> - <fo:table-cell padding="2pt"> - <fo:block>${productionRunData.quantityProduced?if_exists}</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell padding="2pt"> - <fo:block>${uiLabelMap.ManufacturingQuantityRemaining}:</fo:block> - </fo:table-cell> - <fo:table-cell padding="2pt"> - <fo:block>${productionRunData.quantityRemaining}</fo:block> - </fo:table-cell> - <fo:table-cell padding="2pt"> - <fo:block>${uiLabelMap.ManufacturingQuantityRejected}:</fo:block> - </fo:table-cell> - <fo:table-cell padding="2pt"> - <fo:block>${quantityRejected?if_exists}</fo:block> + <fo:list-block provisional-distance-between-starts="50mm"> + <fo:list-item> + <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingQuantityToProduce}</fo:block></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"><fo:block>${productionRunData.quantityToProduce?if_exists}</fo:block></fo:list-item-body> + </fo:list-item> + <fo:list-item space-after="5mm"> + <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingQuantityRemaining}</fo:block></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"><fo:block>${quantityRemaining?if_exists}</fo:block></fo:list-item-body> + </fo:list-item> + <fo:list-item> + <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingEstimatedStartDate}</fo:block></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"><fo:block><#if productionRunData.estimatedStartDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.estimatedStartDate, "dd/MM/yyyy")}</#if></fo:block></fo:list-item-body> + </fo:list-item> + <fo:list-item> + <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingEstimatedCompletionDate}</fo:block></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"><fo:block><#if productionRunData.estimatedCompletionDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.estimatedCompletionDate, "dd/MM/yyyy")}</#if></fo:block></fo:list-item-body> + </fo:list-item> + </fo:list-block> + </fo:table-cell> + <fo:table-cell padding="2pt"> + <fo:list-block provisional-distance-between-starts="50mm"> + <fo:list-item> + <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingQuantityProduced}</fo:block></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"><fo:block>${productionRunData.quantityProduced?if_exists}</fo:block></fo:list-item-body> + </fo:list-item> + <fo:list-item space-after="5mm"> + <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingQuantityRejected}</fo:block></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"><fo:block>${quantityRejected?if_exists}</fo:block></fo:list-item-body> + </fo:list-item> + <fo:list-item> + <fo:list-item-label><fo:block>${uiLabelMap.CommonStartDate}</fo:block></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"><fo:block><#if productionRunData.actualStartDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.actualStartDate, "dd/MM/yyyy")}</#if></fo:block></fo:list-item-body> + </fo:list-item> + <fo:list-item> + <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingActualCompletionDate}</fo:block></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"><fo:block><#if productionRunData.actualCompletionDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.actualCompletionDate, "dd/MM/yyyy")}</#if></fo:block></fo:list-item-body> + </fo:list-item> + </fo:list-block> </fo:table-cell> </fo:table-row> </fo:table-body> </fo:table> + <fo:block space-after.optimum="0.3cm"><fo:leader leader-length="100%" leader-pattern="rule" rule-style="solid" rule-thickness="0.1mm" color="black"/></fo:block> + <#-- Components --> - <fo:block space-after.optimum="0.3cm"></fo:block> - <fo:table> - <fo:table-column column-width="3.4cm"/> - <fo:table-column column-width="6.0cm"/> - <fo:table-column column-width="2.5cm"/> - <fo:table-column column-width="2.5cm"/> - <fo:table-column column-width="3.5cm"/> + <fo:table width="22cm"> + <fo:table-column column-width="20%"/> + <fo:table-column column-width="40%"/> + <fo:table-column column-width="10%"/> + <fo:table-column column-width="10%"/> + <fo:table-column column-width="10%"/> <fo:table-header> - <fo:table-row background-color="${dimColor}"> + <fo:table-row font-weight="bold"> <fo:table-cell><fo:block>${uiLabelMap.ProductProductId}</fo:block></fo:table-cell> <fo:table-cell><fo:block>${uiLabelMap.CommonDescription}</fo:block></fo:table-cell> <fo:table-cell><fo:block>${uiLabelMap.ManufacturingQuantity}</fo:block></fo:table-cell> @@ -103,42 +96,41 @@ under the License. </fo:table-row> </fo:table-header> <fo:table-body> - <#assign dimColor = "#D4D0C8"> - <#assign rowColor = "white"> <#list productionRunComponentsData as productionRunComponentData> <#assign resQuantityComp = productionRunComponentData.estimatedQuantity - productionRunComponentData.issuedQuantity> <fo:table-row> - <fo:table-cell padding="2pt"> + <fo:table-cell> <fo:block>${productionRunComponentData.productId?if_exists}</fo:block> </fo:table-cell> - <fo:table-cell padding="2pt"> + <fo:table-cell> <fo:block>${productionRunComponentData.internalName?if_exists}</fo:block> </fo:table-cell> - <fo:table-cell padding="2pt"> + <fo:table-cell> <fo:block>${productionRunComponentData.estimatedQuantity?if_exists}</fo:block> </fo:table-cell> - <fo:table-cell padding="2pt"> + <fo:table-cell> <fo:block>${productionRunComponentData.issuedQuantity?if_exists}</fo:block> </fo:table-cell> - <fo:table-cell padding="2pt"> + <fo:table-cell> <fo:block>${resQuantityComp?if_exists}</fo:block> </fo:table-cell> </fo:table-row> </#list> </fo:table-body> </fo:table> + <fo:block space-after.optimum="0.3cm"><fo:leader leader-length="100%" leader-pattern="rule" rule-style="solid" rule-thickness="0.1mm" color="black"/></fo:block> + <#-- Tasks --> - <fo:block space-after.optimum="0.3cm"></fo:block> - <fo:table> - <fo:table-column column-width="3.5cm"/> - <fo:table-column column-width="3.5cm"/> - <fo:table-column column-width="5.0cm"/> - <fo:table-column column-width="3.0cm"/> - <fo:table-column column-width="3.0cm"/> + <fo:table width="100%"> + <fo:table-column column-width="20%"/> + <fo:table-column column-width="30%"/> + <fo:table-column column-width="30%"/> + <fo:table-column column-width="10%"/> + <fo:table-column column-width="10%"/> <fo:table-header> - <fo:table-row background-color="${dimColor}"> + <fo:table-row font-weight="bold"> <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> @@ -147,28 +139,28 @@ under the License. </fo:table-row> </fo:table-header> <fo:table-body> - <#assign rowColor = "white"> <#list productionRunRoutingTasks as productionRunRoutingTask> <fo:table-row> - <fo:table-cell padding="2pt"> + <fo:table-cell> <fo:block>${productionRunRoutingTask.fixedAssetId?if_exists}</fo:block> </fo:table-cell> - <fo:table-cell padding="2pt"> + <fo:table-cell> <fo:block>${productionRunRoutingTask.workEffortName?if_exists}</fo:block> </fo:table-cell> - <fo:table-cell padding="2pt"> + <fo:table-cell> <fo:block>${productionRunRoutingTask.description?if_exists}</fo:block> </fo:table-cell> - <fo:table-cell padding="2pt"> + <fo:table-cell> <fo:block>${productionRunRoutingTask.estimatedSetupMillis?if_exists}</fo:block> </fo:table-cell> - <fo:table-cell padding="2pt"> + <fo:table-cell> <fo:block>${productionRunRoutingTask.estimatedMilliSeconds?if_exists}</fo:block> </fo:table-cell> </fo:table-row> </#list> </fo:table-body> </fo:table> + <fo:block space-after.optimum="0.3cm"><fo:leader leader-length="100%" leader-pattern="rule" rule-style="solid" rule-thickness="0.1mm" color="black"/></fo:block> <#if productionRunContents?has_content> <fo:block space-after.optimum="0.3cm"></fo:block> @@ -176,13 +168,12 @@ under the License. <fo:table-column column-width="9cm"/> <fo:table-column column-width="9cm"/> <fo:table-header> - <fo:table-row background-color="${dimColor}"> + <fo:table-row font-weight="bold"> <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"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |