From e4ece8ab93245cac86fb166c549d96010d8c3474 Mon Sep 17 00:00:00 2001 From: Ivan Maslov Date: Sat, 27 Apr 2019 21:07:31 +0300 Subject: [PATCH] #Orchestrator_ActivityLogRender - ok #PageCustomizationLabeledButtons --- Orchestrator/Web/Index.xhtml | 99 ++++++++++++++++++++++----- Orchestrator/orchestratorProcessor.py | 8 +-- 2 files changed, 86 insertions(+), 21 deletions(-) diff --git a/Orchestrator/Web/Index.xhtml b/Orchestrator/Web/Index.xhtml index ab8ee2c6..47507567 100644 --- a/Orchestrator/Web/Index.xhtml +++ b/Orchestrator/Web/Index.xhtml @@ -58,7 +58,33 @@ ///Вернуть результат return lResultHTMLCode } - + ////////////////////////// + /////Info JS module + ////////////////////////// + mGlobal.Info={}; + + mGlobal.Info.TableActivityLogScheduleListRefresh=function() { + ///Обнулить таблицу + $(".openrpa-info-table-activitylogschedulelist").html("") + $.ajax({ + type: "POST", + url: 'ProcessingRun', + data: '{"actionList":[{"type":"ActivityLogScheduleListGet"}]}', + success: + function(lData,l2,l3) + { + var lResponseJSON=JSON.parse(lData) + ///Отправить запрос на формирование таблицы + lHTMLCode=mGlobal.GeneralGenerateHTMLCodeHandlebars(".openrpa-hidden-info-table-activitylogschedulelist",lResponseJSON["actionListResult"][0]) + ///Установить HTML код + $(".openrpa-info-table-activitylogschedulelist").html(lHTMLCode) + }, + dataType: "text" + }); + } + ////////////////////////// + /////Monitor JS module + ////////////////////////// mGlobal.Monitor={}; mGlobal.Monitor.ScreenshotModal={}; mGlobal.Monitor.GenerateUniqueID=function(inPrefix="tempUID=") { @@ -102,6 +128,11 @@ dataType: "text" }); } + + ///////////////////////////////////// + ///Инициализация страницы + //////////////////////////////////// + mGlobal.Info.TableActivityLogScheduleListRefresh(); }) ; @@ -152,11 +183,11 @@
-
+

OpenRPA

-
-

Daemon GUI

+
+

Orchestrator Web GUI

by UnicodeLabs
@@ -164,30 +195,65 @@
-
+
+

+ + Activity log +

+
+ +
+
+
+
-
-

This example shows how to use lazy loaded images, a sticky menu, and a simple text container

-
-
+
-
-

Monitor

+
+
-
- +
+

Monitor

-
-
+
- - GetScreenshot +
diff --git a/Orchestrator/orchestratorProcessor.py b/Orchestrator/orchestratorProcessor.py index e8dd1332..d6d6a7e6 100644 --- a/Orchestrator/orchestratorProcessor.py +++ b/Orchestrator/orchestratorProcessor.py @@ -14,14 +14,14 @@ global mGlobalDict # bodyObject: # }, # { -# type: +# type: # } # ] # #} def ProcessingRun(inConfigurationDict): - print(mGlobalDict) + #print(mGlobalDict) lDateTimeString=datetime.datetime.strftime(datetime.datetime.now(),"%Y.%m.%d %H:%M:%S::%f") lResult={"dateTime":lDateTimeString, "state":"connected", "actionListResult":[]} @@ -41,9 +41,9 @@ def ProcessingRun(inConfigurationDict): lHTTPResponse=lHTTPConnection.getresponse() lHTTPResponseByteArray=lHTTPResponse.read() lResult["actionListResult"][-1] = {**lResult["actionListResult"][-1], **json.loads(lHTTPResponseByteArray.decode('utf8'))} - #Обработка команды ActivityLogScheduleGet + #Обработка команды ActivityLogScheduleListGet if lItem["type"]=="ActivityLogScheduleListGet": - pdb.set_trace() + #pdb.set_trace() lResult["actionListResult"][-1] = {**lResult["actionListResult"][-1], **{"result":mGlobalDict["ActivityLogScheduleList"]}} #Вернуть результат return lResult