jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

configure first day of week for calendar and date-picker (#1952)

Browse Source
This commit is contained in:
Kevin Papst
2020-09-05 18:31:37 +02:00
committed by GitHub
parent ed528eb19a
commit 217960de60
30 changed files with 195 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/plugins/KimaiAutocomplete.js
View File

@@ -20,7 +20,7 @@ export default class KimaiAutocomplete extends KimaiPlugin {
}
init() {
this.minChars = this.getContainer().getConfiguration().get('autoComplete');
this.minChars = this.getConfiguration('autoComplete');
}
getId() {

2
assets/js/plugins/KimaiDatatable.js
View File

@@ -46,7 +46,7 @@ export default class KimaiDatatable extends KimaiPlugin {
document.addEventListener(eventName, handle);
}
if (this.getContainer().getConfiguration().get('autoReloadDatatable')) {
if (this.getConfiguration('autoReloadDatatable')) {
document.addEventListener('toolbar-change', handle);
} else {
document.addEventListener('pagination-change', handle);

3
assets/js/plugins/KimaiDatePicker.js
View File

@@ -27,6 +27,7 @@ export default class KimaiDatePicker extends KimaiPlugin {
activateDatePicker(selector) {
const TRANSLATE = this.getContainer().getTranslation();
const DATE_UTILS = this.getContainer().getPlugin('date');
const firstDow = this.getConfiguration('first_dow_iso');
jQuery(selector + ' ' + this.selector).each(function(index) {
let localeFormat = jQuery(this).data('format');
@@ -36,7 +37,7 @@ export default class KimaiDatePicker extends KimaiPlugin {
autoUpdateInput: false,
locale: {
format: localeFormat,
firstDay: moment().startOf('week').format('d'),
firstDay: firstDow,
applyLabel: TRANSLATE.get('confirm'),
cancelLabel: TRANSLATE.get('cancel'),
customRangeLabel: TRANSLATE.get('customRange'),

3
assets/js/plugins/KimaiDateRangePicker.js
View File

@@ -27,6 +27,7 @@ export default class KimaiDateRangePicker extends KimaiPlugin {
activateDateRangePicker(selector) {
const TRANSLATE = this.getContainer().getTranslation();
const DATE_UTILS = this.getContainer().getPlugin('date');
const firstDow = this.getConfiguration('first_dow_iso');
jQuery(selector + ' ' + this.selector).each(function(index) {
let localeFormat = jQuery(this).data('format');
@@ -50,7 +51,7 @@ export default class KimaiDateRangePicker extends KimaiPlugin {
locale: {
separator: separator,
format: localeFormat,
firstDay: moment().startOf('week').format('d'),
firstDay: firstDow,
applyLabel: TRANSLATE.get('confirm'),
cancelLabel: TRANSLATE.get('cancel'),
customRangeLabel: TRANSLATE.get('customRange'),

7
assets/js/plugins/KimaiDateTimePicker.js
View File

@@ -25,20 +25,21 @@ export default class KimaiDateTimePicker extends KimaiPlugin {
activateDateTimePicker(selector) {
const TRANSLATE = this.getContainer().getTranslation();
const CONFIG = this.getContainer().getConfiguration();
const DATE_UTILS = this.getContainer().getPlugin('date');
const firstDow = this.getConfiguration('first_dow_iso');
const is24hours = this.getConfiguration('twentyFourHours');
jQuery(selector + ' ' + this.selector).each(function(index) {
let localeFormat = jQuery(this).data('format');
jQuery(this).daterangepicker({
singleDatePicker: true,
timePicker: true,
timePicker24Hour: CONFIG.get('twentyFourHours'),
timePicker24Hour: is24hours,
showDropdowns: true,
autoUpdateInput: false,
locale: {
format: localeFormat,
firstDay: moment().startOf('week').format('d'),
firstDay: firstDow,
applyLabel: TRANSLATE.get('confirm'),
cancelLabel: TRANSLATE.get('cancel'),
customRangeLabel: TRANSLATE.get('customRange'),

2
assets/js/plugins/KimaiFormSelect.js
View File

@@ -105,7 +105,7 @@ export default class KimaiFormSelect extends KimaiPlugin {
}
options = {...options, ...{
language: this.getContainer().getConfiguration().get('locale').replace('_', '-'),
language: this.getConfiguration('locale').replace('_', '-'),
theme: "bootstrap",
matcher: matcher
}};

2
assets/js/plugins/KimaiThemeInitializer.js
View File

@@ -29,7 +29,7 @@ export default class KimaiThemeInitializer extends KimaiPlugin {
* redirect access denied / session timeouts to login page
*/
registerGlobalAjaxErrorHandler() {
const loginUrl = this.getContainer().getConfiguration().get('login');
const loginUrl = this.getConfiguration('login');
const alert = this.getContainer().getPlugin('alert');
const translation = this.getContainer().getTranslation().get('login.required');
jQuery(document).ajaxError(function(event, jqxhr, settings, thrownError) {