From 8adef97316cab429e684a5a5133279e712036dcb Mon Sep 17 00:00:00 2001
From: modzeleg <g.modzelewski@protonmail.com>
Date: Fri, 19 Feb 2021 18:27:16 +0100
Subject: [PATCH] T191 partially functional. Work in progress

---
 src/main/resources/static/js/datatransfer.js | 23 +++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js
index b088bd1..c10dcb1 100644
--- a/src/main/resources/static/js/datatransfer.js
+++ b/src/main/resources/static/js/datatransfer.js
@@ -1,4 +1,7 @@
 //TODO: Add delete buttons for messages
+//TODO: Save button deactivation after swap, post or delete
+//TODO: It sends request, gets responds but doesnt run a function!!
+//TODO: Warning is displayed twice
 var clientUUID = '';
 var json = {};
 var jsonIndex = 0;
@@ -6,7 +9,16 @@ var htable_row = 0;
 var host = getDomain();
 var dataModified = false;
 const C_UUID = 'mock-uuid';
+const setModified = function(){
+    setDataModified();
+}
+const setOrigin = function(){
+    setDataOrigin();
+}
 
+const getUpdate = function(){
+    updateData();
+}
 $('#iconPlus').click(function(){addMessage()});
 $('#btn-addRow').click(function(){addRow()});
 //TODO remove later save onclick init
@@ -21,7 +33,6 @@ function getData(){
         console.log(JSON.stringify(json));
         console.log("Json received");
         refreshData();
-        setDataOrigin();
     });
 }
 
@@ -37,17 +48,17 @@ function setDataModified(){
     dataModified = true;
     $('#btn-save').removeClass('btn-inactive');
     $('#btn-save').addClass('btn-action');
-    $('#btn-save').click(function(){updateData()});
+    $('#btn-save').click(getUpdate);
 }
 
 //Adding change listener to fields
-$('.field').change(function(){setDataModified()});
+$('.field').change(setModified);
 
 function setDataOrigin(){
     dataModified = false;
     $('#btn-save').addClass('btn-inactive');
     $('#btn-save').removeClass('btn-action');
-    $('#btn-save').off('click');
+    $('#btn-save').off();
 }
 
 function displayDataLossWarn(){
@@ -99,8 +110,9 @@ function updateData(){
         contentType: "application/json",
     });
     request.done(function () {
-        getData();
         displaySaveConfirmation();
+        setDataOrigin();
+        getData();
     });
 }
 
@@ -244,6 +256,7 @@ function findJsonIndexById(id){
 
 function loadMessage(id){
     displayDataLossWarn();
+    setDataOrigin();
     for(let i=0; i<json.length; i++){
         if(id == json[i].mockedResponseId){
             jsonIndex = i;