From c0596c08c550c24a4996df0e9d8808d42c0e6da3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 09:43:26 +0200
Subject: [PATCH] changes the header for the Dashboard to the CISVUE-Header and
 passes the selectedTypes props to fix the CISVUE Header search

---
 application/views/CisHmvc/Dashboard.php       | 4 ++--
 application/views/CisHtml/Dashboard.php       | 4 ++--
 application/views/templates/CISVUE-Header.php | 3 ++-
 public/js/components/Cis/Menu.js              | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/application/views/CisHmvc/Dashboard.php b/application/views/CisHmvc/Dashboard.php
index 06da8cd7f..6e044c548 100755
--- a/application/views/CisHmvc/Dashboard.php
+++ b/application/views/CisHmvc/Dashboard.php
@@ -8,7 +8,7 @@
 		],
 	);
 
-	$this->load->view('templates/FHC-Header', $includesArray);
+	$this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="content">
@@ -17,5 +17,5 @@
 	<fhc-dashboard dashboard="CIS"/>
 </div>
 
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
 
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
index 1eddba454..ec08a8ffa 100755
--- a/application/views/CisHtml/Dashboard.php
+++ b/application/views/CisHtml/Dashboard.php
@@ -8,7 +8,7 @@ $includesArray = array(
 	],
 );
 
-$this->load->view('templates/CISHTML-Header', $includesArray);
+$this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 
 <div id="content">
@@ -17,5 +17,5 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 	<fhc-dashboard dashboard="CIS"/>
 </div>
 
-<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
 
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index b65e02e13..686656592 100755
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -27,7 +27,8 @@ $this->load->view('templates/FHC-Header', $includesArray);
 		root-url="<?= site_url(''); ?>" 
 		logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" 
 		avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
-		logout-url="<?= site_url('Cis/Auth/logout'); ?>" 
+		logout-url="<?= site_url('Cis/Auth/logout'); ?>"
+		:selectedtypes="selectedtypes" 
 		:searchbaroptions="searchbaroptions" 
 		:searchfunction="searchfunction" />
 </header>
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index a138fbe98..53069a83f 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -11,6 +11,7 @@ export default {
         logoUrl: String,
         avatarUrl: String,
         logoutUrl: String,
+		selectedtypes: Array,
         searchbaroptions: Object,
         searchfunction: Function
     },
@@ -48,7 +49,7 @@ export default {
             </button>
         </div>
         <div class="offcanvas-body p-0">
-            <fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
+            <fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction" :selectedtypes="selectedtypes"></fhc-searchbar>
             <button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
                 <img :src="avatarUrl" class="avatar rounded-circle"/>
             </button>