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

added multi-select for customer, project and activity (#1557)

Browse Source
This commit is contained in:
Kevin Papst
2020-03-16 14:06:26 +01:00
committed by GitHub
parent 6eeb01ad48
commit 4b1cfa5840
74 changed files with 1262 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ export default class KimaiFormSelect extends KimaiPlugin {
});
// If the option element contains all terms, return it
if(foundAll) {
if (foundAll) {
return data;
}
@@ -157,10 +157,10 @@ export default class KimaiFormSelect extends KimaiPlugin {
// if available, re-select the previous selected option (mostly usable for global activities)
select.val(selectedValue);
// if we don't trigger the change, the other selects won't be resetted
// if we don't trigger the change, the other selects won't reset
select.trigger('change');
// if the beta test kimai.theme.select_type is active, this will tell the selects to refresh
// if select2 is active, this will tell the select to refresh
if (select.hasClass('selectpicker')) {
select.trigger('change.select2');
}

13
assets/js/plugins/KimaiSelectDataAPI.js
View File

@@ -49,7 +49,9 @@ export default class KimaiSelectDataAPI extends KimaiPlugin {
let newApiUrl = self._buildUrlWithFormFields(this.dataset['apiUrl'], formPrefix);
if (jQuery(this).val() === '') {
const selectValue = jQuery(this).val();
if (selectValue === '' || (Array.isArray(selectValue) && selectValue.length === 0)) {
if (this.dataset['emptyUrl'] === undefined) {
self._updateSelect(targetSelect, {});
jQuery(targetSelect).attr('disabled', 'disabled');
@@ -82,7 +84,7 @@ export default class KimaiSelectDataAPI extends KimaiPlugin {
} else {
if (targetField.val() !== null) {
newValue = targetField.val();
if (newValue !== '') {
// having that special case here is far from being perfect... but for now it works ;-)
if (targetField.data('daterangepicker') !== undefined) {
@@ -95,10 +97,15 @@ export default class KimaiSelectDataAPI extends KimaiPlugin {
if (moment(newValue, targetField.data('format')).isValid()) {
newValue = moment(newValue, targetField.data('format')).format(moment.HTML5_FMT.DATETIME_LOCAL_SECONDS);
}
}
}
}
}
}
if (Array.isArray(newValue)) {
newValue = newValue.join(',');
}
newApiUrl = newApiUrl.replace(value, newValue);
}
});