[Fmsystem-commits] [13336] More on booking

[Sigurd Nes]

Revision: 13336
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13336
Author:   sigurdne
Date:     2015-06-03 16:57:28 +0000 (Wed, 03 Jun 2015)
Log Message:
-----------
More on booking

Modified Paths:
--------------
    trunk/booking/inc/class.boapplication.inc.php
    trunk/booking/templates/base/application.xsl

Modified: trunk/booking/inc/class.boapplication.inc.php
===================================================================
--- trunk/booking/inc/class.boapplication.inc.php       2015-06-03 16:25:53 UTC 
(rev 13335)
+++ trunk/booking/inc/class.boapplication.inc.php       2015-06-03 16:57:28 UTC 
(rev 13336)
@@ -92,9 +92,14 @@
                                                $resourcename = 
implode(",",$this->get_resource_name($application['resources']));
                                                $bsubject = 
$config->config_data['application_mail_subject'].": En søknad om leie/lån av 
".$resourcename." på ".$application['building_name']." er godkjent";
                                                $bbody = 
"<p>".$application['contact_name']." sin søknad  om leie/lån av 
".$resourcename." på ".$application['building_name']."</p>";
-                                               $bbody .= "<p>Den ".$adates."er 
Godkjent</p>";
-                                               $bbody .= "<p><b>Ekstra 
informasjon fra søker:</b><br />".$application['equipment']."</p>";
+//                                             $bbody .= "<p>Den ".$adates."er 
Godkjent</p>";
+                                               if($adates)
+                                               {
+                                                       $body .= 
"<pre>Godkjent:\n".$adates."</pre>";
+                                               }
 
+                                               $bbody .= 
"<p><b>{$config->config_data['application_equipment']}:</b><br 
/>".$application['equipment']."</p>";
+
                                                foreach ($buildingemail as 
$bemail)
                                                {
                                                        try

Modified: trunk/booking/templates/base/application.xsl
===================================================================
--- trunk/booking/templates/base/application.xsl        2015-06-03 16:25:53 UTC 
(rev 13335)
+++ trunk/booking/templates/base/application.xsl        2015-06-03 16:57:28 UTC 
(rev 13336)
@@ -115,7 +115,10 @@
             <dd><xsl:value-of select="application/activity_name"/></dd>
             <dt><xsl:value-of select="php:function('lang', 'Description')" 
/></dt>
                        <dd><div style="width: 80%;"><xsl:value-of 
select="application/description"/></div></dd>
-            <dt><xsl:value-of select="php:function('lang', 'Extra 
information')" /></dt>
+            <dt>
+                               <xsl:value-of 
select="config/application_equipment"/>
+                               <!--xsl:value-of select="php:function('lang', 
'Extra information')" /-->
+                       </dt>
             <dd><div style="width: 80%;"><xsl:value-of 
select="application/equipment"/></div></dd>
                </dl>
         <dl class="proplist-col">