From e9312dfbb34b8305370ee1597fc9d2396dbd6b5b Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 15 Jul 2026 11:35:37 +0200
Subject: [PATCH] lvverwaltung new release

---
 application/controllers/api/frontend/v1/lv/Setup.php     | 6 +++---
 application/libraries/LektorLib.php                      | 9 ++++++---
 public/js/components/LVVerwaltung/Setup/Table.js         | 3 ++-
 .../components/Stv/Studentenverwaltung/Details/Noten.js  | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/lv/Setup.php b/application/controllers/api/frontend/v1/lv/Setup.php
index fa5b542bf..4b91b99c1 100644
--- a/application/controllers/api/frontend/v1/lv/Setup.php
+++ b/application/controllers/api/frontend/v1/lv/Setup.php
@@ -66,7 +66,7 @@ class Setup extends FHCAPI_Controller
 		);
 		$tabs['termine'] = array (
 			'title' =>  'Termine',
-			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Termine.js',
+			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Termine.js'),
 			'config' => []
 		);
 		$tabs['notiz'] = array (
@@ -86,12 +86,12 @@ class Setup extends FHCAPI_Controller
 	{
 		$tabs['termine'] = array (
 			'title' =>  'Termine',
-			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/LVTermine.js',
+			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/LVTermine.js'),
 			'config' => []
 		);
 		$tabs['noten'] = array (
 			'title' =>  'Noten',
-			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Noten.js',
+			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Noten.js'),
 			'config' => [
 				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
 				'edit' => 'both', // Possible values: both|header|inline
diff --git a/application/libraries/LektorLib.php b/application/libraries/LektorLib.php
index 7deed3a11..8a60e0aaa 100644
--- a/application/libraries/LektorLib.php
+++ b/application/libraries/LektorLib.php
@@ -165,12 +165,15 @@ class LektorLib
 			$oe_result = $this->_ci->OrganisationseinheitModel->getChilds($stundengrenze->oe_kurzbz);
 			$oe_array = hasData($oe_result) ? array_column(getData($oe_result), 'oe_kurzbz') : array();
 
+			$semesterstunden_alt_sql = is_null($semesterstunden_alt) ? 0 : $semesterstunden_alt;
+			$semesterstunden_neu_sql = is_null($semesterstunden_neu) ? 0 : $semesterstunden_neu;
+
 			if ($alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
-				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($semesterstunden_alt) + {$this->_ci->LehreinheitmitarbeiterModel->db->escape($semesterstunden_neu)}) as summe");
+				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($semesterstunden_alt_sql) + {$this->_ci->LehreinheitmitarbeiterModel->db->escape($semesterstunden_neu_sql)}) as summe");
 			else if ($alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
-				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($semesterstunden_alt)) as summe");
+				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($semesterstunden_alt_sql)) as summe");
 			else if (!$alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
-				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) + ({$this->_ci->LehreinheitmitarbeiterModel->db->escape($semesterstunden_neu)})) as summe");
+				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) + ({$this->_ci->LehreinheitmitarbeiterModel->db->escape($semesterstunden_neu_sql)})) as summe");
 			else if (!$alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
 				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden)) as summe");
 
diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index 0e2092723..751fe459a 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -54,6 +54,7 @@ export default {
 				if (this.$refs.table && this.$refs.table.tabulator)
 				{
 					this.expanded = [];
+					this.currentTreeLevel = 0;
 					this.reload();
 				}
 			},
@@ -141,7 +142,7 @@ export default {
 				},
 				layout: 'fitDataStretch',
 				height: '100%',
-				persistenceID: 'lehrveranstaltungen_2025_12_02_v1',
+				persistenceID: 'lehrveranstaltungen_2026_07_15_v1',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 				rowContextMenu: (component, e) => {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten.js
index 3217f192c..48863da9c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten.js
@@ -3,7 +3,7 @@ import NotenTeacher from './Noten/Teacher.js';
 import NotenRepeater from './Noten/Repeater.js';
 
 import ApiStvGrades from '../../../../api/factory/stv/grades.js';
-import { highlightGesamtnote } from "../../../../helpers/DocumentHelper";
+import { highlightGesamtnote } from "../../../../helpers/DocumentHelper.js";
 
 const LOCAL_STORAGE_ID = 'stv_details_noten_2024-11-25_stdsem_all';