From 3db82aea95d318bdaaf4b49c751a468642b8404e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Jun 2025 10:26:29 +0200
Subject: [PATCH] stundenplan/lvplan revert changes to stundenplan_model and
 stundenplandev_model

---
 .../models/ressource/Stundenplan_model.php    | 20 +++++++++----------
 .../models/ressource/Stundenplandev_model.php |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 92a42a1df..012ce0a57 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -33,12 +33,12 @@ class Stundenplan_model extends DB_Model
 		*/
 
 
-		$raum_lvplan= $this->execReadOnlyQuery("
+		$raum_stundenplan= $this->execReadOnlyQuery("
 		SELECT CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
 		", [$ort_kurzbz, $start_date, $end_date]);
 
-		return $raum_lvplan;
+		return $raum_stundenplan;
 	}
 
 	/**
@@ -136,11 +136,11 @@ class Stundenplan_model extends DB_Model
 
 	/**
 	 * groups rows of a subquery that fetches data from the lehre.vw_stundenplan table
-	 * @param string $lvplanViewQuery the subquery used to group the result
+	 * @param string $stundenplanViewQuery the subquery used to group the result
 	 *
 	 * @return stdClass
 	 */
-	public function lvPlanGruppierung($lvplanViewQuery)
+	public function stundenplanGruppierung($stundenplanViewQuery)
 	{
 		$query_result = $this->execReadOnlyQuery("
 		SELECT
@@ -173,7 +173,7 @@ class Stundenplan_model extends DB_Model
 			)) as organisationseinheit,
 			ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
 
-			FROM (".$lvplanViewQuery.") sp
+			FROM (".$stundenplanViewQuery.") sp
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
 
 		) as subquery
@@ -187,11 +187,11 @@ class Stundenplan_model extends DB_Model
 	}
 
 	/**
-	 * queries LvPlan but for a whole lva, irrespective of who is requesting it
+	 * queries Stundenplan but for a whole lva, irrespective of who is requesting it
 	 * 
 	 * @return void
 	 */
-	public function getLvPlanLVA($start_date, $end_date, $lv_id) {
+	public function getStundenplanLVA($start_date, $end_date, $lv_id) {
 		return $this->execReadOnlyQuery("
 	
 		SELECT
@@ -242,11 +242,11 @@ class Stundenplan_model extends DB_Model
 	}
 
 	/**
-	 * queries LvPlan and filters by assigned ma_kurzbz, very similar to get by LVA
+	 * queries Stundenplan and filters by assigned ma_kurzbz, very similar to get by LVA
 	 *
 	 * @return void
 	 */
-	public function getLvPlanMitarbeiter($start_date, $end_date, $ma_uid) {
+	public function getStundenplanMitarbeiter($start_date, $end_date, $ma_uid) {
 		return $this->execReadOnlyQuery("
 	
 		SELECT
@@ -302,7 +302,7 @@ class Stundenplan_model extends DB_Model
 	 *
 	 * @return mixed
 	 */
-	public function getLvPlanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
+	public function getStundenplanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
 		
 		// helper function to check if either $gruppen or $studentlehrverbaende are empty for each semester
 		$emptyCheck = function($toBeCheckedArray) use ($semester){
diff --git a/application/models/ressource/Stundenplandev_model.php b/application/models/ressource/Stundenplandev_model.php
index 1a74c6aa8..800540d60 100644
--- a/application/models/ressource/Stundenplandev_model.php
+++ b/application/models/ressource/Stundenplandev_model.php
@@ -65,7 +65,7 @@ class Stundenplandev_model extends DB_Model
 	}
 
     /**
-     * Get LvPlan data.
+     * Get Stundenplan data.
      *
      * @param null $lehrveranstaltung_id
      * @param null $studiensemester_kurzbz
@@ -75,7 +75,7 @@ class Stundenplandev_model extends DB_Model
      * @param false $nurBevorstehende If true, only future data is retrieved.
      * @return array|false|stdClass|null
      */
-    public function getLvPlanData($lehrveranstaltung_id=null, $studiensemester_kurzbz=null, $lehreinheit_id=null, $mitarbeiter_uid=null, $student_uid=null, $nurBevorstehende = false)
+    public function getStundenplanData($lehrveranstaltung_id=null, $studiensemester_kurzbz=null, $lehreinheit_id=null, $mitarbeiter_uid=null, $student_uid=null, $nurBevorstehende = false)
     {
         $params = array();