samply · MatsJohansen87 · Nov 7, 2023 · Nov 7, 2023 · Nov 9, 2023 · Nov 21, 2023
diff --git a/packages/demo/public/catalogues/catalogue-dktk.json b/packages/demo/public/catalogues/catalogue-dktk.json
diff --git a/packages/demo/public/options.json b/packages/demo/public/options.json
@@ -80,23 +80,23 @@
                 "Verteilung der Probentypen die mit den identifizierten Patienten verbunden sind."
             ],
             "tooltips": {
+                "tissue-ffpe": "Gewebe FFPE",
+                "tissue-frozen": "Gewebe schockgefroren",
+                "tissue-other": "Gewebe, Andere Konservierungsart",
                 "whole-blood": "Vollblut",
-                "bone-marrow": "Knochenmark",
+                "blood-serum": "Serum",
+                "blood-plasma": "Plasma",
                 "buffy-coat": "Buffycoat",
-                "dried-whole-blood": "Blutkarten",
                 "peripheral-blood-cells": "Periphere mononukleäre Blutzellen (PBMC)",
-                "blood-plasma": "Plasma",
-                "blood-serum": "Serum",
+                "dried-whole-blood": "Blutkarten",
+                "swab": "Abstrich",
                 "ascites": "Aszites",
-                "csf-liquor": "Liquor",
-                "saliva": "Speichel",
                 "stool-faeces": "Stuhl",
                 "urine": "Urin",
-                "swab": "Abstrich",
+                "csf-liquor": "Liquor",
+                "bone-marrow": "Knochenmark",
+                "saliva": "Speichel",
                 "liquid-other": "Flüssigprobe, Andere",
-                "tissue-ffpe": "Gewebe FFPE",
-                "tissue-frozen": "Gewebe schockgefroren",
-                "tissue-other": "Gewebe, Andere Konservierungsart",
                 "dna": "DNA",
                 "rna": "RNA",
                 "derivative-other": "Derivat, Andere"
@@ -114,9 +114,8 @@
                 "dataKey": "patients"
             },
             {
-                "title": "Bioproben",
-                "dataKey": "specimen",
-                "hintText": ["Es sind in der Regel auch FFPE-Gewebeproben verfügbar"]
+                "title": "Bioproben*",
+                "dataKey": "specimen"
             }
         ]
     }

diff --git a/packages/demo/src/AppCCP.svelte b/packages/demo/src/AppCCP.svelte
@@ -224,7 +224,11 @@
         />
       </div>
       <div class="chart-wrapper result-table">
-        <lens-result-table pageSize="10" />
+        <lens-result-table pageSize="10" >
+          <div slot="above-pagination" class="result-table-hint-text">
+            * Es sind in der Regel auch FFPE-Gewebeproben verfügbar
+          </div>
+        </lens-result-table>
       </div>
       <div class="chart-wrapper">
         <lens-chart
@@ -294,6 +298,7 @@
           chartType="bar"
           xAxisTitle="Probentypen"
           yAxisTitle="Probenanzahl"
+          filterRegex="^(?!(tissue-other|buffy-coat|peripheral-blood-cells|dried-whole-blood|swab|ascites|stool-faeces|saliva|liquid-other|derivative-other))"
         >
         <div class="sample-information-text">* Es sind in der Regel auch FFPE-Gewebeproben verfügbar</div>
     </lens-chart>

diff --git a/packages/demo/src/ccp.css b/packages/demo/src/ccp.css
@@ -372,4 +372,9 @@ lens-info-button::part(info-button-icon) {
 .catalogue lens-info-button::part(info-button-dialogue){
   max-width: 300px;
   text-align: left;
+}
+
+.result-table-hint-text {
+ display: flex;
+ align-items: end;
 }
diff --git a/packages/demo/src/measures.ts b/packages/demo/src/measures.ts
@@ -832,9 +832,11 @@ export const dktkPatientsMeasure = {
     ],
   },
   cql: `
+
 DKTK_STRAT_GENDER_STRATIFIER
 
-DKTK_STRAT_AGE_STRATIFIER
+DKTK_STRAT_PRIMARY_DIAGNOSIS_STRATIFIER
+DKTK_STRAT_AGE_CLASS_STRATIFIER
 
 DKTK_STRAT_DECEASED_STRATIFIER
 `,

diff --git a/packages/demo/src/styles/default/result-table.css b/packages/demo/src/styles/default/result-table.css
@@ -2,7 +2,7 @@
 lens-result-table {
     background-color: var(--white);
     display: grid;
-    grid-template-rows: auto auto 1fr;
+    grid-template-rows: auto auto 1fr auto auto;
   }
 
   lens-result-table::part(result-table-title) {

diff --git a/packages/lib/src/components/results/ChartComponent.wc.svelte b/packages/lib/src/components/results/ChartComponent.wc.svelte
@@ -41,7 +41,6 @@
     $: responseGroupCode =
         $catalogueKeyToResponseKeyMap.get(catalogueGroupCode);
 
-    export let tooltips: Map<string, string> = new Map<string, string>();
     export let headers: Map<string, string> = new Map<string, string>();
     export let displayLegends: boolean = false;
     export let chartType: keyof ChartTypeRegistry = "pie";

diff --git a/packages/lib/src/components/results/ResultTableComponent.wc.svelte b/packages/lib/src/components/results/ResultTableComponent.wc.svelte
@@ -184,6 +184,7 @@
         {/each}
     </tbody>
 </table>
+<slot name="above-pagination"/>
 <div part="table-pagination">
     <button
         part="table-pagination-button pagination-pagination-previous"
@@ -194,10 +195,11 @@
     >
     <div part="table-pagination-pagenumber">{activePage}</div>
     <button
-        part="table-pagination-button pagination-pagination-next"
-        disabled={activePage === Math.ceil(tableRowData.length / pageSize)}
-        on:click={() => {
-            activePage = activePage + 1;
-        }}>&#8594;</button
+    part="table-pagination-button pagination-pagination-next"
+    disabled={activePage === Math.ceil(tableRowData.length / pageSize)}
+    on:click={() => {
+        activePage = activePage + 1;
+    }}>&#8594;</button
     >
 </div>
+<slot name="beneath-pagination"/>