diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php index 8a12338a3..c9f2b3305 100755 --- a/application/views/templates/CISHTML-Header.php +++ b/application/views/templates/CISHTML-Header.php @@ -31,7 +31,7 @@ if (!isset($menu)) { - + @@ -42,7 +42,7 @@ if (!isset($menu)) {
- + diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js index b514f3662..c0eef6be1 100755 --- a/public/js/apps/Cis.js +++ b/public/js/apps/Cis.js @@ -11,6 +11,11 @@ Vue.createApp({ }, data: function() { return { + selectedtypes:[ + "mitarbeiter", + "raum", + "organisationunit" + ], searchbaroptions: { types: [ "mitarbeiter", @@ -71,6 +76,11 @@ Vue.createApp({ methods: { searchfunction: function(searchsettings) { return Vue.$fhcapi.Search.search(searchsettings); - } + }, + updatesearchtypes: function(newValues){ + console.log(newValues,"this are the new values") + this.selectedtypes= newValues; + + }, } }).mount('#cis-header'); \ No newline at end of file diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js index 963b43cb7..474f0ad8b 100755 --- a/public/js/components/searchbar/searchbar.js +++ b/public/js/components/searchbar/searchbar.js @@ -2,22 +2,21 @@ import person from "./person.js"; import raum from "./raum.js"; import employee from "./employee.js"; import organisationunit from "./organisationunit.js"; +import {searchSettings, searchresult} from "./sharedSettings.js"; export default { - props: [ "searchoptions", "searchfunction" ], + props: [ "searchoptions", "searchfunction","selectedtypes" ], + data: function() { return { searchtimer: null, hidetimer: null, showsettings: false, - searchsettings: { - searchstr: '', - types: [] - }, - showresult: false, - searchresult: [], + searchsettings: searchSettings, + searchresult: searchresult, + showresult: false, searching: false, - error: null + error: null, }; }, components: { @@ -26,10 +25,13 @@ export default { employee: employee, organisationunit: organisationunit }, + template: /*html*/`
+
+ @@ -42,8 +44,8 @@ export default {
{{ this.error }}
-
Es wurden keine Ergebnisse gefunden.
-