From 6b0eff175ec9512d30d4e9507dc4ce941f8cd441 Mon Sep 17 00:00:00 2001
From: Ivan Maslov <i.maslov@mail.ru>
Date: Wed, 6 May 2020 19:37:21 +0300
Subject: [PATCH] # Update control panel

---
 .../Settings/ControlPanel_RobotScreenActive.py         | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Orchestrator/Settings/ControlPanel_RobotScreenActive.py b/Orchestrator/Settings/ControlPanel_RobotScreenActive.py
index 64dc7e64..10c88af4 100644
--- a/Orchestrator/Settings/ControlPanel_RobotScreenActive.py
+++ b/Orchestrator/Settings/ControlPanel_RobotScreenActive.py
@@ -4,7 +4,7 @@ import logging
 import os
 #DEFINITIONS
 lProcessName = "OpenRPA_RobotScreenActive.exe"
-lStartFilePath = os.path.join(os.getcwd(), "..\\Utils\\RobotScreenActive\\pyOpenRPA.Tools.RobotScreenActive_x64.cmd")
+lStartFilePath = os.path.join(os.getcwd(), "RobotScreenActive\\pyOpenRPA.Tools.RobotScreenActive_x64.cmd")
 def RenderRobotScreenActive(inGlobalConfiguration):
     #Subheader Variants
     lSubheaderRunTrueText="State: <span style=\"color:green\">Turned on</span>"
@@ -14,6 +14,11 @@ def RenderRobotScreenActive(inGlobalConfiguration):
     import os
     lRobotScreenActivePath = lStartFilePath
     lOnClickRunButton=f"mGlobal.Controller.CMDRunText('start cmd /K  {lRobotScreenActivePath}');"
+    # Activity update orchestrator
+    lActivityOrchestratorBuildPath = os.getcwd()
+    lActivityOrchestratorBuildPathEscaped = lActivityOrchestratorBuildPath.replace("\\","\\\\")
+    lActivityOrchestratorUpdateStr = f"mGlobal.Controller.CMDRunText(\"taskkill /f /im OpenRPA_Orchestrator.exe & timeout 2 & cd {lActivityOrchestratorBuildPathEscaped} & git reset --hard & git pull origin master & pyOpenRPA.Orchestrator_x64_administrator_startup.cmd\");".replace("\"","&quot;")
+    lActivityOrchestratorUpdateHTMLStr=f'<a onclick=\"{lActivityOrchestratorUpdateStr}\" style=\"color:orange\">Обновить orchestrator из GIT и перезапустить</a>'
     #Force close button
     lOnClickForceCloseButton=f"mGlobal.Controller.CMDRunText('taskkill /F /im {lProcessName}');"
     #Result template
@@ -23,6 +28,7 @@ def RenderRobotScreenActive(inGlobalConfiguration):
         "DataStorageKey":"RobotScreenActive", #Use key for set current dict in mGlobal.DataStorage["DtaaStorageKey"] on client side
         "SubheaderText":lSubheaderRunFalseText,
         "BodyKeyValueList":[
+            {"Key":"Репозиторий","Value":lActivityOrchestratorUpdateHTMLStr}
         ],
         "FooterText":"Last update: 9:38:00 09.10.2019",
         "FooterButtonX2List":[
@@ -56,5 +62,5 @@ def CheckIfProcessRunning(processName):
 #Orchestrator settings
 def SettingsUpdate(inDict):
     #Add RobotRDPActive in control panel
-    inDict["ControlPanelDict"]["RobotList"].append({"RenderFunction": RenderRobotScreenActive , "KeyStr": "RobotScreenActive"})
+    inDict["ControlPanelDict"]["RobotList"].append({"RenderFunction": RenderRobotScreenActive,"KeyStr":"RobotScreenActive"}) 
     return inDict
\ No newline at end of file