From 04ded593376b8bb6e95ae111061978f003aa92ea Mon Sep 17 00:00:00 2001 From: Alex Orid Date: Wed, 12 May 2021 21:47:44 -0400 Subject: [PATCH] WORKING?!?!?!?!?! I hate javascript --- user_client/v1/webclient.js | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/user_client/v1/webclient.js b/user_client/v1/webclient.js index dfc6297..dddab51 100644 --- a/user_client/v1/webclient.js +++ b/user_client/v1/webclient.js @@ -230,6 +230,10 @@ updateEventList(); +fetch_RerunEvent = (fetchURL) => response = fetch(fetchURL) +.then((response) => { + return response.text(); +}) RerunEvent_OBJ = async (eventToRun) => { if (true) { @@ -248,7 +252,7 @@ RerunEvent_OBJ = async (eventToRun) => { "&"+"eventData="+encodeURIComponent(eventToRun['eventData']); let targetURL = "http://127.0.0.1:42055/api/v1/user_client/event_log/reRunEvent"+params; //console.log(targetURL) - let a = await fetch(targetURL); + let a = await fetch_RerunEvent(targetURL); //console.log("return: "+a); return a } @@ -258,17 +262,18 @@ RerunEvent_OBJ = async (eventToRun) => { } -async function reRunEvent() { + +async function reRunEvent(eventName, eventTime, eventType, eventSender, eventData) { var newEvent = { - 'eventName': "eventName", - 'eventTime': "eventTime", - 'eventType': "eventType", - 'eventSender': "eventSender", - 'eventData': "eventData" + 'eventName': eventName, + 'eventTime': eventTime, + 'eventType': eventType, + 'eventSender': eventSender, + 'eventData': eventData } let response = await RerunEvent_OBJ(newEvent); console.log(response) - //let main = JSON.parse(response); - let data = response.message + let main = JSON.parse(response); + let data = main.message console.log("response: ", data); } \ No newline at end of file