[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11140] bkbooking: stavanger update
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [11140] bkbooking: stavanger update |
|
Date: |
Fri, 31 May 2013 06:43:37 +0000 |
Revision: 11140
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11140
Author: kjell
Date: 2013-05-31 06:43:36 +0000 (Fri, 31 May 2013)
Log Message:
-----------
bkbooking: stavanger update
Modified Paths:
--------------
branches/stavangerkommune/booking/inc/class.async_task_send_reminder.inc.php
branches/stavangerkommune/booking/inc/class.boapplication.inc.php
branches/stavangerkommune/booking/inc/class.bobooking.inc.php
branches/stavangerkommune/booking/inc/class.menu.inc.php
branches/stavangerkommune/booking/inc/class.soapplication.inc.php
branches/stavangerkommune/booking/inc/class.sobuilding.inc.php
branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
branches/stavangerkommune/booking/jasper/templates/logo.png
branches/stavangerkommune/booking/setup/phpgw_no.lang
branches/stavangerkommune/booking/setup/setup.inc.php
branches/stavangerkommune/booking/setup/tables_current.inc.php
branches/stavangerkommune/booking/setup/tables_update.inc.php
branches/stavangerkommune/booking/templates/base/application.xsl
branches/stavangerkommune/booking/templates/base/application_new.xsl
branches/stavangerkommune/booking/templates/base/building.xsl
branches/stavangerkommune/booking/templates/base/building_form.xsl
branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php
branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang
branches/stavangerkommune/bookingfrontend/setup/setup.inc.php
branches/stavangerkommune/bookingfrontend/templates/base/search.xsl
branches/stavangerkommune/bookingfrontend/templates/stavanger/application_new.xsl
branches/stavangerkommune/bookingfrontend/templates/stavanger/building.xsl
branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php
Added Paths:
-----------
branches/stavangerkommune/booking/inc/class.uiapplication_settings.inc.php
branches/stavangerkommune/booking/inc/class.uimail_settings.inc.php
branches/stavangerkommune/booking/jasper/templates/logo.jpg
branches/stavangerkommune/booking/templates/base/application_settings.xsl
branches/stavangerkommune/booking/templates/base/mail_settings.xsl
Property Changed:
----------------
branches/stavangerkommune/
Property changes on: branches/stavangerkommune
___________________________________________________________________
Modified: svn:ignore
- header.inc.php
.svnignore
.cache
.settings
.project
.*.swp
nbproject
.buildpath
+ header.inc.php
.svnignore
.cache
.settings
.project
.*.swp
nbproject
.buildpath
*.jasper
Modified:
branches/stavangerkommune/booking/inc/class.async_task_send_reminder.inc.php
===================================================================
---
branches/stavangerkommune/booking/inc/class.async_task_send_reminder.inc.php
2013-05-28 19:56:34 UTC (rev 11139)
+++
branches/stavangerkommune/booking/inc/class.async_task_send_reminder.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -118,7 +118,7 @@
{
$body .= "Hvem: %WHO%\n";
}
- $body .= "\nBergen kommune fører statistikk på bruk av
lokaler og ber derfor om at dere \n";
+ $body .= "\nStavanger kommune fører statistikk på bruk
av lokaler og ber derfor om at dere \n";
$body .= "\netter arrangementet melder inn korrekt
deltakertall til oss.\n";
$body .= "Du kan gjøre dette ved å klikke på linken
nedenfor.\n\n%URL%";
Modified: branches/stavangerkommune/booking/inc/class.boapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.boapplication.inc.php
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/inc/class.boapplication.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -20,34 +20,47 @@
$from = isset($config->config_data['email_sender']) &&
$config->config_data['email_sender'] ? $config->config_data['email_sender'] :
"noreply<address@hidden'phpgw_info']['server']['hostname']}>";
$external_site_address =
isset($config->config_data['external_site_address']) &&
$config->config_data['external_site_address'] ?
$config->config_data['external_site_address'] :
$GLOBALS['phpgw_info']['server']['webserver_url'];
+ $subject =
$config->config_data['application_mail_subject'];
- $subject = 'Melding fra Bergen kommune - AktivBy';
$link =
$external_site_address.'/bookingfrontend/?menuaction=bookingfrontend.uiapplication.show&id='.$application['id'].'&secret='.$application['secret'];
if ($created) {
- $body = '<p>Din søknad om leie/lån er
mottatt.</p>';
- $body .= '<p>Praktisk informasjon finner du i
dokumenter knyttet til bygget, ref. juridiske betingelser pk.8 i søknad.</p>';
- $body .= '<p>Klikk på linken under for å se på,
redigere eller ha dialog med saksbehandler om din søknad.</p>';
- $body .= '<p><a href="'.$link.'">Link til
AktivBy: søknad #'.$application['id'].'</a></p>';
+ $body =
"<pre>".$config->config_data['application_mail_created']."</pre>";
+ $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 AktivBy? om leie/lån
er '.lang($application['status']).'.<br />Saksbehandler trenger ytterligere
informasjon, ber om at du klikker på linken under og gir nødvendig
tilbakemeldinger slik at saken kan ferdigbehandles.</p>';
- $body .= '<p><a href="'.$link.'">Link til
AktivBy: søknad #'.$application['id'].'</a></p>';
+ $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><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 AktivBy om leie/lån er
'.lang($application['status']).'.<br /> For å skrive ut en bekreftelse eller ha
dialog med saksbehandler bruk <a href="'.$link.'">Link til AktivBy: søknad
#'.$application['id'].'</a></p>';
+ $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
+['application_mail_systemname'].': søknad #'.$application['id'].'</a></pre>';
if ($application['comment'] != '') {
$body .= '<p>Kommentar fra
saksbehandler:<br />'.$application['comment'].'</p>';
}
+ $buildingemail =
$this->get_building_email($application['building_id']);
+ $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>";
+
+ $send->msg('email', $buildingemail, $subject,
$bbody, '', '', '', $from, '', 'html');
+
} elseif ($application['status'] == 'REJECTED') {
- $body = '<p>Din søknad i AktivBy om leie/lån er
'.lang($application['status']).'.<br />For ytterligere informasjon se <a
href="'.$link.'">Link til AktivBy: søknad #'.$application['id'].'</a></p>';
+ $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>';
if ($application['comment'] != '') {
$body .= '<p>Kommentar fra
saksbehandler:<br />'.$application['comment'].'</p>';
}
}
- $body .= '<p>Med vennlig hilsen AktivBy - Bergen
Kommune</p>';
+ $body .=
"<p>".$config->config_data['application_mail_signature']."</p>";
try
{
Modified: branches/stavangerkommune/booking/inc/class.bobooking.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.bobooking.inc.php
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/inc/class.bobooking.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -275,6 +275,8 @@
$booking['name'] = $booking['group_name'];
$booking['shortname'] =
$booking['group_shortname'];
$booking['type'] = 'booking';
+ unset($booking['audience']);
+ unset($booking['agegroups']);
}
$allocations = $this->split_allocations($allocations,
$bookings);
@@ -285,6 +287,9 @@
{
$event['name'] = $event['description'];
$event['type'] = 'event';
+ unset($event['comments']);
+ unset($event['audience']);
+ unset($event['agegroups']);
}
$bookings = array_merge($allocations, $bookings);
$bookings = $this->_remove_event_conflicts($bookings,
$events);
Modified: branches/stavangerkommune/booking/inc/class.menu.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.menu.inc.php 2013-05-28
19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/inc/class.menu.inc.php 2013-05-31
06:43:36 UTC (rev 11140)
@@ -265,6 +265,16 @@
'text' =>
lang('Documentation'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'booking.uidocumentation.index', 'appname' => 'booking') )
),
+ 'mail_settings' => array
+ (
+ 'text' =>
lang('Mail Settings'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'booking.uimail_settings.index', 'appname' => 'booking') )
+ ),
+ 'application_settings'
=> array
+ (
+ 'text' =>
lang('Application Settings'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'booking.uiapplication_settings.index', 'appname' => 'booking') )
+ ),
'office' => array
(
'text' =>
lang('office'),
Modified: branches/stavangerkommune/booking/inc/class.soapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.soapplication.inc.php
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/inc/class.soapplication.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -115,6 +115,29 @@
'name' => $this->db->f('name',
false));
}
+ function get_building_email($id)
+ {
+ $this->db->limit_query("SELECT email FROM bb_building
where id=" . intval($id), 0, __LINE__, __FILE__, 1);
+ if(!$this->db->next_record())
+ {
+ return False;
+ }
+ return $this->db->f('email', false);
+ }
+
+ function get_resource_name($id)
+ {
+ $list = implode(",",$id);
+ $results = array();
+ $this->db->query("SELECT name FROM bb_resource where id
IN ($list)",__LINE__, __FILE__);
+ while ($this->db->next_record())
+ {
+ $results[] = $this->db->f('name', false);
+ }
+ 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.sobuilding.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.sobuilding.inc.php
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/inc/class.sobuilding.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -13,6 +13,9 @@
'description' => array('type' =>
'string'),
'phone' => array('type' => 'string'),
'email' => array('type' => 'string'),
+ 'tilsyn_name' => array('type' =>
'string'),
+ 'tilsyn_phone' => array('type' =>
'string'),
+ 'tilsyn_email' => array('type' =>
'string'),
'deactivate_calendar' => array('type'
=> 'int'),
'deactivate_application' =>
array('type' => 'int'),
'deactivate_sendmessage' =>
array('type' => 'int'),
Modified: branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -418,6 +418,9 @@
public function add()
{
+ $config = CreateObject('phpgwapi.config','booking');
+ $config->read();
+ $application_text = $config->config_data;
$errors = array();
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
@@ -517,7 +520,7 @@
$audience = $audience['results'];
$this->install_customer_identifier_ui($application);
$application['customer_identifier_types']['ssn'] =
'Date of birth or SSN';
- self::render_template('application_new',
array('application' => $application, 'activities' => $activities, 'agegroups'
=> $agegroups, 'audience' => $audience));
+ self::render_template('application_new',
array('application' => $application, 'activities' => $activities, 'agegroups'
=> $agegroups, 'audience' => $audience,'config' => $application_text));
}
public function edit()
@@ -636,6 +639,9 @@
public function show()
{
+ $config = CreateObject('phpgwapi.config','booking');
+ $config->read();
+ $application_text = $config->config_data;
$id = intval(phpgw::get_var('id', 'GET'));
$application = $this->bo->read_single($id);
@@ -735,6 +741,6 @@
self::check_date_availability($application);
self::render_template('application',
array('application' => $application,
'audience' =>
$audience, 'agegroups' => $agegroups,
-
'num_associations'=>$num_associations,'comments' => $comments));
+
'num_associations'=>$num_associations,'comments' => $comments,'config' =>
$application_text));
}
}
Added:
branches/stavangerkommune/booking/inc/class.uiapplication_settings.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uiapplication_settings.inc.php
(rev 0)
+++ branches/stavangerkommune/booking/inc/class.uiapplication_settings.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -0,0 +1,40 @@
+<?php
+ phpgw::import_class('booking.uicommon');
+
+ class booking_uiapplication_settings extends booking_uicommon
+ {
+ public $public_functions = array
+ (
+ 'index' => true,
+ );
+
+ public function __construct()
+ {
+ parent::__construct();
+
self::set_active_menu('booking::settings::application_settings');
+ }
+
+ public function index()
+ {
+ $config = CreateObject('phpgwapi.config','booking');
+ $config->read();
+
+ if($_SERVER['REQUEST_METHOD'] == 'POST')
+ {
+ foreach($_POST as $dim => $value)
+ {
+ if (strlen(trim($value)) > 0)
+ {
+ $config->value($dim,
trim($value));
+ }
+ else
+ {
+
unset($config->config_data[$dim]);
+ }
+ }
+ $config->save_repository();
+ }
+ $this->use_yui_editor();
+ self::render_template('application_settings',
array('config_data' =>$config->config_data));
+ }
+ }
Modified: branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -26,7 +26,7 @@
$this->bo = CreateObject('booking.bobuilding');
self::set_active_menu('booking::buildings');
- $this->fields = array('name', 'homepage',
'description', 'email', 'street', 'zip_code', 'city', 'district', 'phone',
'active',
'location_code','deactivate_application','deactivate_calendar','deactivate_sendmessage');
+ $this->fields = array('name', 'homepage',
'description', 'email', 'tilsyn_name', 'tilsyn_email', 'tilsyn_phone',
'street', 'zip_code', 'city', 'district', 'phone', 'active',
'location_code','deactivate_application','deactivate_calendar','deactivate_sendmessage');
}
public function properties()
Added: branches/stavangerkommune/booking/inc/class.uimail_settings.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uimail_settings.inc.php
(rev 0)
+++ branches/stavangerkommune/booking/inc/class.uimail_settings.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -0,0 +1,40 @@
+<?php
+ phpgw::import_class('booking.uicommon');
+
+ class booking_uimail_settings extends booking_uicommon
+ {
+ public $public_functions = array
+ (
+ 'index' => true,
+ );
+
+ public function __construct()
+ {
+ parent::__construct();
+
self::set_active_menu('booking::settings::mail_settings');
+ }
+
+ public function index()
+ {
+ $config = CreateObject('phpgwapi.config','booking');
+ $config->read();
+
+ if($_SERVER['REQUEST_METHOD'] == 'POST')
+ {
+ foreach($_POST as $dim => $value)
+ {
+ if (strlen(trim($value)) > 0)
+ {
+ $config->value($dim,
trim($value));
+ }
+ else
+ {
+
unset($config->config_data[$dim]);
+ }
+ }
+ $config->save_repository();
+ }
+ $this->use_yui_editor();
+ self::render_template('mail_settings',
array('config_data' =>$config->config_data));
+ }
+ }
Added: branches/stavangerkommune/booking/jasper/templates/logo.jpg
===================================================================
(Binary files differ)
Property changes on: branches/stavangerkommune/booking/jasper/templates/logo.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/stavangerkommune/booking/jasper/templates/logo.png
===================================================================
(Binary files differ)
Modified: branches/stavangerkommune/booking/setup/phpgw_no.lang
===================================================================
--- branches/stavangerkommune/booking/setup/phpgw_no.lang 2013-05-28
19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/setup/phpgw_no.lang 2013-05-31
06:43:36 UTC (rev 11140)
@@ -1,5 +1,47 @@
booking common no Booking
bookingfrontend common no Bookingfrontend
+global configuration common no Global konfigurasjon
+global message common no Globale beskjeder
+manage users common no Administrere brukere
+manage groups common no Administrere grupper
+clear cache common no Slett cache
+Global Categories common no Globale kategorier
+View Sessions common no Vis sesjoner
+View Access Log common no Vis Access logger
+Find and Register all Application Hooks common no Finn og
register alle applikasjons koblinger
+Asynchronous timed services common no Asynkrone tidsbestemte tjenester
+list users common no bruker liste
+list groups common no gruppe liste
+firstname common no Fornavn
+lastname common no Etternavn
+description common no Beskrivelse
+add sub common no Legg til underkategori
+color common no Farge
+apply common no Aktiver
+enabled common no aktiv
+no category common no Ingen kategori
+inactive common no Inaktiv
+inactive and hidden common no Inaktiv og gjemt
+status common no Status
+contact common no Kontakt
+user data common no Bruker data
+Application common no Applikasjon
+User access common no Bruker tilgang
+edit user common no Rediger bruker
+edit user account common no Rediger bruker konto
+group data common no Gruppe data
+edit group common no Rediger gruppe
+group common no Gruppe
+all users common no Alle brukere
+members common no Medlemer
+applications common no Applikasjoner
+You do not have edit access to addressmaster contacts common no Du har
ikke tilgang til AddresseMaster kontakter
+Can change password common no Kan bytte passord
+Anonymous User (not shown in list sessions) common no Anonym bruker
(vises ikke i sesjons liste)
+expires common no Uløpsdato
+Never common no Aldri
+quota common no Kvote
+are you sure you want to clear cache admin no Er du sikker på at du
vil slette cache
current activities booking no Aktiviteter
-- select an activity -- booking no Velg en aktivitet
-- select a building -- booking no Velg en bygning
@@ -444,7 +486,7 @@
Print as PDF booking no Skriv ut som PDF
Pending booking no UNDER BEHANDLING
This booking is not connected to a season booking no Denne bookingen
er ikke koblet mot en sesong
-Message from Bergen county - AktivBy booking no Melding fra Bergen
kommune - AktivBy
+Message from Bergen county - AktivBy booking no Melding fra Stavanger
kommune - AktivBy
Organization shortname booking no Kortnavn
Group shortname booking no Kortnavn
contacts[0][email] contains an invalid email booking no Ugyldig epost
under ansvarlig gruppeleder 1
@@ -536,11 +578,11 @@
Cancelation of bookings from booking no Avbestilling av bookinger fra
Booking system settings booking no Bookingmodul systeminnstillinger
Frontend users can delete bookings and allocations booking no Brukere
av frontend kan slette bookinger og tildelinger direkte
-All that borrow premises from Bergen Kommune must verify that they have read
the terms and conditions, this is usually fire regulations and house rules.
booking no Alle som leier lokaler hos Bergen kommune må bekrefte at de
har lest betingelsene, dette gjelder som regel brannforskrifter og husreglement.
-Delete information bookingfrontend no Hvis du kun skal slette
tildeling på valgt dato, velg Slett-knappen nederst og tiden blir vist som
ledig i kalenderen, og kan tildeles andre klubber/org.
-Delete information2 bookingfrontend no Skal du slette flere kan du
velge Ut sesong eller Slett til og velg en dato, du kan også velge intervall
(f.eks. annen hver uke).
-Booking Delete information bookingfrontend no Hvis du skal slette
booking på valgt dato, velg Slett-knappen nederst. Skal tiden bli vist som
ledig i kalenderen krysser du av for slett tildeling.
-Booking Delete information2 bookingfrontend no Skal du slette flere
kan du velge Ut sesong eller Slett til og velg en dato, du kan også velge
intervall (f.eks. annen hver uke).
+All that borrow premises from Stavanger Kommune must verify that they have
read the terms and conditions, this is usually fire regulations and house
rules. booking no Alle som leier lokaler hos Stavanger kommune må
bekrefte at de har lest betingelsene, dette gjelder som regel brannforskrifter
og husreglement.
+Delete Information booking no Hvis du kun skal slette tildeling på
valgt dato, velg Slett-knappen nederst og tiden blir vist som ledig i
kalenderen, og kan tildeles andre klubber/org.
+Delete information2 booking no Skal du slette flere kan du velge Ut
sesong eller Slett til og velg en dato, du kan også velge intervall (f.eks.
annen hver uke).
+Booking Delete information booking no Hvis du skal slette booking på
valgt dato, velg Slett-knappen nederst. Skal tiden bli vist som ledig i
kalenderen krysser du av for slett tildeling.
+Booking Delete information2 booking no Skal du slette flere kan du
velge Ut sesong eller Slett til og velg en dato, du kan også velge intervall
(f.eks. annen hver uke).
There is a cost of %1 assosiated with the allocation you are useing booking
no Det er en kostnad på %1kr knyttet til den tildelingen du bruker.
Export booking no Eksport
Upload booking no Last opp
@@ -556,3 +598,17 @@
Resourcenumber is wrong, 5 or 6 characters long booking no
Ressursnummer er feil, skal være 5 eller 6 tegn langt.
office booking no Kontor
office user booking no Saksbehandler
+Mail Settings booking no E-post oppsett
+Application Settings booking no Søknads oppsett
+Booking application settings booking no Booking søknads oppsett.
+Booking email settings booking no Booking epost oppsett.
+System name booking no System navn
+Subject booking no Subject
+Mail text for application created booking no Epost tekst for søknad
opprettet.
+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.
+Signature booking no Signatur
+Tilsynsvakt name booking no Tilsynsvakt navn
+Tilsynsvakt email booking no Tilsynsvakt epost
+Tilsynsvakt telephone booking no Tilsynsvakt telefon
Modified: branches/stavangerkommune/booking/setup/setup.inc.php
===================================================================
--- branches/stavangerkommune/booking/setup/setup.inc.php 2013-05-28
19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/setup/setup.inc.php 2013-05-31
06:43:36 UTC (rev 11140)
@@ -1,6 +1,6 @@
<?php
$setup_info['booking']['name'] = 'booking';
- $setup_info['booking']['version'] = '0.2.10';
+ $setup_info['booking']['version'] = '0.2.11';
$setup_info['booking']['app_order'] = 9;
$setup_info['booking']['enable'] = 1;
$setup_info['booking']['app_group'] = 'office';
@@ -58,7 +58,7 @@
'bb_documentation'
);
- $setup_info['booking']['description'] = 'Bergen kommune booking';
+ $setup_info['booking']['description'] = 'Stavanger kommune booking';
$setup_info['booking']['author'][] = array
(
Modified: branches/stavangerkommune/booking/setup/tables_current.inc.php
===================================================================
--- branches/stavangerkommune/booking/setup/tables_current.inc.php
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/setup/tables_current.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -27,6 +27,9 @@
'location_code' => array('type' =>
'varchar','precision' => '50','nullable' => True),
'phone' => array('type' =>
'varchar','precision' => '50','nullable' => True),
'email' => array('type' =>
'varchar','precision' => '50','nullable' => True),
+ 'tilsyn_name' => array('type' =>
'varchar','precision' => '50','nullable' => True),
+ 'tilsyn_phone' => array('type' =>
'varchar','precision' => '50','nullable' => True),
+ 'tilsyn_email' => array('type' =>
'varchar','precision' => '50','nullable' => True),
'street' => array('type' =>
'varchar','precision' => '255', 'nullable' => True),
'zip_code' => array('type' =>
'varchar','precision' => '255', 'nullable' => True),
'district' => array('type' =>
'varchar','precision' => '255', 'nullable' => True),
Modified: branches/stavangerkommune/booking/setup/tables_update.inc.php
===================================================================
--- branches/stavangerkommune/booking/setup/tables_update.inc.php
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/setup/tables_update.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -2657,4 +2657,24 @@
}
}
+ $test[] = '0.2.10';
+ /**
+ * Update booking version from 0.2.10 to 0.2.11
+ * add description to bb_office
+ *
+ */
+ function booking_upgrade0_2_10()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN tilsyn_name varchar(50)");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN tilsyn_email varchar(50)");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN tilsyn_phone varchar(50)");
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['booking']['currentver'] =
'0.2.11';
+ return $GLOBALS['setup_info']['booking']['currentver'];
+ }
+ }
+
Modified: branches/stavangerkommune/booking/templates/base/application.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/application.xsl
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/templates/base/application.xsl
2013-05-31 06:43:36 UTC (rev 11140)
@@ -212,7 +212,7 @@
</dl>
<dl class="form-col">
<div class="heading"><br />8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></div>
- <p><xsl:value-of select="php:function('lang', 'All that
borrow premises from Bergen Kommune must verify that they have read the terms
and conditions, this is usually fire regulations and house rules.')" /></p>
+ <p><xsl:value-of select="php:function('lang', 'All that
borrow premises from Stavanger Kommune must verify that they have read the
terms and conditions, this is usually fire regulations and house rules.')"
/></p>
<br />
<div id='regulation_documents'> </div>
<br />
Modified: branches/stavangerkommune/booking/templates/base/application_new.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/application_new.xsl
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/templates/base/application_new.xsl
2013-05-31 06:43:36 UTC (rev 11140)
@@ -6,16 +6,21 @@
<xsl:call-template name="yui_booking_i18n"/>
<form action="" method="POST" id='application_form'>
- <p style="width: 750px;">For at vi skal kunne behandle din
søknad
- trenger vi en del opplysninger, og vi trenger en del
opplysninger
- for statistikk formål. Du må derfor fylle ut alle
feltene i
- søknadskjemaet, er det vanskelig å angi eksakt så gi
oss et
- estimat.</p>
+ <xsl:if test="config/application_new_application">
+ <p style="width: 750px;">
+ <xsl:value-of
select="config/application_new_application"/>
+ </p>
+ </xsl:if>
<dl class="form-2col">
<div class="heading">1. <xsl:value-of
select="php:function('lang', 'Why?')" /></div>
<dt>
<label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label>
+ <xsl:if test="config/application_activities">
+ <p>
+ <xsl:value-of
select="config/application_activities"/>
+ </p>
+ </xsl:if>
</dt>
<dd>
<select name="activity_id" id="field_activity">
@@ -33,7 +38,11 @@
</dd>
<dt>
<label for="field_description"><xsl:value-of
select="php:function('lang', 'Information about the event')" /></label>
- <p><xsl:value-of select="php:function('lang',
'Short description. For public events, activities and training under the
direction of organizations and clubs, this information will be displayed on the
internet')" /></p>
+ <xsl:if test="config/application_description">
+ <p>
+ <xsl:value-of
select="config/application_description"/>
+ </p>
+ </xsl:if>
</dt>
<dd>
<textarea id="field_description"
class="full-width" name="description"><xsl:value-of
select="application/description"/></textarea>
@@ -41,7 +50,11 @@
</dl>
<dl class="form-col">
<div class="heading">2. <xsl:value-of
select="php:function('lang', 'How many?')" /></div>
- <p>Oppgi forventet/estimert antall deltakere. Vi vil ha
det fordelt på aldersgruppeog kjønn. Dette er viktig ift. å kartlegge hvem som
bruker anleggene.</p>
+ <xsl:if test="config/application_howmany">
+ <p>
+ <xsl:value-of
select="config/application_howmany"/>
+ </p>
+ </xsl:if>
<dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Estimated number of participants')"
/></label></dt>
<dd>
<table id="agegroup">
@@ -71,7 +84,11 @@
<div class="clr"/>
<dl class="form-col">
<div class="heading">3. <xsl:value-of
select="php:function('lang', 'Where?')" /></div>
- <p>Velg hus og ressurser</p>
+ <xsl:if test="config/application_where">
+ <p>
+ <xsl:value-of
select="config/application_where"/>
+ </p>
+ </xsl:if>
<dt><label for="field_building"><xsl:value-of
select="php:function('lang', 'Building')" /></label></dt>
<dd>
<div class="autocomplete">
@@ -91,7 +108,11 @@
</dl>
<dl class="form-col">
<div class="heading">4. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
- <p>Velg fra dato og angi fra klokkeslett. Velg til dato
og angi klokkeslett. Dato velges fra kalender. Klokkeslett angis med
timer:minutter. Du kan søke om flere tider ved å velge Legg til
dato. For søknad om fast tid i en gitt periode legg inn startdato og
klokkeslett for den første gangen her og oppgi intervall og
sluttdato i felt 1: "Informasjon om aktiviteten"</p>
+ <xsl:if test="config/application_when">
+ <p>
+ <xsl:value-of
select="config/application_when"/>
+ </p>
+ </xsl:if>
<div id="dates-container">
<xsl:for-each select="application/dates">
<div class="date-container">
@@ -117,7 +138,11 @@
</dl>
<dl class="form-col">
<div class="heading">5. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
- <p>Kryss av for hvilken målgruppe
arrangementet/treningen er rettet mot. Du kan krysse av for flere.</p>
+ <xsl:if test="config/application_who">
+ <p>
+ <xsl:value-of
select="config/application_who"/>
+ </p>
+ </xsl:if>
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Target audience')" /></label></dt>
<dd>
<div id="audience_container"> </div>
@@ -126,7 +151,11 @@
<div class="clr"/>
<dl class="form-col">
<div class="heading"><br />6. <xsl:value-of
select="php:function('lang', 'Contact information')" /></div>
- <p>Oppgi ditt navn (fornavn og etternavn), e-post
adresse vi kan nå deg på og telefon, mobil om du vil ha melding på SMS.</p>
+ <xsl:if test="config/application_contact_information">
+ <p>
+ <xsl:value-of
select="config/application_contact_information"/>
+ </p>
+ </xsl:if>
<dt><label for="field_contact_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label></dt>
<dd>
<input id="field_contact_name"
name="contact_name" type="text">
@@ -154,18 +183,34 @@
</dl>
<dl class="form-col">
<div class="heading">7. <xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /></div>
- <p>Ut fra reglementet i pkt. 8 finner du kriterier for
fakturering. Når du som privatperson skal låne noe som det ikke skal faktureres
for oppgir du kun fødselsdato, men skal du leie noe som koster noe, da må vi ha
hele personnummeret. Alle lag og organisasjoner skal oppgi organisasjonsnr.</p>
+ <xsl:if test="config/application_responsible_applicant">
+ <p>
+ <xsl:value-of
select="config/application_responsible_applicant"/>
+ </p>
+ </xsl:if>
<xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/>
<br />
- <p><xsl:value-of select="php:function('lang', 'In order
to send the invoice we need information about either customer organization
number or norwegian social security number')" /></p>
+ <xsl:if test="config/application_invoice_information">
+ <p>
+ <xsl:value-of
select="config/application_invoice_information"/>
+ </p>
+ </xsl:if>
</dl>
<dl class="form-col">
<div class="heading"><br />8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></div>
- <p>Alle som leier lokaler hos Bergen kommune må
bekrefte at de har lest betingelsene, dette gjelder som regel brannforskrifter
og husreglement.</p>
+ <xsl:if test="config/application_terms">
+ <p>
+ <xsl:value-of
select="config/application_terms"/>
+ </p>
+ </xsl:if>
<br />
<div id='regulation_documents'> </div>
<br />
- <p><xsl:value-of select="php:function('lang', 'To
borrow premises you must verify that you have read terms and conditions')"
/></p>
+ <xsl:if test="config/application_terms2">
+ <p>
+ <xsl:value-of
select="config/application_terms2"/>
+ </p>
+ </xsl:if>
</dl>
<div class="form-buttons">
<input type="submit">
Added: branches/stavangerkommune/booking/templates/base/application_settings.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/application_settings.xsl
(rev 0)
+++ branches/stavangerkommune/booking/templates/base/application_settings.xsl
2013-05-31 06:43:36 UTC (rev 11140)
@@ -0,0 +1,73 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <div id="content">
+
+ <xsl:call-template name="msgbox"/>
+ <xsl:call-template name="yui_booking_i18n"/>
+
+ <dl class="form">
+ <dt class="heading"><xsl:value-of select="php:function('lang',
'Booking application settings')"/></dt>
+ </dl>
+
+ <form action="" method="POST">
+
+ <dl class="form-col">
+ <dt><label for="field_application_new_application"><xsl:value-of
select="php:function('lang', 'New application')"/></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea
id="field_application_new_application" class="full-width settings"
name="application_new_application" type="text"><xsl:value-of
select="config_data/application_new_application"/></textarea>
+ </dd>
+ <dt><label for="field_application_activities"><xsl:value-of
select="php:function('lang', 'Activity')"/></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_activities"
name="application_activities" class="full-width settings"
type="text"><xsl:value-of
select="config_data/application_activities"/></textarea>
+ </dd>
+ <dt>
+ <label
for="field_application_description"><xsl:value-of select="php:function('lang',
'Information about the event')" /></label>
+ </dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_description"
name="application_description" class="full-width settings"
type="text"><xsl:value-of
select="config_data/application_description"/></textarea>
+ </dd>
+ <dt><label for="field_application_howmany"><xsl:value-of
select="php:function('lang', 'How many?')" /></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_howmany"
name="application_howmany" class="full-width settings"
type="text"><xsl:value-of select="config_data/application_howmany"/></textarea>
+ </dd>
+ <dt><label for="field_application_where"><xsl:value-of
select="php:function('lang', 'Where?')" /></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_where"
name="application_where" class="full-width settings" type="text"><xsl:value-of
select="config_data/application_where"/></textarea>
+ </dd>
+ <dt><label for="field_application_when"><xsl:value-of
select="php:function('lang', 'When?')" /></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_when"
name="application_when" class="full-width settings" type="text"><xsl:value-of
select="config_data/application_when"/></textarea>
+ </dd>
+ <dt><label for="field_application_who"><xsl:value-of
select="php:function('lang', 'Who?')" /></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_who"
name="application_who" class="full-width settings" type="text"><xsl:value-of
select="config_data/application_who"/></textarea>
+ </dd>
+ <dt><label
for="field_application_contact_information"><xsl:value-of
select="php:function('lang', 'Contact information')" /></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea
id="field_application_contact_information"
name="application_contact_information" class="full-width settings"
type="text"><xsl:value-of
select="config_data/application_contact_information"/></textarea>
+ </dd>
+ <dt><label
for="field_application_responsible_applicant"><xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /> 1</label></dt>
+ <dd class="yui-skin-sam">
+ <textarea
id="field_application_responsible_applicant"
name="application_responsible_applicant" class="full-width settings"
type="text"><xsl:value-of
select="config_data/application_responsible_applicant"/></textarea>
+ </dd>
+ <dt><label
for="field_application_invoice_information"><xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /> 2</label></dt>
+ <dd class="yui-skin-sam">
+ <textarea
id="field_application_invoice_information"
name="application_invoice_information" class="full-width settings"
type="text"><xsl:value-of
select="config_data/application_invoice_information"/></textarea>
+ </dd>
+ <dt><label for="field_application_terms"><xsl:value-of
select="php:function('lang', 'Terms and conditions')" /> 1</label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_terms"
name="application_terms" class="full-width settings" type="text"><xsl:value-of
select="config_data/application_terms"/></textarea>
+ </dd>
+ <dt><label for="field_application_terms2"><xsl:value-of
select="php:function('lang', 'Terms and conditions')" /> 2</label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_terms2"
name="application_terms2" class="full-width settings"
type="text"><xsl:value-of select="config_data/application_terms2"/></textarea>
+ </dd>
+ </dl>
+ <div class="form-buttons">
+ <input type="submit">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Save')"/></xsl:attribute>
+ </input>
+ </div>
+ </form>
+ </div>
+
+</xsl:template>
Modified: branches/stavangerkommune/booking/templates/base/building.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/building.xsl
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/templates/base/building.xsl
2013-05-31 06:43:36 UTC (rev 11140)
@@ -36,6 +36,7 @@
<dt><xsl:value-of select="php:function('lang',
'Location Code')" /></dt>
<dd><a href="{building/location_link}"><xsl:value-of
select="building/location_code"/></a></dd>
</xsl:if>
+
</dl>
<dl class="proplist-col">
<dt>
@@ -53,8 +54,22 @@
<dt><xsl:value-of select="php:function('lang',
'Telephone')" /></dt>
<dd><xsl:value-of select="building/phone"/></dd>
+
+ <xsl:if test="building/tilsyn_name != ''">
+ <dt><xsl:value-of select="php:function('lang', 'Tilsynsvakt
name')" /></dt>
+ <dd><xsl:value-of select="building/tilsyn_name"/></dd>
+ <dt>
+ <xsl:value-of select="php:function('lang', 'Tilsynsvakt
email')" /></dt>
+ <dd><a>
+ <xsl:attribute name="href">mailto:<xsl:value-of
select="building/tilsyn_email"/></xsl:attribute>
+ <xsl:value-of select="building/tilsyn_email"/></a>
+ </dd>
+
+ <dt><xsl:value-of select="php:function('lang',
'Tilsynsvakt telephone')" /></dt>
+ <dd><xsl:value-of select="building/tilsyn_phone"/></dd>
+ </xsl:if>
</dl>
-
+
<div class="form-buttons">
<xsl:if test="building/permission/write">
<button>
Modified: branches/stavangerkommune/booking/templates/base/building_form.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/building_form.xsl
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/booking/templates/base/building_form.xsl
2013-05-31 06:43:36 UTC (rev 11140)
@@ -74,6 +74,17 @@
</dd>
</xsl:if>
</dl>
+ <dl class="form-col">
+ <dt><label for="field_name"><xsl:value-of
select="php:function('lang', 'Tilsyns vakt name')" /></label></dt>
+ <dd><input name="name" type="text"
value="{building/tilsyn_name}"/></dd>
+
+ <dt><label for="field_phone"><xsl:value-of
select="php:function('lang', 'Tilsyns vakt telephone')" /></label></dt>
+ <dd><input id="field_phone" name="phone"
type="text" value="{building/tilsyn_phone}"/></dd>
+
+ <dt><label for="field_email"><xsl:value-of
select="php:function('lang', 'Tilsyns vakt email')" /></label></dt>
+ <dd><input id="field_email" name="email"
type="text" value="{building/tilsyn_email}"/></dd>
+ </dl>
+
<div class="clr"/>
<dl class="form-col">
<xsl:if test="not(new_form)">
Added: branches/stavangerkommune/booking/templates/base/mail_settings.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/mail_settings.xsl
(rev 0)
+++ branches/stavangerkommune/booking/templates/base/mail_settings.xsl
2013-05-31 06:43:36 UTC (rev 11140)
@@ -0,0 +1,57 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <div id="content">
+
+ <xsl:call-template name="msgbox"/>
+ <xsl:call-template name="yui_booking_i18n"/>
+
+ <dl class="form">
+ <dt class="heading"><xsl:value-of select="php:function('lang',
'Booking system settings')"/></dt>
+ </dl>
+
+ <form action="" method="POST">
+
+ <dl class="form-col">
+ <dt><label for="field_application_mail_systemname"><xsl:value-of
select="php:function('lang', 'System name')"/></label></dt>
+ <dd>
+ <input id="field_application_mail_systemname"
name="application_mail_systemname" type="text" size="50">
+ <xsl:attribute
name="value"><xsl:value-of
select="config_data/application_mail_systemname"/></xsl:attribute>
+ </input>
+ </dd>
+ <dt><label for="field_application_mail_subject"><xsl:value-of
select="php:function('lang', 'Subject')"/></label></dt>
+ <dd>
+ <input id="field_application_mail_subject"
name="application_mail_subject" type="text" size="50">
+ <xsl:attribute
name="value"><xsl:value-of
select="config_data/application_mail_subject"/></xsl:attribute>
+ </input>
+ </dd>
+ <dt><label for="field_application_mail_created"><xsl:value-of
select="php:function('lang', 'Mail text for application
created')"/></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_mail_created"
class="full-width settings" name="application_mail_created"
type="text"><xsl:value-of
select="config_data/application_mail_created"/></textarea>
+ </dd>
+ <dt><label for="field_application_mail_pending"><xsl:value-of
select="php:function('lang', 'Mail text for application
pending')"/></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_mail_pending"
class="full-width settings" name="application_mail_pending"
type="text"><xsl:value-of
select="config_data/application_mail_pending"/></textarea>
+ </dd>
+ <dt><label for="field_application_mail_accepted"><xsl:value-of
select="php:function('lang', 'Mail text for application
accepted')"/></label></dt>
+ <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_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>
+ </dd>
+ <dt><label for="field_application_mail_signature"><xsl:value-of
select="php:function('lang', 'Signature')"/></label></dt>
+ <dd>
+ <input id="field_application_mail_signature"
name="application_mail_signature" type="text" size="50">
+ <xsl:attribute
name="value"><xsl:value-of
select="config_data/application_mail_signature"/></xsl:attribute>
+ </input>
+ </dd>
+
+ </dl>
+ <div class="form-buttons">
+ <input type="submit">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Save')"/></xsl:attribute>
+ </input>
+ </div>
+ </form>
+ </div>
+</xsl:template>
Modified: branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/bookingfrontend/inc/class.bouser.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -3,8 +3,8 @@
{
const ORGNR_SESSION_KEY = 'orgnr';
- public
- $orgnr = null;
+ public $orgnr = null;
+ public $orgname = null;
protected
$default_module = 'bookingfrontend',
@@ -20,8 +20,20 @@
public function __construct() {
$this->set_module();
$this->orgnr = $this->get_user_orgnr_from_session();
+ $this->orgname =
$this->get_orgname_from_db($this->get_user_orgnr_from_session());
}
+ protected function get_orgname_from_db($orgnr)
+ {
+ $this->db = & $GLOBALS['phpgw']->db;
+ $this->db->limit_query("select name from
bb_organization where organization_number ='" .$orgnr."'", 0, __LINE__,
__FILE__, 1);
+ if(!$this->db->next_record())
+ {
+ return $orgnr;
+ }
+ return $this->db->f('name', false);
+
+ }
protected function set_module($module = null)
{
$this->module = is_string($module) ? $module :
$this->default_module;
@@ -31,11 +43,12 @@
{
return $this->module;
}
-
+
public function log_in()
{
$this->log_off();
$this->orgnr = $this->get_user_orgnr_from_auth_header();
+ $this->orgname =
$this->get_orgname_from_db($this->get_user_orgnr_from_auth_header());
/*
try
@@ -73,6 +86,7 @@
protected function clear_user_orgnr()
{
$this->orgnr = null;
+ $this->orgname = null;
}
public function get_user_orgnr()
@@ -150,64 +164,82 @@
return null;
}
}
+
protected function get_user_orgnr_from_auth_header()
{
$config =
CreateObject('phpgwapi.config','bookingfrontend');
$config->read();
- $header_key = isset($config->config_data['header_key'])
&& $config->config_data['header_key'] ? $config->config_data['header_key'] :
'Osso-User-Dn';
- $header_regular_expression =
isset($config->config_data['header_regular_expression']) &&
$config->config_data['header_regular_expression'] ?
$config->config_data['header_regular_expression'] : '/^cn=(.*),cn=users.*$/';
+# echo "<pre>\n";
- $headers = getallheaders();
+# $xmldata =
simplexml_load_file('/srv/portico/stavangerkommune_xml/KnutHelle.xml');
+ $xmldata =
simplexml_load_file('/srv/portico/stavangerkommune_xml/AneYrjaHolter.xml');
+# $xmldata =
simplexml_load_file('/srv/portico/stavangerkommune_xml/HanneDale.xml');
- if(isset($config->config_data['debug']) &&
$config->config_data['debug'])
- {
- $this->debug = true;
- echo 'headers:<br>';
- _debug_array($headers);
+# print_r($xmldata);
+# echo "\n";
+ $myorgnr = null;
+ foreach ($xmldata->melding->roller->enhet->orgnr as
$key => $value) {
+ $myorgnr = $value;
}
- if(isset($headers[$header_key]) &&
$headers[$header_key])
- {
- $matches = array();
-
preg_match_all($header_regular_expression,$headers[$header_key], $matches);
- $userid = $matches[1][0];
+ $external_user = (object) 'ciao'; $external_user->login
= $myorgnr;
- if($this->debug)
- {
- echo 'matches:<br>';
- _debug_array($matches);
- }
+# exit;
- }
+# $header_key = isset($config->config_data['header_key'])
&& $config->config_data['header_key'] ? $config->config_data['header_key'] :
'Osso-User-Dn';
+# $header_regular_expression =
isset($config->config_data['header_regular_expression']) &&
$config->config_data['header_regular_expression'] ?
$config->config_data['header_regular_expression'] : '/^cn=(.*),cn=users.*$/';
- $options = array();
- $options['soap_version'] = SOAP_1_1;
- $options['location'] =
isset($config->config_data['soap_location']) &&
$config->config_data['soap_location'] ? $config->config_data['soap_location'] :
'';// 'http://soat1a.srv.bergenkom.no:8888/gateway/services/BrukerService-v1';
- $options['uri'] =
isset($config->config_data['soap_uri']) && $config->config_data['soap_uri'] ?
$config->config_data['soap_uri'] : '';// 'http://soat1a.srv.bergenkom.no';
- $options['trace'] = 1;
+# $headers = getallheaders();
- if(isset($config->config_data['soap_proxy_host']) &&
$config->config_data['soap_proxy_host'])
- {
- $options['proxy_host'] =
$config->config_data['soap_proxy_host'];
- }
+# if(isset($config->config_data['debug']) &&
$config->config_data['debug'])
+# {
+# $this->debug = true;
+# echo 'headers:<br>';
+# _debug_array($headers);
+# }
- if(isset($config->config_data['soap_proxy_port']) &&
$config->config_data['soap_proxy_port'])
- {
- $options['proxy_port'] =
$config->config_data['soap_proxy_port'];
- }
- $options['encoding'] =
isset($config->config_data['soap_encoding']) &&
$config->config_data['soap_encoding'] ? $config->config_data['soap_encoding'] :
'UTF-8';
- $options['login'] =
isset($config->config_data['soap_login']) && $config->config_data['soap_login']
? $config->config_data['soap_login'] : '';
- $options['password'] =
isset($config->config_data['soap_password']) &&
$config->config_data['soap_password'] ? $config->config_data['soap_password'] :
'';
+# if(isset($headers[$header_key]) &&
$headers[$header_key])
+# {
+# $matches = array();
+#
preg_match_all($header_regular_expression,$headers[$header_key], $matches);
+# $userid = $matches[1][0];
- $wsdl = isset($config->config_data['soap_wsdl']) &&
$config->config_data['soap_wsdl'] ? $config->config_data['soap_wsdl'] : '';//
'http://soat1a.srv.bergenkom.no:8888/gateway/services/BrukerService-v1?wsdl';
+# if($this->debug)
+# {
+# echo 'matches:<br>';
+# _debug_array($matches);
+# }
- $authentication_method =
isset($config->config_data['authentication_method']) &&
$config->config_data['authentication_method'] ?
$config->config_data['authentication_method'] : '';
+# }
- require_once
PHPGW_SERVER_ROOT."/bookingfrontend/inc/custom/default/{$authentication_method}";
-
- $external_user = new booking_external_user($wsdl,
$options, $userid, $this->debug);
+# $options = array();
+# $options['soap_version'] = SOAP_1_1;
+# $options['location'] =
isset($config->config_data['soap_location']) &&
$config->config_data['soap_location'] ? $config->config_data['soap_location'] :
'';// 'http://soat1a.srv.bergenkom.no:8888/gateway/services/BrukerService-v1';
+# $options['uri'] =
isset($config->config_data['soap_uri']) && $config->config_data['soap_uri'] ?
$config->config_data['soap_uri'] : '';// 'http://soat1a.srv.bergenkom.no';
+# $options['trace'] = 1;
+
+# if(isset($config->config_data['soap_proxy_host']) &&
$config->config_data['soap_proxy_host'])
+# {
+# $options['proxy_host'] =
$config->config_data['soap_proxy_host'];
+# }
+
+# if(isset($config->config_data['soap_proxy_port']) &&
$config->config_data['soap_proxy_port'])
+# {
+# $options['proxy_port'] =
$config->config_data['soap_proxy_port'];
+# }
+# $options['encoding'] =
isset($config->config_data['soap_encoding']) &&
$config->config_data['soap_encoding'] ? $config->config_data['soap_encoding'] :
'UTF-8';
+# $options['login'] =
isset($config->config_data['soap_login']) && $config->config_data['soap_login']
? $config->config_data['soap_login'] : '';
+# $options['password'] =
isset($config->config_data['soap_password']) &&
$config->config_data['soap_password'] ? $config->config_data['soap_password'] :
'';
+
+# $wsdl = isset($config->config_data['soap_wsdl']) &&
$config->config_data['soap_wsdl'] ? $config->config_data['soap_wsdl'] : '';//
'http://soat1a.srv.bergenkom.no:8888/gateway/services/BrukerService-v1?wsdl';
+
+# $authentication_method =
isset($config->config_data['authentication_method']) &&
$config->config_data['authentication_method'] ?
$config->config_data['authentication_method'] : '';
+
+# require_once
PHPGW_SERVER_ROOT."/bookingfrontend/inc/custom/default/{$authentication_method}";
+#
+# $external_user = new booking_external_user($wsdl,
$options, $userid, $this->debug);
// test values
//$external_user = (object) 'ciao';
$external_user->login = 994239929;
Modified: branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang
2013-05-31 06:43:36 UTC (rev 11140)
@@ -356,3 +356,6 @@
Booking Cancel information bookingfrontend no Hvis du skal avbestille
booking på valgt dato, velg Avbestill-knappen nederst. Skal tiden bli vist som
ledig i kalenderen krysser du av for slett tildeling.
Booking Cancel information2 bookingfrontend no Skal du avbestille
flere kan du velge Ut sesong eller Avbestill til og velg en dato, du kan også
velge intervall (f.eks. annen hver uke).
You cant edit a booking that is older than 2 weeks bookingfrontend no
Du kan ikke redigere en booking som er eldre en 2 uker.
+Tilsynsvakt name bookingfrontend no Tilsynsvakt navn
+Tilsynsvakt email bookingfrontend no Tilsynsvakt epost
+Tilsynsvakt telephone bookingfrontend no Tilsynsvakt telefon
Modified: branches/stavangerkommune/bookingfrontend/setup/setup.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/setup/setup.inc.php
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/bookingfrontend/setup/setup.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -5,7 +5,7 @@
$setup_info['bookingfrontend']['enable'] = 1;
$setup_info['bookingfrontend']['app_group'] = 'office';
- $setup_info['bookingfrontend']['description'] = 'Bergen kommune
bookingfrontend';
+ $setup_info['bookingfrontend']['description'] = 'Stavanger kommune
bookingfrontend';
$setup_info['bookingfrontend']['author'][] = array
(
Modified: branches/stavangerkommune/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/stavangerkommune/bookingfrontend/templates/base/search.xsl
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/bookingfrontend/templates/base/search.xsl
2013-05-31 06:43:36 UTC (rev 11140)
@@ -34,7 +34,7 @@
<xsl:if test="not(search)">
<div id="cloud">
- <div>Velkommen til Bergen kommune og AktivBy.<br />
+ <div>Velkommen til Stavanger kommune og AktivBy.<br />
Her finner du informasjon om bygg, anlegg<br />
som leies ut av Idrett, Kultur og Grønn etat.</div>
Modified:
branches/stavangerkommune/bookingfrontend/templates/stavanger/application_new.xsl
===================================================================
---
branches/stavangerkommune/bookingfrontend/templates/stavanger/application_new.xsl
2013-05-28 19:56:34 UTC (rev 11139)
+++
branches/stavangerkommune/bookingfrontend/templates/stavanger/application_new.xsl
2013-05-31 06:43:36 UTC (rev 11140)
@@ -6,16 +6,21 @@
<xsl:call-template name="yui_booking_i18n"/>
<form action="" method="POST" id='application_form'>
- <p style="width: 750px;">For at vi skal kunne behandle din
søknad
- trenger vi en del opplysninger, og vi trenger en del
opplysninger
- for statistikk formål. Du må derfor fylle ut alle
feltene i
- søknadskjemaet, er det vanskelig å angi eksakt så gi
oss et
- estimat.</p>
+ <xsl:if test="config/application_new_application">
+ <p style="width: 750px;">
+ <xsl:value-of
select="config/application_new_application"/>
+ </p>
+ </xsl:if>
<dl class="form-2col">
<div class="heading">1. <xsl:value-of
select="php:function('lang', 'Why?')" /></div>
<dt>
<label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label>
+ <xsl:if test="config/application_activities">
+ <p>
+ <xsl:value-of
select="config/application_activities"/>
+ </p>
+ </xsl:if>
</dt>
<dd>
<select name="activity_id" id="field_activity">
@@ -33,7 +38,11 @@
</dd>
<dt>
<label for="field_description"><xsl:value-of
select="php:function('lang', 'Information about the event')" /></label>
- <p>Gi en kort beskrivelse av
arrangementet/aktiviteten.</p>
+ <xsl:if test="config/application_description">
+ <p>
+ <xsl:value-of
select="config/application_description"/>
+ </p>
+ </xsl:if>
</dt>
<dd>
<textarea id="field_description"
class="full-width" name="description"><xsl:value-of
select="application/description"/></textarea>
@@ -41,7 +50,11 @@
</dl>
<dl class="form-col">
<div class="heading">2. <xsl:value-of
select="php:function('lang', 'How many?')" /></div>
- <p>Oppgi forventet/estimert antall deltakere.</p>
+ <xsl:if test="config/application_howmany">
+ <p>
+ <xsl:value-of
select="config/application_howmany"/>
+ </p>
+ </xsl:if>
<dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Estimated number of participants')"
/></label></dt>
<dd>
<table id="agegroup">
@@ -71,7 +84,11 @@
<div class="clr"/>
<dl class="form-col">
<div class="heading">3. <xsl:value-of
select="php:function('lang', 'Where?')" /></div>
- <p>Velg idrettsanlegg og ressurser.</p>
+ <xsl:if test="config/application_where">
+ <p>
+ <xsl:value-of
select="config/application_where"/>
+ </p>
+ </xsl:if>
<dt><label for="field_building"><xsl:value-of
select="php:function('lang', 'Building')" /></label></dt>
<dd>
<div class="autocomplete">
@@ -91,7 +108,11 @@
</dl>
<dl class="form-col">
<div class="heading">4. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
- <p>Velg fra dato og angi fra klokkeslett. Velg til dato
og angi klokkeslett. Du kan søke om flere tider ved å velge Legg til dato.</p>
+ <xsl:if test="config/application_when">
+ <p>
+ <xsl:value-of
select="config/application_when"/>
+ </p>
+ </xsl:if>
<div id="dates-container">
<xsl:for-each select="application/dates">
<div class="date-container">
@@ -117,7 +138,11 @@
</dl>
<dl class="form-col">
<div class="heading">5. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
- <p>Kryss av for hvilken målgruppe
arrangementet/treningen er rettet mot. Du kan krysse av for flere.</p>
+ <xsl:if test="config/application_who">
+ <p>
+ <xsl:value-of
select="config/application_who"/>
+ </p>
+ </xsl:if>
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Target audience')" /></label></dt>
<dd>
<div id="audience_container"> </div>
@@ -126,6 +151,11 @@
<div class="clr"/>
<dl class="form-col">
<div class="heading"><br />6. <xsl:value-of
select="php:function('lang', 'Contact information')" /></div>
+ <xsl:if test="config/application_contact_information">
+ <p>
+ <xsl:value-of
select="config/application_contact_information"/>
+ </p>
+ </xsl:if>
<dt><label for="field_contact_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label></dt>
<dd>
<input id="field_contact_name"
name="contact_name" type="text">
@@ -144,7 +174,7 @@
<xsl:attribute
name="value"><xsl:value-of select="application/contact_email2"/></xsl:attribute>
</input>
</dd>
- <dt><label
for="field_contact_phone">Mobiltelefon</label></dt>
+ <dt><label for="field_contact_phone"><xsl:value-of
select="php:function('lang', 'Phone')" /></label></dt>
<dd>
<input id="field_contact_phone"
name="contact_phone" type="text">
<xsl:attribute
name="value"><xsl:value-of select="application/contact_phone"/></xsl:attribute>
@@ -153,16 +183,34 @@
</dl>
<dl class="form-col">
<div class="heading">7. <xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /></div>
- <p>I reglementet i pkt. 8 finner du kriterier for
fakturering.</p>
+ <xsl:if test="config/application_responsible_applicant">
+ <p>
+ <xsl:value-of
select="config/application_responsible_applicant"/>
+ </p>
+ </xsl:if>
<xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/>
<br />
- <p>For å kunne sende faktura trenger vi opplysninger om
organisasjonsnr. eller fødselsnr. Organisasjonsnr. finner du her:
www.brreg.no</p>
+ <xsl:if test="config/application_invoice_information">
+ <p>
+ <xsl:value-of
select="config/application_invoice_information"/>
+ </p>
+ </xsl:if>
</dl>
<dl class="form-col">
<div class="heading"><br />8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></div>
+ <xsl:if test="config/application_terms">
+ <p>
+ <xsl:value-of
select="config/application_terms"/>
+ </p>
+ </xsl:if>
+ <br />
<div id='regulation_documents'> </div>
<br />
- <p>For å booke idrettsanlegg må du bekrefte at du har
lest juridiske betingelser.</p>
+ <xsl:if test="config/application_terms2">
+ <p>
+ <xsl:value-of
select="config/application_terms2"/>
+ </p>
+ </xsl:if>
</dl>
<div class="form-buttons">
<input type="submit">
Modified:
branches/stavangerkommune/bookingfrontend/templates/stavanger/building.xsl
===================================================================
--- branches/stavangerkommune/bookingfrontend/templates/stavanger/building.xsl
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/bookingfrontend/templates/stavanger/building.xsl
2013-05-31 06:43:36 UTC (rev 11140)
@@ -64,6 +64,23 @@
<xsl:value-of
select="district"/>
</dd>
</xsl:if>
+
+ <xsl:if test="tilsyn_name and
normalize-space(tilsyn_name)">
+ <dt><xsl:value-of
select="php:function('lang', 'Tilsynsvakt name')" /></dt>
+ <dd><xsl:value-of
select="tilsyn_name"/></dd>
+ </xsl:if>
+
+ <xsl:if test="tilsyn_email and
normalize-space(tilsyn_email)">
+ <dt><xsl:value-of
select="php:function('lang', 'Tilsynsvakt email')" /></dt>
+ <dd><a
href='mailto:{tilsyn_email}'><xsl:value-of select="tilsyn_email"/></a></dd>
+ </xsl:if>
+
+ <xsl:if test="tilsyn_phone and
normalize-space(tilsyn_phone)">
+ <dt><xsl:value-of
select="php:function('lang', 'Tilsynsvakt telephone')" /></dt>
+ <dd><xsl:value-of
select="tilsyn_phone"/></dd>
+ </xsl:if>
+
+
</dl>
</xsl:if>
Modified: branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php
===================================================================
--- branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php
2013-05-28 19:56:34 UTC (rev 11139)
+++ branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php
2013-05-31 06:43:36 UTC (rev 11140)
@@ -143,7 +143,7 @@
$bouser = CreateObject('bookingfrontend.bouser');
if($bouser->is_logged_in())
{
- $tpl_vars['login_text'] = $bouser->orgnr . ' :: ' .
lang('Logout');
+ $tpl_vars['login_text'] = $bouser->orgname . ' :: ' .
lang('Logout');
$tpl_vars['login_url'] = 'logout.php';
}
else
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11140] bkbooking: stavanger update,
Kjell Arne Espedal <=