[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6642] bkbooking: added functionality to event, buil
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [6642] bkbooking: added functionality to event, building and application |
|
Date: |
Thu, 25 Nov 2010 17:12:16 +0000 |
Revision: 6642
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6642
Author: kjell
Date: 2010-11-25 17:12:15 +0000 (Thu, 25 Nov 2010)
Log Message:
-----------
bkbooking: added functionality to event, building and application
Modified Paths:
--------------
trunk/booking/inc/class.bobuilding.inc.php
trunk/booking/inc/class.sobuilding.inc.php
trunk/booking/inc/class.soevent.inc.php
trunk/booking/inc/class.uiapplication.inc.php
trunk/booking/inc/class.uibuilding.inc.php
trunk/booking/inc/class.uievent.inc.php
trunk/booking/setup/phpgw_no.lang
trunk/booking/setup/setup.inc.php
trunk/booking/setup/tables_current.inc.php
trunk/booking/setup/tables_update.inc.php
trunk/booking/templates/base/building_form.xsl
trunk/booking/templates/base/event_edit.xsl
trunk/bookingfrontend/inc/class.uibuilding.inc.php
trunk/bookingfrontend/setup/phpgw_no.lang
trunk/bookingfrontend/setup/setup.inc.php
trunk/bookingfrontend/templates/base/building.xsl
trunk/bookingfrontend/templates/base/building_schedule.xsl
Modified: trunk/booking/inc/class.bobuilding.inc.php
===================================================================
--- trunk/booking/inc/class.bobuilding.inc.php 2010-11-25 14:52:47 UTC (rev
6641)
+++ trunk/booking/inc/class.bobuilding.inc.php 2010-11-25 17:12:15 UTC (rev
6642)
@@ -20,7 +20,7 @@
),
booking_sopermission::ROLE_CASE_OFFICER
=> array
(
- 'write' =>
array_fill_keys(array('name', 'homepage', 'description', 'email', 'phone',
'street', 'zip_code', 'city', 'district'), true),
+ 'write' =>
array_fill_keys(array('name', 'homepage', 'description', 'email', 'phone',
'street', 'zip_code', 'city',
'district','deactivate_application','deactivate_calendar'), true),
),
'global' => array
(
Modified: trunk/booking/inc/class.sobuilding.inc.php
===================================================================
--- trunk/booking/inc/class.sobuilding.inc.php 2010-11-25 14:52:47 UTC (rev
6641)
+++ trunk/booking/inc/class.sobuilding.inc.php 2010-11-25 17:12:15 UTC (rev
6642)
@@ -13,6 +13,8 @@
'description' => array('type' =>
'string'),
'phone' => array('type' => 'string'),
'email' => array('type' => 'string'),
+ 'deactivate_calendar' => array('type'
=> 'int'),
+ 'deactivate_application' =>
array('type' => 'int'),
'location_code' =>array('type' =>
'string', 'required' => false),
'street' => array('type'
=> 'string', 'query' => true),
'zip_code' => array('type'
=> 'string'),
Modified: trunk/booking/inc/class.soevent.inc.php
===================================================================
--- trunk/booking/inc/class.soevent.inc.php 2010-11-25 14:52:47 UTC (rev
6641)
+++ trunk/booking/inc/class.soevent.inc.php 2010-11-25 17:12:15 UTC (rev
6642)
@@ -74,7 +74,7 @@
function get_building_info($id)
{
- $this->db->limit_query("SELECT bb_building.id,
bb_building.name FROM bb_building, bb_resource, bb_event_resource WHERE
bb_building.id=bb_resource.building_id AND
bb_resource.id=bb_event_resource.resource_id AND bb_event_resource.event_id=" .
intval($id), 0, __LINE__, __FILE__, 1);
+ $this->db->limit_query("SELECT bb_building.id,
bb_building.name, bb_building.email FROM bb_building, bb_resource,
bb_event_resource WHERE bb_building.id=bb_resource.building_id AND
bb_resource.id=bb_event_resource.resource_id AND bb_event_resource.event_id=" .
intval($id), 0, __LINE__, __FILE__, 1);
if(!$this->db->next_record())
{
return False;
Modified: trunk/booking/inc/class.uiapplication.inc.php
===================================================================
--- trunk/booking/inc/class.uiapplication.inc.php 2010-11-25 14:52:47 UTC
(rev 6641)
+++ trunk/booking/inc/class.uiapplication.inc.php 2010-11-25 17:12:15 UTC
(rev 6642)
@@ -359,6 +359,13 @@
$errors['email'] = lang('The e-mail
addresses you entered do not match');
$application['contact_email2'] =
$_POST['contact_email2'];
}
+ foreach($application['agegroups'] as $ag)
+ {
+ if($ag['male'] > 9999 || $ag['female']
> 9999) {
+ $errors['agegroups'] =
lang('Agegroups kan not be larger than 9999 peoples');
+ }
+ }
+
if(!$errors)
{
$comment_text =
$this->create_accepted_documents_comment_text($application);
Modified: trunk/booking/inc/class.uibuilding.inc.php
===================================================================
--- trunk/booking/inc/class.uibuilding.inc.php 2010-11-25 14:52:47 UTC (rev
6641)
+++ trunk/booking/inc/class.uibuilding.inc.php 2010-11-25 17:12:15 UTC (rev
6642)
@@ -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');
+ $this->fields = array('name', 'homepage',
'description', 'email', 'street', 'zip_code', 'city', 'district', 'phone',
'active', 'location_code','deactivate_application','deactivate_calendar');
}
public function properties()
@@ -177,7 +177,7 @@
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
$building = array_merge($building,
extract_values($_POST, $this->fields));
-
+
$errors = $this->bo->validate($building);
if(!$errors)
{
Modified: trunk/booking/inc/class.uievent.inc.php
===================================================================
--- trunk/booking/inc/class.uievent.inc.php 2010-11-25 14:52:47 UTC (rev
6641)
+++ trunk/booking/inc/class.uievent.inc.php 2010-11-25 17:12:15 UTC (rev
6642)
@@ -482,9 +482,9 @@
if(!$errors['event'] and
!$errors['resource_number'] and !$errors['organization_number'] and
!$errors['invoice_data'])
{
- if (phpgw::get_var('mail', 'POST'))
+ if (phpgw::get_var('mail', 'POST') ||
phpgw::get_var('sendtorbuilding', 'POST'))
{
-
if(phpgw::get_var('sendtocollision', 'POST') || phpgw::get_var('sendtocontact',
'POST'))
+
if(phpgw::get_var('sendtocollision', 'POST') || phpgw::get_var('sendtocontact',
'POST') || phpgw::get_var('sendtorbuilding', 'POST'))
{
$maildata =
$this->create_sendt_mail_notification_comment_text($event,$errors);
if ($maildata)
@@ -518,6 +518,34 @@
$comment_text_log = phpgw::get_var('mail', 'POST');
$this->send_mailnotification($event['contact_email'], lang('Event changed'),
$comment_text_log);
}
+
if(phpgw::get_var('sendtorbuilding', 'POST'))
+ {
+
+ if
($event['customer_organization_name']) {
+
$comment_text_log = $event['customer_organization_name'];
+ } else {
+
$comment_text_log = $event['contact_name'];
+ }
+
$comment_text_log = $comment_text_log.' har fått innvilget et arrangement i
'.$event['building_name'].' '.date('d-m-Y H:i',
strtotime($event['from_'])).".\nFor mer opplysinger slå opp i AktivBy.";
+//
$comment_text_log = phpgw::get_var('mail', 'POST');
+ $sendt = 0;
+
if($building_info['email']) {
+
$sendt++;
+
$this->send_mailnotification($building_info['email'], lang('Message about new
event'), $comment_text_log);
+ }
+ if
($_POST['sendtorbuilding_email1']) {
+
$sendt++;
+
$this->send_mailnotification($_POST['sendtorbuilding_email1'], lang('Message
about new event'), $comment_text_log);
+
+ }
+ if
($_POST['sendtorbuilding_email2']) {
+
$sendt++;
+
$this->send_mailnotification($_POST['sendtorbuilding_email2'], lang('Message
about new event'), $comment_text_log);
+ }
+ if ($sendt > 0)
{
+
$errors['mailtobuilding'] = lang('Unable to send warning, No mailadresses
found');
+ }
+ }
}
else
{
Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang 2010-11-25 14:52:47 UTC (rev 6641)
+++ trunk/booking/setup/phpgw_no.lang 2010-11-25 17:12:15 UTC (rev 6642)
@@ -477,3 +477,8 @@
Repeat until booking no Gjenta til
Bookings that can be created booking no Bookinger som kan lages
Bookings and allocations booking no Bookinger og tildelinger
+Send warning to building responsible booking no Send e-post til
ansvarlig på bygget
+Optional e-mail adress booking no Valgfri e-post adresse
+Message about new event booking no Melding om nytt arrangement
+Deactivate application booking no Inaktiver kalender (frontend)
+Deactivate calendar booking no Inaktiver søknad (frontend)
Modified: trunk/booking/setup/setup.inc.php
===================================================================
--- trunk/booking/setup/setup.inc.php 2010-11-25 14:52:47 UTC (rev 6641)
+++ trunk/booking/setup/setup.inc.php 2010-11-25 17:12:15 UTC (rev 6642)
@@ -1,6 +1,6 @@
<?php
$setup_info['booking']['name'] = 'booking';
- $setup_info['booking']['version'] = '0.2.01';
+ $setup_info['booking']['version'] = '0.2.02';
$setup_info['booking']['app_order'] = 9;
$setup_info['booking']['enable'] = 1;
$setup_info['booking']['app_group'] = 'office';
Modified: trunk/booking/setup/tables_current.inc.php
===================================================================
--- trunk/booking/setup/tables_current.inc.php 2010-11-25 14:52:47 UTC (rev
6641)
+++ trunk/booking/setup/tables_current.inc.php 2010-11-25 17:12:15 UTC (rev
6642)
@@ -19,6 +19,8 @@
'fd' => array(
'id' => array('type' => 'auto', 'nullable' =>
false),
'active' => array('type' => 'int', 'nullable'
=> False,'precision' => '4', 'default' => 1),
+ 'deactive_calendar' => array('type' => 'int',
'nullable' => False,'precision' => '4', 'default' => 0),
+ 'deactive_application' => array('type' =>
'int', 'nullable' => False,'precision' => '4', 'default' => 0),
'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
'homepage' => array('type' => 'text',
'nullable' => False),
'location_code' => array('type' =>
'varchar','precision' => '50','nullable' => True),
Modified: trunk/booking/setup/tables_update.inc.php
===================================================================
--- trunk/booking/setup/tables_update.inc.php 2010-11-25 14:52:47 UTC (rev
6641)
+++ trunk/booking/setup/tables_update.inc.php 2010-11-25 17:12:15 UTC (rev
6642)
@@ -2394,4 +2394,23 @@
}
}
+ $test[] = '0.2.01';
+ function booking_upgrade0_2_01()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $table = "bb_building";
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
$table ADD COLUMN deactivate_calendar int NOT NULL DEFAULT 0");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE $table SET
deactivate_calendar = 0");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
$table ADD COLUMN deactivate_application int NOT NULL DEFAULT 0");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE $table SET
deactivate_application = 0");
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['booking']['currentver'] =
'0.2.02';
+ return $GLOBALS['setup_info']['booking']['currentver'];
+ }
+ }
+
Modified: trunk/booking/templates/base/building_form.xsl
===================================================================
--- trunk/booking/templates/base/building_form.xsl 2010-11-25 14:52:47 UTC
(rev 6641)
+++ trunk/booking/templates/base/building_form.xsl 2010-11-25 17:12:15 UTC
(rev 6642)
@@ -76,8 +76,50 @@
</dd>
</xsl:if>
</dl>
-
<div class="clr"/>
+ <dl class="form-col">
+ <xsl:if test="not(new_form)">
+ <dt><label
for="field_deactivate_calendar"><xsl:value-of select="php:function('lang',
'Deactivate calendar')"/></label></dt>
+ <dd>
+ <select
id="deactivate_calendar" name="deactivate_calendar">
+ <option value="1">
+ <xsl:if
test="building/deactivate_calendar=1">
+
<xsl:attribute name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Yes')"/>
+ </option>
+ <option value="0">
+ <xsl:if
test="building/deactivate_calendar=0">
+
<xsl:attribute name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'No')"/>
+ </option>
+ </select>
+ </dd>
+ </xsl:if>
+ </dl>
+ <dl class="form-col">
+ <xsl:if test="not(new_form)">
+ <dt><label
for="field_deactivate_application"><xsl:value-of select="php:function('lang',
'Deactivate application')"/></label></dt>
+ <dd>
+ <select
id="field_deactivate_application" name="deactivate_application">
+ <option value="1">
+ <xsl:if
test="building/deactivate_application=1">
+
<xsl:attribute name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Yes')"/>
+ </option>
+ <option value="0">
+ <xsl:if
test="building/deactivate_application=0">
+
<xsl:attribute name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'No')"/>
+ </option>
+ </select>
+ </dd>
+ </xsl:if>
+ </dl>
+ <div class="clr"/>
<dl class="form-col">
<dt><label
for="field_description"><xsl:value-of select="php:function('lang',
'Description')" /></label></dt>
Modified: trunk/booking/templates/base/event_edit.xsl
===================================================================
--- trunk/booking/templates/base/event_edit.xsl 2010-11-25 14:52:47 UTC (rev
6641)
+++ trunk/booking/templates/base/event_edit.xsl 2010-11-25 17:12:15 UTC (rev
6642)
@@ -262,7 +262,9 @@
<textarea id="field_mail" name="mail"
class="full-width"></textarea><br />
<label><input type="checkbox" value="1"
name="sendtocontact" /> <xsl:value-of select="php:function('lang', 'Send to
contact')" /></label><br />
<label><input type="checkbox" value="1"
name="sendtocollision" /> <xsl:value-of select="php:function('lang', 'Send to
contact for overlaping allocations/bookings')" /></label><br />
- </dd>
+ <label><input type="checkbox" value="1"
name="sendtorbuilding" /> <xsl:value-of select="php:function('lang', 'Send
warning to building responsible')" /></label><br />
+ <label><input type="text" name="sendtorbuilding_email1"
/> <xsl:value-of select="php:function('lang', 'Optional e-mail adress')"
/></label><br />
+ <label><input type="text" name="sendtorbuilding_email2"
/> <xsl:value-of select="php:function('lang', 'Optional e-mail adress')"
/></label><br /> </dd>
</dl>
<div class="form-buttons">
<input type="submit">
Modified: trunk/bookingfrontend/inc/class.uibuilding.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uibuilding.inc.php 2010-11-25 14:52:47 UTC
(rev 6641)
+++ trunk/bookingfrontend/inc/class.uibuilding.inc.php 2010-11-25 17:12:15 UTC
(rev 6642)
@@ -14,11 +14,15 @@
{
$backend = phpgw::get_var('backend', 'GET');
$building =
$this->bo->get_schedule(phpgw::get_var('id', 'GET'),
'bookingfrontend.uibuilding');
- $building['application_link'] = self::link(array(
- 'menuaction' =>
'bookingfrontend.uiapplication.add',
- 'building_id' => $building['id'],
- 'building_name' => $building['name'],
- ));
+ if ($building['deactivate_application'] == 0) {
+ $building['application_link'] =
self::link(array(
+ 'menuaction' =>
'bookingfrontend.uiapplication.add',
+ 'building_id' => $building['id'],
+ 'building_name' => $building['name'],
+ ));
+ } else {
+ $building['application_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule', 'id' =>
$building['id']));
+ }
$building['datasource_url'] = self::link(array(
'menuaction' =>
'bookingfrontend.uibooking.building_schedule',
'building_id' => $building['id'],
@@ -47,6 +51,7 @@
{
$building['homepage'] =
'http://'.$building['homepage'];
}
+// echo "<pre>";print_r($building);exit;
self::render_template('building', array("building" =>
$building));
}
Modified: trunk/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/bookingfrontend/setup/phpgw_no.lang 2010-11-25 14:52:47 UTC (rev
6641)
+++ trunk/bookingfrontend/setup/phpgw_no.lang 2010-11-25 17:12:15 UTC (rev
6642)
@@ -321,3 +321,4 @@
The e-mail addresses you entered do not match bookingfrontend no
E-postadressene er ikke like
Lengt of shortname is to long, max 11 characters long bookingfrontend no
Kortnavn er for langt, maks 11 tegn
Go back to calendar bookingfrontend no Tilbake til kalender
+Agegroups kan not be larger than 9999 peoples bookingfrontend no
Estimert antall deltakere kan ikke være større en 9999 personer
Modified: trunk/bookingfrontend/setup/setup.inc.php
===================================================================
--- trunk/bookingfrontend/setup/setup.inc.php 2010-11-25 14:52:47 UTC (rev
6641)
+++ trunk/bookingfrontend/setup/setup.inc.php 2010-11-25 17:12:15 UTC (rev
6642)
@@ -21,7 +21,7 @@
$setup_info['bookingfrontend']['depends'][] = array(
'appname' => 'booking',
- 'versions' => Array('0.1.92', '0.1.93', '0.1.94', '0.1.95',
'0.1.96', '0.1.97', '0.1.98', '0.1.99', '0.2.00', '0.2.01')
+ 'versions' => Array('0.2.00', '0.2.01','0.2.02')
);
$setup_info['bookingfrontend']['depends'][] = array(
Modified: trunk/bookingfrontend/templates/base/building.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/building.xsl 2010-11-25 14:52:47 UTC
(rev 6641)
+++ trunk/bookingfrontend/templates/base/building.xsl 2010-11-25 17:12:15 UTC
(rev 6642)
@@ -13,10 +13,13 @@
<xsl:for-each select="building">
+ <xsl:if test="deactivate_calendar=0">
<div>
<button
onclick="window.location.href='{schedule_link}'"><xsl:value-of
select="php:function('lang', 'Building schedule')" /></button>
- Søk ledig tid/informasjon om hva som skjer
</div>
+ </xsl:if>
+
<div>
<button
onclick="window.location.href='{message_link}'"><xsl:value-of
select="php:function('lang', 'Send message')" /></button>
- Meldig til saksbehandler for bygg
Modified: trunk/bookingfrontend/templates/base/building_schedule.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/building_schedule.xsl 2010-11-25
14:52:47 UTC (rev 6641)
+++ trunk/bookingfrontend/templates/base/building_schedule.xsl 2010-11-25
17:12:15 UTC (rev 6642)
@@ -18,8 +18,10 @@
<xsl:call-template name="msgbox"/>
- <button
onclick="YAHOO.booking.newApplicationForm();"><xsl:value-of
select="php:function('lang', 'New booking application')" /></button>
- - Søk ledig tid
+ <xsl:if test="building/deactivate_application=0">
+ <button
onclick="YAHOO.booking.newApplicationForm();"><xsl:value-of
select="php:function('lang', 'New booking application')" /></button>
+ - Søk ledig tid
+ </xsl:if>
</xsl:if>
<ul id="week-selector">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6642] bkbooking: added functionality to event, building and application,
Kjell Arne Espedal <=