[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11199] bkbooking: stavanger update
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [11199] bkbooking: stavanger update |
|
Date: |
Mon, 24 Jun 2013 12:15:28 +0000 |
Revision: 11199
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11199
Author: kjell
Date: 2013-06-24 12:15:19 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
bkbooking: stavanger update
Modified Paths:
--------------
branches/stavangerkommune/booking/inc/class.boapplication.inc.php
branches/stavangerkommune/booking/inc/class.bocommon.inc.php
branches/stavangerkommune/booking/inc/class.soapplication.inc.php
branches/stavangerkommune/booking/inc/class.socommon.inc.php
branches/stavangerkommune/booking/inc/class.uiallocation.inc.php
branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
branches/stavangerkommune/booking/inc/class.uievent.inc.php
branches/stavangerkommune/booking/inc/class.uiseason.inc.php
branches/stavangerkommune/booking/setup/phpgw_no.lang
branches/stavangerkommune/booking/templates/base/application.xsl
Modified: branches/stavangerkommune/booking/inc/class.boapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.boapplication.inc.php
2013-06-24 12:05:28 UTC (rev 11198)
+++ branches/stavangerkommune/booking/inc/class.boapplication.inc.php
2013-06-24 12:15:19 UTC (rev 11199)
@@ -29,28 +29,45 @@
$body .= '<p><a href="'.$link.'">Link til
'.$config->config_data['application_mail_systemname'].': søknad
#'.$application['id'].'</a></p>';
} elseif ($application['status'] == 'PENDING') {
- $body = "<p>Din søknad i
".$config->config_data['application_mail_systemname']." om leie/lån
er".lang($application['status']);
- $body .=
"<pre>".$config->config_data['application_mail_pending']."</pre>";
+ $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_pending']."</pre>";
$body .= '<p><a href="'.$link.'">Link til
'.$config->config_data['application_mail_systemname'].': søknad
#'.$application['id'].'</a></p>';
if ($application['comment'] != '') {
$body .= '<p>Kommentar fra
saksbehandler:<br />'.$application['comment'].'</p>';
}
} elseif ($application['status'] == 'ACCEPTED') {
- $body = "<p>Din søknad i
".$config->config_data['application_mail_systemname']." om leie/lån
er".lang($application['status']);
- $body .=
'<pre>'.$config->config_data['application_mail_pending'].' <a
href="'.$link.'">Link til '.$config->config_data
+ $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";
+ }
+ $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";
+ }
+
+ $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_pending'].' <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 ($application['comment'] != '') {
$body .= '<p>Kommentar fra
saksbehandler:<br />'.$application['comment'].'</p>';
}
$buildingemail =
$this->get_tilsyn_email($application['building_id']);
+
if ($buildingemail != '') {
$resourcename =
implode(",",$this->get_resource_name($application['resources']));
- $dates = "";
- foreach ($application['dates'] as
$date) {
- $dates .=implode(", ",$date)."
";
- }
$bbody =
"<p>".$application['contact_name']." sin søknad om leie/lån av
".$resourcename." i ".$application[building_name]."</p>";
- $bbody .= "<p>Den ".$dates."er
Godkjent</p>";
+ $bbody .= "<p>Den ".$adates."er
Godkjent</p>";
try
{
@@ -63,8 +80,8 @@
}
} elseif ($application['status'] == 'REJECTED') {
- $body = "<p>Din søknad i
".$config->config_data['application_mail_systemname']." om leie/lån
er".lang($application['status']);
- $body .=
'<pre>'.$config->config_data['application_mail_rejected'].'<a
href="'.$link.'">Link til
'.$config->config_data['application_mail_systemname'].': søknad
#'.$application['id'].'</a></pre>';
+ $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_rejected'].' <a
href="'.$link.'">Link til
'.$config->config_data['application_mail_systemname'].': søknad
#'.$application['id'].'</a></pre>';
if ($application['comment'] != '') {
$body .= '<p>Kommentar fra
saksbehandler:<br />'.$application['comment'].'</p>';
}
Modified: branches/stavangerkommune/booking/inc/class.bocommon.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.bocommon.inc.php
2013-06-24 12:05:28 UTC (rev 11198)
+++ branches/stavangerkommune/booking/inc/class.bocommon.inc.php
2013-06-24 12:15:19 UTC (rev 11199)
@@ -71,7 +71,9 @@
}
if(!isset($_SESSION['showall'])) {
- $filters['active'] = "1";
+ if(!isset($filters['application_id'])) {
+ $filters['active'] = "1";
+ }
}
return array(
Modified: branches/stavangerkommune/booking/inc/class.soapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.soapplication.inc.php
2013-06-24 12:05:28 UTC (rev 11198)
+++ branches/stavangerkommune/booking/inc/class.soapplication.inc.php
2013-06-24 12:15:19 UTC (rev 11199)
@@ -115,6 +115,47 @@
'name' => $this->db->f('name',
false));
}
+ function get_accepted($id)
+ {
+ $sql = "SELECT bad.from_, bad.to_
+ FROM bb_application ba,
bb_application_date bad, bb_event be
+ WHERE ba.id=($id)
+ AND ba.id=bad.application_id
+ AND ba.id=be.application_id
+ AND be.from_=bad.from_
+ AND be.to_=bad.to_";
+ $results = array();
+ $this->db->query($sql,__LINE__, __FILE__);
+ while ($this->db->next_record())
+ {
+ $results[] = array('from_' =>
$this->db->f('from_', false),
+ 'to_' =>
$this->db->f('to_', false));
+ }
+ return $results;
+ }
+
+ function get_rejected($id)
+ {
+ $sql = "SELECT bad.from_, bad.to_ FROM bb_application
ba, bb_application_date bad
+ WHERE ba.id=($id)
+ AND ba.id=bad.application_id
+ AND bad.id NOT IN (SELECT bad.id
+ FROM bb_application ba,
bb_application_date bad, bb_event be
+ WHERE ba.id=($id)
+ AND ba.id=bad.application_id
+ AND ba.id=be.application_id
+ AND be.from_=bad.from_
+ AND be.to_=bad.to_)";
+ $results = array();
+ $this->db->query($sql,__LINE__, __FILE__);
+ while ($this->db->next_record())
+ {
+ $results[] = array('from_' =>
$this->db->f('from_', false),
+ 'to_' =>
$this->db->f('to_', false));
+ }
+ return $results;
+ }
+
function get_tilsyn_email($id)
{
$this->db->limit_query("SELECT tilsyn_email FROM
bb_building where id=" . intval($id), 0, __LINE__, __FILE__, 1);
@@ -137,7 +178,7 @@
return $results;
}
-
+
function get_building($id)
{
$this->db->limit_query("SELECT name FROM bb_building
where id=" . intval($id), 0, __LINE__, __FILE__, 1);
Modified: branches/stavangerkommune/booking/inc/class.socommon.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.socommon.inc.php
2013-06-24 12:05:28 UTC (rev 11198)
+++ branches/stavangerkommune/booking/inc/class.socommon.inc.php
2013-06-24 12:15:19 UTC (rev 11199)
@@ -398,7 +398,6 @@
$dir = isset($params['dir']) && $params['dir'] ?
$params['dir'] : 'asc';
$query = isset($params['query']) && $params['query'] ?
$params['query'] : null;
$filters = isset($params['filters']) &&
$params['filters'] ? $params['filters'] : array();
-
$cols_joins = $this->_get_cols_and_joins();
$cols = join(',', $cols_joins[0]);
$joins = join(' ', $cols_joins[1]);
Modified: branches/stavangerkommune/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uiallocation.inc.php
2013-06-24 12:05:28 UTC (rev 11198)
+++ branches/stavangerkommune/booking/inc/class.uiallocation.inc.php
2013-06-24 12:15:19 UTC (rev 11199)
@@ -205,16 +205,42 @@
$allocation['active'] = '1';
$allocation['completed'] = '0';
- $from_date = $_POST['from_'];
- $to_date = $_POST['to_'];
- $weekday = $_POST['weekday'];
+ if (phpgw::get_var('weekday', 'str', 'GET') !=
'')
+ {
+ $from_date = phpgw::get_var('from_',
'str', 'GET');
+ $to_date = phpgw::get_var('to_', 'str',
'GET');
+ $weekday = phpgw::get_var('weekday',
'str', 'GET');
+ $datef = explode(' ',$from_date[0]);
+ $timef = $_POST['from_'];
+ $datet = explode(' ',$to_date[0]);
+ $timet = $_POST['to_'];
- $allocation['from_'] = strftime("%Y-%m-%d
%H:%M", strtotime($_POST['weekday']." ".$_POST['from_']));
- $allocation['to_'] = strftime("%Y-%m-%d %H:%M",
strtotime($_POST['weekday']." ".$_POST['to_']));
+ if (strlen($_POST['from_']) < 15) {
+ $allocation['from_'] =
$datef[0]." ".$timef;
+ $allocation['to_'] =
$datet[0]." ".$timet;
+ $from_date =
$allocation['from_'];
+ $to_date = $allocation['to_'];
+ } else {
+ $allocation['from_'] =
$_POST['from_'];
+ $allocation['to_'] =
$_POST['to_'];
+ $from_date =
$allocation['from_'];
+ $to_date = $allocation['to_'];
+ }
+ } else {
+ $from_date = $_POST['from_'];
+ $to_date = $_POST['to_'];
+ $weekday = $_POST['weekday'];
- if (($_POST['weekday'] != 'sunday' &&
date('w') > date('w',strtotime($_POST['weekday']))) || (date('w') == 'sunday'
&& date('w') < date('w',strtotime($_POST['weekday'])))){
- $allocation['from_'] =
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday']."
".$_POST['from_'])-60*60*24*7);
- $allocation['to_'] = strftime("%Y-%m-%d
%H:%M", strtotime($_POST['weekday']." ".$_POST['to_'])-60*60*24*7);
+ $allocation['from_'] =
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday']." ".$_POST['from_']));
+ $allocation['to_'] = strftime("%Y-%m-%d
%H:%M", strtotime($_POST['weekday']." ".$_POST['to_']));
+ }
+
+
+ if (($_POST['weekday'] != 'sunday' &&
date('w') > date('w',strtotime($_POST['weekday']))) || (date('w') == 'sunday'
&& date('w') < date('w',strtotime($_POST['weekday'])))) {
+ if(phpgw::get_var('weekday', 'str',
'GET') == ''){
+ $allocation['from_'] =
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday']."
".$_POST['from_'])-60*60*24*7);
+ $allocation['to_'] =
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday']."
".$_POST['to_'])-60*60*24*7);
+ }
}
$_POST['from_'] = $allocation['from_'];
$_POST['to_'] = $allocation['to_'];
@@ -416,6 +442,7 @@
if ($_POST['recurring'] != 'on' &&
$_POST['outseason'] != 'on' )
{
+
$err = $this->bo->so->check_for_booking($id);
if ($err)
{
Modified: branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
2013-06-24 12:05:28 UTC (rev 11198)
+++ branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
2013-06-24 12:15:19 UTC (rev 11199)
@@ -332,7 +332,8 @@
$dates[] = $data['from_'];
break;
}
- $application['from_'] = implode(',',$dates);
+ $fromdate = implode(',',$dates);
+ $application['from_'] =
pretty_timestamp($fromdate);
$application['status'] =
lang($application['status']);
$application['created'] =
pretty_timestamp($application['created']);
$application['modified'] =
pretty_timestamp($application['modified']);
Modified: branches/stavangerkommune/booking/inc/class.uievent.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uievent.inc.php 2013-06-24
12:05:28 UTC (rev 11198)
+++ branches/stavangerkommune/booking/inc/class.uievent.inc.php 2013-06-24
12:15:19 UTC (rev 11199)
@@ -357,11 +357,9 @@
$_POST['contact_email'] =
$organization['contacts'][0]['email'];
$_POST['contact_phone'] =
$organization['contacts'][0]['phone'];
}
-
if (!$_POST['application_id'])
{
- $event['active'] = '0';
- $temp_errors = array();
+ $temp_errors = array();
foreach( $event['dates'] as $checkdate)
{
$event['from_'] =
$checkdate['from_'];
@@ -386,6 +384,7 @@
}
else
{
+ $event['active'] = '0';
list($event, $errors) =
$this->extract_and_validate($event);
$time_from = split(" ",$_POST['from_']);
$time_to = split(" ",$_POST['to_']);
@@ -396,7 +395,7 @@
}
}
}
-
+
if ($_POST['cost'] != 0 and
!$event['customer_organization_number'] and !$event['customer_ssn']) {
$errors['invoice_data'] = lang('There
is set a cost, but no invoice data is filled inn');
}
Modified: branches/stavangerkommune/booking/inc/class.uiseason.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uiseason.inc.php
2013-06-24 12:05:28 UTC (rev 11198)
+++ branches/stavangerkommune/booking/inc/class.uiseason.inc.php
2013-06-24 12:15:19 UTC (rev 11199)
@@ -67,6 +67,7 @@
),
'datatable' => array(
'source' =>
self::link(array('menuaction' => 'booking.uiseason.index', 'phpgw_return_as' =>
'json')),
+ 'sorted_by' => array('key' => 'to_',
'dir' => 'desc'),
'field' => array(
array(
'key' => 'name',
Modified: branches/stavangerkommune/booking/setup/phpgw_no.lang
===================================================================
--- branches/stavangerkommune/booking/setup/phpgw_no.lang 2013-06-24
12:05:28 UTC (rev 11198)
+++ branches/stavangerkommune/booking/setup/phpgw_no.lang 2013-06-24
12:15:19 UTC (rev 11199)
@@ -613,7 +613,7 @@
Tilsynsvakt name booking no Tilsynsvakt navn
Tilsynsvakt email booking no Tilsynsvakt epost
Tilsynsvakt telephone booking no Tilsynsvakt telefon
-Metadata booking no Metadata
+Metadata common no Metadata
Author booking no Forfatter
Robots booking no Søkerobot parameter
Frontpage text booking no Forside tekst
Modified: branches/stavangerkommune/booking/templates/base/application.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/application.xsl
2013-06-24 12:05:28 UTC (rev 11198)
+++ branches/stavangerkommune/booking/templates/base/application.xsl
2013-06-24 12:15:19 UTC (rev 11199)
@@ -326,7 +326,7 @@
if (resourceIds) {
<![CDATA[
var url =
'index.php?menuaction=booking.uiresource.index&sort=name&phpgw_return_as=json&'
+ resourceIds;
- var url2 =
'index.php?menuaction=booking.uiapplication.associated&sort=from_&dir=asc&phpgw_return_as=json&filter_application_id='
+ app_id;
+ var url2 =
'index.php?menuaction=booking.uiapplication.associated&sort=from_&dir=asc&phpgw_return_as=json&filter_application_id='+app_id;
]]>
var colDefs = [{key: 'name', label: lang['Resources'], formatter:
YAHOO.booking.formatLink}, {key: 'type', label: lang['Resource Type']}];
YAHOO.booking.inlineTableHelper('resources_container', url,
colDefs);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11199] bkbooking: stavanger update,
Kjell Arne Espedal <=