[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17133] Merge 17125:17132 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17133] Merge 17125:17132 from trunk |
|
Date: |
Tue, 3 Oct 2017 14:12:06 -0400 (EDT) |
Revision: 17133
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17133
Author: sigurdne
Date: 2017-10-03 14:12:06 -0400 (Tue, 03 Oct 2017)
Log Message:
-----------
Merge 17125:17132 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
branches/Version-2_0-branch/booking/inc/class.uibooking.inc.php
branches/Version-2_0-branch/bookingfrontend/inc/class.uibooking.inc.php
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/phpgwapi/setup/setup.inc.php
branches/Version-2_0-branch/property/inc/class.soreport.inc.php
branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-2_0-branch/property/setup/setup.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
branches/Version-2_0-branch/bookingfrontend/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-10-03 14:13:22 UTC (rev 17132)
+++ branches/Version-2_0-branch 2017-10-03 18:12:06 UTC (rev 17133)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132
\ No newline at end of property
Index: branches/Version-2_0-branch/booking
===================================================================
--- branches/Version-2_0-branch/booking 2017-10-03 14:13:22 UTC (rev 17132)
+++ branches/Version-2_0-branch/booking 2017-10-03 18:12:06 UTC (rev 17133)
Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/booking:14933-16846
/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
-/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948,17020-17023,17028-17033,17039-17040,17076-17088
\ No newline at end of property
+/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948,17020-17023,17028-17033,17039-17040,17076-17088,17126-17132
\ No newline at end of property
Modified: branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
2017-10-03 14:13:22 UTC (rev 17132)
+++ branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
2017-10-03 18:12:06 UTC (rev 17133)
@@ -468,13 +468,18 @@
{
if($dateformat == 'Y-m-d' &&
$_SERVER['REQUEST_METHOD'] == 'GET')
{
- $allocation['from_'] =
date("{$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']}
H:i",strtotime($dateTimeFrom));
+ $_dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+ $allocation['from_'] =
date("{$_dateformat} H:i",strtotime($dateTimeFrom));
$_timeFrom = strtotime($dateTimeFrom);
+ $allocation['to_'] =
date("{$_dateformat} H:i",strtotime($dateTimeTo));
+ $_timeTo = strtotime($dateTimeTo);
}
else
{
$allocation['from_'] = $dateTimeFrom;
$_timeFrom =
phpgwapi_datetime::date_to_timestamp($dateTimeFrom);
+ $allocation['to_'] = $dateTimeTo;
+ $_timeTo =
phpgwapi_datetime::date_to_timestamp($dateTimeTo);
}
if ($_SERVER['REQUEST_METHOD'] == 'POST' &&
$errors)
{
@@ -485,7 +490,7 @@
}
$GLOBALS['phpgw']->jqcal2->add_listener('field_from', 'datetime', $_timeFrom);
-
$GLOBALS['phpgw']->jqcal2->add_listener('field_to', 'time', $_timeTo);
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_to', 'datetime', $_timeTo);
self::render_template_xsl('allocation_new',
array('allocation' => $allocation,
'step' => $step,
Modified: branches/Version-2_0-branch/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uibooking.inc.php
2017-10-03 14:13:22 UTC (rev 17132)
+++ branches/Version-2_0-branch/booking/inc/class.uibooking.inc.php
2017-10-03 18:12:06 UTC (rev 17133)
@@ -397,12 +397,6 @@
}
if ($_SERVER['REQUEST_METHOD'] == 'POST')
{
-// $_POST['from_'] = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['from_']));
-// $_POST['to_'] = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['to_']));
-// $_POST['repeat_until'] = date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($_POST['repeat_until']));
-// $_POST['from_'] =
phpgw::get_var('from_','string', 'POST');
-// $_POST['to_'] = phpgw::get_var('to_','string',
'POST');
-// $_POST['repeat_until'] =
phpgw::get_var('repeat_until','string', 'POST');
$today = getdate();
$booking = extract_values($_POST,
$this->fields);
@@ -411,10 +405,8 @@
$this->add_cost_history($booking,
phpgw::get_var('cost_comment'), phpgw::get_var('cost', 'float'));
}
-// $timestamp = strtotime($booking['from_']);
$timestamp =
phpgwapi_datetime::date_to_timestamp($booking['from_']);
$booking['from_'] = date("Y-m-d H:i:s",
$timestamp);
-// $timestamp = strtotime($booking['to_']);
$timestamp =
phpgwapi_datetime::date_to_timestamp($booking['to_']);
$booking['to_'] = date("Y-m-d H:i:s",
$timestamp);
@@ -438,18 +430,6 @@
$errors = $this->bo->validate($booking);
-# if (strtotime($_POST['from_']) < $today[0])
-# {
-# if($_POST['recurring'] == 'on' ||
$_POST['outseason'] == 'on')
-# {
-# $errors['booking'] = lang('Can
not repeat from a date in the past');
-# }
-# else
-# {
-# $errors['booking'] = lang('Can
not create a booking in the past');
-# }
-# }
-
if (!$booking['season_id'] &&
$_POST['outseason'] == 'on')
{
$errors['booking'] = lang('This booking
is not connected to a season');
@@ -641,8 +621,8 @@
$active_tab = 'generic';
$GLOBALS['phpgw']->jqcal2->add_listener('field_repeat_until', 'date');
- $GLOBALS['phpgw']->jqcal2->add_listener('start_date',
'datetime');
- $GLOBALS['phpgw']->jqcal2->add_listener('end_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('start_date',
'datetime', phpgwapi_datetime::date_to_timestamp($booking['from_']));
+ $GLOBALS['phpgw']->jqcal2->add_listener('end_date',
'datetime', phpgwapi_datetime::date_to_timestamp($booking['to_']));
$booking['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
$booking['validator'] =
phpgwapi_jquery::formvalidator_generate(array('location',
Index: branches/Version-2_0-branch/bookingfrontend
===================================================================
--- branches/Version-2_0-branch/bookingfrontend 2017-10-03 14:13:22 UTC (rev
17132)
+++ branches/Version-2_0-branch/bookingfrontend 2017-10-03 18:12:06 UTC (rev
17133)
Property changes on: branches/Version-2_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/bookingfrontend:14933-16846
/branches/stavangerkommune/bookingfrontend:9468-12740,12986
-/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836,16846-16847,16908-16909,16946,16948,16988-16999
\ No newline at end of property
+/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836,16846-16847,16908-16909,16946,16948,16988-16999,17126-17132
\ No newline at end of property
Modified:
branches/Version-2_0-branch/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/inc/class.uibooking.inc.php
2017-10-03 14:13:22 UTC (rev 17132)
+++ branches/Version-2_0-branch/bookingfrontend/inc/class.uibooking.inc.php
2017-10-03 18:12:06 UTC (rev 17133)
@@ -106,6 +106,12 @@
#The string replace is a workaround for a problem at
Bergen Kommune
$booking['from_'] = str_replace('%3A', ':',
phpgw::get_var('from_', 'string', 'GET'));
$booking['to_'] = str_replace('%3A', ':',
phpgw::get_var('to_', 'string', 'GET'));
+ foreach ($booking['from_'] as $k => $v)
+ {
+ $booking['from_'][$k] =
pretty_timestamp($booking['from_'][$k]);
+ $booking['to_'][$k] =
pretty_timestamp($booking['to_'][$k]);
+ }
+
$time_from = explode(" ", phpgw::get_var('from_',
'string', 'GET'));
$time_to = explode(" ", phpgw::get_var('to_', 'string',
'GET'));
@@ -116,6 +122,9 @@
if ($allocation_id)
{
$allocation =
$this->allocation_bo->read_single($allocation_id);
+ $boapplication =
CreateObject('booking.boapplication');
+ $application =
$boapplication->read_single($allocation['application_id']);
+ $activity_id = $application['activity_id'];
$season =
$this->season_bo->read_single($allocation['season_id']);
$building =
$this->building_bo->read_single($season['building_id']);
$booking['season_id'] = $season['id'];
@@ -122,6 +131,7 @@
$booking['building_id'] = $building['id'];
$booking['building_name'] = $building['name'];
$booking['allocation_id'] = $allocation_id;
+ $booking['application_id'] =
$allocation['application_id'];
array_set_default($booking, 'resources',
array(phpgw::get_var('resource')));
}
else
@@ -130,16 +140,23 @@
}
if ($_SERVER['REQUEST_METHOD'] == 'POST')
{
- $_POST['repeat_until'] =
($_POST['repeat_until']) ? date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($_POST['repeat_until'])) : "";
$today = getdate();
$booking = extract_values($_POST,
$this->fields);
+
+ $booking['application_id'] =
$allocation['application_id'];
+
+ $timestamp =
phpgwapi_datetime::date_to_timestamp($booking['from_']);
+ $booking['from_'] = date("Y-m-d H:i:s",
$timestamp);
+ $timestamp =
phpgwapi_datetime::date_to_timestamp($booking['to_']);
+ $booking['to_'] = date("Y-m-d H:i:s",
$timestamp);
+
if (strlen($_POST['from_']) < 6)
{
- $date_from = array($time_from[0],
phpgw::get_var('from_'));
+ $date_from = array($time_from[0],
$_POST['from_']);
$booking['from_'] = join(" ",
$date_from);
$_POST['from_'] = join(" ", $date_from);
- $date_to = array($time_to[0],
phpgw::get_var('to_'));
+ $date_to = array($time_to[0],
$_POST['to_']);
$booking['to_'] = join(" ", $date_to);
$_POST['to_'] = join(" ", $date_to);
}
@@ -158,17 +175,6 @@
$errors = $this->bo->validate($booking);
-# if (strtotime($_POST['from_']) < $today[0])
-# {
-# if($_POST['recurring'] == 'on' ||
$_POST['outseason'] == 'on')
-# {
-# $errors['booking'] = lang('Can
not repeat from a date in the past');
-# }
-# else
-# {
-# $errors['booking'] = lang('Can
not create a booking in the past');
-# }
-# }
if (!$season['id'] && $_POST['outseason'] ==
'on')
{
$errors['booking'] = lang('This booking
is not connected to a season');
@@ -189,15 +195,15 @@
{
if ($_POST['recurring'] == 'on')
{
- $repeat_until =
strtotime($_POST['repeat_until']) + 60 * 60 * 24;
+ $repeat_until =
phpgwapi_datetime::date_to_timestamp($_POST['repeat_until']) + 60 * 60 * 24;
}
else
{
$repeat_until =
strtotime($season['to_']) + 60 * 60 * 24;
- $_POST['repeat_until'] =
$season['to_'];
+ $_POST['repeat_until'] =
pretty_timestamp($season['to_']);
}
- $max_dato = strtotime($_POST['to_']);
// highest date from input
+ $max_dato =
phpgwapi_datetime::date_to_timestamp($_POST['to_']); // highest date from input
$interval = $_POST['field_interval'] *
60 * 60 * 24 * 7; // weeks in seconds
$i = 0;
// calculating valid and invalid dates
from the first booking's to-date to the repeat_until date is reached
@@ -204,8 +210,8 @@
// the form from step 1 should validate
and if we encounter any errors they are caused by double bookings.
while (($max_dato + ($interval * $i))
<= $repeat_until)
{
- $fromdate = date('Y-m-d H:i',
strtotime($_POST['from_']) + ($interval * $i));
- $todate = date('Y-m-d H:i',
strtotime($_POST['to_']) + ($interval * $i));
+ $fromdate = date('Y-m-d H:i',
phpgwapi_datetime::date_to_timestamp($_POST['from_']) + ($interval * $i));
+ $todate = date('Y-m-d H:i',
phpgwapi_datetime::date_to_timestamp($_POST['to_']) + ($interval * $i));
$booking['from_'] = $fromdate;
$booking['to_'] = $todate;
$fromdate =
pretty_timestamp($fromdate);
@@ -212,6 +218,7 @@
$todate =
pretty_timestamp($todate);
$err =
$this->bo->validate($booking);
+
if ($err)
{
$invalid_dates[$i]['from_'] = $fromdate;
@@ -245,6 +252,8 @@
{
$activity_id = phpgw::get_var('activity_id',
'int', 'REQUEST', -1);
}
+ $booking['activity_id'] = $activity_id;
+
$activity_path =
$this->activity_bo->get_path($activity_id);
$top_level_activity = $activity_path ?
$activity_path[0]['id'] : -1;
@@ -270,13 +279,13 @@
$res_names[] = array('id' => $res['id'], 'name'
=> $res['name']);
}
- $GLOBALS['phpgw']->jqcal2->add_listener('field_from',
'time');
- $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'time');
-
$GLOBALS['phpgw']->jqcal2->add_listener('field_repeat_until', 'date');
-
$booking['from_'] = pretty_timestamp($booking['from_']);
$booking['to_'] = pretty_timestamp($booking['to_']);
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_from',
'datetime', phpgwapi_datetime::date_to_timestamp($booking['from_']));
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'datetime', phpgwapi_datetime::date_to_timestamp($booking['to_']));
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_repeat_until', 'date');
+
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
'file'), 'booking_form');
@@ -517,13 +526,14 @@
'active' => 1)));
$groups = $groups['results'];
- $GLOBALS['phpgw']->jqcal2->add_listener('field_from',
'datetime');
- $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'datetime');
+ $booking['from_'] = pretty_timestamp($booking['from_']);
+ $booking['to_'] = pretty_timestamp($booking['to_']);
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_from',
'datetime', phpgwapi_datetime::date_to_timestamp($booking['from_']));
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'datetime', phpgwapi_datetime::date_to_timestamp($booking['to_']));
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_repeat_until', 'date');
- $booking['from_'] = pretty_timestamp($booking['from_']);
- $booking['to_'] = pretty_timestamp($booking['to_']);
foreach ($bookings['results'] as &$b)
{
@@ -798,14 +808,17 @@
{
$config = CreateObject('phpgwapi.config', 'booking');
$config->read();
+ $id = phpgw::get_var('id', 'int');
if ($config->config_data['user_can_delete_bookings'] !=
'yes')
{
-
- $booking =
$this->bo->read_single(phpgw::get_var('id', 'int'));
+ $booking = $this->bo->read_single($id);
$errors = array();
if ($_SERVER['REQUEST_METHOD'] == 'POST')
{
+ $_POST['from_'] = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['from_']));
+ $_POST['to_'] = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['to_']));
+ $_POST['repeat_until'] =
isset($_POST['repeat_until']) && $_POST['repeat_until'] ? date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($_POST['repeat_until'])) : false;
$from = $_POST['from_'];
$to = $_POST['to_'];
@@ -857,8 +870,8 @@
$booking['resources_json'] =
json_encode(array_map('intval', $booking['resources']));
$this->flash_form_errors($errors);
- $allocation['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule',
- 'id' =>
$allocation['building_id']));
+ $booking['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule',
+ 'id' =>
$booking['building_id']));
self::rich_text_editor('field-message');
self::render_template_xsl('booking_cancel',
array('booking' => $booking));
@@ -865,8 +878,6 @@
}
else
{
-
- $id = phpgw::get_var('id', 'int');
$outseason = phpgw::get_var('outseason',
'string');
$recurring = phpgw::get_var('recurring',
'string');
$repeat_until = phpgw::get_var('repeat_until',
'string');
@@ -911,7 +922,7 @@
{
$_POST['from_'] = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['from_']));
$_POST['to_'] = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['to_']));
- $_POST['repeat_until'] = date("Y-m-d
H:i:s", phpgwapi_datetime::date_to_timestamp($_POST['repeat_until']));
+ $_POST['repeat_until'] =
isset($_POST['repeat_until']) && $_POST['repeat_until'] ? date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($_POST['repeat_until'])) : false;
$from_date = $_POST['from_'];
$to_date = $_POST['to_'];
Modified:
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
2017-10-03 14:13:22 UTC (rev 17132)
+++
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
2017-10-03 18:12:06 UTC (rev 17133)
@@ -121,6 +121,17 @@
$stage = phpgw::get_var('stage');
$org_id = phpgw::get_var('org_id');
+ if ($this->debug)
+ {
+ $orgs[] = array
+ (
+ 'id' => 994239929,
+ 'name' => 'Bølleball',
+ );
+ $orgs_validate[] = 994239929;
+ $fodsels_nr = 1;
+ }
+
if ($stage == 2 && $fodsels_nr && in_array($org_id,
$orgs_validate))
{
try
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-10-03 14:13:22 UTC (rev 17132)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-10-03 18:12:06 UTC (rev 17133)
@@ -463,6 +463,7 @@
$file_def = array
(
array('key' => 'file_name', 'label' =>
lang('Filename'), 'sortable' => false,'resizeable' => true),
+ array('key' => 'picture', 'label' => '',
'sortable' => false,'resizeable' => false, 'formatter' =>
'JqueryPortico.showPicture')
);
$datatable_def[] = array
@@ -480,9 +481,6 @@
)
);
- $file_def[] = array('key' => 'picture', 'label' => '',
'sortable' => false,
- 'resizeable' => true, 'formatter' =>
'JqueryPortico.showPicture');
-
$datatable_def[] = array
(
'container' => 'datatable-container_3',
Modified: branches/Version-2_0-branch/phpgwapi/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/setup/setup.inc.php 2017-10-03
14:13:22 UTC (rev 17132)
+++ branches/Version-2_0-branch/phpgwapi/setup/setup.inc.php 2017-10-03
18:12:06 UTC (rev 17133)
@@ -23,6 +23,7 @@
(
'phpgw_access_log',
'phpgw_accounts',
+ 'phpgw_accounts_data',
'phpgw_account_delegates',
'phpgw_acl',
'phpgw_applications',
Modified: branches/Version-2_0-branch/property/inc/class.soreport.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.soreport.inc.php
2017-10-03 14:13:22 UTC (rev 17132)
+++ branches/Version-2_0-branch/property/inc/class.soreport.inc.php
2017-10-03 18:12:06 UTC (rev 17133)
@@ -423,7 +423,7 @@
$value = array();
foreach ($columns as $column)
{
- $value[$column] = $this->db->f($column);
+ $value[$column] =
$this->db->f($column,true);
}
foreach ($functions as $k => $v)
@@ -523,8 +523,8 @@
$values = array
(
'id' => $this->db->f('id'),
- 'view_name' =>
$this->db->f('view_name'),
- 'dataset_name' =>
$this->db->f('dataset_name')
+ 'view_name' =>
$this->db->f('view_name',true),
+ 'dataset_name' =>
$this->db->f('dataset_name',true)
);
}
@@ -588,8 +588,8 @@
$values[] = array
(
'id' => $this->db->f('id'),
- 'view_name' =>
$this->db->f('view_name'),
- 'dataset_name' =>
$this->db->f('dataset_name'),
+ 'view_name' =>
$this->db->f('view_name',true),
+ 'dataset_name' =>
$this->db->f('dataset_name',true),
'n_reports' => $this->db->f('n_reports')
);
}
@@ -603,7 +603,7 @@
$values_insert = array
(
'dataset_id' => $data['dataset_id'],
- 'report_name' => $data['report_name'],
+ 'report_name' =>
$this->db->db_addslashes($data['report_name']),
'report_definition' =>
json_encode($data['report_definition']),
'owner_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
'entry_date' => time()
@@ -634,7 +634,7 @@
$value_set = array
(
'dataset_id' => $data['dataset_id'],
- 'report_name' => $data['report_name'],
+ 'report_name' =>
$this->db->db_addslashes($data['report_name']),
'report_definition' =>
json_encode($data['report_definition']),
'owner_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
'entry_date' => time()
@@ -644,7 +644,7 @@
$this->db->transaction_begin();
- $this->db->query("UPDATE fm_view_dataset_report SET
{$value_set} WHERE id='" . $data['id'] . "'", __LINE__, __FILE__);
+ $this->db->query("UPDATE fm_view_dataset_report SET
{$value_set} WHERE id='" . (int)$data['id'] . "'", __LINE__, __FILE__);
$receipt['id'] = $data['id'];
if ($this->db->transaction_commit())
@@ -686,7 +686,7 @@
$receipt = array();
$values_insert = array
(
- 'view_name' => $data['view_name'],
+ 'view_name' =>
$this->db->db_addslashes($data['view_name']),
'dataset_name' =>
$this->db->db_addslashes($data['dataset_name']),
'owner_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
'entry_date' => time()
@@ -716,7 +716,7 @@
$value_set = array
(
- 'view_name' => $data['view_name'],
+ 'view_name' =>
$this->db->db_addslashes($data['view_name']),
'dataset_name' =>
$this->db->db_addslashes($data['dataset_name']),
'owner_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
'entry_date' => time()
Modified: branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2017-10-03 14:13:22 UTC (rev 17132)
+++ branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2017-10-03 18:12:06 UTC (rev 17133)
@@ -2018,6 +2018,18 @@
{
$delivery_address .=
"\n{$entry['text']}: {$entry['value']}";
}
+
+
if(!empty($project['location_data']['last_name']))
+ {
+ $lang_tenant = lang('tenant');
+ $delivery_address .= "\n{$lang_tenant}:
{$project['location_data']['first_name']}
{$project['location_data']['last_name']}";
+ }
+ if(!empty($project['contact_phone']))
+ {
+ $lang_contact_phone = lang('Contact
phone');
+ $delivery_address .=
"\n{$lang_contact_phone}: {$project['contact_phone']}";
+ }
+
}
$formatted_gab_id = $this->get_gab_id($location_code);
@@ -2042,6 +2054,15 @@
array('col1' => $from, 'col2' =>
$invoice_address)
);
+ if($common_data['workorder']['start_date'])
+ {
+ $data[] = array('col1' => lang('deadline for
start'), 'col2' =>"<b>{$common_data['workorder']['start_date']}</b>");
+ }
+ if($common_data['workorder']['end_date'])
+ {
+ $data[] = array('col1' => lang('deadline for
execution'), 'col2' =>"<b>{$common_data['workorder']['end_date']}</b>");
+ }
+
$pdf->ezTable($data, array('col1' => '', 'col2' => ''),
''
, array('showHeadings' => 0, 'shaded' => 0,
'xPos' => 0,
'xOrientation' => 'right', 'width' => 500,
'gridlines' => EZ_GRIDLINE_ALL,
Modified: branches/Version-2_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/setup.inc.php 2017-10-03
14:13:22 UTC (rev 17132)
+++ branches/Version-2_0-branch/property/setup/setup.inc.php 2017-10-03
18:12:06 UTC (rev 17133)
@@ -186,6 +186,11 @@
'fm_entity_lookup',
'fm_entity_history',
'fm_entity_group',
+// 'fm_entity_1_1',
+// 'fm_entity_1_2',
+// 'fm_entity_1_3',
+// 'fm_entity_2_1',
+// 'fm_entity_2_2',
'fm_custom',
'fm_custom_cols',
'fm_orders',
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17133] Merge 17125:17132 from trunk,
sigurdne <=