From 83c4b75d82fd86fe742b93ef52be225f518d3ec9 Mon Sep 17 00:00:00 2001
From: Ivan Maslov <i.maslov@mail.ru>
Date: Sat, 20 Apr 2019 10:42:00 +0300
Subject: [PATCH] #GetScreenshots

---
 .../RobotDaemonServerWeb/Index.xhtml          | 38 +++++++++++++++++--
 Orchestrator/RobotDaemon/robotDaemonServer.py |  3 +-
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/Orchestrator/RobotDaemon/RobotDaemonServerWeb/Index.xhtml b/Orchestrator/RobotDaemon/RobotDaemonServerWeb/Index.xhtml
index 280732ac..bdde7a29 100644
--- a/Orchestrator/RobotDaemon/RobotDaemonServerWeb/Index.xhtml
+++ b/Orchestrator/RobotDaemon/RobotDaemonServerWeb/Index.xhtml
@@ -33,6 +33,26 @@
 				on: 'hover'
 			  });
 			
+				mGlobal.Monitor={};
+				mGlobal.Monitor.ScreenshotModal={};
+				mGlobal.Monitor.GenerateUniqueID=function(inPrefix="tempUID=") {
+					return inPrefix+Math.round(Math.random()*1000)+"-"+Math.round(Math.random()*10000)+"-"+Math.round(Math.random()*1000)
+				}
+				mGlobal.Monitor.ScreenshotModal.Show=function() {
+					$('.ui.modal.daemon-screenshot').modal('show');
+					
+					//Функция обновления картинки
+					lScreenshotUpdate=function() {
+						lScreenshotSrc="/GetScreenshot?"+mGlobal.Monitor.GenerateUniqueID()
+						$(".daemon-screenshot img").attr('src', lScreenshotSrc);
+					}
+					
+					mGlobal.Monitor.ScreenshotModal.timerId=setInterval(lScreenshotUpdate,1500)
+				
+				}
+				mGlobal.Monitor.ScreenshotModal.Close=function() {
+					clearInterval(mGlobal.Monitor.ScreenshotModal.timerId);
+				}
 			})
 		  ;
 		  </script>
@@ -129,8 +149,7 @@
 				
 			</div>
 			<div class="row">
-				<img src="GetScreenshot" width="60%" height="60%">
-					<a href="GetScreenshot" class="item" target="_blank">GetScreenshot</a>
+				<a onclick="mGlobal.Monitor.ScreenshotModal.Show();" class="item" target="_blank">GetScreenshot</a>
 			</div>
 			<div class="row black">
 				
@@ -199,7 +218,20 @@
 				</div>
 			</div>
 		</div>
-		
+		<div class="ui daemon-screenshot modal">
+			<div class="ui icon header">
+			</div>
+			<div class="content">
+				<img src="GetScreenshot" class="ui fluid image">
+				
+			</div>
+			<div class="actions">
+				<div class="ui green ok inverted button" onclick="mGlobal.Monitor.ScreenshotModal.Close()">
+					<i class="checkmark icon"></i>
+					Close
+				</div>
+			</div>
+		</div>
 		
 		<div class="ui modal openrpa-code-list-gui-import-modal">
 			<i class="close icon"></i>
diff --git a/Orchestrator/RobotDaemon/robotDaemonServer.py b/Orchestrator/RobotDaemon/robotDaemonServer.py
index abc246a0..c2fbd5c2 100644
--- a/Orchestrator/RobotDaemon/robotDaemonServer.py
+++ b/Orchestrator/RobotDaemon/robotDaemonServer.py
@@ -67,7 +67,8 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler):
         if self.path == '/favicon.ico':
             self.SendResponseContentTypeFile('image/x-icon',"..\\..\\favicon.ico")
         #Получить скриншот
-        if self.path == '/GetScreenshot':
+        
+        if self.path.split("?")[0] == '/GetScreenshot':
             #Сохранить файл на диск
             SaveScreenshot("Screenshot.png")
             self.SendResponseContentTypeFile('image/png',"Screenshot.png")