From 3666378172ebe7ad662c38f6cf7ed3d0a8b65a69 Mon Sep 17 00:00:00 2001 From: inportb Date: Wed, 3 May 2023 23:17:13 -0400 Subject: [PATCH] Simplified status tags: active and inactive --- htdocs/ViewSchedule.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/htdocs/ViewSchedule.vue b/htdocs/ViewSchedule.vue index 7adf6e9..f6c3d1a 100644 --- a/htdocs/ViewSchedule.vue +++ b/htdocs/ViewSchedule.vue @@ -107,10 +107,8 @@ var res = {}, re, 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.CANCELLED != '0') res['cancelled'] = 'CANCELLED'; - else if(row.NOSHOW != '0') res['noshow'] = 'NOSHOW'; - else if(row.CHECKOUT) res['checkedout'] = 'CHECKEDOUT'; - else if(row.CHECKIN) res['checkedin'] = 'CHECKEDIN'; + if((row.CANCELLED != '0') || (row.NOSHOW != '0')) res['inactive'] = 'INACTIVE'; + else res['active'] = 'ACTIVE'; if(row.NOTE) { re = /#([0-9a-z][\w-]*)/gi; while(matches = re.exec(row.NOTE)) res[matches[1].toLowerCase()] = matches[1];