From 98cd861b5b0ff939eb47e53db46357aa6f586df3 Mon Sep 17 00:00:00 2001
From: inportb <inportb@gmail.com>
Date: Mon, 8 May 2023 20:19:10 -0400
Subject: [PATCH] Multi-level navigation

---
 htdocs/App.vue          | 15 +++++++++++++--
 htdocs/Navbar.vue       | 32 +++++++++++++-------------------
 htdocs/RoutePatient.vue | 16 +++++++++++++++-
 htdocs/Submenu.vue      | 32 ++++++++++++++++++++++++++++++++
 htdocs/common.mjs       |  3 +++
 5 files changed, 76 insertions(+), 22 deletions(-)
 create mode 100644 htdocs/Submenu.vue
 create mode 100644 htdocs/common.mjs

diff --git a/htdocs/App.vue b/htdocs/App.vue
index ef0c933..2aa3c41 100644
--- a/htdocs/App.vue
+++ b/htdocs/App.vue
@@ -1,4 +1,5 @@
 <template>
+	<Submenu :value="menu" />
 	<div class="container-fluid" style="padding-top: 5rem;">
 		<Navbar v-model:server="server" :user="user" />
 		<Throbber :client="client" />
@@ -10,6 +11,7 @@
 </template>
 
 <script>
+	import Submenu from './Submenu.vue';
 	import Navbar from './Navbar.vue';
 	import Throbber from './Throbber.vue';
 	import Login from './Login.vue';
@@ -24,7 +26,7 @@
 
 	export default {
 		components: {
-			Navbar, Throbber, Login
+			Submenu, Navbar, Throbber, Login
 		},
 		props: {
 			secret: String
@@ -36,7 +38,16 @@
 				user: null,
 				heartbeat: null,
 				banner: '',
-				authenticated: false
+				authenticated: false,
+				menu: {
+					name: 'Main',
+					items: [
+						{ name: 'Schedule', href: '/' },
+						{ name: 'Lookup', href: '/lookup' },
+						{ name: 'Planner', href: '/planner' },
+						{ name: 'Recall', href: '/recall' }
+					]
+				}
 			};
 		},
 		watch: {
diff --git a/htdocs/Navbar.vue b/htdocs/Navbar.vue
index c02838b..24d6bc5 100644
--- a/htdocs/Navbar.vue
+++ b/htdocs/Navbar.vue
@@ -7,25 +7,16 @@
 			</button>
 			<div class="collapse navbar-collapse" id="navbarSupportedContent">
 				<ul class="navbar-nav me-auto mb-2 mb-lg-0">
-					<li class="nav-item">
-						<router-link class="nav-link" to="/">Schedule</router-link>
+					<li v-if="menustate.length > 0" v-for="item in menustate[0].items" class="nav-item">
+						<router-link class="nav-link" :to="item.href">{{item.name}}</router-link>
 					</li>
-					<li class="nav-item">
-						<router-link class="nav-link" to="/lookup">Lookup</router-link>
-					</li>
-					<template v-if="($route.matched.length > 0) && ($route.matched[0].path == '/patient/:id')">
-						<li class="nav-item">
-							<router-link class="nav-link" :to="'/patient/' + $route.params.id + '/visits'">Visits</router-link>
-						</li>
-						<li class="nav-item">
-							<router-link class="nav-link" :to="'/patient/' + $route.params.id + '/orders'">Orders</router-link>
-						</li>
-					</template>
-					<li class="nav-item">
-						<router-link class="nav-link" to="/planner">Planner</router-link>
-					</li>
-					<li class="nav-item">
-						<router-link class="nav-link" to="/recall">Recall</router-link>
+					<li v-if="menustate.length > 1" v-for="menu in menustate.slice(1)" class="nav-item dropdown">
+						<button class="nav-link btn dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">{{menu.name}}</button>
+						<ul class="dropdown-menu dropdown-menu-dark">
+							<li v-for="item in menu.items" class="nav-item">
+								<router-link class="nav-link" :to="item.href">{{item.name}}</router-link>
+							</li>
+						</ul>
 					</li>
 					<li class="nav-item" v-if="server">
 						<a class="nav-link disabled"><template v-if="user">{{user[2]}} @ </template>{{server.domain}}</a>
@@ -48,6 +39,7 @@
 
 <script>
 	import vistax from './vistax.mjs';
+	import { menustate } from './common.mjs';
 
 	export default {
 		props: {
@@ -61,7 +53,9 @@
 			}
 		},
 		data() {
-			return {};
+			return {
+				menustate
+			};
 		}
 	};
 </script>
diff --git a/htdocs/RoutePatient.vue b/htdocs/RoutePatient.vue
index fe93fec..56bba5a 100644
--- a/htdocs/RoutePatient.vue
+++ b/htdocs/RoutePatient.vue
@@ -7,6 +7,7 @@
 		<router-link class="btn btn-danger" :to="'/patient/' + patient_dfn + '?viewsensitive'">Proceed</router-link>
 	</div>
 	<template v-if="patient_info">
+		<Submenu :value="menu" />
 		<div class="card mb-3 shadow">
 			<div class="card-header">{{patient_info.name}} <span :title="patient_info.pid">{{patient_info.pid.slice(-4)}}</span> #{{patient_dfn}}</div>
 			<div class="card-body row" style="font-family: monospace;">
@@ -27,10 +28,11 @@
 	import { strptime_vista } from './util.mjs';
 
 	import Subtitle from './Subtitle.vue';
+	import Submenu from './Submenu.vue';
 
 	export default {
 		components: {
-			Subtitle
+			Subtitle, Submenu
 		},
 		props: {
 			client: Object
@@ -42,6 +44,18 @@
 				patient_info: null
 			};
 		},
+		computed: {
+			menu() {
+				return this.patient_info ? {
+					name: this.patient_info.name,
+					items: [
+						{ name: 'Patient', href: '/patient/' + this.patient_dfn + (this.sensitive && '?viewsensitive' || '') },
+						{ name: 'Visits', href: '/patient/' + this.patient_dfn + '/visits' + (this.sensitive && '?viewsensitive' || '') },
+						{ name: 'Orders', href: '/patient/' + this.patient_dfn + '/orders' + (this.sensitive && '?viewsensitive' || '') }
+					]
+				} : null;
+			}
+		},
 		methods: {
 			strptime_vista,
 			async loadinfo(dfn, viewsensitive) {
diff --git a/htdocs/Submenu.vue b/htdocs/Submenu.vue
new file mode 100644
index 0000000..355e0fb
--- /dev/null
+++ b/htdocs/Submenu.vue
@@ -0,0 +1,32 @@
+<script>
+	import { menustate } from './common.mjs';
+
+	export default {
+		props: ['value'],
+		data() {
+			return { ptr: null };
+		},
+		watch: {
+			value: {
+				handler(value) {
+					this.update(value);
+				}, immediate: true
+			}
+		},
+		methods: {
+			update(value) {
+				var idx = this.ptr ? menustate.indexOf(this.ptr) : -1;
+				if(idx >= 0) menustate.splice(idx, 1);
+				if(value) {
+					this.ptr = value;
+					if(idx >= 0) menustate.splice(idx, 0, this.ptr);
+					else menustate.unshift(this.ptr);
+				} else this.ptr = null;
+			}
+		},
+		unmounted() {
+			this.update();
+		},
+		render() {}
+	};
+</script>
diff --git a/htdocs/common.mjs b/htdocs/common.mjs
new file mode 100644
index 0000000..afb89d2
--- /dev/null
+++ b/htdocs/common.mjs
@@ -0,0 +1,3 @@
+import { reactive } from 'vue';
+
+export const menustate = reactive([]);