diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php index 3ca8bbc2e..e0c163bac 100755 --- a/application/controllers/components/Cis/Stundenplan.php +++ b/application/controllers/components/Cis/Stundenplan.php @@ -74,6 +74,7 @@ class Stundenplan extends Auth_Controller $result = $this->StundenplanModel->getRoomDataOnDay('EDV_A2.06','2024-05-21'); + $result = hasData($result) ? getData($result) : []; //echo($this->db->last_query()); echo json_encode($result); diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php index ed447b36a..f42a395f9 100755 --- a/application/models/content/Content_model.php +++ b/application/models/content/Content_model.php @@ -165,6 +165,15 @@ class Content_model extends DB_Model "menu_open": false, "aktiv": true, "childs": [] + }, + { + "content_id": 1000008, + "template_kurzbz": "redirect", + "titel": "room information (to delete)", + "content": "", + "menu_open": false, + "aktiv": true, + "childs": [] } ] diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php index b566b0325..f67eab166 100755 --- a/application/models/ressource/Stundenplan_model.php +++ b/application/models/ressource/Stundenplan_model.php @@ -21,7 +21,7 @@ class Stundenplan_model extends DB_Model public function getRoomDataOnDay($ort_kurzbz,$date){ - $this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as eintrag","lektor","CONCAT(lehrfach,'-',lehrform)"]); + $this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as stg","lektor","CONCAT(lehrfach,'-',lehrform) as lv_info" ]); /* $this->addSelect(["lehre.tbl_stundenplan.*","CONCAT(UPPER(sg.typ),UPPER(sg.kurzbz),'-',lehre.tbl_stundenplan.semester,lehre.tbl_stundenplan.verband) as simml"]); $this->addJoin("public.tbl_lehrverband as lv","lv.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz AND lv.gruppe=lehre.tbl_stundenplan.gruppe AND lv.verband=lehre.tbl_stundenplan.verband AND lv.semester=lehre.tbl_stundenplan.semester","LEFT"); $this->addJoin("public.tbl_studiengang as sg","sg.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz","LEFT"); @@ -29,7 +29,7 @@ class Stundenplan_model extends DB_Model $res = hasData($res) ? getData($res): null; return $res; */ $this->db->where('ort_kurzbz','EDV_A2.06',true); - $this->db->where('datum','2024-05-21',true); + $this->db->where('datum >=','2024-05-21',true); $query = $this->db->get_compiled_select('lehre.vw_stundenplan sp'); diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js index adb571047..cc7aec2bb 100644 --- a/public/js/apps/Cis/RoomInformation.js +++ b/public/js/apps/Cis/RoomInformation.js @@ -37,12 +37,12 @@ const app = Vue.createApp({ }); events = res.data; //console.log("this are the room events",events) - //this.events = events; + this.events = events; } }).catch((e)=>{console.log(e,"this is the exception")}) }); - axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => { + /* axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => { let events; console.log(" this is the res of the api call stundenplan",res); @@ -65,7 +65,7 @@ const app = Vue.createApp({ }).catch((e)=>{console.log(e,"this is the exception")}) - + */ @@ -73,7 +73,13 @@ const app = Vue.createApp({ template: /*html*/`
- + +
+ {{event.orig.lv_info}} + {{event.orig.stg}} + {{event.orig.lektor}} +
+
`, }); diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js index eef39011a..cd0ec816e 100755 --- a/public/js/components/Calendar/Week/Page.js +++ b/public/js/components/Calendar/Week/Page.js @@ -112,7 +112,7 @@ export default {
{{hour}}:00
- +