Index: APPS/CHUI/NativeCommandoService.cls.xml =================================================================== diff -u -r74593 -r74620 --- APPS/CHUI/NativeCommandoService.cls.xml (.../NativeCommandoService.cls.xml) (revision 74593) +++ APPS/CHUI/NativeCommandoService.cls.xml (.../NativeCommandoService.cls.xml) (revision 74620) @@ -103,28 +103,33 @@ #dim Antwoord as %String ="" Use 0:(:/ECHO=0) Write "ReflectionGetRDPClientName" - Read Antwoord:1 + Read Antwoord:3 Use 0:(:/ECHO=1) If $$$Not($$$HasLength(Antwoord)){ - Do ##class(vhLib.Logger).%New("Reflection terminal emulatie").Info("ReflectionRDPClientName", "VBA code en/of events (RDPClientName) out of date voor reflection ("_$io_")") - Do SendMiniMailForced^vhLib.Mail("cachelogin@vanhoecke.be",$LB("ict_meldingen@vanhoecke.be","jo.willems@vanhoecke.be"),"Reflection terminal emulatie", "VBA code en/of events (RDPUserName out of date voor reflection ("_$io_")") + Do ##class(vhLib.Logger).%New("Reflection terminal emulatie").Info("ReflectionRDPClientName", "VBA code en/of events (RDPClientName) waarschijnlijk out of date voor reflection of timeout ("_$io_")") + ;Do SendMiniMailForced^vhLib.Mail("cachelogin@vanhoecke.be",$LB("ict_meldingen@vanhoecke.be","jo.willems@vanhoecke.be"),"Reflection terminal emulatie", "VBA code en/of events (RDPUserName out of date voor reflection ("_$io_")") + Do ##class(Tools.Wlip).%New(207).String("Reflection terminal emulatie : VBA code en/of events out of date voor reflection ("_$io_")") } + Do ##class(Tools.Wlip).%New(207).String("ReflectionRDPClientName vanop " _Antwoord_ "(" _ $io _ ")") Quit Antwoord ]]> %String @@ -142,12 +147,16 @@ #dim Antwoord as %String = "" Use 0:(:/ECHO=0) Write "ReflectionGetComputerName " - Read Antwoord:1 + Read Antwoord:3 Use 0:(:/ECHO=1) If $$$Not($$$HasLength(Antwoord)){ - Do ##class(vhLib.Logger).%New("Reflection terminal emulatie").Info("ReflectionComputerName","VBA code en/of events (ReflectionComputerName out of date voor reflection ("_$io_")") - Do SendMiniMailForced^vhLib.Mail("cachelogin@vanhoecke.be",$LB("ict_meldingen@vanhoecke.be","jo.willems@vanhoecke.be"),"Reflection terminal emulatie", "VBA code en/of events (ReflectionComputerName) out of date voor reflection ("_$io_")") + Do ##class(vhLib.Logger).%New("Reflection terminal emulatie").Info("ReflectionComputerName","VBA code en/of events (ComputerName) out of date voor reflection of timeout ("_$io_")") + ;Do SendMiniMailForced^vhLib.Mail("cachelogin@vanhoecke.be",$LB("ict_meldingen@vanhoecke.be","jo.willems@vanhoecke.be"),"Reflection terminal emulatie", "VBA code en/of events (ReflectionComputerName) out of date voor reflection ("_$io_")") + Do ##class(Tools.Wlip).%New(207).String("Reflection terminal emulatie : VBA code en/of events out of date voor reflection ("_$io_")") } + Do ##class(Tools.Wlip).%New(207).String("ReflectionComputerName " _Antwoord_ "(" _ $io _ ")") + + Quit Antwoord ]]> Index: BLDSYSLOG.mac.rou =================================================================== diff -u -r74593 -r74620 --- BLDSYSLOG.mac.rou (.../BLDSYSLOG.mac.rou) (revision 74593) +++ BLDSYSLOG.mac.rou (.../BLDSYSLOG.mac.rou) (revision 74620) @@ -34,10 +34,11 @@ Set CNaam=$ZCVT($P($E(IONaam,6,99),":",1),"U") if CNaam="LOCALHOST" Set CNaam=$ZU(110) - set CNaam = ##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam() ;is evt reeds intune intune werkstation naam + ;set CNaam = ##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam() ;is evt reeds intune intune werkstation naam ; de computer naam is gekend maar nakijken of het bijhorend IP-adres veranderd is If $D(^cQSYS(0,"FIXED","NBN",$P(CNaam,"."))) Do Quit - . Set IP=$s((IONaam [ ##class(TECH.Config.ConfigMgr).Instance().GetString("VDIServerPrefix","VDI-APPS")) :"",1:$$GetIP(CNaam,1)) ; geen ipaddres indien we over VDI komen + . ;Set IP=$s((IONaam [ ##class(TECH.Config.ConfigMgr).Instance().GetString("VDIServerPrefix","VDI-APPS")) :"",1:$$GetIP(CNaam,1)) ; geen ipaddres indien we over VDI komen + . Set IP=$$GetIP(CNaam,1) . Set Device=^cQSYS(0,"FIXED","NBN",$P(CNaam,".")) . Do:$L(Device) RemQSYS(Device,CNaam,IP) . Do:$L(Device) BldQSYS(Device,CNaam,IP) Index: APPS/CHUI/TerminalNavigatieService.cls.xml =================================================================== diff -u -r74593 -r74620 --- APPS/CHUI/TerminalNavigatieService.cls.xml (.../TerminalNavigatieService.cls.xml) (revision 74593) +++ APPS/CHUI/TerminalNavigatieService.cls.xml (.../TerminalNavigatieService.cls.xml) (revision 74620) @@ -123,8 +123,9 @@ Set ComputerNaam = ComputerNaam _ "%" if ..GebruikerLookup.BestaatGebruiker(UserName) { #dim GebruikerID as %String = ..GebruikerLookup.GeefGebruikerId(UserName) + Do ##class(Tools.Wlip).%New(207).String("GeefTaak obv " _ComputerNaam _","_GebruikerID) #dim rsTaak As %ResultSet = $$ExecDynQuery^vhLib.Query("SELECT ID FROM APPS_CHUI_TerminalNavigatieService_impl.TerminalNavigatieTaak WHERE (ComputerNaam like 'VDI-RDS%' or Computernaam like 'VDI-APP%' or computernaam like ? )and GebruikerID = ?",$lb(ComputerNaam,GebruikerID)) - } else { + } else { Set rsTaak = $$ExecDynQuery^vhLib.Query("SELECT ID FROM APPS_CHUI_TerminalNavigatieService_impl.TerminalNavigatieTaak WHERE ComputerNaam like ?",$lb(ComputerNaam)) } #dim Taak As %String = "" Index: cQZSTART.mac.rou =================================================================== diff -u -r74593 -r74620 --- cQZSTART.mac.rou (.../cQZSTART.mac.rou) (revision 74593) +++ cQZSTART.mac.rou (.../cQZSTART.mac.rou) (revision 74620) @@ -164,7 +164,7 @@ I IP'="?",$D(^cQSYS(CFG,"FIXED","IP",IP)) S P=^(IP) I $$PV(P),$D(^cLOG($ZU(5),"CHARWIN","INIT",P)) S K=P G IOSY S (NBN,^cJOB(JOB,$ZCVT($ZU(110),"U"),"job","NBN"))=$$NBN(I) S (MAC,^cJOB(JOB,$ZCVT($ZU(110),"U"),"job","MAC"))=$$MAC(I) - S ORDER="NBN\IP",OK=0,J=$G(^cLOG($ZCVT($ZU(110),"U"),"IO","ORDER")) I $L(J) S ORDER=J + S ORDER="IP\NBN",OK=0,J=$G(^cLOG($ZCVT($ZU(110),"U"),"IO","ORDER")) I $L(J) S ORDER=J F J=1:1:$L(ORDER,"\") S L=$P(ORDER,"\",J) D I OK=1 Q . I $L(@L),@L'="?",$D(^cQSYS(CFG,"FIXED",L,@L)) S K=^(@L),OK=1 I 'OK,I?1.N S K=I @@ -203,7 +203,7 @@ NBN(I) N DDB,JOB,K,R,%v S I=$G(I,$I) S:I="" I=$I S JOB=$$ZJOB(I) I JOB,$D(^cJOB(JOB,$ZCVT($ZU(110),"U"),"job","NBN")),^("NBN")'="??" Q ^("NBN") - Q ##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam() + ;Q ##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam() S K=$ZU(67,12,$J) S:K["/" K=$P(K,"/") I $L(K),K?.ANP Set K = $ZCVT($Piece(K,".",1),"U") Q K S K=$$CLN() S:'$L(K) K=$$CNN() I $L(K) Q K S K=$P($P(I,":"),"|",3) S:K["~" K=$P(K,"~",2) I $L(K),K'?3(1.3N1".")1.3N Q $ZSTRIP($ZCONVERT($P(K,"."),"U"),"*C")