Compare commits

..

No commits in common. "d2e68031c3f809f9a4ad9ff9fdb25fa0cb143c53" and "c3a99697b0d1f9b85eb933f1443f3c14a5da4702" have entirely different histories.

2 changed files with 7 additions and 40 deletions

View File

@ -4,7 +4,6 @@
<div v-else-if="age >= 90000" class="alert alert-warning">⚠ last updated <template v-if="age < 3600000">{{ts.toLocaleString()}}</template><template v-else>{{ts.toLocaleString()}}</template></div> <div v-else-if="age >= 90000" class="alert alert-warning">⚠ last updated <template v-if="age < 3600000">{{ts.toLocaleString()}}</template><template v-else>{{ts.toLocaleString()}}</template></div>
</template> </template>
<div v-if="filter_array.length > 0"><span class="tag badge bg-primary" @click="filter = {}">CLEAR {{filter_array.length}} TAG{{filter_array.length > 1 ? 'S' : ''}}</span><span v-for="key in filter_array" class="tag badge" :style="{ backgroundColor: strHashHSL(key, '50%') }" @click="delete filter[key]"> {{key.toUpperCase()}}</span></div> <div v-if="filter_array.length > 0"><span class="tag badge bg-primary" @click="filter = {}">CLEAR {{filter_array.length}} TAG{{filter_array.length > 1 ? 'S' : ''}}</span><span v-for="key in filter_array" class="tag badge" :style="{ backgroundColor: strHashHSL(key, '50%') }" @click="delete filter[key]"> {{key.toUpperCase()}}</span></div>
<datalist :id="'datalist-' + uid"><option v-for="item in practitioner_list" :value="item" /></datalist>
<table class="table" style="font-family: monospace;" v-if="appointments && appointments.length > 0"> <table class="table" style="font-family: monospace;" v-if="appointments && appointments.length > 0">
<thead> <thead>
<tr><th style="width: 7rem;">Time</th><th>Clinic</th><th>Patient</th><th>Note</th><th style="width: 16rem;">Assignee</th></tr> <tr><th style="width: 7rem;">Time</th><th>Clinic</th><th>Patient</th><th>Note</th><th style="width: 16rem;">Assignee</th></tr>
@ -19,10 +18,9 @@
<td>{{row.RESOURCENAME}}</td> <td>{{row.RESOURCENAME}}</td>
<td><router-link :to="'/patient/' + row.PATIENTID">{{row.PATIENTNAME}} <span :title="row.HRN">{{row.HRN.slice(-4)}}</span></router-link></td> <td><router-link :to="'/patient/' + row.PATIENTID">{{row.PATIENTNAME}} <span :title="row.HRN">{{row.HRN.slice(-4)}}</span></router-link></td>
<td>{{row.NOTE}}<span v-for="(value, key) in gettags(row)" class="tag badge" :style="{ backgroundColor: strHashHSL(key, '50%') }" @click="filter[key] = true">{{value}}</span></td> <td>{{row.NOTE}}<span v-for="(value, key) in gettags(row)" class="tag badge" :style="{ backgroundColor: strHashHSL(key, '50%') }" @click="filter[key] = true">{{value}}</span></td>
<td><input class="form-control" :list="'datalist-' + uid" :value="practitioner[row.PATIENTNAME]" @input="e => practitioner[row.PATIENTNAME] = e.target.value" /></td> <td><Autocomplete :modelValue="practitioner[row.PATIENTNAME]" @update:modelValue="x => practitioner[row.PATIENTNAME] = x" :items="practitioner_list" /></td>
</tr> </tr>
</tbody> </tbody>
<caption style="text-align: center;">{{appointments.length || 'no'}} appointment{{appointments.length != 1 ? 's' : ''}} <template v-if="date_begin.toLocaleDateString('sv-SE') == date_end.toLocaleDateString('sv-SE')">on {{date_begin.toLocaleDateString('sv-SE')}}</template><template v-else>from {{date_begin.toLocaleDateString('sv-SE')}} to {{date_end.toLocaleDateString('sv-SE')}}</template></caption>
</table> </table>
</template> </template>
@ -62,6 +60,8 @@
<script> <script>
import { uniq, strHashHSL, strfdate_vista, debounce } from './util.mjs'; import { uniq, strHashHSL, strfdate_vista, debounce } from './util.mjs';
import Autocomplete from './Autocomplete.vue';
function clearTimeouts(timers) { function clearTimeouts(timers) {
if(timers.length > 1) console.warn('Clearing multiple timeouts', timers.slice()); if(timers.length > 1) console.warn('Clearing multiple timeouts', timers.slice());
for(var i = 0; i < timers.length; ++i) window.clearTimeout(timers[i]); for(var i = 0; i < timers.length; ++i) window.clearTimeout(timers[i]);
@ -69,6 +69,9 @@
} }
export default { export default {
components: {
Autocomplete
},
props: { props: {
client: Object, client: Object,
selection: { selection: {
@ -80,7 +83,6 @@
}, },
data() { data() {
return { return {
uid: Math.random()*0x7fffffff|0,
appointments: [], appointments: [],
timers: [], timers: [],
ts: null, ts: null,
@ -140,6 +142,7 @@
this.$watch( this.$watch(
() => (this.client, this.selection, this.date_begin, this.date_end, {}), () => (this.client, this.selection, this.date_begin, this.date_end, {}),
debounce(async () => { debounce(async () => {
this.filter = {};
this.update(); this.update();
}, 500) }, 500)
); );

View File

@ -101,42 +101,6 @@ function lab_parse1default(data) {
flag: (x < 1.4 ? 'L' : x > 6.5 ? 'H' : undefined) flag: (x < 1.4 ? 'L' : x > 6.5 ? 'H' : undefined)
}); });
} }
if(results.hasOwnProperty('EOSINO')) {
results.push(results['EOSINOPHIL%'] = {
name: 'EOSINOPHIL%', unit: '%', range: '0.0 - 10.0',
value: x = +results.EOSINO.value,
flag: (x < 0 ? 'L' : x > 10 ? 'H' : undefined)
});
results.push(results['EOSINOPHIL#'] = {
name: 'EOSINOPHIL#', unit: 'K/cmm', range: '0.0 - 0.7',
value: +(x = 0.01*x*results.WBC.value).toFixed(3),
flag: (x < 0 ? 'L' : x > 0.7 ? 'H' : undefined)
});
}
if(results.hasOwnProperty('BASO')) {
results.push(results['BASOPHIL%'] = {
name: 'BASOPHIL%', unit: '%', range: '0.0 - 2.0',
value: x = +results.BASO.value,
flag: (x < 0 ? 'L' : x > 2 ? 'H' : undefined)
});
results.push(results['BASOPHIL#'] = {
name: 'BASOPHIL#', unit: 'K/cmm', range: '0.0 - 0.2',
value: +(x = 0.01*x*results.WBC.value).toFixed(3),
flag: (x < 0 ? 'L' : x > 0.2 ? 'H' : undefined)
});
}
if(results.hasOwnProperty('MONOS')) {
results.push(results['MONOCYTE%'] = {
name: 'MONOCYTE%', unit: '%', range: '1.7 - 9.3',
value: x = +results.MONOS.value,
flag: (x < 1.7 ? 'L' : x > 9.3 ? 'H' : undefined)
});
results.push(results['MONOCYTE#'] = {
name: 'MONOCYTE#', unit: 'K/cmm', range: '0.11 - 0.59',
value: +(x = 0.01*x*results.WBC.value).toFixed(3),
flag: (x < 0.11 ? 'L' : x > 0.59 ? 'H' : undefined)
});
}
if((results.hasOwnProperty('LYMPHS')) || (results.hasOwnProperty('ATYPICAL LYMPHOCYTES'))) { if((results.hasOwnProperty('LYMPHS')) || (results.hasOwnProperty('ATYPICAL LYMPHOCYTES'))) {
results.push(results['LYMPHOCYTE%'] = { results.push(results['LYMPHOCYTE%'] = {
name: 'LYMPHOCYTE%', unit: '%', range: '15.0 - 41.0', name: 'LYMPHOCYTE%', unit: '%', range: '15.0 - 41.0',