From d0d92c703ed66f888b305f11e5d9bf3e21e9f0e4 Mon Sep 17 00:00:00 2001 From: modzeleg Date: Thu, 4 Mar 2021 15:07:39 +0100 Subject: [PATCH] T217 data about last displayed and advance mode stored in the cookie --- src/main/resources/static/js/datatransfer.js | 29 +++++++++++++++----- src/main/resources/static/js/uianimation.js | 1 + target/classes/static/js/datatransfer.js | 29 +++++++++++++++----- target/classes/static/js/uianimation.js | 1 + 4 files changed, 46 insertions(+), 14 deletions(-) diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js index f36d1df..787bb56 100644 --- a/src/main/resources/static/js/datatransfer.js +++ b/src/main/resources/static/js/datatransfer.js @@ -3,6 +3,7 @@ //TODO: It sends request, gets responds but doesnt run a function!! //TODO: Warning is displayed twice var clientUUID = ''; +var advancedDisplayed = false; var json = {}; var jsonIndex = 0; var lastId = 1; @@ -16,6 +17,8 @@ const removeMessageName = 'removeMessage'; // TODO: Add last given command const C_UUID = 'mock-uuid'; +const C_ID = 'last-displayed-id'; +const C_ADV = 'advanced-mode'; const setModified = function(){ setDataModified(); } @@ -35,17 +38,22 @@ $('#btn-addRow').click(function(){addRow()}); $('#btn-save').click(getUpdate); function getData(){ - loadCookies(); $.getJSON(host + '/mock/json/'+clientUUID, function(data) { json = data; - clientUUID = json[0].clientUUID; - setCookies(); + checkUuid(); console.log(JSON.stringify(json)); console.log("Json received"); refreshData(); }); } +function checkUuid(){ + if(clientUUID == null || clientUUID == undefined || clientUUID == ''){ + clientUUID = json[0].clientUUID; + setCookie(); + } +} + function getDomain(){ var url = window.location.href; var arr = url.split("/"); @@ -95,13 +103,16 @@ function refreshData(){ console.log("Message loaded"); } -function setCookies(){ - document.cookie = - C_UUID + '=' +clientUUID+';' +function setCookie(){ + document.cookie = C_UUID + '=' +clientUUID+';' + document.cookie = C_ID + '=' + lastId; + document.cookie = C_ADV + '=' + advancedVisibility; } function loadCookies(){ clientUUID = getCookie(C_UUID); + lastId = getCookie(C_ID); + advancedDisplayed = getCookie(C_ADV) == 'true'; } function getCookie(cname) { @@ -314,6 +325,7 @@ function callLoadMessage(id){ function loadMessage(id){ lastId = id; + setCookie(); setDataOrigin(); for(let i=0; i