[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13335] booking: tune email settings
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [13335] booking: tune email settings |
Date: |
Wed, 03 Jun 2015 16:25:55 +0000 |
Revision: 13335
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13335
Author: sigurdne
Date: 2015-06-03 16:25:53 +0000 (Wed, 03 Jun 2015)
Log Message:
-----------
booking: tune email settings
Modified Paths:
--------------
trunk/booking/inc/class.boapplication.inc.php
trunk/booking/inc/class.soapplication.inc.php
trunk/booking/setup/phpgw_no.lang
trunk/booking/templates/base/mail_settings.xsl
Modified: trunk/booking/inc/class.boapplication.inc.php
===================================================================
--- trunk/booking/inc/class.boapplication.inc.php 2015-06-02 22:02:43 UTC
(rev 13334)
+++ trunk/booking/inc/class.boapplication.inc.php 2015-06-03 16:25:53 UTC
(rev 13335)
@@ -37,52 +37,76 @@
if ($application['comment'] != '') {
$body .= '<p>Kommentar fra
saksbehandler:<br />'.$application['comment'].'</p>';
}
- } elseif ($application['status'] == 'ACCEPTED') {
- $accepted =
$this->so->get_accepted($application['id']);
- $adates = "";
- foreach ($accepted as $key => $date) {
- if($key === 0)
- $adates .= implode(" -
",$date)."\n";
- else
- $adates .=
"\t".implode(" - ",$date)."\n";
+ }
+ elseif ($application['status'] == 'ACCEPTED')
+ {
+ // Sigurd:
+ // Check if any bookings, allocations or events
are associated with this application
+ $assoc_bo = new
booking_boapplication_association();
+ $associations =
$assoc_bo->so->read(array('filters'=>array('application_id'=>$application['id']),'sort'=>'from_',
'dir' => 'asc'));
+ $_adates = array();
+
+ foreach($associations['results'] as $assoc)
+ {
+ if($assoc['active'])
+ {
+ $_adates[] =
"\t{$assoc['from_']} - {$assoc['to_']}";
+ }
}
+
+ $adates = implode("\n",$_adates);
+
$rejected =
$this->so->get_rejected($application['id']);
$rdates = "";
- foreach ($rejected as $key => $date) {
- if($key === 0)
- $rdates .= implode(" -
",$date)."\n";
- else
- $rdates .=
"\t".implode(" - ",$date)."\n";
+ foreach ($rejected as $key => $date)
+ {
+ if($key === 0)
+ {
+ $rdates .= implode(" -
",$date)."\n";
+ }
+ else
+ {
+ $rdates .= "\t".implode(" -
",$date)."\n";
+ }
}
$body = "<p>Din søknad i
".$config->config_data['application_mail_systemname']." om leie/lån er
".lang($application['status']);
$body .=
'</p><pre>'.$config->config_data['application_mail_accepted'].'<br /><a
href="'.$link.'">Link til
'.$config->config_data['application_mail_systemname'].': søknad
#'.$application['id'].'</a></pre>';
- $body .= "<pre>Godkjent: ".$adates."</pre>";
- $body .= "<pre>Avvist: ".$rdates."</pre>";
+ if($adates)
+ {
+ $body .=
"<pre>Godkjent:\n".$adates."</pre>";
+ }
+ if($rdates)
+ {
+ $body .= "<pre>Avvist:
".$rdates."</pre>";
+ }
if ($application['comment'] != '') {
$body .= "<p>Kommentar fra
saksbehandler:<br />".$application['comment']."</p>";
}
- $buildingemail =
$this->get_tilsyn_email($application['building_name']);
- if ($buildingemail['email1'] != '' ||
$buildingemail['email2'] != '' || $buildingemail['email3'] != '') {
- $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>";
+ if (isset
($config->config_data['application_notify_on_accepted']) &&
$config->config_data['application_notify_on_accepted'] ==1)
+ {
+ $buildingemail =
$this->get_tilsyn_email($application['building_name']);
+ if ($buildingemail['email1'] != '' ||
$buildingemail['email2'] != '' || $buildingemail['email3'] != '') {
+ $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>";
- foreach ($buildingemail as $bemail)
- {
- try
+ foreach ($buildingemail as
$bemail)
{
- $send->msg('email',
$bemail, $bsubject, $bbody, '', '', '', $from, '', 'html');
+ try
+ {
+
$send->msg('email', $bemail, $bsubject, $bbody, '', '', '', $from, '', 'html');
+ }
+ catch
(phpmailerException $e)
+ {
+ // TODO: Inform user if
something goes wrong
+ }
+
}
- catch (phpmailerException $e)
- {
- // TODO: Inform user if
something goes wrong
- }
-
}
}
} elseif ($application['status'] == 'REJECTED') {
Modified: trunk/booking/inc/class.soapplication.inc.php
===================================================================
--- trunk/booking/inc/class.soapplication.inc.php 2015-06-02 22:02:43 UTC
(rev 13334)
+++ trunk/booking/inc/class.soapplication.inc.php 2015-06-03 16:25:53 UTC
(rev 13335)
@@ -117,7 +117,8 @@
'name' => $this->db->f('name',
false));
}
- function get_accepted($id)
+// function get_accepted($id)
+ function get_rejected($id)
{
$sql = "SELECT bad.from_, bad.to_
FROM bb_application ba,
bb_application_date bad, bb_event be
@@ -136,7 +137,8 @@
return $results;
}
- function get_rejected($id)
+// function get_rejected($id)
+ function get_accepted($id)
{
$sql = "SELECT bad.from_, bad.to_ FROM bb_application
ba, bb_application_date bad
WHERE ba.id=($id)
Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang 2015-06-02 22:02:43 UTC (rev 13334)
+++ trunk/booking/setup/phpgw_no.lang 2015-06-03 16:25:53 UTC (rev 13335)
@@ -613,6 +613,7 @@
Mail text for application pending booking no Epost tekst for søknad
under behandling.
Mail text for application accepted booking no Epost tekst for søknad
akseptert.
Mail text for application rejected booking no Epost tekst for søknad
avist.
+notify on accepted booking no Send kvittering til ansvarlig ved
akseptert.
Signature booking no Signatur
Tilsynsvakt name booking no Tilsynsvakt navn
Tilsynsvakt email booking no Tilsynsvakt epost
Modified: trunk/booking/templates/base/mail_settings.xsl
===================================================================
--- trunk/booking/templates/base/mail_settings.xsl 2015-06-02 22:02:43 UTC
(rev 13334)
+++ trunk/booking/templates/base/mail_settings.xsl 2015-06-03 16:25:53 UTC
(rev 13335)
@@ -38,6 +38,20 @@
<dd class="yui-skin-sam">
<textarea id="field_application_mail_accepted"
class="full-width settings" name="application_mail_accepted"
type="text"><xsl:value-of
select="config_data/application_mail_accepted"/></textarea>
</dd>
+ <dt><label
for="field_application_notify_on_accepted"><xsl:value-of
select="php:function('lang', 'notify on accepted')"/></label></dt>
+ <dd class="yui-skin-sam">
+ <input name="application_notify_on_accepted"
type="hidden" value = "0"/>
+ <input
id="field_application_notify_on_accepted" class="full-width settings"
name="application_notify_on_accepted" type="checkbox" value = "1">
+ <xsl:if
test="config_data/application_notify_on_accepted = '1'">
+ <xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </dd>
<dt><label for="field_application_mail_rejected"><xsl:value-of
select="php:function('lang', 'Mail text for application
rejected')"/></label></dt>
<dd class="yui-skin-sam">
<textarea id="field_application_mail_rejected"
class="full-width settings" name="application_mail_rejected"
type="text"><xsl:value-of
select="config_data/application_mail_rejected"/></textarea>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13335] booking: tune email settings,
Sigurd Nes <=