Merge branch 'develop'

samply · Oct 12, 2023 · 58303e8 · 58303e8
2 parents 674d180 + cda94f0
commit 58303e8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/packages/demo/src/AppCCP.svelte b/packages/demo/src/AppCCP.svelte
@@ -72,6 +72,12 @@
   const catalogueKeyToResponseKeyMap = [
     ["gender", "Gender"],
     ["age_at_diagnosis", "Age"],
+    ['diagnosis', 'diagnosis'],
+    ['medicationStatements', "MedicationType"],
+    ["sample_kind", 'sample_kind' ],
+    ["therapy_of_tumor", "ProcedureType"],
+    ["75186-7", "75186-7"],
+    // ["encounter", "Encounter"],
   ];
 
   const siteToDefaultCollectionId: string[][] = [
@@ -209,6 +215,7 @@
           title="Diagnosis"
           catalogueGroupCode="diagnosis"
           chartType="bar"
+          indexAxis='y'
           clickToAddState={true}
         />
       </div>
@@ -239,7 +246,7 @@
       <div class="chart-wrapper">
         <lens-chart
           title="Systemische Therapien"
-          catalogueGroupCode=""
+          catalogueGroupCode="medicationStatements"
           chartType="bar"
           clickToAddState={true}
         />

diff --git a/packages/demo/src/ccp.css b/packages/demo/src/ccp.css
@@ -242,4 +242,10 @@ lens-search-bar-multiple::part(query-delete-button-group) {
 
 lens-search-button::part(lens-search-button) {
   background-color: var(--light-blue);
+}
+
+.chart-diagnosis lens-chart::part(chart-canvas) {
+  width: 100%;
+  max-height: 1000px;
+  height: 940px;
 }
diff --git a/packages/lib/src/components/results/ChartComponent.wc.svelte b/packages/lib/src/components/results/ChartComponent.wc.svelte
@@ -29,6 +29,7 @@
 
     export let title: string = ""; // e.g. 'Gender Distribution'
     export let catalogueGroupCode: string = ""; // e.g. "gender"
+    export let indexAxis: string = "x";
     export let clickToAddState: boolean = false;
     let responseGroupCode: string;
     $: responseGroupCode =
@@ -84,6 +85,7 @@
             ],
         },
         options: {
+            indexAxis: indexAxis,
             maintainAspectRatio: false,
             plugins: {
                 legend: {
@@ -110,7 +112,7 @@
     const getChartDataSets = (
         responseStore: ResponseStore,
         chartLabels: string[]
-    ): { label; data; backgroundColors; backgroundHoverColors }[] => {
+    ): { label; data; backgroundColor; backgroundHoverColor }[] => {
         let dataSet: number[];
 
         if (perSite) {
@@ -149,7 +151,7 @@
      * watches the response store and updates the chart data
      */
     const setChartData = (responseStore: ResponseStore) => {
-        console.log(responseStore);
+
         if (responseStore.size === 0) return;
 
         let isDataAvailable: boolean = false;
@@ -184,14 +186,12 @@
 
     $: {
         if ($responseStore.size !== 0){
-            console.log($responseStore);
             setChartData($responseStore);
         }
     } 
     
 
     onMount(() => {
-        console.log(initialChartData);
         chart = new Chart(canvas, initialChartData);
     });
 
@@ -220,9 +220,7 @@
          */
         const stratifier = chart.getActiveElements()[0];
         if (!stratifier || !clickToAddState) return;
-        console.log(typeof chart.data.labels[stratifier.index]);
         const label: string = chart.data.labels[stratifier.index] as string;
-        console.log(stratifier, label); 
         let queryItem: QueryItem;
         $catalogue.forEach((parentCategory: Category) => {
             if ("childCategories" in parentCategory) {
@@ -233,7 +231,6 @@
                             "criteria" in childCategorie
                         ) {
                             let values: QueryValue[] = [];
-                            console.log(childCategorie);
 
                             if (childCategorie.fieldType === "number") {
                                 /**