[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16576] Stable: Merge 16566:16575 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16576] Stable: Merge 16566:16575 from trunk |
|
Date: |
Tue, 11 Apr 2017 12:09:58 -0400 (EDT) |
Revision: 16576
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16576
Author: sigurdne
Date: 2017-04-11 12:09:58 -0400 (Tue, 11 Apr 2017)
Log Message:
-----------
Stable: Merge 16566:16575 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
branches/Version-2_0-branch/booking/inc/class.uiseason.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.jqcal2.inc.php
branches/Version-2_0-branch/setup/manageheader.php
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-04-11 16:08:51 UTC (rev 16575)
+++ branches/Version-2_0-branch 2017-04-11 16:09:58 UTC (rev 16576)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16394
/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
\ 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
\ No newline at end of property
Index: branches/Version-2_0-branch/booking
===================================================================
--- branches/Version-2_0-branch/booking 2017-04-11 16:08:51 UTC (rev 16575)
+++ branches/Version-2_0-branch/booking 2017-04-11 16:09:58 UTC (rev 16576)
Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/booking:14933-16394
/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
\ 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
\ 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-04-11 16:08:51 UTC (rev 16575)
+++ branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
2017-04-11 16:09:58 UTC (rev 16576)
@@ -297,6 +297,15 @@
$allocation['active'] = '1';
$allocation['completed'] = '0';
+ $weekday = phpgw::get_var('weekday', 'string',
'POST');
+
+ if(!$weekday)
+ {
+ $weekday = strtolower (date('l',
phpgwapi_datetime::date_to_timestamp($_POST['from_'])));
+ }
+
+ $_POST['weekday'] = $weekday;
+
$from_date = $_POST['from_'];
$to_date = $_POST['to_'];
$from_date_arr = explode(' ', $_POST['from_']);
@@ -304,34 +313,35 @@
if(count($from_date_arr) == 2)
{
$from_time = $from_date_arr[1];
- $to_time = $to_date_arr[1];
+ if(count($to_date_arr) == 2)
+ {
+ $to_time = $to_date_arr[1];
+ }
+ else
+ {
+ $to_time = $to_date_arr[0];
+ }
+
+ $allocation['from_'] =
strftime("%Y-%m-%d %H:%M",
phpgwapi_datetime::date_to_timestamp($from_date_arr[0] . " " . $from_time));
+ $allocation['to_'] = strftime("%Y-%m-%d
%H:%M", phpgwapi_datetime::date_to_timestamp($from_date_arr[0] . " " .
$to_time));
}
else
{
$from_time = $_POST['from_'];
$to_time = $_POST['to_'];
- }
+ $allocation['from_'] =
strftime("%Y-%m-%d %H:%M", strtotime($weekday . " " . $from_time));
+ $allocation['to_'] = strftime("%Y-%m-%d
%H:%M", strtotime($weekday . " " . $to_time));
- if(!isset($_POST['weekday']))
- {
- $_POST['weekday'] = strtolower
(date('l', phpgwapi_datetime::date_to_timestamp($_POST['from_'])));
- }
-
- $weekday = $_POST['weekday'];
-
-// $allocation['from_'] = strftime("%Y-%m-%d
%H:%M", strtotime($_POST['weekday'] . " " . $_POST['from_']));
-// $allocation['to_'] = strftime("%Y-%m-%d %H:%M",
strtotime($_POST['weekday'] . " " . $_POST['to_']));
- $allocation['from_'] = strftime("%Y-%m-%d
%H:%M", strtotime($_POST['weekday'] . " " . $from_time));
- $allocation['to_'] = strftime("%Y-%m-%d %H:%M",
strtotime($_POST['weekday'] . " " . $to_time));
-
- if (($_POST['weekday'] != 'sunday' && date('w')
> date('w', strtotime($_POST['weekday']))) || (date('w') == '0' && date('w') <
date('w', strtotime($_POST['weekday']))))
- {
- if (!phpgw::get_var('weekday',
'string', 'POST'))
+ if (($weekday != 'sunday' && date('w')
> date('w', strtotime($weekday))) || (date('w') == '0' && date('w') < date('w',
strtotime($weekday))))
{
- $allocation['from_'] =
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday'] . " " .
$from_date_arr[1]) - 60 * 60 * 24 * 7);
- $allocation['to_'] =
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday'] . " " . $to_date_arr[1])
- 60 * 60 * 24 * 7);
+ if (!phpgw::get_var('weekday',
'string', 'POST'))
+ {
+ $allocation['from_'] =
strftime("%Y-%m-%d %H:%M", strtotime($weekday . " " . $from_date_arr[1]) - 60 *
60 * 24 * 7);
+ $allocation['to_'] =
strftime("%Y-%m-%d %H:%M", strtotime($weekday . " " . $to_date_arr[1]) - 60 *
60 * 24 * 7);
+ }
}
}
+
$_POST['from_'] = $allocation['from_'];
$_POST['to_'] = $allocation['to_'];
@@ -409,8 +419,10 @@
}
else
{
- $dateTimeFrom = phpgw::get_var('from_',
'string', 'POST');
- $dateTimeTo = phpgw::get_var('to_', 'string',
'POST');
+// $dateTimeFrom = phpgw::get_var('from_',
'string', 'POST');
+// $dateTimeTo = phpgw::get_var('to_', 'string',
'POST');
+ $dateTimeFrom = phpgw::get_var('from_',
'string');
+ $dateTimeTo = phpgw::get_var('to_', 'string');
$dateTimeFromE = explode(" ", $dateTimeFrom[0]);
$dateTimeToE = explode(" ", $dateTimeTo[0]);
if (phpgw::get_var('from_', 'string') < 14)
@@ -429,7 +441,7 @@
array_set_default($allocation, 'building_name',
phpgw::get_var('building_name', 'string'));
array_set_default($allocation, 'from_',
$timeFrom);
array_set_default($allocation, 'to_', $timeTo);
- $weekday = phpgw::get_var('weekday', 'string',
'POST');
+ $weekday = phpgw::get_var('weekday', 'string');
}
$this->flash_form_errors($errors);
@@ -438,24 +450,33 @@
$allocation['cancel_link'] =
self::link(array('menuaction' => 'booking.uiallocation.index'));
array_set_default($allocation, 'cost', '0');
- $GLOBALS['phpgw']->jqcal2->add_listener('field_from',
'time');
- $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'time');
+
+ $_timeFrom = $timeFrom ? $timeFrom[0] : '';
+ $_timeTo = $timeTo ? $timeTo[0] : '';
+
$tabs = array();
$tabs['generic'] = array('label' => lang('Allocation
New'), 'link' => '#allocation_new');
$active_tab = 'generic';
$allocation['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $allocation['validator'] =
phpgwapi_jquery::formvalidator_generate(array('location',
- 'date', 'security', 'file'));
+ $allocation['validator'] =
phpgwapi_jquery::formvalidator_generate(array('date', 'security'));
if ($step < 2)
{
+ $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+ $allocation['from_'] = date("{$dateformat}
H:i",strtotime($dateTimeFrom[0]));
if ($_SERVER['REQUEST_METHOD'] == 'POST' &&
$errors)
{
- $allocation['from_'] =
strftime("%H:%M", strtotime($_POST['weekday'] . " " . $_POST['from_']));
- $allocation['to_'] = strftime("%H:%M",
strtotime($_POST['weekday'] . " " . $_POST['to_']));
+ // $allocation['from_'] =
strftime("%H:%M", strtotime($_POST['weekday'] . " " . $_POST['from_']));
+ // $allocation['to_'] = strftime("%H:%M",
strtotime($_POST['weekday'] . " " . $_POST['to_']));
+ $_timeFrom = $allocation['from_'];
+ $_timeTo = $allocation['to_'];
}
+
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_from', 'datetime',
strtotime($dateTimeFrom[0]));
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_to', 'time', $_timeTo);
+
self::render_template_xsl('allocation_new',
array('allocation' => $allocation,
'step' => $step,
'interval' => $_POST['field_interval'],
@@ -466,6 +487,9 @@
}
else if ($step == 2)
{
+//
$GLOBALS['phpgw']->jqcal2->add_listener('field_from', 'time', $_timeFrom);
+//
$GLOBALS['phpgw']->jqcal2->add_listener('field_to', 'time', $_timeTo);
+
self::render_template_xsl('allocation_new_preview', array('allocation' =>
$allocation,
'step' => $step,
'recurring' => $_POST['recurring'],
Modified: branches/Version-2_0-branch/booking/inc/class.uiseason.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiseason.inc.php
2017-04-11 16:08:51 UTC (rev 16575)
+++ branches/Version-2_0-branch/booking/inc/class.uiseason.inc.php
2017-04-11 16:09:58 UTC (rev 16576)
@@ -244,8 +244,8 @@
$season['cancel_link'] = self::link(array('menuaction'
=> 'booking.uiseason.show',
'id' => $season['id']));
- $GLOBALS['phpgw']->jqcal2->add_listener('from_',
'date');
- $GLOBALS['phpgw']->jqcal2->add_listener('to_', 'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('from_',
'date',phpgwapi_datetime::date_to_timestamp($season['from_']));
+ $GLOBALS['phpgw']->jqcal2->add_listener('to_', 'date',
phpgwapi_datetime::date_to_timestamp($season['to_']));
$tabs = array();
$tabs['generic'] = array('label' => lang('Season
Edit'), 'link' => '#season_new');
@@ -349,8 +349,8 @@
$boundary['to_'] = "{$to_arr[0]}:{$to_arr[1]}";
}
- $GLOBALS['phpgw']->jqcal2->add_listener('field_from',
'time');
- $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'time');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_from',
'time', $boundary['from_']);
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'time', $boundary['to_']);
self::render_template('season_boundaries',
array('boundary' => $boundary, 'boundaries' => $boundaries,
'season' => $season));
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.jqcal2.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.jqcal2.inc.php
2017-04-11 16:08:51 UTC (rev 16575)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.jqcal2.inc.php
2017-04-11 16:09:58 UTC (rev 16576)
@@ -65,7 +65,7 @@
}
else
{
- $start_value = '';
+ $start_value = $dateformat == 'H:i' ? $value :
'';
}
$this->_input_modern($name, $_type, $dateformat,
$config, $start_value);
return "<input id='{$name}' type='text'
value='{$value}' size='10' name='{$name}'/>";
@@ -98,6 +98,7 @@
$min_date .= ",maxDate:'{$config['max_date']}'";
}
+ $value = 'false';
if(!$start_value)
{
$start_value = 'new Date()';
@@ -104,7 +105,15 @@
}
else
{
- $start_value = "new Date('{$start_value}')";
+ if($datepicker)
+ {
+ $start_value = "new
Date('{$start_value}')";
+ }
+ else if($timepicker)
+ {
+ $value = $start_value ?
"'{$start_value}'" : 'false';
+ $start_value = 'false';
+ }
}
@@ -121,6 +130,7 @@
datepicker:{$datepicker},
timepicker: {$timepicker},
step: 15,
+ value: {$value},
weeks: true,
dayOfWeekStart:1,
// mask:true,
Modified: branches/Version-2_0-branch/setup/manageheader.php
===================================================================
--- branches/Version-2_0-branch/setup/manageheader.php 2017-04-11 16:08:51 UTC
(rev 16575)
+++ branches/Version-2_0-branch/setup/manageheader.php 2017-04-11 16:09:58 UTC
(rev 16576)
@@ -322,10 +322,10 @@
{
$detected .= '<li class="warn">' . lang('No
Postgres-DB support found. Disabling') . "</li>\n";
}
- if (extension_loaded('mysql') ||
function_exists('mysql_connect'))
+ if (extension_loaded('mysqli'))
{
$detected .= '<li>' . lang('You appear to have
MySQL support enabled') . "</li>\n";
- $supported_db[] = 'mysql';
+// $supported_db[] = 'mysql';
}
else
{
@@ -334,7 +334,7 @@
if (extension_loaded('mssql') ||
function_exists('mssql_connect'))
{
$detected .= '<li>' . lang('You appear to have
Microsoft SQL Server support enabled') . "</li>\n";
- $supported_db[] = 'mssql';
+// $supported_db[] = 'mssql';
}
else
{
@@ -343,7 +343,7 @@
if (extension_loaded('oci8'))
{
$detected .= '<li>' . lang('You appear to have
Oracle V8 (OCI) support enabled') . "</li>\n";
- $supported_db[] = 'oracle';
+// $supported_db[] = 'oracle';
}
else
{
@@ -350,7 +350,7 @@
if(extension_loaded('oracle'))
{
$detected .= '<li>' . lang('You appear
to have Oracle support enabled') . "</li>\n";
- $supported_db[] = 'oracle';
+// $supported_db[] = 'oracle';
}
else
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16576] Stable: Merge 16566:16575 from trunk,
sigurdne <=