blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

reservierungen query also joins the studiengangs and mitarbeiter information

Browse Source
This commit is contained in:
SimonGschnell
2024-06-10 13:01:55 +02:00
parent 392d8f38d2
commit 022ad26dd2
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/Stundenplan.php
+2
View File
@@ -316,6 +316,8 @@ class Stundenplan extends FHCAPI_Controller
public function Reservierungen()
{
//TODO the reservierungen have to be grouped like the stundenplan
$ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
$start_date = $this->input->get('start_date', TRUE);
$end_date = $this->input->get('end_date', TRUE);
application/models/ressource/Reservierung_model.php
+5 -2
View File
@@ -22,8 +22,11 @@ class Reservierung_model extends DB_Model
{
$raum_reservierungen= $this->execReadOnlyQuery("
SELECT * FROM lehre.vw_reservierung res
WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
SELECT res.*, mit.kurzbz as person_kurzbz , CONCAT(studg.typ,studg.kurzbz,'-') as stg
FROM lehre.vw_reservierung res
JOIN public.tbl_mitarbeiter mit ON mit.mitarbeiter_uid=res.uid
JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?
", [$ort_kurzbz, $start_date, $end_date]);
return $raum_reservierungen;
public/js/apps/Cis/RoomInformation.js
+3 -3
View File
@@ -78,7 +78,7 @@ const app = Vue.createApp({
let reservierungs_events = res.data;
console.log(reservierungs_events, " this are the reserverungs event")
this.events = [...this.events,...reservierungs_events];
this.events = [...(this.events?this.events:[]),...reservierungs_events];
});
});
@@ -91,9 +91,9 @@ const app = Vue.createApp({
<span>{{event.orig.reservierung? event.orig.title :event.orig.lv_info}}</span>
<span v-if="event.orig.reservierung">{{'this is a reservierung'}}</span>
<span v-if="event.orig.reservierung">{{event.orig.stg}}</span>
<span v-else v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
<span>{{event.orig.reservierung? event.orig.uid : event.orig.lektor}}</span>
<span>{{event.orig.reservierung? event.orig.person_kurzbz : event.orig.lektor}}</span>
</div>
</fhc-calendar>