From ce43e0aeb6fbbc669cb0e11961b953fcb944c585 Mon Sep 17 00:00:00 2001 From: augustyd Date: Tue, 25 Apr 2023 09:53:21 +0200 Subject: [PATCH 1/3] save button added --- .../src/main/resources/static/html/mock.html | 4 ++-- .../src/main/resources/static/js/modal.js | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Backend/mocked-services/src/main/resources/static/html/mock.html b/Backend/mocked-services/src/main/resources/static/html/mock.html index bb373c8..cc4c30b 100644 --- a/Backend/mocked-services/src/main/resources/static/html/mock.html +++ b/Backend/mocked-services/src/main/resources/static/html/mock.html @@ -309,9 +309,9 @@
Unsaved data
-
You haven't saved your message! Any changes will be lost.
Do you want to continue?
+
You haven't saved your message!
Do you want to save it?
- +
diff --git a/Backend/mocked-services/src/main/resources/static/js/modal.js b/Backend/mocked-services/src/main/resources/static/js/modal.js index 3061752..36e17e5 100644 --- a/Backend/mocked-services/src/main/resources/static/js/modal.js +++ b/Backend/mocked-services/src/main/resources/static/js/modal.js @@ -6,10 +6,10 @@ var methodToCall = { const overlay = $('#overlay'); const savedModal = $('#modal-confirm'); -const dataLossModal = $('#modal-query'); +const unsavedModal = $('#modal-query'); const uuidChangeModal = $('#modal-uuidChanged') -const dataLossModalYes = dataLossModal.children().eq(2).children().eq(0); -const dataLossModalNo = dataLossModal.children().eq(2).children().eq(1); +const unsavedModalYes = unsavedModal.children().eq(2).children().eq(0); +const unsavedModalNo = unsavedModal.children().eq(2).children().eq(1); const allModals = $('.modal'); const btnModalClose = $('.modal button'); const closeModals = function() { @@ -20,8 +20,8 @@ const savedModalDisplay = function() { showModal(savedModal); setTimeout(closeModals, 2000); } -const dataLossModalDisplay = function(){ - showModal(dataLossModal); +const unsavedModalDisplay = function(){ + showModal(unsavedModal); } const uuidChangeModalDisplay = function(addidionalMessage){ @@ -62,7 +62,7 @@ function setMethodToCall(name, id){ const dropChangesAndClose = function(){ callMethodByName(methodToCall) - hideModal(dataLossModal); + hideModal(unsavedModal); } function showModal(jmodal){ @@ -84,6 +84,6 @@ btnModalClose.click(closeModals); overlay.click(closeModals); -dataLossModalNo.click(closeModals); -dataLossModalYes.click(dropChangesAndClose); +unsavedModalNo.click(closeModals); +unsavedModalYes.click(dropChangesAndClose); -- 2.51.0 From bab75fb18fdb55fa9dd755dfef26eb17780f8257 Mon Sep 17 00:00:00 2001 From: augustyd Date: Tue, 25 Apr 2023 11:32:02 +0200 Subject: [PATCH 2/3] Save button working --- .../src/main/resources/static/html/mock.html | 4 +++- .../src/main/resources/static/js/datatransfer.js | 4 ++++ .../src/main/resources/static/js/modal.js | 16 ++++++++-------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Backend/mocked-services/src/main/resources/static/html/mock.html b/Backend/mocked-services/src/main/resources/static/html/mock.html index cc4c30b..e3b6254 100644 --- a/Backend/mocked-services/src/main/resources/static/html/mock.html +++ b/Backend/mocked-services/src/main/resources/static/html/mock.html @@ -311,7 +311,9 @@
You haven't saved your message!
Do you want to save it?
- + + +
diff --git a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js index adc0cc7..70bd01b 100644 --- a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js +++ b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js @@ -155,6 +155,10 @@ function callMethodByName(methodObject){ } } +function myfunction() { + alert("how are you"); +} + function updateData(){ var updatedJson = generateJson(); const dataSaved = function () { diff --git a/Backend/mocked-services/src/main/resources/static/js/modal.js b/Backend/mocked-services/src/main/resources/static/js/modal.js index 36e17e5..3061752 100644 --- a/Backend/mocked-services/src/main/resources/static/js/modal.js +++ b/Backend/mocked-services/src/main/resources/static/js/modal.js @@ -6,10 +6,10 @@ var methodToCall = { const overlay = $('#overlay'); const savedModal = $('#modal-confirm'); -const unsavedModal = $('#modal-query'); +const dataLossModal = $('#modal-query'); const uuidChangeModal = $('#modal-uuidChanged') -const unsavedModalYes = unsavedModal.children().eq(2).children().eq(0); -const unsavedModalNo = unsavedModal.children().eq(2).children().eq(1); +const dataLossModalYes = dataLossModal.children().eq(2).children().eq(0); +const dataLossModalNo = dataLossModal.children().eq(2).children().eq(1); const allModals = $('.modal'); const btnModalClose = $('.modal button'); const closeModals = function() { @@ -20,8 +20,8 @@ const savedModalDisplay = function() { showModal(savedModal); setTimeout(closeModals, 2000); } -const unsavedModalDisplay = function(){ - showModal(unsavedModal); +const dataLossModalDisplay = function(){ + showModal(dataLossModal); } const uuidChangeModalDisplay = function(addidionalMessage){ @@ -62,7 +62,7 @@ function setMethodToCall(name, id){ const dropChangesAndClose = function(){ callMethodByName(methodToCall) - hideModal(unsavedModal); + hideModal(dataLossModal); } function showModal(jmodal){ @@ -84,6 +84,6 @@ btnModalClose.click(closeModals); overlay.click(closeModals); -unsavedModalNo.click(closeModals); -unsavedModalYes.click(dropChangesAndClose); +dataLossModalNo.click(closeModals); +dataLossModalYes.click(dropChangesAndClose); -- 2.51.0 From 0524fb09f9d64899a8a9f90396708ea2d2353af2 Mon Sep 17 00:00:00 2001 From: augustyd Date: Wed, 26 Apr 2023 13:35:34 +0200 Subject: [PATCH 3/3] Cleanup --- .../src/main/resources/static/js/datatransfer.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js index 70bd01b..ba21743 100644 --- a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js +++ b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js @@ -155,9 +155,6 @@ function callMethodByName(methodObject){ } } -function myfunction() { - alert("how are you"); -} function updateData(){ var updatedJson = generateJson(); -- 2.51.0