[Fmsystem-commits] [17079] property: more on order layout

[sigurdne]

Revision: 17079
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17079
Author:   sigurdne
Date:     2017-09-15 10:20:27 -0400 (Fri, 15 Sep 2017)
Log Message:
-----------
property: more on order layout

Modified Paths:
--------------
    trunk/property/inc/class.uitts.inc.php
    trunk/property/templates/base/tts.xsl

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2017-09-15 09:06:53 UTC (rev 
17078)
+++ trunk/property/inc/class.uitts.inc.php      2017-09-15 14:20:27 UTC (rev 
17079)
@@ -3803,7 +3803,7 @@
                                        . "{$department}<br/>"
                                        . "Org.nr: 
{$this->bo->config->config_data['org_unit_id']}"
                                        . "</td>";
-                       $body .= "<td valign='top'>v/saksbehandler: 
{$user_name}<br/>"
+                       $body .= "<td valign='top'>Saksbehandler: 
{$user_name}<br/>"
                                        . "Ressursnr.: {$ressursnr}<br/>"
                                        . "</td>";
                        $body .= "</tr>";
@@ -3819,19 +3819,55 @@
 
                        $deadline_block = '';
 
+                       if($ticket['order_deadline'] || 
$ticket['order_deadline2'])
+                       {
+                               $deadline_block .= "<br/><table 
id='order_deadline'><tr>";
+                       }
+
                        if($ticket['order_deadline'])
                        {
-                               $deadline_block .= "<br/><b>" . lang('deadline 
for start') . '</b>';
-                               $deadline_block .= "<br/>" . 
$ticket['order_deadline'];
+                               $deadline_block .= "<td><b>" . lang('deadline 
for start') . '</b></td>';
                        }
                        if($ticket['order_deadline2'])
                        {
-                               if($ticket['order_deadline'])
+                               $deadline_block .= "<td><b>" . lang('deadline 
for execution') . '</b></td></tr>';
+                       }
+                       else
+                       {
+                               $deadline_block .= '</tr>';
+                       }
+                       if($ticket['order_deadline'])
+                       {
+                               $deadline_block .= "<tr><td>" . 
$ticket['order_deadline'] . "</td>";
+                       }
+                       if($ticket['order_deadline2'])
+                       {
+                               $deadline_block .= "<td>" . 
$ticket['order_deadline2'] . "</td>";
+                       }
+                       else
+                       {
+                               $deadline_block .= '</tr>';
+                       }
+                       if($deadline_block)
+                       {
+                               $deadline_block .= "</tr></table>";
+                       }
+
+                       $location_exceptions = 
createObject('property.solocation')->get_location_exception($ticket['location_code'],
 $alert_vendor = true);
+
+                       $important_imformation = '';
+                       if($location_exceptions)
+                       {
+                               $important_imformation .= "<b>" . 
lang('important information') . '</b>';
+                       }
+                       foreach ($location_exceptions as $location_exception)
+                       {
+                               $important_imformation .= "<br/>" . 
$location_exception['category_text'];
+
+                               if($location_exception['location_descr'])
                                {
-                                       $deadline_block .= "<br/>";
+                                       $important_imformation .= "<br/>" . 
$location_exception['location_descr'];
                                }
-                               $deadline_block .= "<br/><b>" . lang('deadline 
for execution') . '</b>';
-                               $deadline_block .= "<br/>" . 
$ticket['order_deadline2'];
                        }
 
                        $body .= '<br/>'. nl2br(str_replace(array
@@ -3845,6 +3881,7 @@
                                '__location__',
                                '__order_description__',
                                '__deadline_block__',
+                               '__important_imformation__',
                                '__contact_block__',
                                '__contact_name__',
                                '__contact_email__',
@@ -3863,6 +3900,7 @@
                                $location,
                                $order_description,
                                $deadline_block,
+                               $important_imformation,
                                $contact_block,
                                $contact_name,
                                $contact_email,
@@ -3872,23 +3910,8 @@
                                '</b>'
                                        ), $order_email_template));
 
-                       $location_exceptions = 
createObject('property.solocation')->get_location_exception($ticket['location_code'],
 $alert_vendor = true);
 
-                       if($location_exceptions)
-                       {
-                               $body .= "<br/><br/><b>" . lang('important 
information') . '</b>';
-                       }
-                       foreach ($location_exceptions as $location_exception)
-                       {
-                               $body .= "<br/>" . 
$location_exception['category_text'] . '<br/>';
 
-                               if($location_exception['location_descr'])
-                               {
-                                       $body .= 
$location_exception['location_descr'] . '<br/>';
-                               }
-                       }
-
-
                        $html = "<html><head><meta http-equiv=\"Content-Type\" 
content=\"text/html; charset=utf-8\"><title>{$subject}</title>";
                        $html .= '      <style>
 
@@ -3903,6 +3926,14 @@
                size: A4;
                }
 
+               #order_deadline{
+                       width: 800px;
+                       border:0px solid transparent;
+               }
+
+               #order_deadline td{
+                       border:0px solid transparent;
+               }
                @media print {
                li {page-break-inside: avoid;}
                h1, h2, h3, h4, h5 {

Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl       2017-09-15 09:06:53 UTC (rev 
17078)
+++ trunk/property/templates/base/tts.xsl       2017-09-15 14:20:27 UTC (rev 
17079)
@@ -1621,4 +1621,4 @@
                        <xsl:value-of select="email"/>
                </td>
        </tr>
-</xsl:template>
+</xsl:template>
\ No newline at end of file