Index: vhLib/Macro.inc.rou =================================================================== diff -u -r321 -r893 --- vhLib/Macro.inc.rou (.../Macro.inc.rou) (revision 321) +++ vhLib/Macro.inc.rou (.../Macro.inc.rou) (revision 893) @@ -1,16 +1,16 @@ #include %occErrors #include %occStatus - + // Koppeling tussen User en IP adres / IO-device = - + #define clNone $ZH("000000") #define clRed $ZH("000000") - - -#define IctUserFromIP(%ip) $Case($P(%ip,".",3,4), "1.15":"pv", "1.27":"cw", "1.97":"wv", "1.127":"jbl", "1.138":"wro", "1.150":"pra", "1.191":"csc" , "1.195":"jcl", "1.204":"fma" , "1.205":"wv", "1.206":"jcl", "1.49":"csc", "1.95":"jbl","1.42":"mvi","1.51":"mvi",:"") - + + +#define IctUserFromIP(%ip) $Case($P(%ip,".",3,4), "1.15":"pv", "1.27":"cw", "1.97":"wv", "1.127":"tve", "1.138":"wro", "1.150":"pra", "1.191":"csc" , "1.195":"jcl", "1.204":"fma" , "1.205":"wv", "1.206":"jcl", "1.49":"csc", "1.183":"tve","1.42":"mvi","1.51":"mvi", "1.26":"kca", "1.194":"kca",:"") + #define UserFromDevice(%v) $$$TextBetween(%v,"|TNT|","_") -#define IctUserFromDevice(%v) $Select($$$UserFromDevice(%v)?1(1"pv",1"cw",1"wv",1"jbl",1"wro",1"pra",1"jcl",1"fma",1"csc",1"mvi"):$$$UserFromDevice(%v), 1:"") +#define IctUserFromDevice(%v) $Select($$$UserFromDevice(%v)?1(1"pv",1"cw",1"wv",1"tve",1"wro",1"pra",1"jcl",1"fma",1"csc",1"mvi",1"kca"):$$$UserFromDevice(%v), 1:"") #define IctSysOp "ICT_SysOp@vanhoecke.be" #define IctMeldingen "ICT_Meldingen@vanhoecke.be" @@ -134,6 +134,7 @@ #define ConfigGetString(%s) ##class(TECH.Config.ConfigMgr).Instance().GetString(%s) #define ConfigGetBoolean(%s) ##class(TECH.Config.ConfigMgr).Instance().GetBoolean(%s) - - - + + + + \ No newline at end of file