mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-11-09 17:42:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

Updated sorting to comply with latest layout.

Browse source
This commit is contained in:
Eero Jääskeläinen 2024-05-15 16:17:15 +03:00
parent 23cebdda5d
commit 3d45182c2b
2 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/controllers/Services.php
View file

@ -106,7 +106,7 @@ class Services extends EA_Controller
$keyword = request('keyword', ''); $keyword = request('keyword', '');
$order_by = request('order_by', 'row_order ASC, update_datetime DESC'); $order_by = 'update_datetime DESC';
$limit = request('limit', 1000); $limit = request('limit', 1000);

35
assets/js/pages/services.js
View file

@ -94,18 +94,47 @@ App.Pages.Services = (function () {
*/ */
const sorting = new Sortable(document.querySelector('.results'), { const sorting = new Sortable(document.querySelector('.results'), {
onStart : function(ev) {
if (ev.from.querySelector('hr') == null)
return;
if (! (ev.item.nextSibling && ev.item.nextSibling.tagName == 'HR'))
return;
ev.item.dataset['hadHR'] = true;
ev.item.nextSibling.remove();
},
onUpdate : async function(ev){ onUpdate : async function(ev){
resetForm(); resetForm();
let afterId; let afterId;
const currentItemId = ev.item.dataset['id']; const currentItemId = ev.item.dataset['id'];
const hadHR = ev.item.dataset['hadHR'] == 'true';
;
if (ev.newIndex == 0) if (ev.newIndex == 0)
afterId = -1; afterId = -1;
else if (ev.item.previousSibling !== null && ev.item.previousSibling.classList.contains('service-row')) { else if (ev.item.previousSibling !== null) {
afterId = parseInt(ev.item.previousSibling.dataset['id']); let prevItem =ev.item.previousSibling;
if (prevItem.tagName == 'HR')
prevItem = prevItem.previousSibling;
if (! prevItem.classList.contains('service-row')){
window.App.Utils.Message.show(lang('unexpected_issues'),'Failed to get previous service to sort!');
throw 'Failed to get previous service to sort';
}
afterId = parseInt(prevItem.dataset['id']);
} }
try { try {
await sort(currentItemId, afterId) await sort(currentItemId, afterId);
if (hadHR)
{
const newHr = document.createElement('HR');
if (ev.oldIndex < ev.newIndex)
ev.item.before(newHr);
else
ev.item.after(newHr);
delete ev.item.dataset.hadHR;
}
} }
catch (err){ catch (err){
$services.find('.form-message').addClass('alert-danger').text(lang('error')).show(); $services.find('.form-message').addClass('alert-danger').text(lang('error')).show();