From 846675bb32756df32c1823dbe0ee63dd34518a08 Mon Sep 17 00:00:00 2001 From: modzeleg Date: Wed, 3 Mar 2021 16:13:02 +0100 Subject: [PATCH] T207 Logic fix. Yes button to be implemented --- src/main/resources/static/js/datatransfer.js | 18 ++++++++++++------ target/classes/static/js/datatransfer.js | 19 +++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js index 81a141f..720c35c 100644 --- a/src/main/resources/static/js/datatransfer.js +++ b/src/main/resources/static/js/datatransfer.js @@ -122,8 +122,10 @@ function updateData(){ } function addMessage(){ - if(dataModified) dataLossModalDisplay(); - if(!checkDataLoss()) return; + if(dataModified) { + dataLossModalDisplay(); + if(!checkDataLoss()) return; + } var request = $.ajax({ url: host + '/mock/json/'+clientUUID, type: 'POST', @@ -134,8 +136,10 @@ function addMessage(){ } function removeTile(id){ - if(dataModified) dataLossModalDisplay(); - if(!checkDataLoss()) return; + if(dataModified) { + dataLossModalDisplay(); + if(!checkDataLoss()) return; + } var jsonObject = findJsonById(id); var request = $.ajax({ url: host + '/mock/json/'+clientUUID + '/' + id, @@ -263,8 +267,10 @@ function findJsonIndexById(id){ } function changeMessage(id){ - if(dataModified) dataLossModalDisplay(); - if(!checkDataLoss()) return; + if(dataModified) { + dataLossModalDisplay(); + if(!checkDataLoss()) return; + } loadMessage(id); } diff --git a/target/classes/static/js/datatransfer.js b/target/classes/static/js/datatransfer.js index 6c14541..720c35c 100644 --- a/target/classes/static/js/datatransfer.js +++ b/target/classes/static/js/datatransfer.js @@ -9,6 +9,7 @@ var htable_row = 0; var host = getDomain(); var dataModified = false; var discardChanges = false; +// TODO: Add last given command const C_UUID = 'mock-uuid'; const setModified = function(){ @@ -121,8 +122,10 @@ function updateData(){ } function addMessage(){ - if(dataModified) dataLossModalDisplay(); - if(!checkDataLoss()) return; + if(dataModified) { + dataLossModalDisplay(); + if(!checkDataLoss()) return; + } var request = $.ajax({ url: host + '/mock/json/'+clientUUID, type: 'POST', @@ -133,8 +136,10 @@ function addMessage(){ } function removeTile(id){ - if(dataModified) dataLossModalDisplay(); - if(!checkDataLoss()) return; + if(dataModified) { + dataLossModalDisplay(); + if(!checkDataLoss()) return; + } var jsonObject = findJsonById(id); var request = $.ajax({ url: host + '/mock/json/'+clientUUID + '/' + id, @@ -262,8 +267,10 @@ function findJsonIndexById(id){ } function changeMessage(id){ - if(dataModified) dataLossModalDisplay(); - if(!checkDataLoss()) return; + if(dataModified) { + dataLossModalDisplay(); + if(!checkDataLoss()) return; + } loadMessage(id); }