diff --git a/standalone_user_client.py b/standalone_user_client.py index bcd3488..4ab4333 100644 --- a/standalone_user_client.py +++ b/standalone_user_client.py @@ -123,7 +123,7 @@ def request_reRunEvent(eventName, eventTime, eventType, eventSender, eventData): data = loads(resp.text) msg = data['message'] if msg is not None: - return msg + return flask.make_response("{\"message\": \"%s\"}" % msg, 200, {"Content-Type": "application/json"}) # todo send to logger and other relevent services else: # todo handle failed requests diff --git a/user_client/v1/webclient.js b/user_client/v1/webclient.js index 64a96b9..dfc6297 100644 --- a/user_client/v1/webclient.js +++ b/user_client/v1/webclient.js @@ -200,12 +200,15 @@ async function updateEventList() { let eventSender = returnedEvents[x].eventSender let eventData = returnedEvents[x].eventData - console.log(eventName) - console.log(eventTime) - console.log(eventType) - console.log(eventSender) + //console.log(eventName) + //console.log(eventTime) + //console.log(eventType) + //console.log(eventSender) - let reRunEvent_Params = `reRunEvent("${eventName}", "${eventTime}", "${eventType}", "${eventSender}", "${eventData}")` + //let reRunEvent_Params = String("reRunEvent(\"" + eventName + "\", \"" + eventTime + "\", \"" + eventType + "\", \"" + eventSender + "\", \"" + eventData+"\")") + let reRunEvent_Params = `reRunEvent("${eventName}", "${eventTime}", "${eventType}", "${eventSender}", "${eventData}")` + //let reRunEvent_Params = `reRunEvent('${eventName}', '${eventTime}', '${eventType}', '${eventSender}', '${eventData}')` + console.log(reRunEvent_Params) //let reRunEvent_Params = String("reRunEvent()") let template = ""+ "
"+ @@ -213,7 +216,7 @@ async function updateEventList() { "

Event: "+ eventName +"

"+ "

User: "+ eventSender +"

"+ "

Message: "+ eventData +"

"+ - ""+ + ''+ "refresh"+ "
" $("#EventHistoryWrapper").prepend(template); @@ -264,5 +267,8 @@ async function reRunEvent() { 'eventData': "eventData" } let response = await RerunEvent_OBJ(newEvent); - console.log(response); + console.log(response) + //let main = JSON.parse(response); + let data = response.message + console.log("response: ", data); } \ No newline at end of file