[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11253] bkbooking: stavanger added one more tilsynsva
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [11253] bkbooking: stavanger added one more tilsynsvakt |
|
Date: |
Wed, 07 Aug 2013 11:12:52 +0000 |
Revision: 11253
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11253
Author: kjell
Date: 2013-08-07 11:12:51 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
bkbooking: stavanger added one more tilsynsvakt
Modified Paths:
--------------
branches/stavangerkommune/booking/inc/class.sobuilding.inc.php
branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
branches/stavangerkommune/booking/inc/class.uievent.inc.php
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/building.xsl
branches/stavangerkommune/booking/templates/base/building_form.xsl
branches/stavangerkommune/bookingfrontend/templates/stavanger/building.xsl
Modified: branches/stavangerkommune/booking/inc/class.sobuilding.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.sobuilding.inc.php
2013-08-07 08:27:58 UTC (rev 11252)
+++ branches/stavangerkommune/booking/inc/class.sobuilding.inc.php
2013-08-07 11:12:51 UTC (rev 11253)
@@ -17,6 +17,9 @@
'tilsyn_name' => array('type' =>
'string'),
'tilsyn_phone' => array('type' =>
'string'),
'tilsyn_email' => array('type' =>
'string'),
+ 'tilsyn_name2' => array('type' =>
'string'),
+ 'tilsyn_phone2' => array('type' =>
'string'),
+ 'tilsyn_email2' => array('type' =>
'string'),
'deactivate_calendar' => array('type'
=> 'int'),
'deactivate_application' =>
array('type' => 'int'),
'deactivate_sendmessage' =>
array('type' => 'int'),
Modified: branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
2013-08-07 08:27:58 UTC (rev 11252)
+++ branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
2013-08-07 11:12:51 UTC (rev 11253)
@@ -26,7 +26,7 @@
$this->bo = CreateObject('booking.bobuilding');
self::set_active_menu('booking::buildings');
- $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','calendar_text');
+ $this->fields = array('name', 'homepage',
'description', 'email', 'tilsyn_name', 'tilsyn_email', 'tilsyn_phone',
'tilsyn_name2', 'tilsyn_email2', 'tilsyn_phone2', 'street', 'zip_code', 'city',
'district', 'phone', 'active',
'location_code','deactivate_application','deactivate_calendar','deactivate_sendmessage','calendar_text');
}
public function properties()
Modified: branches/stavangerkommune/booking/inc/class.uievent.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uievent.inc.php 2013-08-07
08:27:58 UTC (rev 11252)
+++ branches/stavangerkommune/booking/inc/class.uievent.inc.php 2013-08-07
11:12:51 UTC (rev 11253)
@@ -385,7 +385,6 @@
}
else
{
- $event['active'] = '0';
list($event, $errors) =
$this->extract_and_validate($event);
$time_from = split(" ",$_POST['from_']);
$time_to = split(" ",$_POST['to_']);
Modified: branches/stavangerkommune/booking/setup/setup.inc.php
===================================================================
--- branches/stavangerkommune/booking/setup/setup.inc.php 2013-08-07
08:27:58 UTC (rev 11252)
+++ branches/stavangerkommune/booking/setup/setup.inc.php 2013-08-07
11:12:51 UTC (rev 11253)
@@ -1,6 +1,6 @@
<?php
$setup_info['booking']['name'] = 'booking';
- $setup_info['booking']['version'] = '0.2.13';
+ $setup_info['booking']['version'] = '0.2.14';
$setup_info['booking']['app_order'] = 9;
$setup_info['booking']['enable'] = 1;
$setup_info['booking']['app_group'] = 'office';
Modified: branches/stavangerkommune/booking/setup/tables_current.inc.php
===================================================================
--- branches/stavangerkommune/booking/setup/tables_current.inc.php
2013-08-07 08:27:58 UTC (rev 11252)
+++ branches/stavangerkommune/booking/setup/tables_current.inc.php
2013-08-07 11:12:51 UTC (rev 11253)
@@ -30,6 +30,9 @@
'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),
+ 'tilsyn_name2' => array('type' =>
'varchar','precision' => '50','nullable' => True),
+ 'tilsyn_phone2' => array('type' =>
'varchar','precision' => '50','nullable' => True),
+ 'tilsyn_email2' => 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-08-07 08:27:58 UTC (rev 11252)
+++ branches/stavangerkommune/booking/setup/tables_update.inc.php
2013-08-07 11:12:51 UTC (rev 11253)
@@ -2719,3 +2719,24 @@
}
}
+ $test[] = '0.2.13';
+ /**
+ * Update booking version from 0.2.12 to 0.2.13
+ * add another tilsynsvakt to buidling
+ *
+ */
+ function booking_upgrade0_2_13()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN tilsyn_name2 varchar(50)");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN tilsyn_email2 varchar(50)");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN tilsyn_phone2 varchar(50)");
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['booking']['currentver'] =
'0.2.14';
+ return $GLOBALS['setup_info']['booking']['currentver'];
+ }
+ }
+
Modified: branches/stavangerkommune/booking/templates/base/building.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/building.xsl
2013-08-07 08:27:58 UTC (rev 11252)
+++ branches/stavangerkommune/booking/templates/base/building.xsl
2013-08-07 11:12:51 UTC (rev 11253)
@@ -32,7 +32,7 @@
<dt><xsl:value-of select="php:function('lang',
'District')" /></dt>
<dd><xsl:value-of select="building/district"/></dd>
- <xsl:if test="building/location_code">
+ <xsl:if test="building/location_code !=''">
<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>
@@ -54,7 +54,9 @@
<dt><xsl:value-of select="php:function('lang',
'Telephone')" /></dt>
<dd><xsl:value-of select="building/phone"/></dd>
-
+ </dl>
+ <div class="clr"/>
+ <dl class="proplist-col">
<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>
@@ -69,6 +71,21 @@
<dd><xsl:value-of select="building/tilsyn_phone"/></dd>
</xsl:if>
</dl>
+ <dl class="proplist-col">
+ <xsl:if test="building/tilsyn_name2 != ''">
+ <dt><xsl:value-of select="php:function('lang', 'Tilsynsvakt
name')" /></dt>
+ <dd><xsl:value-of select="building/tilsyn_name2"/></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_email2"/></xsl:attribute>
+ <xsl:value-of select="building/tilsyn_email2"/></a>
+ </dd>
+
+ <dt><xsl:value-of select="php:function('lang',
'Tilsynsvakt telephone')" /></dt>
+ <dd><xsl:value-of select="building/tilsyn_phone2"/></dd>
+ </xsl:if>
+ </dl>
<div class="form-buttons">
<xsl:if test="building/permission/write">
Modified: branches/stavangerkommune/booking/templates/base/building_form.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/building_form.xsl
2013-08-07 08:27:58 UTC (rev 11252)
+++ branches/stavangerkommune/booking/templates/base/building_form.xsl
2013-08-07 11:12:51 UTC (rev 11253)
@@ -74,6 +74,7 @@
</dd>
</xsl:if>
</dl>
+ <div class="clr"/>
<dl class="form-col">
<dt><label
for="field_tilsyn_name"><xsl:value-of select="php:function('lang', 'Tilsynsvakt
name')" /></label></dt>
<dd><input name="tilsyn_name" type="text"
value="{building/tilsyn_name}"/></dd>
@@ -84,7 +85,18 @@
<dt><label
for="field_tilsyn_email"><xsl:value-of select="php:function('lang',
'Tilsynsvakt email')" /></label></dt>
<dd><input id="field_tilsyn_email"
name="tilsyn_email" type="text" value="{building/tilsyn_email}"/></dd>
</dl>
+ <dl class="form-col">
+ <dt><label
for="field_tilsyn_name2"><xsl:value-of select="php:function('lang',
'Tilsynsvakt name')" /></label></dt>
+ <dd><input name="tilsyn_name2" type="text"
value="{building/tilsyn_name2}"/></dd>
+
+ <dt><label
for="field_tilsyn_phone2"><xsl:value-of select="php:function('lang',
'Tilsynsvakt telephone')" /></label></dt>
+ <dd><input id="field_tilsyn_phone2"
name="tilsyn_phone2" type="text" value="{building/tilsyn_phone2}"/></dd>
+
+ <dt><label
for="field_tilsyn_email2"><xsl:value-of select="php:function('lang',
'Tilsynsvakt email')" /></label></dt>
+ <dd><input id="field_tilsyn_email2"
name="tilsyn_email2" type="text" value="{building/tilsyn_email2}"/></dd>
+ </dl>
+
<div class="clr"/>
<dl class="form-col">
<xsl:if test="not(new_form)">
Modified:
branches/stavangerkommune/bookingfrontend/templates/stavanger/building.xsl
===================================================================
--- branches/stavangerkommune/bookingfrontend/templates/stavanger/building.xsl
2013-08-07 08:27:58 UTC (rev 11252)
+++ branches/stavangerkommune/bookingfrontend/templates/stavanger/building.xsl
2013-08-07 11:12:51 UTC (rev 11253)
@@ -85,7 +85,22 @@
<dd><xsl:value-of
select="tilsyn_phone"/></dd>
</xsl:if>
+ <xsl:if test="tilsyn_name and
normalize-space(tilsyn_name2)">
+ <dt><xsl:value-of
select="php:function('lang', 'Tilsynsvakt name')" /></dt>
+ <dd><xsl:value-of
select="tilsyn_name2"/></dd>
+ </xsl:if>
+ <xsl:if test="tilsyn_email and
normalize-space(tilsyn_email2)">
+ <dt><xsl:value-of
select="php:function('lang', 'Tilsynsvakt email')" /></dt>
+ <dd><a
href='mailto:{tilsyn_email2}'><xsl:value-of select="tilsyn_email2"/></a></dd>
+ </xsl:if>
+
+ <xsl:if test="tilsyn_phone and
normalize-space(tilsyn_phone2)">
+ <dt><xsl:value-of
select="php:function('lang', 'Tilsynsvakt telephone')" /></dt>
+ <dd><xsl:value-of
select="tilsyn_phone2"/></dd>
+ </xsl:if>
+
+
</dl>
</xsl:if>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11253] bkbooking: stavanger added one more tilsynsvakt,
Kjell Arne Espedal <=