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

Merge pull request #367 from MyIgel/master 

Feature: Time Interval Buttons (on Shifts page), closes #366
This commit is contained in:
msquare 2017-11-29 15:24:30 +01:00 committed by GitHub
parent 599f2fd264 b29e23f086
commit 968b7197ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 107 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
includes/pages/user_shifts.php
View File

@ -242,7 +242,14 @@ function view_user_shifts()
page_link_to('shifts_json_export', ['key' => $user['api_key']]),
page_link_to('user_myshifts', ['reset' => 1])
) . '</p>',
'filter' => _('Filter')
'filter' => _('Filter'),
'set_yesterday' => _('Yesterday'),
'set_today' => _('Today'),
'set_tomorrow' => _('Tomorrow'),
'set_last_8h' => _('last 8h'),
'set_last_4h' => _('last 4h'),
'set_next_4h' => _('next 4h'),
'set_next_8h' => _('next 8h'),
])
])
]);

BIN
locale/de_DE.UTF-8/LC_MESSAGES/default.mo
View File

Binary file not shown.

30
locale/de_DE.UTF-8/LC_MESSAGES/default.po
View File

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Engelsystem 2.0\n"
"POT-Creation-Date: 2017-11-24 11:59+0100\n"
"PO-Revision-Date: 2017-11-24 12:00+0100\n"
"PO-Revision-Date: 2017-11-29 13:20+0100\n"
"Last-Translator: msquare <msquare@notrademark.de>\n"
"Language-Team: \n"
"Language: de_DE\n"
@ -1837,6 +1837,34 @@ msgstr ""
msgid "Filter"
msgstr "Filter"
#: engelsystem/includes/pages/user_shifts.php:246
msgid "Yesterday"
msgstr "Gestern"
#: engelsystem/includes/pages/user_shifts.php:247
msgid "Today"
msgstr "Heute"
#: engelsystem/includes/pages/user_shifts.php:248
msgid "Tomorrow"
msgstr "Morgen"
#: engelsystem/includes/pages/user_shifts.php:249
msgid "last 8h"
msgstr "letzte 8h"
#: engelsystem/includes/pages/user_shifts.php:250
msgid "last 4h"
msgstr "letzte 4h"
#: engelsystem/includes/pages/user_shifts.php:251
msgid "next 4h"
msgstr "nächste 4h"
#: engelsystem/includes/pages/user_shifts.php:252
msgid "next 8h"
msgstr "nächste 8h"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:278
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:49
msgid "All"

57
public/js/forms.js
View File

@ -17,6 +17,63 @@ function checkAll(id, checked) {
}
}
/**
* @param {moment} date
*/
function formatDay(date) {
return date.format("YYYY-MM-DD");
}
/**
* @param {moment} date
*/
function formatTime(date) {
return date.format("HH:mm");
}
/**
* @param {moment} from
* @param {moment} to
*/
function setInput(from, to) {
var fromDay = $("#start_day"), fromTime = $("#start_time"), toDay = $("#end_day"), toTime = $("#end_time");
fromDay.val(formatDay(from));
fromTime.val(formatTime(from));
toDay.val(formatDay(to));
toTime.val(formatTime(to));
}
function setDay(days) {
days = days || 0;
var from = moment();
from.hours(0).minutes(0).seconds(0);
from.add(days, "d");
var to = from.clone();
to.hours(23).minutes(59);
setInput(from, to);
}
function setHours(hours) {
hours = hours || 1;
var from = moment();
var to = from.clone();
to.add(hours, "h");
if (to < from) {
setInput(to, from);
return;
}
setInput(from, to);
}
$(function () {
/**
* Disable every submit button after clicking (to prevent double-clicking)

13
templates/user_shifts.html
View File

@ -41,6 +41,19 @@
</div>
</div>
</div>
<div class="form-group" style="margin-top: .5em">
<div class="btn-group">
<a href="javascript:setDay(-1)" class="btn btn-default ">%set_yesterday%</a>
<a href="javascript:setDay()" class="btn btn-default ">%set_today%</a>
<a href="javascript:setDay(1)" class="btn btn-default ">%set_tomorrow%</a>
</div>
<div class="btn-group">
<a href="javascript:setHours(-8)" class="btn btn-default ">%set_last_8h%</a>
<a href="javascript:setHours(-4)" class="btn btn-default ">%set_last_4h%</a>
<a href="javascript:setHours(4)" class="btn btn-default ">%set_next_4h%</a>
<a href="javascript:setHours(8)" class="btn btn-default ">%set_next_8h%</a>
</div>
</div>
</div>
<div class="col-md-2">%room_select%</div>
<div class="col-md-2">%type_select%</div>