jyio/nuVistA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jyio:2b7ae75cc3ec4919bb88d473da086d2215c8b724
Branches Tags
jyio:main
...
compare: jyio:73cfbd5bbdf8335ae0a13e68fd3d045226acb94d
Branches Tags
jyio:main

3 Commits
2b7ae75cc3 ... 73cfbd5bbd

Author SHA1 Message Date
inportb
73cfbd5bbd Fix persistent schedule view filter 2023-05-01 18:06:19 -04:00
inportb
c53a9654b5 Improved unmarked tag detection 2023-05-01 18:06:19 -04:00
inportb
ec841b9591 Fix broken connection detection; disallow stale XWB_IM_HERE 2023-05-01 18:04:53 -04:00
2 changed files with 10 additions and 4 deletions
Show Stats Expand all files Collapse all files

10
htdocs/ViewSchedule.vue
View File

@ -97,14 +97,19 @@
methods: { methods: {
strHashHSL, strHashHSL,
gettags(row) { gettags(row) {
var res = {}, matches; var res = {}, re, matches;
if((row.RESOURCENAME) && (matches = row.RESOURCENAME.replace(/\W+/g, '-').replace(/^-+|-+$/g, ''))) res[matches.toLowerCase()] = matches; if((row.RESOURCENAME) && (matches = row.RESOURCENAME.replace(/\W+/g, '-').replace(/^-+|-+$/g, ''))) res[matches.toLowerCase()] = matches;
if(row.WALKIN != '0') res['walkin'] = 'WALKIN'; if(row.WALKIN != '0') res['walkin'] = 'WALKIN';
if(row.CANCELLED != '0') res['cancelled'] = 'CANCELLED'; if(row.CANCELLED != '0') res['cancelled'] = 'CANCELLED';
else if(row.NOSHOW != '0') res['noshow'] = 'NOSHOW'; else if(row.NOSHOW != '0') res['noshow'] = 'NOSHOW';
else if(row.CHECKOUT) res['checkedout'] = 'CHECKEDOUT'; else if(row.CHECKOUT) res['checkedout'] = 'CHECKEDOUT';
else if(row.CHECKIN) res['checkedin'] = 'CHECKEDIN'; else if(row.CHECKIN) res['checkedin'] = 'CHECKEDIN';
if((row.NOTE) && (matches = row.NOTE.match(/#[0-9a-z][\w-]*/gi))) matches.reduce((acc, val) => (acc[val.substring(1).toLowerCase()] = val.substring(1), acc), res); if(row.NOTE) {
re = /#([0-9a-z][\w-]*)/gi;
while(matches = re.exec(row.NOTE)) res[matches[1].toLowerCase()] = matches[1];
re = /Dr[\.\s]*\b([a-z][\w-]*)/gi;
while(matches = re.exec(row.NOTE)) res[matches[1].toLowerCase()] = matches[1];
}
return res; return res;
}, },
filter_conj(tags) { filter_conj(tags) {
@ -130,6 +135,7 @@
this.$watch( this.$watch(
() => (this.client, this.selection, this.date_begin, this.date_end, {}), () => (this.client, this.selection, this.date_begin, this.date_end, {}),
debounce(async () => { debounce(async () => {
this.filter = {};
window.clearTimeout(this.timer); window.clearTimeout(this.timer);
this.update(); this.update();
}, 500) }, 500)

4
htdocs/vistax.mjs
View File

@ -339,7 +339,7 @@ export function Client(cid, secret) {
if(localstate.practitioner) delete localstate.practitioner; if(localstate.practitioner) delete localstate.practitioner;
}; };
this.XWB_IM_HERE = unwrapped(logged(() => this.call({ method: 'XWB_IM_HERE', ttl: 30 }), 'XWB_IM_HERE')); this.XWB_IM_HERE = unwrapped(logged(() => this.call({ method: 'XWB_IM_HERE', ttl: 30, stale: false }), 'XWB_IM_HERE'));
this.XUS_INTRO_MSG = memoized(unwrapped(logged(() => this.callctx(['XUCOMMAND'], 'XUS_INTRO_MSG'), 'XUS_INTRO_MSG'))); this.XUS_INTRO_MSG = memoized(unwrapped(logged(() => this.callctx(['XUCOMMAND'], 'XUS_INTRO_MSG'), 'XUS_INTRO_MSG')));
this.XWB_GET_BROKER_INFO = memoized(unwrapped(logged(() => this.callctx(['XUCOMMAND'], 'XWB_GET_BROKER_INFO'), 'XWB_GET_BROKER_INFO'))); this.XWB_GET_BROKER_INFO = memoized(unwrapped(logged(() => this.callctx(['XUCOMMAND'], 'XWB_GET_BROKER_INFO'), 'XWB_GET_BROKER_INFO')));
@ -463,7 +463,7 @@ Client.fromCookie = async function(secret, defaulthost='vista.northport.med.va.g
console.log('Using saved secret and connection', secret); console.log('Using saved secret and connection', secret);
var cid = localstate.cid; var cid = localstate.cid;
var client = Client.fromID(cid, secret); var client = Client.fromID(cid, secret);
if((await vista.call(cid, { method: 'XWB_IM_HERE', ttl: 30, id: Date.now() })).result == '1') { if((await vista.call(cid, { method: 'XWB_IM_HERE', ttl: 0, stale: false, id: Date.now() })).result == '1') {
var server = await client.serverinfo(); var server = await client.serverinfo();
if((host[0] == server.result.host) && (host[1] == server.result.port)) { if((host[0] == server.result.host) && (host[1] == server.result.port)) {
localstate.host = host.join(':'); localstate.host = host.join(':');