[Fmsystem-commits] [6758] bkbooking: changed font in pdf export for application

[Kjell Arne Espedal]

Revision: 6758
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6758
Author:   kjell
Date:     2011-01-12 13:51:18 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
bkbooking: changed font in pdf export for application

Modified Paths:
--------------
    trunk/booking/jasper/templates/application.jrxml
    trunk/bookingfrontend/inc/class.uiapplication.inc.php

Modified: trunk/booking/jasper/templates/application.jrxml
===================================================================
--- trunk/booking/jasper/templates/application.jrxml    2011-01-12 12:49:58 UTC 
(rev 6757)
+++ trunk/booking/jasper/templates/application.jrxml    2011-01-12 13:51:18 UTC 
(rev 6758)
@@ -20,11 +20,11 @@
                        <pen lineWidth="0.5" lineColor="#000000"/>
                </box>
        </style>
-       <style name="headers" forecolor="#808080" fontName="FreeSerif" 
fontSize="14"/>
-       <style name="Sans_Normal" isDefault="true" fontName="FreeSerif" 
fontSize="10" isBold="false" isItalic="false" isUnderline="false" 
isStrikeThrough="false"/>
-       <style name="Sans_Bold" fontName="FreeSerif" fontSize="10" 
isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
-       <style name="Sans_Italic" fontName="FreeSerif" fontSize="10" 
isBold="false" isItalic="true" isUnderline="false" isStrikeThrough="false"/>
-       <style name="Sans_Bold_Italic" fontName="FreeSerif" fontSize="10" 
isBold="true" isItalic="true" isUnderline="false" isStrikeThrough="false"/>
+       <style name="headers" isDefault="false" forecolor="#808080" 
fontName="DejaVu Sans" fontSize="14"/>
+       <style name="Sans_Normal" isDefault="true" fontName="DejaVu Sans" 
fontSize="10" isBold="false" isItalic="false" isUnderline="false" 
isStrikeThrough="false"/>
+       <style name="Sans_Bold" isDefault="false" fontName="DejaVu Sans" 
fontSize="10" isBold="true" isItalic="false" isUnderline="false" 
isStrikeThrough="false"/>
+       <style name="Sans_Italic" isDefault="false" fontName="DejaVu Sans" 
fontSize="10" isBold="false" isItalic="true" isUnderline="false" 
isStrikeThrough="false"/>
+       <style name="Sans_Bold_Italic" isDefault="false" fontName="DejaVu Sans" 
fontSize="10" isBold="true" isItalic="true" isUnderline="false" 
isStrikeThrough="false"/>
        <subDataset name="resources">
                <parameter name="APPLICATION_ID" class="java.lang.Integer"/>
                <queryString>
@@ -61,7 +61,6 @@
        </subDataset>
        <parameter name="BK_APPLICATION_ID" class="java.lang.String"/>
        <parameter name="BK_BUILDING_NAME" class="java.lang.String"/>
-       <parameter name="BK_PATH" class="java.lang.String"/>
        <queryString>
                <![CDATA[SELECT bb_application.id AS application_id, 
bb_application.status AS application_status, to_char(bb_application.created, 
'DD/MM/YYYY HH24:MI') AS application_created, to_char(bb_application.modified, 
'DD/MM/YYYY HH24:MI') AS application_modified,bb_application.contact_name, 
bb_application.contact_email, 
bb_application.contact_phone,bb_application.description, 
to_char(bb_application_date.from_, 'DD/MM/YYYY HH24:MI') AS from, 
to_char(bb_application_date.to_, 'DD/MM/YYYY HH24:MI') AS to, bb_activity.name 
AS activity_name, bb_event.cost AS price,bb_application_comment.comment AS 
comment FROM bb_application, bb_application_date,bb_activity, bb_event, 
bb_application_comment WHERE bb_application.id = ANY 
(string_to_array($P{BK_APPLICATION_ID}, ',')::int4[]) AND bb_application.id = 
bb_application_date.application_id AND bb_application.activity_id = 
bb_activity.id AND bb_application.id = bb_event.application_id AND 
bb_application.id = bb_application_comment.application_id LIMIT 1]]>
        </queryString>
@@ -85,11 +84,11 @@
                <band height="107" splitType="Stretch">
                        <image>
                                <reportElement x="0" y="11" width="102" 
height="74"/>
-                               <imageExpression 
class="java.lang.String"><![CDATA[$P{BK_PATH} + 
"/booking/jasper/templates/logo.png"]]></imageExpression>
+                               <imageExpression 
class="java.lang.String"><![CDATA["../../../../booking/jasper/templates/logo.png"]]></imageExpression>
                        </image>
                        <image>
                                <reportElement x="405" y="0" width="150" 
height="100"/>
-                               <imageExpression 
class="java.lang.String"><![CDATA[$P{BK_PATH} + 
"/booking/jasper/templates/aktivby.png"]]></imageExpression>
+                               <imageExpression 
class="java.lang.String"><![CDATA["../../../../booking/jasper/templates/aktivby.png"]]></imageExpression>
                        </image>
                </band>
        </title>

Modified: trunk/bookingfrontend/inc/class.uiapplication.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uiapplication.inc.php       2011-01-12 
12:49:58 UTC (rev 6757)
+++ trunk/bookingfrontend/inc/class.uiapplication.inc.php       2011-01-12 
13:51:18 UTC (rev 6758)
@@ -37,10 +37,9 @@
                        if ($_SERVER['REQUEST_METHOD'] == 'POST' && 
$_POST['print'])
                        {
                                $output_type = 'PDF';
-                               $jasper_parameters = 
sprintf("\"BK_BUILDING_NAME|%s;BK_APPLICATION_ID|%s;BK_PATH|%s\"",
+                               $jasper_parameters = 
sprintf("\"BK_BUILDING_NAME|%s;BK_APPLICATION_ID|%s\"",
                                        $application['building_name'],
-                                       $id,
-                    $GLOBALS['_SERVER']['DOCUMENT_ROOT']);
+                                       $id);
                                // DEBUG
                                // print_r($jasper_parameters);
                                // exit(0);