From 89087dc7fed5f85ef70307cc79326db9206d114d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=20=D0=9C=D0=B0=D1=81=D0=BB=D0=BE?= =?UTF-8?q?=D0=B2?= Date: Fri, 25 Nov 2022 16:34:34 +0300 Subject: [PATCH] orc: fix issue 21 on the gitlab --- .../RobotRDPActive/RobotRDPActive.py | 32 ++++++++++--------- changelog.md | 1 + 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Sources/pyOpenRPA/Orchestrator/RobotRDPActive/RobotRDPActive.py b/Sources/pyOpenRPA/Orchestrator/RobotRDPActive/RobotRDPActive.py index 85805510..5617b227 100755 --- a/Sources/pyOpenRPA/Orchestrator/RobotRDPActive/RobotRDPActive.py +++ b/Sources/pyOpenRPA/Orchestrator/RobotRDPActive/RobotRDPActive.py @@ -87,21 +87,23 @@ def RobotRDPActive(inGSettings, inThreadControlDict): lRDPSessionKeyStr = inGlobalDict["FullScreenRDPSessionKeyStr"] # Get the RDPSessionKeyStr if lRDPSessionKeyStr in inGlobalDict["RDPList"]: # Session Key is in dict lRDPConfigurationDict = inGlobalDict["RDPList"][lRDPSessionKeyStr] - #if not lRDPConfigurationDict["SessionIsIgnoredBool"]: # Session is not ignored - # Check if full screen - lIsFullScreenBool = Connector.SessionIsFullScreen(inSessionHexStr=lRDPConfigurationDict["SessionHex"]) - if not lIsFullScreenBool: # If not the full screen - # Check all RDP window and minimize it - for lRDPSessionKeyStrItem in inGlobalDict["RDPList"]: - lRDPConfigurationDictItem = inGlobalDict["RDPList"][lRDPSessionKeyStrItem] - if Connector.SessionIsFullScreen(inSessionHexStr=lRDPConfigurationDictItem["SessionHex"]): - if inThreadControlDict["ThreadExecuteBool"] == True: # TEST FEATURE BEFORE ONE THREAD INTEGRATION - Connector.SessionScreenSize_X_Y_W_H(inSessionHex=lRDPConfigurationDictItem["SessionHex"], inXInt=10, inYInt=10, - inWInt=550, - inHInt=350) # Prepare little window - # Set full screen for new window - if inThreadControlDict["ThreadExecuteBool"] == True: # TEST FEATURE BEFORE ONE THREAD INTEGRATION - Connector.SessionScreenFull(inSessionHex=lRDPConfigurationDict["SessionHex"], inLogger= inGSettings["Logger"], inRDPConfigurationItem=inGlobalDict["RDPList"][lRDPSessionKeyStrItem]) + # SET FULL SCREEN ONLY IF NOT IGNORED + if not lRDPConfigurationDict["SessionIsIgnoredBool"]: + #if not lRDPConfigurationDict["SessionIsIgnoredBool"]: # Session is not ignored + # Check if full screen + lIsFullScreenBool = Connector.SessionIsFullScreen(inSessionHexStr=lRDPConfigurationDict["SessionHex"]) + if not lIsFullScreenBool: # If not the full screen + # Check all RDP window and minimize it + for lRDPSessionKeyStrItem in inGlobalDict["RDPList"]: + lRDPConfigurationDictItem = inGlobalDict["RDPList"][lRDPSessionKeyStrItem] + if Connector.SessionIsFullScreen(inSessionHexStr=lRDPConfigurationDictItem["SessionHex"]): + if inThreadControlDict["ThreadExecuteBool"] == True: # TEST FEATURE BEFORE ONE THREAD INTEGRATION + Connector.SessionScreenSize_X_Y_W_H(inSessionHex=lRDPConfigurationDictItem["SessionHex"], inXInt=10, inYInt=10, + inWInt=550, + inHInt=350) # Prepare little window + # Set full screen for new window + if inThreadControlDict["ThreadExecuteBool"] == True: # TEST FEATURE BEFORE ONE THREAD INTEGRATION + Connector.SessionScreenFull(inSessionHex=lRDPConfigurationDict["SessionHex"], inLogger= inGSettings["Logger"], inRDPConfigurationItem=inGlobalDict["RDPList"][lRDPSessionKeyStrItem]) else: # Check all RDP window and minimize it for lRDPSessionKeyStrItem in inGlobalDict["RDPList"]: diff --git a/changelog.md b/changelog.md index afa0cd97..b5c55238 100755 --- a/changelog.md +++ b/changelog.md @@ -12,6 +12,7 @@ AGT - AGENT - - Новые функции для упрощенной работы с FastAPI: Orchestrator.WebAuthDefGet Orchestrator.WebAppGet - - Поддержка функции развертывания / сворачивания рабочей области на весь экран - - Ошибка в кнопках управления RDP сессиями: Полный экран / Игнорировать / Переподключить +- - Устранена несовместимость кнопок Полный экран / Игнорировать [1.3.1] - ОРКЕСТРАТОР