Almost Working
This commit is contained in:
parent
13dcfdcd2a
commit
43116bc70a
@ -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
|
||||
|
||||
@ -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 = ""+
|
||||
"<div class=\"rowsInMain row card\">"+
|
||||
@ -213,7 +216,7 @@ async function updateEventList() {
|
||||
"<div class=\"col s3\"><p>Event: "+ eventName +"</p></div>"+
|
||||
"<div class=\"col s3\"><p>User: "+ eventSender +"</p></div>"+
|
||||
"<div class=\"col s3\"><p>Message: "+ eventData +"</p></div>"+
|
||||
"<a onclick=\""+ reRunEvent_Params +"\" class=\"btn waves-effect waves-light green right col s1\" style=\"position: absolute; right: 0; top: 0; width: 3em;\">"+
|
||||
'<a onclick="'+ reRunEvent_Params +'" class="btn waves-effect waves-light green right col s1" style="position: absolute; right: 0; top: 0; width: 3em;">'+
|
||||
"<i class=\"material-icons\">refresh</i>"+
|
||||
"</a></div>"
|
||||
$("#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);
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user