From 803b247ca2631e37f52cdf7fc77d2f3b2832ecca Mon Sep 17 00:00:00 2001 From: marsooooo Date: Fri, 14 Jun 2024 02:36:01 +0200 Subject: [PATCH] Update Validation Save mechanism is now fully operational --- admin/themes/default/js/batchManagerUnit.js | 34 ++++++++++++++++--- .../default/template/batch_manager_unit.tpl | 8 +++-- include/ws_functions/pwg.images.php | 1 + 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/admin/themes/default/js/batchManagerUnit.js b/admin/themes/default/js/batchManagerUnit.js index bb7b8e60b..0b639bf03 100644 --- a/admin/themes/default/js/batchManagerUnit.js +++ b/admin/themes/default/js/batchManagerUnit.js @@ -11,10 +11,16 @@ $(document).ready(function () { if (user_interacted == true) { showUnsavedLocalBadge(pictureId); updateUnsavedGlobalBadge(); - console.log("Change seen on " + pictureId); } }); + $('.icon-cancel-circled, .item-add').on('click', function() { + var pictureId = $(this).parents("fieldset").data("image_id"); + showUnsavedLocalBadge(pictureId); + updateUnsavedGlobalBadge(); + +}); + function updateUnsavedGlobalBadge() { var visibleLocalUnsavedCount = $(".local-unsaved-badge").filter(function() { return $(this).css('display') === 'block'; @@ -71,12 +77,29 @@ function hideSuccesLocalBadge(pictureId) { $("#picture-" + pictureId + " .local-succes-badge").css('display', 'none'); } +function showLocalSaveIcon (pictureId) { + $("#picture-" + pictureId + " .local-save-icon").css('display', 'block'); + $("#picture-" + pictureId + " .action-save-picture").css({ + 'pointer-events': 'none', + 'opacity': '0.5' +}); +} + +function hideLocalSaveIcon(pictureId) { + $("#picture-" + pictureId + " .local-save-icon").css('display', 'none'); + $("#picture-" + pictureId + " .action-save-picture").css({ + 'pointer-events': 'auto', + 'opacity': '1' +}); +} + + + // DELETE $('.action-delete-picture').on('click', function(event) { var $fieldset = $(this).parents("fieldset"); var pictureId = $fieldset.data("image_id"); - console.log(pictureId); $.confirm({ title: str_are_you_sure, @@ -97,7 +120,6 @@ function hideSuccesLocalBadge(pictureId) { btnClass: 'btn-red', action: function () { var image_ids = [pictureId]; - (function(ids) { $.ajax({ type: 'POST', @@ -140,6 +162,7 @@ function hideSuccesLocalBadge(pictureId) { }); // VALIDATION + //Unit Save $('.action-save-picture').on('click', function(event) { var $fieldset = $(this).parents("fieldset"); @@ -177,7 +200,7 @@ function hideSuccesLocalBadge(pictureId) { tags.push(tagId); }); var tagsStr = tags.join(','); - + showLocalSaveIcon(pictureId); $.ajax({ url: 'ws.php?format=json', method: 'POST', @@ -197,11 +220,13 @@ function hideSuccesLocalBadge(pictureId) { }, success: function(response) { console.log(response); + hideLocalSaveIcon(pictureId); hideUnsavedLocalBadge(pictureId); showSuccesLocalBadge(pictureId); updateUnsavedGlobalBadge(); }, error: function(xhr, status, error) { + hideLocalSaveIcon(pictureId); hideUnsavedLocalBadge(pictureId); showErrorLocalBadge(pictureId); console.error('Error:', error); @@ -216,7 +241,6 @@ function hideSuccesLocalBadge(pictureId) { var pictureId = $(this).data("image_id"); saveChanges(pictureId); }); - console.log("changed all") } diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl index 84e0ac15c..80f7db091 100644 --- a/admin/themes/default/template/batch_manager_unit.tpl +++ b/admin/themes/default/template/batch_manager_unit.tpl @@ -385,7 +385,7 @@ var sliders = {
{'Creation date'|@translate} - +
{'Submit'|@translate}
+ @@ -489,16 +490,17 @@ var sliders = { image(s) contains unsaved changes

-