diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php index 7197eae6a..5d60200a9 100644 --- a/application/libraries/SearchBarLib.php +++ b/application/libraries/SearchBarLib.php @@ -390,6 +390,80 @@ EOSC; */ private function _raum($searchstr, $type) { + $dbModel = new DB_Model(); + // select - ARRAY_AGG(ort_reihungstest_studiengang.test) as reihungstest_studiengang + /* LEFT JOIN ( + Select reihungstest_id, bezeichnung as reihungstest_studiengang_bezeichnung, CONCAT(reihungstest_id,\' - \',bezeichnung) as test, public.tbl_rt_ort.ort_kurzbz + FROM public.tbl_reihungstest + JOIN public.tbl_studiengang USING(studiengang_kz) + JOIN public.tbl_rt_ort ON reihungstest_id = rt_id + + ) ort_reihungstest_studiengang ON ort_reihungstest_studiengang.ort_kurzbz = ort.ort_kurzbz + */ + $rooms = $dbModel->execReadOnlyQuery(' + SELECT + \''.$type.'\' AS type, + ort.ort_kurzbz as ort_kurzbz, + ort.gebteil as building, + ort.stockwerk as floor, + ort.dislozierung as room_number + + FROM public.tbl_ort as ort + + WHERE ort.ort_kurzbz like \'%'. $searchstr . '%\' GROUP BY ort.ort_kurzbz' + /* + + org joins: + + JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz) + LEFT JOIN public.tbl_organisationseinheit oParent ON(oParent.oe_kurzbz = o.oe_parent_kurzbz) + LEFT JOIN public.tbl_organisationseinheittyp otParent ON(oParent.organisationseinheittyp_kurzbz = otParent.organisationseinheittyp_kurzbz) + LEFT JOIN ( + SELECT benutzerfunktion_id, oe_kurzbz + FROM public.tbl_benutzerfunktion + WHERE funktion_kurzbz = \'oezuordnung\' + AND (datum_von IS NULL OR datum_von <= NOW()) + AND (datum_bis IS NULL OR datum_bis >= NOW()) + ) bfCount ON(bfCount.oe_kurzbz = o.oe_kurzbz) + LEFT JOIN ( + SELECT bf.oe_kurzbz, bf.uid, p.vorname, p.nachname + FROM public.tbl_benutzerfunktion bf + JOIN public.tbl_benutzer b USING(uid) + JOIN public.tbl_person p USING(person_id) + WHERE funktion_kurzbz = \'Leitung\' + AND (datum_von IS NULL OR datum_von <= NOW()) + AND (datum_bis IS NULL OR datum_bis >= NOW()) + AND b.aktiv = TRUE + ) bfLeader ON(bfLeader.oe_kurzbz = o.oe_kurzbz) + + + + $this->buildSearchClause( + $dbModel, + array('o.oe_kurzbz', 'o.bezeichnung', 'ot.bezeichnung'), + $searchstr + ) . + 'GROUP BY type, o.oe_kurzbz, o.bezeichnung, ot.bezeichnung, oParent.oe_kurzbz, oParent.bezeichnung, otParent.bezeichnung' + */ + ); + + // If something has been found + if (hasData($rooms)) + { + // Loop through the returned dataset + foreach (getData($rooms) as $room) + { + if($room->building == null){ + $room->test = "test"; + + } + } + + // Returns the dataset + return getData($rooms); + } + + // Otherwise return an empty array return array(); } } diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js new file mode 100644 index 000000000..f31bbc6fa --- /dev/null +++ b/public/js/components/Cis/Menu.js @@ -0,0 +1,58 @@ +import CisMenuEntry from "./Menu/Entry.js"; +import FhcSearchbar from "../searchbar/searchbar.js"; + +export default { + components: { + CisMenuEntry, + FhcSearchbar + }, + props: { + rootUrl: String, + logoUrl: String, + avatarUrl: String, + logoutUrl: String, + searchbaroptions: Object, + searchfunction: Function + }, + data: () => { + return { + entries: [] + }; + }, + created() { + axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/CisVue/Menu').then(res => { + this.entries = res.data.retval.childs; + }); + }, + template: /*html*/` + + + ` +}; \ No newline at end of file diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js index 887820d6c..20a9b7bf9 100644 --- a/public/js/components/searchbar/raum.js +++ b/public/js/components/searchbar/raum.js @@ -10,7 +10,8 @@ export default { emits: [ 'actionexecuted' ], template: `
- + 
{{JSON.stringify(actions,null,2)}}
+ 
{{JSON.stringify(res,null,2)}}
@@ -19,7 +20,7 @@ export default {
- {{ res.r }} + {{ res.ort_kurzbz }}
@@ -27,15 +28,15 @@ export default {
Gebäude
-
{{ res.g }}
+
{{ res.building }}
Stockwerk
-
{{ res.s }}
+
{{ res.floor }}
Raumnummer
-
{{ res.rn }}
+
{{ res.room_number }}
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js index 1f4dfc94b..41816292b 100644 --- a/public/js/components/searchbar/searchbar.js +++ b/public/js/components/searchbar/searchbar.js @@ -26,8 +26,13 @@ export default { employee: employee, organisationunit: organisationunit }, +<<<<<<< Updated upstream template: `
>>>>>> Stashed changes @focusin="this.searchfocusin" @focusout="this.searchfocusout">