OFBiz › OFBiz - Commits

svn commit: r833355 - in /ofbiz/trunk/applications/manufacturing: webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl widget/manufacturing/JobshopScreens.xml

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jacopoc

svn commit: r833355 - in /ofbiz/trunk/applications/manufacturing: webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl widget/manufacturing/JobshopScreens.xml

Author: jacopoc
Date: Fri Nov 6 11:43:26 2009
New Revision: 833355

URL: http://svn.apache.org/viewvc?rev=833355&view=rev
Log:
Cleaned up the production run PDF report: small label fixes and now it decorates the simple report template.

Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml

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=833355&r1=833354&r2=833355&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl Fri Nov 6 11:43:26 2009
@@ -17,54 +17,9 @@
under the License.
-->
<#escape x as x?xml>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:fox="http://xml.apache.org/fop/extensions">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="main"
- margin-top="1.0cm" margin-bottom="1in" margin-left="0.5cm" margin-right="0.5cm">
- <fo:region-body margin-top="1.0cm" margin-bottom="1.0cm"/> <#-- main body -->
- <fo:region-before extent="1.0cm"/> <#-- a header -->
- <fo:region-after extent="1.0cm"/> <#-- a footer -->
- </fo:simple-page-master>
- </fo:layout-master-set>
-
<#if productionRunId?has_content>
- <fo:page-sequence master-reference="main" language="en" hyphenate="true">
- <fo:flow flow-name="xsl-region-body" font-family="Helvetica" font-size="8pt">
- <fo:block>${uiLabelMap.ManufacturingProductionRunId}:${productionRunData.workEffortId?if_exists}</fo:block>
- <fo:block space-after.optimum="0.3cm"></fo:block>
- <fo:block>${uiLabelMap.ProductProductId}:${productionRunData.productId?if_exists}/${productionRunData.productName?if_exists}</fo:block>
- <fo:block space-after.optimum="1.0cm"></fo:block>
-<#--
+ <fo:block space-after.optimum="0.3cm">${uiLabelMap.ManufacturingProductionRunId}: ${productionRunData.workEffortId?if_exists}</fo:block>
+ <fo:block space-after.optimum="1.0cm">${uiLabelMap.ProductProductId}: ${productionRunData.productId?if_exists}/${productionRunData.productName?if_exists}</fo:block>
<#assign dimColor = "#D4D0C8">
<fo:table>
<fo:table-column column-width="4.0cm"/>
@@ -74,7 +29,7 @@
<fo:table-body>
<fo:table-row>
<fo:table-cell padding="2pt">
- <fo:block>${uiLabelMap.ManufacturingStartDate}:</fo:block>
+ <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>
@@ -241,8 +196,5 @@
</fo:table-body>
</fo:table>
</#if>
- </fo:flow>
- </fo:page-sequence>
</#if>
-</fo:root>
</#escape>

Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=833355&r1=833354&r2=833355&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Fri Nov 6 11:43:26 2009
@@ -70,7 +70,7 @@
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.ManufacturingCreateProductionRun}">
- <include-form name="CreateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"></include-form>
+ <include-form name="CreateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -267,13 +267,17 @@
<property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="titleProperty" value="ManufacturingReports"/>
+ <set field="titleProperty" value="ManufacturingProductionRun"/>
<script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy"/>
</actions>
<widgets>
- <platform-specific>
- <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl"/></xsl-fo>
- </platform-specific>
+ <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <platform-specific>
+ <xsl-fo><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl"/></xsl-fo>
+ </platform-specific>
+ </decorator-section>
+ </decorator-screen>
</widgets>
</section>
</screen>