ext_note.py

@@ -31,24 +31,15 @@ async def cmd_reports(proc, mrn, alpha, omega):
 		proc.sendline(util.vista_strftime(omega))
 		assert await expect.endswith('\r\n                 Thru: ')
 		proc.sendline(util.vista_strftime(alpha))
-		found = True
+		assert await expect.endswith('\r\nDo you want WORK copies or CHART copies? CHART// ')
-		match await expect.endswith('\r\nDo you want WORK copies or CHART copies? CHART// ', '\r\nPrint Notes Beginning: '):
+		proc.sendline()	# default CHART
-			case autoproc.ExpectMatch(index=0):
+		if await expect.endswith('\r\nDo you want to start each note on a new page? NO// '):
-				proc.sendline()	# default CHART
+			proc.sendline()	# default NO
-				if await expect.endswith('\r\nDo you want to start each note on a new page? NO// '):
+		assert await expect.endswith('\r\nDEVICE: HOME// ')
-					proc.sendline()	# default NO
+		proc.sendline('HOME;;1023')
-				assert await expect.endswith('\r\nDEVICE: HOME// ')
+		assert await expect.earliest(' HOME(CRT)\r\n')
-				proc.sendline('HOME;;1023')
-				assert await expect.earliest(' HOME(CRT)\r\n')
-			case autoproc.ExpectMatch(index=1):
-				proc.sendline('^')
-				assert await expect.endswith('\r\nSelect PATIENT NAME: ')
-				proc.sendline('^')
-				assert await expect.endswith('\r\nSelect Progress Notes Print Options Option: ')
-				found = False
-			case _: assert False
 		pages = []
-		while found:
+		while True:
 			match m_delimiter := await expect.endswith('\r\nType <Enter> to continue or \'^\' to exit: ', '\r\nSelect PATIENT NAME: '):
 				case autoproc.ExpectMatch(index=0, before=before):
 					if isnew(before) and len(pages) > 0:

frontend/src/routes/clinics/+page.js

@@ -2,12 +2,8 @@
 export async function load({ params, fetch }) {
 	let clinics = await (await fetch('/api/clinic/list')).json();
 	clinics.reduce((acc, item) => (acc[item.name] = item, acc), clinics);
-	try {
+	let selection = await (await fetch('/api/config/user/clinics')).json();
-		let selection = await (await fetch('/api/config/user/clinics')).json();
+	selection.forEach(x => clinics[x] ? clinics[x].active = true : false);
-		selection.forEach(x => clinics[x] ? clinics[x].active = true : false);
-	} catch(ex) {
-		console.error(ex, ex.stack);
-	}
 	return {
 		clinics
 	};