#Orchestrator_ActivityLogRender - ok #PageCustomizationLabeledButtons

6 years ago · e4ece8ab93
parent c6a0015a92
commit e4ece8ab93
2 changed files with 86 additions and 21 deletions
--- 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();
 			})
 		  ;
 		  </script>
@ -152,11 +183,11 @@
 	<body>
 		<div class="ui internally celled grid">
 			<div class="row black">
-				<div class="two wide column">
+				<div class="three wide column">
 					<h1 class="ui header inverted">OpenRPA</h1>
 				</div>
-				<div class="twelve wide column">
-					<h1 class="ui header inverted">Daemon GUI</h1>
+				<div class="eleven wide column">
+					<h1 class="ui header inverted">Orchestrator Web GUI</h1>
 				</div>
 				<div class="two wide column">
 					<h5>by UnicodeLabs</h5>
@ -164,30 +195,65 @@
 				
 			</div>
 			<div class="row">
-				<div class="six wide column rpa-object-tree" >
+				<div class="ten wide column" >
+					<h4 class="ui horizontal divider header">
+						<i class="clipboard list icon"></i>
+						Activity log
+					</h4>
+					<div class="ui info message">
+						<button class="ui icon button labeled" onclick="mGlobal.Info.TableActivityLogScheduleListRefresh();">
+							<i class="sync alternate icon"></i>
+							Refresh
+						</button>
 					
 					</div>
-				<div class="six wide column rpa-hierarchy" >
-					<p>This example shows how to use lazy loaded images, a sticky menu, and a simple text container</p>
+					<div class="openrpa-info-table-activitylogschedulelist">
 					</div >
-				<div class="four wide column rpa-property-list" >
+					<script class="openrpa-hidden-info-table-activitylogschedulelist" style="display:none" type="text/x-handlebars-template">
+						<table class="ui celled table">
+							<thead>
+								<tr>
+									<th>#</th>
+									<th>Activity type</th>
+									<th>Process</th>
+									<th>Activity DateTime plan</th>
+									<th>Activity DateTime fact</th>
+								</tr>
+							</thead>
+							<tbody>
+								{{#result}}
+								<tr>
+									<td>{{@index}}</td>
+									<td>{{activityType}}</td>
+									<td>{{processPath}}</td>
+									<td>{{activityDateTime}}</td>
+									<td class="negative">{{activityStartDateTime}}</td>
+								</tr>
+								{{/result}}
+							</tbody>
+						</table>
+					</script>
+				</div>
+				<div class="eight wide column rpa-property-list" >

 				</div>
 			</div>
 			<div class="row black">
-				<div class="two wide column">
-					<h2 class="ui header inverted">Monitor</h2>
-				</div>
-				<div class="two wide column">
+				<div class="three wide column">
 					
+				</div>
+				<div class="three wide column">
+					<h2 class="ui header inverted">Monitor</h2>
 				</div>
 				<div class="two wide column">

 				</div>
-				<div class="ten wide column">
-				</div>
 				
 			</div>
+			<button class="ui labeled icon button" onclick="mGlobal.Monitor.ScreenshotModal.Show();">
+				<i class="desktop icon"></i>
+				Look machine screenshot
+			</button>
 			<script class="openrpa-hidden-monitor-table-general" style="display:none" type="text/x-handlebars-template">
 				<table class="ui celled table">
 					<thead>
@ -207,7 +273,6 @@
 			</script>
 			<div class="row openrpa-monitor">

-				<a onclick="mGlobal.Monitor.ScreenshotModal.Show();" class="item" target="_blank">GetScreenshot</a>
 			</div>
 			<div class="row black">
 				
--- a/Orchestrator/orchestratorProcessor.py
+++ b/Orchestrator/orchestratorProcessor.py
@ -14,14 +14,14 @@ global mGlobalDict
 #               bodyObject: <object dict, int, str, list>
 #           },
 #           {
-#               type: <ActivityLogScheduleGet>
+#               type: <ActivityLogScheduleListGet>
 #           }
 #       ]
 #
 #}

 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