From b74dcb7d245034eeb17f0aa0a13e29ef042a807a Mon Sep 17 00:00:00 2001 From: inportb Date: Tue, 16 May 2023 23:25:21 -0400 Subject: [PATCH] Fix report viewer early truncation of loading --- htdocs/RoutePatientReports.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/RoutePatientReports.vue b/htdocs/RoutePatientReports.vue index 8278dae..fcfc639 100644 --- a/htdocs/RoutePatientReports.vue +++ b/htdocs/RoutePatientReports.vue @@ -357,9 +357,10 @@ } var dfn = this.patient_dfn, resultsets = this.resultsets, resultset, reports = this.reports, report, alpha = strftime_vista(this.date_begin).toFixed(4), omega = strftime_vista(this.date_end).toFixed(4); for(var i = 0; i < reports.length; ++i) if(((report = reports[i]).enabled) && (!((resultset = resultsets[i]) && (alpha == resultset.alpha) && (omega == resultset.omega)))) { - var data = [], batch, idmap = {}, omega0 = omega; + var data = [], batch, count, idmap = {}, omega0 = omega; do { batch = await this.client.ORWRP_REPORT_TEXT(dfn, report.rpt_id + (report.rpt_id.endsWith(';') ? SZ_WINDOW : ''), '', SZ_RANGE, '', alpha, omega0); + count = batch.length; if(report.singleton) data = [report.map(batch[0].join('\n'))]; else if((batch = batch.map(item => { var res = [], line, brk, sub; @@ -378,7 +379,7 @@ batch.map(x => x.id).reduce((acc, val) => (acc[val] = true, acc), idmap); omega0 = strftime_vista(data[data.length - 1].time); }; - } while(batch.length >= SZ_WINDOW); + } while(count >= SZ_WINDOW); data.alpha = alpha; data.omega = omega; resultsets[i] = data;