Compare commits
No commits in common. "1825edc637718a2259cd1177ee867b63ea333858" and "7d45820c39203ccf30c5c71047000404c7423944" have entirely different histories.
1825edc637
...
7d45820c39
@ -26,7 +26,6 @@
|
|||||||
import RoutePlanner from './RoutePlanner.vue';
|
import RoutePlanner from './RoutePlanner.vue';
|
||||||
import RouteRecall from './RouteRecall.vue';
|
import RouteRecall from './RouteRecall.vue';
|
||||||
import RouteInbox from './RouteInbox.vue';
|
import RouteInbox from './RouteInbox.vue';
|
||||||
import RouteSettings from './RouteSettings.vue';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
@ -51,7 +50,6 @@
|
|||||||
{ name: 'Planner', href: '/planner' },
|
{ name: 'Planner', href: '/planner' },
|
||||||
{ name: 'Recall', href: '/recall' },
|
{ name: 'Recall', href: '/recall' },
|
||||||
{ name: 'Inbox', href: '/inbox' },
|
{ name: 'Inbox', href: '/inbox' },
|
||||||
{ name: 'Settings', href: '/settings' },
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -74,7 +72,6 @@
|
|||||||
{ path: '/planner', component: RoutePlanner },
|
{ path: '/planner', component: RoutePlanner },
|
||||||
{ path: '/recall', component: RouteRecall },
|
{ path: '/recall', component: RouteRecall },
|
||||||
{ path: '/inbox', component: RouteInbox },
|
{ path: '/inbox', component: RouteInbox },
|
||||||
{ path: '/settings', component: RouteSettings },
|
|
||||||
].forEach(route => this.$root.$router.addRoute(route));
|
].forEach(route => this.$root.$router.addRoute(route));
|
||||||
await this.$root.$router.replace(this.$route);
|
await this.$root.$router.replace(this.$route);
|
||||||
}
|
}
|
||||||
|
@ -18,10 +18,14 @@
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="nav-item" v-if="server">
|
||||||
|
<a class="nav-link disabled"><template v-if="user">{{user[2]}} @ </template>{{server.domain}}</a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="navbar-nav" v-if="server">
|
<form class="d-flex" role="search">
|
||||||
<a class="nav-link disabled"><template v-if="user">{{user[2]}} @ </template>{{server.domain}}</a>
|
<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
|
||||||
</div>
|
<button class="btn btn-outline-success" type="submit">Search</button>
|
||||||
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
@ -134,9 +134,6 @@
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
div.snippet::before, div.snippet::after {
|
|
||||||
content: '…';
|
|
||||||
}
|
|
||||||
span.close {
|
span.close {
|
||||||
cursor: default;
|
cursor: default;
|
||||||
}
|
}
|
||||||
@ -167,7 +164,7 @@
|
|||||||
const SZ_WINDOW = 100;
|
const SZ_WINDOW = 100;
|
||||||
const SZ_RANGE = 40000;
|
const SZ_RANGE = 40000;
|
||||||
|
|
||||||
const create_reports = () => [
|
const reports = [
|
||||||
{
|
{
|
||||||
name: 'Notes',
|
name: 'Notes',
|
||||||
rpt_id: 'OR_PN:PROGRESS NOTES~TIUPRG;ORDV04;15;',
|
rpt_id: 'OR_PN:PROGRESS NOTES~TIUPRG;ORDV04;15;',
|
||||||
@ -289,7 +286,7 @@
|
|||||||
query: '',
|
query: '',
|
||||||
x_query: '',
|
x_query: '',
|
||||||
unify: false,
|
unify: false,
|
||||||
reports: create_reports(),
|
reports,
|
||||||
resultsets: {},
|
resultsets: {},
|
||||||
selection: null
|
selection: null
|
||||||
};
|
};
|
||||||
|
@ -1,39 +1,46 @@
|
|||||||
<template>
|
<template>
|
||||||
<Subtitle value="Recall" />
|
<Subtitle value="Recall" />
|
||||||
<div class="card mb-3 shadow">
|
<div>
|
||||||
<div class="card-header d-flex justify-content-between align-items-center">
|
<div class="card mb-3 shadow">
|
||||||
<span>Recall list ({{patients_lost.length + patients_outstanding.length}})</span>
|
<div class="card-header">Clinics</div>
|
||||||
<router-link to="/settings">Select clinics<template v-if="selection.length > 0"> ({{selection.length}})</template></router-link>
|
<div class="card-body">
|
||||||
|
<ViewResourceLookup :client="client" v-model:selection="selection" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card mb-3 shadow">
|
||||||
<table class="table" style="font-family: monospace;" v-if="patients_lost && patients_lost.length > 0">
|
<div class="card-header d-flex justify-content-between align-items-center">
|
||||||
<thead>
|
<span>Recall list ({{patients_lost.length + patients_outstanding.length}})</span>
|
||||||
<tr><th>Lost ({{patients_lost.length}})</th><th>Last appt</th><th>Clinic</th><th>Days</th></tr>
|
</div>
|
||||||
</thead>
|
<div class="card-body">
|
||||||
<tbody>
|
<table class="table" style="font-family: monospace;" v-if="patients_lost && patients_lost.length > 0">
|
||||||
<tr v-for="row in patients_lost" :style="{ backgroundColor: strHashHSL(row.Clinic, '90%') }">
|
<thead>
|
||||||
<td v-if="production"><router-link :to="'/patient/$' + row.key">{{row.Name}} <span :title="row.key">{{row.key.slice(-4)}}</span></router-link></td>
|
<tr><th>Lost ({{patients_lost.length}})</th><th>Last appt</th><th>Clinic</th><th>Days</th></tr>
|
||||||
<td v-else><router-link :title="strtr_unscramble(row.Name)" :to="'/patient/$' + row.Name.charAt(0) + row.key.slice(-4) + '?name=' + row.Name">{{row.Name}} <span :title="row.key">{{row.key.slice(-4)}}</span></router-link></td>
|
</thead>
|
||||||
<td>{{datefmt(row.TimeLast)}} {{dow[row.TimeLast.getDay()]}}</td>
|
<tbody>
|
||||||
<td>{{row.Clinic}}</td>
|
<tr v-for="row in patients_lost" :style="{ backgroundColor: strHashHSL(row.Clinic, '90%') }">
|
||||||
<td>{{Math.round(row.TimeLastDiff/86400000)}}</td>
|
<td v-if="production"><router-link :to="'/patient/$' + row.key">{{row.Name}} <span :title="row.key">{{row.key.slice(-4)}}</span></router-link></td>
|
||||||
</tr>
|
<td v-else><router-link :title="strtr_unscramble(row.Name)" :to="'/patient/$' + row.Name.charAt(0) + row.key.slice(-4) + '?name=' + row.Name">{{row.Name}} <span :title="row.key">{{row.key.slice(-4)}}</span></router-link></td>
|
||||||
</tbody>
|
<td>{{datefmt(row.TimeLast)}} {{dow[row.TimeLast.getDay()]}}</td>
|
||||||
</table>
|
<td>{{row.Clinic}}</td>
|
||||||
<table class="table" style="font-family: monospace;" v-if="patients_outstanding && patients_outstanding.length > 0">
|
<td>{{Math.round(row.TimeLastDiff/86400000)}}</td>
|
||||||
<thead>
|
</tr>
|
||||||
<tr><th>Outstanding ({{patients_outstanding.length}})</th><th>Next appt</th><th>Clinic</th><th>Days</th></tr>
|
</tbody>
|
||||||
</thead>
|
</table>
|
||||||
<tbody>
|
<table class="table" style="font-family: monospace;" v-if="patients_outstanding && patients_outstanding.length > 0">
|
||||||
<tr v-for="row in patients_outstanding" :style="{ backgroundColor: strHashHSL(row.Clinic, '90%') }">
|
<thead>
|
||||||
<td v-if="production"><router-link :to="'/patient/$' + row.key">{{row.Name}} <span :title="row.key">{{row.key.slice(-4)}}</span></router-link></td>
|
<tr><th>Outstanding ({{patients_outstanding.length}})</th><th>Next appt</th><th>Clinic</th><th>Days</th></tr>
|
||||||
<td v-else><router-link :title="strtr_unscramble(row.Name)" :to="'/patient/$' + row.Name.charAt(0) + row.key.slice(-4) + '?name=' + row.Name">{{row.Name}} <span :title="row.key">{{row.key.slice(-4)}}</span></router-link></td>
|
</thead>
|
||||||
<td>{{datefmt(row.TimeNext)}} {{dow[row.TimeNext.getDay()]}}</td>
|
<tbody>
|
||||||
<td>{{row.Clinic}}</td>
|
<tr v-for="row in patients_outstanding" :style="{ backgroundColor: strHashHSL(row.Clinic, '90%') }">
|
||||||
<td>{{Math.round(row.TimeNextDiff/86400000)}}</td>
|
<td v-if="production"><router-link :to="'/patient/$' + row.key">{{row.Name}} <span :title="row.key">{{row.key.slice(-4)}}</span></router-link></td>
|
||||||
</tr>
|
<td v-else><router-link :title="strtr_unscramble(row.Name)" :to="'/patient/$' + row.Name.charAt(0) + row.key.slice(-4) + '?name=' + row.Name">{{row.Name}} <span :title="row.key">{{row.key.slice(-4)}}</span></router-link></td>
|
||||||
</tbody>
|
<td>{{datefmt(row.TimeNext)}} {{dow[row.TimeNext.getDay()]}}</td>
|
||||||
</table>
|
<td>{{row.Clinic}}</td>
|
||||||
|
<td>{{Math.round(row.TimeNextDiff/86400000)}}</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@ -42,6 +49,7 @@
|
|||||||
import { groupByArray, strtr_unscramble, strHashHSL, strftime_vista, debounce } from './util.mjs';
|
import { groupByArray, strtr_unscramble, strHashHSL, strftime_vista, debounce } from './util.mjs';
|
||||||
|
|
||||||
import Subtitle from './Subtitle.vue';
|
import Subtitle from './Subtitle.vue';
|
||||||
|
import ViewResourceLookup from './ViewResourceLookup.vue';
|
||||||
|
|
||||||
function dateonly(date) {
|
function dateonly(date) {
|
||||||
return new Date(date.getFullYear(), date.getMonth(), date.getDate());
|
return new Date(date.getFullYear(), date.getMonth(), date.getDate());
|
||||||
@ -49,7 +57,7 @@
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
Subtitle
|
Subtitle, ViewResourceLookup
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
client: Object
|
client: Object
|
||||||
@ -65,7 +73,10 @@
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
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() {
|
patients_lost() {
|
||||||
return this.patients.filter(x => x.TimeLastDiff >= 0).sort((a, b) => b.TimeLastDiff - a.TimeLastDiff);
|
return this.patients.filter(x => x.TimeLastDiff >= 0).sort((a, b) => b.TimeLastDiff - a.TimeLastDiff);
|
||||||
},
|
},
|
||||||
|
@ -1,19 +1,27 @@
|
|||||||
<template>
|
<template>
|
||||||
<Subtitle value="Schedule" />
|
<Subtitle value="Schedule" />
|
||||||
<div class="card mb-3 shadow">
|
<div>
|
||||||
<div class="card-header d-flex justify-content-between align-items-center">
|
<div class="card mb-3 shadow">
|
||||||
<span>Schedule</span>
|
<div class="card-header">Clinics</div>
|
||||||
<router-link to="/settings">Select clinics<template v-if="selection.length > 0"> ({{selection.length}})</template></router-link>
|
<div class="card-body">
|
||||||
<DateRangePicker range="1D" direction="+1" v-model:date="date" v-model:date_end="date_end" />
|
<ViewResourceLookup :client="client" v-model:selection="selection" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card mb-3 shadow">
|
||||||
<ViewSchedule :client="client" :selection="selection" :date_begin="date" :date_end="new Date(date_end.getTime() - 1)" />
|
<div class="card-header d-flex justify-content-between align-items-center">
|
||||||
|
<span>Schedule</span>
|
||||||
|
<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>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import Subtitle from './Subtitle.vue';
|
import Subtitle from './Subtitle.vue';
|
||||||
|
import ViewResourceLookup from './ViewResourceLookup.vue';
|
||||||
import DateRangePicker from './DateRangePicker.vue';
|
import DateRangePicker from './DateRangePicker.vue';
|
||||||
import ViewSchedule from './ViewSchedule.vue';
|
import ViewSchedule from './ViewSchedule.vue';
|
||||||
|
|
||||||
@ -23,7 +31,7 @@
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
Subtitle, DateRangePicker, ViewSchedule
|
Subtitle, ViewResourceLookup, DateRangePicker, ViewSchedule
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
client: Object
|
client: Object
|
||||||
@ -35,7 +43,10 @@
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
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>
|
</script>
|
||||||
|
@ -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>
|
|
Loading…
Reference in New Issue
Block a user