iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the timepicker in shifts view 

This is one part of #516.
This commit is contained in:
MichiK 2018-12-07 23:34:30 +01:00 committed by msquare
parent 5891dff584
commit f83e754f84
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/assets/js/forms.js
View File

@ -118,7 +118,7 @@ $(function () {
elem.children('input').attr('type', 'text'); elem.children('input').attr('type', 'text');
elem.children().on('click', function (ev) { elem.children().on('click', function (ev) {
ev.stopImmediatePropagation(); ev.stopImmediatePropagation();
if (typeof elem.data('DateTimePicker') === "undefined") { if (typeof elem.data('DateTimePicker') === 'undefined') {
elem.datetimepicker(opts); elem.datetimepicker(opts);
elem.data('DateTimePicker').show(); elem.data('DateTimePicker').show();
} else { } else {
@ -133,16 +133,16 @@ $(function () {
*/ */
$(function () { $(function () {
$('.input-group.time').each(function () { $('.input-group.time').each(function () {
var elem = $(this); var elem = $(this).children('input').first();
var opts = { var opts = {
locale: 'en', locale: 'en',
format: 'HH:mm', format: 'HH:mm',
widgetPositioning: {horizontal: 'auto', vertical: 'bottom'} widgetPositioning: {horizontal: 'auto', vertical: 'bottom'}
}; };
$.extend(opts, elem.data()); $.extend(opts, elem.data());
elem.children('input').attr('type', 'text'); elem.attr('type', 'text');
elem.datetimepicker(opts); elem.datetimepicker(opts);
elem.children('input').on('click', function (ev) { elem.on('click', function (ev) {
ev.stopImmediatePropagation(); ev.stopImmediatePropagation();
elem.data('DateTimePicker').toggle(); elem.data('DateTimePicker').toggle();
}); });

10
resources/views/pages/user-shifts.html
View File

@ -5,9 +5,10 @@
<h1>%title%</h1> <h1>%title%</h1>
<div class="form-group">%start_select%</div> <div class="form-group">%start_select%</div>
<div class="form-group"> <div class="form-group">
<div class="input-group time" data-locale="%short_locale%"> <div class="input-group time">
<input type="time" class="form-control" id="start_time" name="start_time" size="5" <input type="time" class="form-control" id="start_time" name="start_time" size="5"
pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%start_time%"> pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%start_time%"
data-locale="%short_locale%">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-default" title="Now" type="button"> <button class="btn btn-default" title="Now" type="button">
<span class="glyphicon glyphicon-time"></span> <span class="glyphicon glyphicon-time"></span>
@ -18,9 +19,10 @@
&#8211; &#8211;
<div class="form-group">%end_select%</div> <div class="form-group">%end_select%</div>
<div class="form-group"> <div class="form-group">
<div class="input-group time" data-locale="%short_locale%"> <div class="input-group time">
<input type="time" class="form-control" id="end_time" name="end_time" size="5" <input type="time" class="form-control" id="end_time" name="end_time" size="5"
pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%end_time%"> pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%end_time%"
data-locale="%short_locale%">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-default" title="Now" type="button"> <button class="btn btn-default" title="Now" type="button">
<span class="glyphicon glyphicon-time"></span> <span class="glyphicon glyphicon-time"></span>