-
{{sourceName}}
+
{{sourceName}}
Resource
{{resource?.source_resource_type}}
{{resource?.source_resource_id}}
diff --git a/frontend/src/app/pages/source-detail/source-detail.component.html b/frontend/src/app/pages/source-detail/source-detail.component.html
index 3e68e5f9..a6b6bd80 100644
--- a/frontend/src/app/pages/source-detail/source-detail.component.html
+++ b/frontend/src/app/pages/source-detail/source-detail.component.html
@@ -18,7 +18,7 @@
{{getPatientName()}}
diff --git a/frontend/src/app/pipes/dataset-latest-entry.pipe.spec.ts b/frontend/src/app/pipes/dataset-latest-entry.pipe.spec.ts
new file mode 100644
index 00000000..69458442
--- /dev/null
+++ b/frontend/src/app/pipes/dataset-latest-entry.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { DatasetLatestEntryPipe } from './dataset-latest-entry.pipe';
+
+describe('DatasetLatestEntryPipe', () => {
+ it('create an instance', () => {
+ const pipe = new DatasetLatestEntryPipe();
+ expect(pipe).toBeTruthy();
+ });
+});
diff --git a/frontend/src/app/pipes/dataset-latest-entry.pipe.ts b/frontend/src/app/pipes/dataset-latest-entry.pipe.ts
new file mode 100644
index 00000000..f068982f
--- /dev/null
+++ b/frontend/src/app/pipes/dataset-latest-entry.pipe.ts
@@ -0,0 +1,44 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import {ChartDataset} from 'chart.js';
+import * as _ from 'lodash';
+
+@Pipe({
+ name: 'datasetLatestEntry'
+})
+export class DatasetLatestEntryPipe implements PipeTransform {
+
+ transform(dataset: ChartDataset<'line'>, round?: number, valLookupKey?: string, unitLookupKey?: string): string {
+ if(!round){
+ round = 0 //round to nearest whole number
+ }
+ let lastItem = dataset?.data?.[dataset?.data?.length -1] || ''
+ // let valueKey = this.chartOptions?.parsing?.['yAxisKey'] || dataset?.parsing?.['key']
+ console.log('latestEntryConfig', lastItem, valLookupKey, unitLookupKey, round)
+ let lastItemUnit = ""
+ let lastItemValue
+
+ if(Array.isArray(lastItem)){
+ lastItemValue = _.flatten(lastItem?.[0]?.[valLookupKey])?.[0] as string
+ lastItemUnit = _.flatten(lastItem?.[0]?.[unitLookupKey])?.[0] as string
+ } else if(typeof lastItem === 'object'){
+ console.log('lastItem-object', lastItem?.[valLookupKey])
+ lastItemValue = lastItem?.[valLookupKey]
+ lastItemUnit = lastItem?.[unitLookupKey]
+ } else {
+ //do nothing
+ }
+
+ lastItemValue = this.roundToDecimalPlaces(lastItemValue, round)
+ if(lastItemUnit){
+ return lastItemValue + ' ' + lastItemUnit
+ } else {
+ return lastItemValue.toString()
+ }
+ }
+
+
+ roundToDecimalPlaces(value: string, decimalPlaces: number): string {
+ return parseFloat(value).toFixed(decimalPlaces).toString()
+ }
+
+}
diff --git a/frontend/src/app/pipes/pipes.module.ts b/frontend/src/app/pipes/pipes.module.ts
index c7ea63f3..7949cc7d 100644
--- a/frontend/src/app/pipes/pipes.module.ts
+++ b/frontend/src/app/pipes/pipes.module.ts
@@ -5,6 +5,7 @@ import { NgModule } from '@angular/core';
import {FhirPathPipe} from './fhir-path.pipe';
import {FilterPipe} from './filter.pipe';
import { ShortDomainPipe } from './short-domain.pipe';
+import { DatasetLatestEntryPipe } from './dataset-latest-entry.pipe';
@NgModule({
declarations: [
@@ -12,6 +13,7 @@ import { ShortDomainPipe } from './short-domain.pipe';
FhirPathPipe,
FilterPipe,
ShortDomainPipe,
+ DatasetLatestEntryPipe,
],
imports: [
@@ -19,7 +21,8 @@ import { ShortDomainPipe } from './short-domain.pipe';
exports: [
FhirPathPipe,
FilterPipe,
- ShortDomainPipe
+ ShortDomainPipe,
+ DatasetLatestEntryPipe
]
})
export class PipesModule {}
diff --git a/frontend/src/app/widgets/dashboard-widget/dashboard-widget.component.ts b/frontend/src/app/widgets/dashboard-widget/dashboard-widget.component.ts
index f87cf79c..c6f5130d 100644
--- a/frontend/src/app/widgets/dashboard-widget/dashboard-widget.component.ts
+++ b/frontend/src/app/widgets/dashboard-widget/dashboard-widget.component.ts
@@ -121,26 +121,6 @@ export class DashboardWidgetComponent implements OnInit, DashboardWidgetComponen
console.log(`Loading COmpleted for ${this.widgetConfig.title_text}, ${this.loading}`)
}
- getLastDatasetValue(dataset: ChartDataset<'line'>): string {
- let lastItem = dataset?.data?.[dataset?.data?.length -1] || ''
- let valueKey = this.chartOptions?.parsing?.['yAxisKey'] || dataset?.parsing?.['key']
- console.log('current', lastItem, valueKey)
-
- if(typeof lastItem === 'string'){
- console.log('lastItem-string', lastItem)
- return lastItem
- } else if(Array.isArray(lastItem)){
-
- return _.flatten(lastItem?.[0]?.[valueKey])?.[0] as string
- } else if(typeof lastItem === 'object'){
- console.log('lastItem-object', lastItem?.[valueKey])
- return lastItem?.[valueKey]
- } else {
- return lastItem.toString()
- }
- }
-
-
// This function will process the raw response from the Dashboard Query API call, which requires frontend processing of the select clause.
// it will call the fhirPathMapQueryFn which will extract FHIRPath values from the resource_raw field of the ResourceFhir object
diff --git a/frontend/src/app/widgets/grouped-bar-chart-widget/grouped-bar-chart-widget.component.html b/frontend/src/app/widgets/grouped-bar-chart-widget/grouped-bar-chart-widget.component.html
index 7aa131b4..6479e1ca 100644
--- a/frontend/src/app/widgets/grouped-bar-chart-widget/grouped-bar-chart-widget.component.html
+++ b/frontend/src/app/widgets/grouped-bar-chart-widget/grouped-bar-chart-widget.component.html
@@ -12,7 +12,7 @@
diff --git a/frontend/src/app/widgets/grouped-bar-chart-widget/grouped-bar-chart-widget.component.ts b/frontend/src/app/widgets/grouped-bar-chart-widget/grouped-bar-chart-widget.component.ts
index cc10f642..4eeaadb1 100644
--- a/frontend/src/app/widgets/grouped-bar-chart-widget/grouped-bar-chart-widget.component.ts
+++ b/frontend/src/app/widgets/grouped-bar-chart-widget/grouped-bar-chart-widget.component.ts
@@ -5,10 +5,11 @@ import {DashboardWidgetComponent} from '../dashboard-widget/dashboard-widget.com
import {CommonModule} from '@angular/common';
import {LoadingWidgetComponent} from '../loading-widget/loading-widget.component';
import {EmptyWidgetComponent} from '../empty-widget/empty-widget.component';
+import {PipesModule} from '../../pipes/pipes.module';
@Component({
standalone: true,
- imports: [NgChartsModule, CommonModule, LoadingWidgetComponent, EmptyWidgetComponent],
+ imports: [NgChartsModule, CommonModule, LoadingWidgetComponent, EmptyWidgetComponent, PipesModule],
selector: 'grouped-bar-chart-widget',
templateUrl: './grouped-bar-chart-widget.component.html',
styleUrls: ['./grouped-bar-chart-widget.component.scss']
diff --git a/frontend/src/app/widgets/simple-line-chart-widget/simple-line-chart-widget.component.html b/frontend/src/app/widgets/simple-line-chart-widget/simple-line-chart-widget.component.html
index d8d8c431..df26c5e7 100644
--- a/frontend/src/app/widgets/simple-line-chart-widget/simple-line-chart-widget.component.html
+++ b/frontend/src/app/widgets/simple-line-chart-widget/simple-line-chart-widget.component.html
@@ -11,7 +11,7 @@
diff --git a/frontend/src/app/widgets/simple-line-chart-widget/simple-line-chart-widget.component.ts b/frontend/src/app/widgets/simple-line-chart-widget/simple-line-chart-widget.component.ts
index d69614b7..1b564da3 100644
--- a/frontend/src/app/widgets/simple-line-chart-widget/simple-line-chart-widget.component.ts
+++ b/frontend/src/app/widgets/simple-line-chart-widget/simple-line-chart-widget.component.ts
@@ -7,10 +7,11 @@ import {ChartConfiguration, ChartDataset, ChartOptions} from 'chart.js';
import {CommonModule} from '@angular/common';
import {LoadingWidgetComponent} from '../loading-widget/loading-widget.component';
import {EmptyWidgetComponent} from '../empty-widget/empty-widget.component';
+import {PipesModule} from '../../pipes/pipes.module';
@Component({
standalone: true,
- imports: [NgChartsModule, CommonModule, LoadingWidgetComponent, EmptyWidgetComponent],
+ imports: [NgChartsModule, CommonModule, LoadingWidgetComponent, EmptyWidgetComponent, PipesModule],
selector: 'simple-line-chart-widget',
templateUrl: './simple-line-chart-widget.component.html',
styleUrls: ['./simple-line-chart-widget.component.scss']