DateTimePicker use config value for timepicker_increment - refs BT#19479

pull/4367/head
Angel Fernando Quiroz Campos 3 years ago
parent c2a47f9a19
commit 45a463d824
  1. 5
      main/inc/lib/formvalidator/Element/DateRangePicker.php
  2. 3
      main/inc/lib/formvalidator/Element/DateTimePicker.php
  3. 13
      main/inc/lib/formvalidator/FormValidator.class.php

@ -182,10 +182,7 @@ class DateRangePicker extends HTML_QuickForm_text
$timePicker = 'false';
}
$timeIncrement = 30;
if (api_get_configuration_value('timepicker_increment')) {
$timeIncrement = api_get_configuration_value('timepicker_increment');
}
$timeIncrement = FormValidator::getTimepickerIncrement();
// timeFormat: 'hh:mm'
$js .= "<script>

@ -134,6 +134,8 @@ class DateTimePicker extends HTML_QuickForm_text
*/
private function getElementJS()
{
$timeIncrement = FormValidator::getTimepickerIncrement();
$js = null;
$id = $this->getAttribute('id');
//timeFormat: 'hh:mm'
@ -151,6 +153,7 @@ class DateTimePicker extends HTML_QuickForm_text
dateFormat: 'yy-mm-dd',
controlType: 'select',
oneLine: true,
stepMinute: $timeIncrement,
timeFormat: 'HH:mm',
altField: '#{$id}_alt',
altFormat: \"".get_lang('DateFormatLongNoDayJS')."\",

@ -16,6 +16,8 @@ class FormValidator extends HTML_QuickForm
public const LAYOUT_BOX_NO_LABEL = 'box-no-label';
public const LAYOUT_GRID = 'grid';
public const TIMEPICKER_INCREMENT_DEFAULT = 15;
public $with_progress_bar = false;
private $layout;
@ -1791,6 +1793,17 @@ EOT;
}
}
public static function getTimepickerIncrement(): int
{
$customIncrement = api_get_configuration_value('timepicker_increment');
if (false !== $customIncrement) {
return (int) $customIncrement;
}
return self::TIMEPICKER_INCREMENT_DEFAULT;
}
/**
* @param string $url page that will handle the upload
* @param string $inputName

Loading…
Cancel
Save