Merge pull request #2 from samply/refactor/use-eucaim-transformer

refactor: use new eucaim result transformer
samply · Sep 26, 2023 · c193f43 · c193f43
2 parents c44a238 + 48b0a8f
commit c193f43
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -23,9 +23,12 @@ import {
 
 import {
   CqlTranslatorService,
-  MeasureTransformerService,
 } from '@samply/lens-core/cql';
 
+import {
+  EucaimResultTransformerService
+} from '@samply/lens-core/eucaim'
+
 import { SearchBarModule } from '@samply/lens-components/search-bar';
 import { CriteriaCatalogueModule } from '@samply/lens-components/criteria-catalogue';
 import { ResultSummaryBarModule } from '@samply/lens-components/result-summary-bar';
@@ -57,7 +60,7 @@ const routes: Routes = [{ path: '', component: MainComponent }];
     },
     {
       provide: RESULT_TRANSFORMER_TOKEN,
-      useClass: MeasureTransformerService
+      useClass: EucaimResultTransformerService
     },
     {
       provide: CATALOGUE_FETCHER_TOKEN,

diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts
@@ -123,10 +123,11 @@ export class MainComponent {
       }
     ]
 
-  public summaryBar = new ResultRenderer('Ergebnisse', [{ key: 'sites' }, { key: 'patients' }], ResultSummaryBarComponent, { headers: this.summaryBarHeaders, clickDisabled: true, showNegotiationButton: true });
+  public summaryBar = new ResultRenderer('Ergebnisse', [{ key: 'collections' }, { key: 'patients'}], ResultSummaryBarComponent, { headers: this.summaryBarHeaders, clickDisabled: true, showNegotiationButton: true });
 
   public diagrams: ResultRenderer[] = [
-    new ResultRenderer("Patients per collection", [{ key: "sites", subset: '*' }], PieChartComponent, { headers: this.siteHeaders, clickDisabled: true }),
+    new ResultRenderer("Studies per collection", [{ key: "collections", subset: 'studies' }], PieChartComponent, { headers: this.siteHeaders, clickDisabled: true}),
+    // new ResultRenderer("Subjects per collection", [{ key: "collections", subset: 'subjects' }], PieChartComponent, { headers: this.siteHeaders, clickDisabled: true}),
     new ResultRenderer("", [{ key: 'patients', subset: 'sites' }], ResultTableComponent, { headers: this.siteHeaders, clickDisabled: true, displayProperties: ["wide-diagram"] }),
   ]