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

adds the roomInformation Calendar to the menu and uses different template for the calendar page slot

Browse Source
This commit is contained in:
SimonGschnell
2024-05-31 12:28:06 +02:00
parent b9bd8e1d4d
commit 39321dcde3
5 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/components/Cis/Stundenplan.php
+1
View File
@@ -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);
application/models/content/Content_model.php
+9
View File
@@ -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": "<content><url><![CDATA[' . site_url('/CisVue/Cms/getRoomInformation') . ']]></url><target><![CDATA[]]></target></content>",
"menu_open": false,
"aktiv": true,
"childs": []
}
]
application/models/ressource/Stundenplan_model.php
+2 -2
View File
@@ -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');