htdocs/App.vue

@@ -26,7 +26,6 @@
 	import RoutePlanner from './RoutePlanner.vue';
 	import RouteRecall from './RouteRecall.vue';
 	import RouteInbox from './RouteInbox.vue';
-	import RouteSettings from './RouteSettings.vue';
 
 	export default {
 		components: {
@@ -51,7 +50,6 @@
 						{ name: 'Planner', href: '/planner' },
 						{ name: 'Recall', href: '/recall' },
 						{ name: 'Inbox', href: '/inbox' },
-						{ name: 'Settings', href: '/settings' },
 					]
 				}
 			};
@@ -74,7 +72,6 @@
 						{ path: '/planner', component: RoutePlanner },
 						{ path: '/recall', component: RouteRecall },
 						{ path: '/inbox', component: RouteInbox },
-						{ path: '/settings', component: RouteSettings },
 					].forEach(route => this.$root.$router.addRoute(route));
 					await this.$root.$router.replace(this.$route);
 				}

htdocs/Navbar.vue

@@ -18,10 +18,14 @@
 							</li>
 						</ul>
 					</li>
-				</ul>
+					<li class="nav-item" v-if="server">
-				<div class="navbar-nav" v-if="server">
 						<a class="nav-link disabled"><template v-if="user">{{user[2]}} @ </template>{{server.domain}}</a>
-				</div>
+					</li>
+				</ul>
+				<form class="d-flex" role="search">
+					<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
+					<button class="btn btn-outline-success" type="submit">Search</button>
+				</form>
 			</div>
 		</div>
 	</nav>

htdocs/RoutePatientReports.vue

@@ -134,9 +134,6 @@
 		white-space: nowrap;
 		text-overflow: ellipsis;
 	}
-	div.snippet::before, div.snippet::after {
-		content: '…';
-	}
 	span.close {
 		cursor: default;
 	}
@@ -167,7 +164,7 @@
 	const SZ_WINDOW = 100;
 	const SZ_RANGE = 40000;
 
-	const create_reports = () => [
+	const reports = [
 		{
 			name: 'Notes',
 			rpt_id: 'OR_PN:PROGRESS NOTES~TIUPRG;ORDV04;15;',
@@ -289,7 +286,7 @@
 				query: '',
 				x_query: '',
 				unify: false,
-				reports: create_reports(),
+				reports,
 				resultsets: {},
 				selection: null
 			};

htdocs/RouteRecall.vue

@@ -1,9 +1,15 @@
 <template>
 	<Subtitle value="Recall" />
+	<div>
+		<div class="card mb-3 shadow">
+			<div class="card-header">Clinics</div>
+			<div class="card-body">
+				<ViewResourceLookup :client="client" v-model:selection="selection" />
+			</div>
+		</div>
 		<div class="card mb-3 shadow">
 			<div class="card-header d-flex justify-content-between align-items-center">
 				<span>Recall list ({{patients_lost.length + patients_outstanding.length}})</span>
-			<router-link to="/settings">Select clinics<template v-if="selection.length > 0"> ({{selection.length}})</template></router-link>
 			</div>
 			<div class="card-body">
 				<table class="table" style="font-family: monospace;" v-if="patients_lost && patients_lost.length > 0">
@@ -36,12 +42,14 @@
 				</table>
 			</div>
 		</div>
+	</div>
 </template>
 
 <script>
 	import { groupByArray, strtr_unscramble, strHashHSL, strftime_vista, debounce } from './util.mjs';
 
 	import Subtitle from './Subtitle.vue';
+	import ViewResourceLookup from './ViewResourceLookup.vue';
 
 	function dateonly(date) {
 		return new Date(date.getFullYear(), date.getMonth(), date.getDate());
@@ -49,7 +57,7 @@
 
 	export default {
 		components: {
-			Subtitle
+			Subtitle, ViewResourceLookup
 		},
 		props: {
 			client: Object
@@ -65,7 +73,10 @@
 			};
 		},
 		computed: {
-			selection() { return (this.client) && (this.client.remotestate.resources) ? (this.client.remotestate.resources.split(',').filter(x => x) || []) : [] },
+			selection: {
+				get() { return this.client.remotestate.resources ? (this.client.remotestate.resources.split(',').filter(x => x) || []) : [] },
+				set(value) { this.client.remotestate.resources = value.join(','); }
+			},
 			patients_lost() {
 				return this.patients.filter(x => x.TimeLastDiff >= 0).sort((a, b) => b.TimeLastDiff - a.TimeLastDiff);
 			},

htdocs/RouteSchedule.vue

@@ -1,19 +1,27 @@
 <template>
 	<Subtitle value="Schedule" />
+	<div>
+		<div class="card mb-3 shadow">
+			<div class="card-header">Clinics</div>
+			<div class="card-body">
+				<ViewResourceLookup :client="client" v-model:selection="selection" />
+			</div>
+		</div>
 		<div class="card mb-3 shadow">
 			<div class="card-header d-flex justify-content-between align-items-center">
 				<span>Schedule</span>
-			<router-link to="/settings">Select clinics<template v-if="selection.length > 0"> ({{selection.length}})</template></router-link>
 				<DateRangePicker range="1D" direction="+1" v-model:date="date" v-model:date_end="date_end" />
 			</div>
 			<div class="card-body">
 				<ViewSchedule :client="client" :selection="selection" :date_begin="date" :date_end="new Date(date_end.getTime() - 1)" />
 			</div>
 		</div>
+	</div>
 </template>
 
 <script>
 	import Subtitle from './Subtitle.vue';
+	import ViewResourceLookup from './ViewResourceLookup.vue';
 	import DateRangePicker from './DateRangePicker.vue';
 	import ViewSchedule from './ViewSchedule.vue';
 
@@ -23,7 +31,7 @@
 
 	export default {
 		components: {
-			Subtitle, DateRangePicker, ViewSchedule
+			Subtitle, ViewResourceLookup, DateRangePicker, ViewSchedule
 		},
 		props: {
 			client: Object
@@ -35,7 +43,10 @@
 			};
 		},
 		computed: {
-			selection() { return (this.client) && (this.client.remotestate.resources) ? (this.client.remotestate.resources.split(',').filter(x => x) || []) : [] }
+			selection: {
+				get() { return this.client.remotestate.resources ? (this.client.remotestate.resources.split(',').filter(x => x) || []) : [] },
+				set(value) { this.client.remotestate.resources = value.join(','); }
+			}
 		}
 	};
 </script>

htdocs/RouteSettings.vue

@@ -1,32 +0,0 @@
-<template>
-	<Subtitle value="Settings" />
-	<div class="card mb-3 shadow">
-		<div class="card-header">Clinics</div>
-		<div class="card-body">
-			<ViewResourceLookup :client="client" v-model:selection="selection" />
-		</div>
-	</div>
-</template>
-
-<script>
-	import Subtitle from './Subtitle.vue';
-	import ViewResourceLookup from './ViewResourceLookup.vue';
-
-	export default {
-		components: {
-			Subtitle, ViewResourceLookup
-		},
-		props: {
-			client: Object
-		},
-		data() {
-			return {};
-		},
-		computed: {
-			selection: {
-				get() { return (this.client) && (this.client.remotestate.resources) ? (this.client.remotestate.resources.split(',').filter(x => x) || []) : [] },
-				set(value) { if(this.client) this.client.remotestate.resources = value.join(','); }
-			}
-		},
-	};
-</script>