Merge branch 'develop' into main

README.md

@@ -1,5 +1,5 @@
-# DKTK/CCP Navigator
+# DKTK/CCP Explorer
 
-This project holds the DKTK/CCP Navigator, the German Cancer Consortium's federated search provided by the [DKTK Clinical Communication Platform](https://dktk.dkfz.de/en/clinical-platform).
+This project holds the DKTK/CCP Explorer, the German Cancer Consortium's federated search provided by the [DKTK Clinical Communication Platform](https://dktk.dkfz.de/en/clinical-platform).
 
 For all technical information, please refer to the repository of the [Samply.Lens federated search toolkit](https://github.com/samply/lens).

angular.json

@@ -64,6 +64,7 @@
               "localize": ["de"]
             },
             "development": {
+              "preserveSymlinks": true,
               "buildOptimizer": false,
               "optimization": false,
               "vendorChunk": true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lens-demo",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "license": "SEE LICENSE IN LICENSE.md",
   "scripts": {
     "ng": "ng",

src/app/app.component.css

@@ -32,7 +32,21 @@
   display: flex;
   flex-flow: row;
   align-items: center;
-  justify-content: space-between;
+  justify-content: center;
+}
+
+.line > * {
+  flex: 1;
+  display: flex;
+  justify-content: center;
+}
+
+.line > *:first-child {
+  justify-content: start;
+}
+
+.line > *:last-child {
+  justify-content: end;
 }
 
 .main {

src/app/app.component.html

@@ -1,14 +1,22 @@
 <header class="row line">
   <p-image [src]="'assets/dktk.svg'" alt="DKTK"></p-image>
-  <span class="ccp-header">Clinical Communication Platform (CCP)</span>
-</header>
-<router-outlet></router-outlet>
-<footer class="row line">
-  <div></div>
-  <div></div>
   <div>
-    Made with ♥ and <a href="https://git.verbis.dkfz.de/torbens-prototypen/lens">samply/lens-core</a>.
+    <span class="ccp-header">CCP Explorer</span>
   </div>
   <p-image [src]="'assets/logo-dkfz.svg'" alt="DKFZ"></p-image>
-  <div></div>
+</header>
+<router-outlet></router-outlet>
+<footer class="row line">
+    <span>
+      Nutzungsvereinbarung
+    </span>
+    <span>
+      <a href="mailto:ccp@dkfz.de">ccp@dkfz.de</a>
+    </span>
+    <span>
+      © 2023&nbsp;
+      <a href="https://dktk.dkfz.de/klinische-plattformen/ueber-die-ccp/about-ccp">
+        Clinical Communication Platform (CCP)
+      </a>
+    </span>
 </footer>

src/app/app.component.spec.ts

@@ -57,9 +57,9 @@ describe('AppComponent', () => {
     expect(app).toBeTruthy();
   });
 
-  it(`should have as title 'DKTK/CCP Navigator'`, () => {
+  it(`should have as title 'DKTK/CCP Explorer'`, () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.componentInstance;
-    expect(app.title.getTitle()).toEqual('DKTK/CCP Navigator');
+    expect(app.title.getTitle()).toEqual('DKTK/CCP Explorer');
   });
 });

src/app/app.component.ts

@@ -13,7 +13,7 @@ import {
 })
 export class AppComponent {
   constructor(public title: Title) {
-    title.setTitle('DKTK/CCP Navigator');
+    title.setTitle('DKTK/CCP Explorer');
   }
 
   public primaryButtonColors: primaryButtonColors = {

src/assets/catalogue.ts

@@ -26,7 +26,7 @@ export const staticCatalogue: Array<Category> = [
         },
         {
           key: 'other',
-          de: 'Sonstiges / intersexuell',
+          de: 'divers, sonstiges / intersexuell',
           en: 'diverse',
         },
         {
@@ -36,6 +36,7 @@ export const staticCatalogue: Array<Category> = [
         },
       ]
     ),
+    new Category('tumor_entity', 'Tumorentität', Entities),
     new Criteria(
       '75186-7',
       { de: 'Vitalstatus', en: 'Vital status' },
@@ -61,7 +62,6 @@ export const staticCatalogue: Array<Category> = [
       ]
     ),
   ]),
-  new Category('tumor_entity', 'Tumorentität', Entities),
   new Category('tumor_classification', 'Klassifikation von Tumoren', [
     new Criteria(
       'year_of_diagnosis',

src/environments/environment.prod.ts

@@ -15,7 +15,15 @@ export const environment = {
       new Beam(
         'broker.ccp-it.dktk.dkfz.de',
         new URL('https://backend.data.dktk.dkfz.de/prod/'),
-        ['mannheim', 'freiburg', 'muenchen-tum', 'hamburg']
+        [
+          'mannheim',
+          'freiburg',
+          'muenchen-tum',
+          'hamburg',
+          'berlin',
+          'mainz',
+          'dresden',
+        ]
       ),
     ],
     [

src/environments/environment.ts

@@ -19,25 +19,23 @@ export const environment = {
       new Beam(
         'dev.broker.ccp-it.dktk.dkfz.de',
         new URL('https://backend.demo.lens.samply.de/test/'),
+        ['bonn', 'essen', 'frankfurt', 'hannover', 'ulm', 'wuerzburg']
+      ),
+      // NOTE: This is a temporary workaround while switching the sites to the production system
+      new Beam(
+        'broker.ccp-it.dktk.dkfz.de',
+        new URL('https://backend.demo.lens.samply.de/prod/'),
         [
+          'mannheim',
+          'freiburg',
+          'muenchen-tum',
+          'hamburg',
           'berlin',
-          'bonn',
           'dresden',
-          'essen',
-          'frankfurt',
-          'hannover',
           'mainz',
           'muenchen-lmu',
-          'ulm',
-          'wuerzburg',
         ]
       ),
-      // NOTE: This is a temporary workaround while switching the sites to the production system
-      new Beam(
-        'broker.ccp-it.dktk.dkfz.de',
-        new URL('https://backend.demo.lens.samply.de/prod/'),
-        ['mannheim', 'freiburg', 'muenchen-tum', 'hamburg']
-      ),
     ],
     [
       dktkPatientsMeasure,