svn commit: r595906 - in /ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint: WEB-INF/controller.xml assetmaint/printFixedAssetMaint.fo.ftl

[adrianc]

Author: adrianc
Date: Fri Nov 16 20:11:59 2007
New Revision: 595906

URL: http://svn.apache.org/viewvc?rev=595906&view=rev
Log:
Fixed print Maintenance.

Modified:
    ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl

Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml?rev=595906&r1=595905&r2=595906&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml Fri Nov 16 20:11:59 2007
@@ -192,7 +192,7 @@
     <view-map name="EditWorkEffortTimeEntries" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditWorkEffortTimeEntries"/>
     <view-map name="EditWorkEffortNotes" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditWorkEffortNotes"/>
     <view-map name="EditItemIssuances" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditItemIssuances"/>
-    <view-map name="PrintFixedAssetMaint" type="screenfop" page="component://assetmaint/widget/AssetmaintScreens.xml#PrintFixedAssetMaint"/>
+    <view-map name="PrintFixedAssetMaint" type="screenfop" page="component://assetmaint/widget/AssetmaintScreens.xml#PrintFixedAssetMaint" content-type="application/pdf"/>
 
     <!-- Lookup request mappings -->
     <view-map name="LookupFixedAsset" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupFixedAsset"/>

Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl?rev=595906&r1=595905&r2=595906&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl Fri Nov 16 20:11:59 2007
@@ -167,17 +167,17 @@
   </fo:table>
 <#-- End Print Maintenance Schedule Information -->
 
-  <fo:table table-layout="fixed"  border-spacing="3pt" border-style="solid" border-width="1pt">
-    <fo:table-column column-width="6.5in"/>
-    <fo:table-column column-width="1.5in"/>
-    <fo:table-header>
-      <fo:table-row>
-        <fo:table-cell><fo:block font-weight="bold">${uiLabelMap.FixedAssetMaintItemIssuance}</fo:block></fo:table-cell>
-        <fo:table-cell text-align="center"><fo:block font-weight="bold">${uiLabelMap.OrderQuantity}</fo:block></fo:table-cell>
-      </fo:table-row>        
-    </fo:table-header>
-    <fo:table-body>
-      <#if itemIssuanceList?has_content>
+  <#if itemIssuanceList?has_content>
+    <fo:table table-layout="fixed"  border-spacing="3pt" border-style="solid" border-width="1pt">
+      <fo:table-column column-width="6.5in"/>
+      <fo:table-column column-width="1.5in"/>
+      <fo:table-header>
+        <fo:table-row>
+          <fo:table-cell><fo:block font-weight="bold">${uiLabelMap.FixedAssetMaintItemIssuance}</fo:block></fo:table-cell>
+          <fo:table-cell text-align="center"><fo:block font-weight="bold">${uiLabelMap.OrderQuantity}</fo:block></fo:table-cell>
+        </fo:table-row>        
+      </fo:table-header>
+      <fo:table-body>
         <#list itemIssuanceList as itemIssuance>
           <#assign productId = itemIssuance.productId?if_exists>
           <#assign quantity = itemIssuance.quantity?default(0)>
@@ -192,23 +192,23 @@
               <fo:table-cell text-align="center"><fo:block>${quantity}</fo:block></fo:table-cell>            
             </fo:table-row>
         </#list>
-      </#if>
-    </fo:table-body>
-  </fo:table>
+      </fo:table-body>
+    </fo:table>
+  </#if>
 
-  <fo:table table-layout="fixed"   border-spacing="3pt" border-style="solid" border-width="1pt">
-    <fo:table-column column-width="8in"/>
-    <fo:table-header>
-      <fo:table-row>
-        <fo:table-cell><fo:block font-weight="bold">${uiLabelMap.WorkEffortNotes}</fo:block></fo:table-cell>
-      </fo:table-row>        
-    </fo:table-header>
-    <fo:table-body>
-      <#if notes?has_content>
+  <#if notes?has_content>
+    <fo:table table-layout="fixed"   border-spacing="3pt" border-style="solid" border-width="1pt">
+      <fo:table-column column-width="8in"/>
+      <fo:table-header>
+        <fo:table-row>
+          <fo:table-cell><fo:block font-weight="bold">${uiLabelMap.WorkEffortNotes}</fo:block></fo:table-cell>
+        </fo:table-row>        
+      </fo:table-header>
+      <fo:table-body>
         <#list notes as note>
           <fo:table-row>
             <fo:table-cell>
-              <fo:block>Auther : ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</fo:block>
+              <fo:block>Author : ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</fo:block>
               <fo:block>Date : ${note.noteDateTime?string.short}</fo:block>
               <#escape x as x?html>
                 <fo:block>${note.noteInfo?if_exists}</fo:block>
@@ -216,9 +216,9 @@
             </fo:table-cell>
           </fo:table-row>
         </#list>
-      </#if>
-    </fo:table-body>
-  </fo:table>
+      </fo:table-body>
+    </fo:table>
+  </#if>
 
   </fo:flow>
   </fo:page-sequence>