From 1b49ea2a20469bac37567eda86d0e1f16d8a0c37 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 11 Oct 2022 08:23:49 +0200
Subject: [PATCH 001/149] - rt job angepasst

---
 .../controllers/jobs/ReihungstestJob.php      | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/application/controllers/jobs/ReihungstestJob.php b/application/controllers/jobs/ReihungstestJob.php
index ab6c429a0..58f84f830 100644
--- a/application/controllers/jobs/ReihungstestJob.php
+++ b/application/controllers/jobs/ReihungstestJob.php
@@ -727,33 +727,27 @@ class ReihungstestJob extends JOB_Controller
 			tbl_reihungstest.reihungstest_id,
 			tbl_studienplan.studienplan_id,
 			tbl_reihungstest.studiensemester_kurzbz,
-			tbl_studienordnung.studiengang_kz
+			tbl_studienordnung.studiengang_kz,
+			tbl_studienplan.orgform_kurzbz
 		FROM
 			public.tbl_reihungstest
-			JOIN public.tbl_rt_studienplan ON(tbl_rt_studienplan.reihungstest_id=tbl_reihungstest.reihungstest_id)
-			JOIN lehre.tbl_studienplan USING(studienplan_id)
-			JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+				JOIN public.tbl_rt_studienplan ON(tbl_rt_studienplan.reihungstest_id=tbl_reihungstest.reihungstest_id)
+				JOIN lehre.tbl_studienplan USING(studienplan_id)
+				JOIN lehre.tbl_studienordnung USING(studienordnung_id)
 		WHERE
-			NOT EXISTS(
-				SELECT 1 FROM lehre.tbl_studienplan_semester
-				WHERE studienplan_id=tbl_rt_studienplan.studienplan_id
-					AND tbl_studienplan_semester.studiensemester_kurzbz=tbl_reihungstest.studiensemester_kurzbz
-			)
+			EXISTS (
+				SELECT studienplan_id
+				FROM lehre.tbl_studienordnung sordnung
+					JOIN lehre.tbl_studienplan USING (studienordnung_id)
+					JOIN lehre.tbl_studienplan_semester USING (studienplan_id)
+				WHERE sordnung.studiengang_kz = tbl_studienordnung.studiengang_kz
+					AND tbl_studienplan_semester.studiensemester_kurzbz = tbl_reihungstest.studiensemester_kurzbz
+					AND tbl_studienplan.studienplan_id NOT IN
+					(
+						SELECT studienplan_id FROM tbl_rt_studienplan WHERE reihungstest_id = tbl_reihungstest.reihungstest_id
+					)
 			AND tbl_reihungstest.datum >= now()
-			AND NOT EXISTS(
-				SELECT
-					1
-				FROM
-					public.tbl_rt_studienplan rtstp
-					JOIN lehre.tbl_studienplan stp USING(studienplan_id)
-					JOIN lehre.tbl_studienordnung sto USING(studienordnung_id)
-					JOIN lehre.tbl_studienplan_semester stpsem USING(studienplan_id)
-				WHERE
-					sto.studiengang_kz=tbl_studienordnung.studiengang_kz
-					AND rtstp.reihungstest_id=tbl_reihungstest.reihungstest_id
-					AND stpsem.studiensemester_kurzbz=tbl_reihungstest.studiensemester_kurzbz
-			)
-		";
+          )";
 
 		$db = new DB_Model();
 		$result_rt = $db->execReadOnlyQuery($qry);
@@ -763,7 +757,9 @@ class ReihungstestJob extends JOB_Controller
 				// find an active studyplan for the same degree program with is valid in this semester
 				$result_stpl = $this->StudienplanModel->getStudienplaeneBySemester(
 					$row_rt->studiengang_kz,
-					$row_rt->studiensemester_kurzbz
+					$row_rt->studiensemester_kurzbz,
+					null,
+					$row_rt->orgform_kurzbz
 				);
 
 				if (hasData($result_stpl)) {

From a2c2eddf0dc8633eb7399b33d24de9f34be9d6b1 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 12 Oct 2022 11:18:05 +0200
Subject: [PATCH 002/149] - sql angepasst

---
 application/controllers/jobs/ReihungstestJob.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/jobs/ReihungstestJob.php b/application/controllers/jobs/ReihungstestJob.php
index 58f84f830..97a78fc41 100644
--- a/application/controllers/jobs/ReihungstestJob.php
+++ b/application/controllers/jobs/ReihungstestJob.php
@@ -746,8 +746,8 @@ class ReihungstestJob extends JOB_Controller
 					(
 						SELECT studienplan_id FROM tbl_rt_studienplan WHERE reihungstest_id = tbl_reihungstest.reihungstest_id
 					)
-			AND tbl_reihungstest.datum >= now()
-          )";
+			)
+			AND tbl_reihungstest.datum >= now()";
 
 		$db = new DB_Model();
 		$result_rt = $db->execReadOnlyQuery($qry);

From 9c0d70fe890d234aa2b44086fcfec4be0074a714 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Tue, 8 Nov 2022 12:01:05 +0100
Subject: [PATCH 003/149] Removed version 4 of tinymce

---
 composer.json |  12 --
 composer.lock | 424 +++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 386 insertions(+), 50 deletions(-)

diff --git a/composer.json b/composer.json
index 825ed5625..46f4edc39 100644
--- a/composer.json
+++ b/composer.json
@@ -270,17 +270,6 @@
 				}
 			}
 		},
-		{
-			"type": "package",
-			"package": {
-				"name": "tinymce/tinymce4",
-				"version": "4.9.11",
-				"dist": {
-					"url": "https://github.com/tinymce/tinymce-dist/archive/refs/tags/4.9.11.zip",
-					"type": "zip"
-				}
-			}
-		},
 		{
 			"type": "package",
 			"package": {
@@ -413,7 +402,6 @@
 		"scottjehl/respond": "1.4.2",
 
 		"tapmodo/jcrop": "2.0.4",
-		"tinymce/tinymce4": "4.9.*",
 		"tinymce/tinymce5": "5.10.*",
 		"tomazdragar/simplecropper": "1.0",
 		"twbs/bootstrap3": "3.4.*",
diff --git a/composer.lock b/composer.lock
index 72f13c76f..ce909eccc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d530cc4d7bd81812535eb64e87ba04f4",
+    "content-hash": "269157583af475d4c8cd307400c7b248",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -35,6 +35,10 @@
             ],
             "description": "Defacto way to enable use of HTML5 sectioning elements in legacy Internet Explorer.",
             "homepage": "http://paulirish.com/2011/the-history-of-the-html5-shiv/",
+            "support": {
+                "issues": "https://github.com/aFarkas/html5shiv/issues",
+                "source": "https://github.com/aFarkas/html5shiv/tree/3.7.3"
+            },
             "time": "2015-07-20T20:04:00+00:00"
         },
         {
@@ -130,6 +134,16 @@
             "keywords": [
                 "qr code"
             ],
+            "support": {
+                "issues": "https://github.com/chillerlan/php-qrcode/issues",
+                "source": "https://github.com/chillerlan/php-qrcode/tree/v2.0.x"
+            },
+            "funding": [
+                {
+                    "url": "https://ko-fi.com/codemasher",
+                    "type": "ko_fi"
+                }
+            ],
             "time": "2020-04-12T07:38:35+00:00"
         },
         {
@@ -178,6 +192,10 @@
                 "helper",
                 "trait"
             ],
+            "support": {
+                "issues": "https://github.com/chillerlan/php-traits/issues",
+                "source": "https://github.com/chillerlan/php-traits"
+            },
             "abandoned": true,
             "time": "2018-06-22T00:30:47+00:00"
         },
@@ -218,6 +236,10 @@
             ],
             "description": "REST Server for the CodeIgniter framework",
             "homepage": "https://github.com/chriskacerguis/codeigniter-restserver",
+            "support": {
+                "issues": "https://github.com/chriskacerguis/codeigniter-restserver/issues",
+                "source": "https://github.com/chriskacerguis/codeigniter-restserver"
+            },
             "time": "2017-09-23T16:44:55+00:00"
         },
         {
@@ -236,6 +258,10 @@
             },
             "type": "library",
             "notification-url": "https://packagist.org/downloads/",
+            "support": {
+                "issues": "https://github.com/akiyatkin/tablesorter/issues",
+                "source": "https://github.com/akiyatkin/tablesorter/tree/master"
+            },
             "time": "2016-09-02T11:31:54+00:00"
         },
         {
@@ -269,6 +295,13 @@
             ],
             "description": "The CodeIgniter framework",
             "homepage": "https://codeigniter.com",
+            "support": {
+                "forum": "http://forum.codeigniter.com/",
+                "issues": "https://github.com/bcit-ci/CodeIgniter/issues",
+                "slack": "https://codeigniterchat.slack.com",
+                "source": "https://github.com/bcit-ci/CodeIgniter",
+                "wiki": "https://github.com/bcit-ci/CodeIgniter/wiki"
+            },
             "time": "2022-03-03T13:21:49+00:00"
         },
         {
@@ -573,6 +606,10 @@
             ],
             "description": "Shim repository for Angular.js",
             "homepage": "http://angularjs.org",
+            "support": {
+                "issues": "https://github.com/components/angular.js/issues",
+                "source": "https://github.com/components/angular.js/tree/master"
+            },
             "time": "2015-06-07T20:10:38+00:00"
         },
         {
@@ -615,6 +652,13 @@
             ],
             "description": "jQuery JavaScript Library",
             "homepage": "http://jquery.com",
+            "support": {
+                "forum": "http://forum.jquery.com",
+                "irc": "irc://irc.freenode.org/jquery",
+                "issues": "https://github.com/jquery/jquery/issues",
+                "source": "https://github.com/jquery/jquery",
+                "wiki": "http://docs.jquery.com/"
+            },
             "time": "2021-03-20T19:13:42+00:00"
         },
         {
@@ -700,6 +744,10 @@
                 }
             ],
             "description": "jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library. Whether you're building highly interactive web applications or you just need to add a date picker to a form control, jQuery UI is the perfect choice.",
+            "support": {
+                "issues": "https://github.com/components/jqueryui/issues",
+                "source": "https://github.com/components/jqueryui/tree/master"
+            },
             "time": "2016-09-16T05:47:55+00:00"
         },
         {
@@ -749,6 +797,10 @@
                 "captcha",
                 "security"
             ],
+            "support": {
+                "issues": "https://github.com/dapphp/securimage/issues",
+                "source": "https://github.com/dapphp/securimage/tree/master"
+            },
             "abandoned": true,
             "time": "2018-03-09T06:07:41+00:00"
         },
@@ -812,6 +864,12 @@
                 "rdfa",
                 "sparql"
             ],
+            "support": {
+                "forum": "http://groups.google.com/group/easyrdf/",
+                "irc": "irc://chat.freenode.net/easyrdf",
+                "issues": "http://github.com/njh/easyrdf/issues",
+                "source": "https://github.com/easyrdf/easyrdf/tree/0.9.1"
+            },
             "time": "2015-02-27T09:45:49+00:00"
         },
         {
@@ -890,6 +948,10 @@
                 "faker",
                 "fixtures"
             ],
+            "support": {
+                "issues": "https://github.com/fzaninotto/Faker/issues",
+                "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2"
+            },
             "abandoned": true,
             "time": "2020-12-11T09:56:16+00:00"
         },
@@ -1012,6 +1074,10 @@
                 "json",
                 "schema"
             ],
+            "support": {
+                "issues": "https://github.com/justinrainbow/json-schema/issues",
+                "source": "https://github.com/justinrainbow/json-schema/tree/master"
+            },
             "time": "2014-08-25T02:48:14+00:00"
         },
         {
@@ -1046,6 +1112,10 @@
                 }
             ],
             "description": "A framework-agnostic PHP Implementation for generating simple forms based on json-schema",
+            "support": {
+                "issues": "https://github.com/kingsquare/json-schema-form/issues",
+                "source": "https://github.com/kingsquare/json-schema-form/tree/master"
+            },
             "time": "2014-07-10T12:27:19+00:00"
         },
         {
@@ -1106,6 +1176,10 @@
             "keywords": [
                 "markdown"
             ],
+            "support": {
+                "issues": "https://github.com/michelf/php-markdown/issues",
+                "source": "https://github.com/michelf/php-markdown/tree/lib"
+            },
             "time": "2015-03-01T12:03:08+00:00"
         },
         {
@@ -1153,20 +1227,24 @@
                 "uri",
                 "url"
             ],
+            "support": {
+                "issues": "https://github.com/lanthaler/IRI/issues",
+                "source": "https://github.com/lanthaler/IRI/tree/master"
+            },
             "time": "2014-01-21T13:43:39+00:00"
         },
         {
             "name": "ml/json-ld",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lanthaler/JsonLD.git",
-                "reference": "c74a1aed5979ed1cfb1be35a55a305fd30e30b93"
+                "reference": "537e68e87a6bce23e57c575cd5dcac1f67ce25d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/c74a1aed5979ed1cfb1be35a55a305fd30e30b93",
-                "reference": "c74a1aed5979ed1cfb1be35a55a305fd30e30b93",
+                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/537e68e87a6bce23e57c575cd5dcac1f67ce25d8",
+                "reference": "537e68e87a6bce23e57c575cd5dcac1f67ce25d8",
                 "shasum": ""
             },
             "require": {
@@ -1202,7 +1280,11 @@
                 "JSON-LD",
                 "jsonld"
             ],
-            "time": "2020-06-16T17:45:06+00:00"
+            "support": {
+                "issues": "https://github.com/lanthaler/JsonLD/issues",
+                "source": "https://github.com/lanthaler/JsonLD/tree/1.2.1"
+            },
+            "time": "2022-09-29T08:45:17+00:00"
         },
         {
             "name": "moment/momentjs",
@@ -1262,6 +1344,14 @@
                 "sorting",
                 "table"
             ],
+            "support": {
+                "docs": "https://mottie.github.io/tablesorter/docs/index.html",
+                "email": "wowmotty@gmail.com",
+                "irc": "irc://irc.freenode.org/tablesorter",
+                "issues": "https://github.com/Mottie/tablesorter/issues",
+                "source": "https://github.com/Mottie/tablesorter",
+                "wiki": "https://github.com/Mottie/tablesorter/wiki"
+            },
             "time": "2020-03-03T13:46:03+00:00"
         },
         {
@@ -1312,6 +1402,10 @@
                 "rest",
                 "restful"
             ],
+            "support": {
+                "issues": "https://github.com/nategood/httpful/issues",
+                "source": "https://github.com/nategood/httpful/tree/v0.2.20"
+            },
             "time": "2015-10-26T16:11:30+00:00"
         },
         {
@@ -1365,6 +1459,12 @@
                 "plaintext",
                 "textile"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/textile",
+                "issues": "https://github.com/textile/php-textile/issues",
+                "source": "https://github.com/textile/php-textile",
+                "wiki": "https://github.com/textile/php-textile/wiki"
+            },
             "time": "2022-05-01T17:05:16+00:00"
         },
         {
@@ -1420,16 +1520,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.37",
+            "version": "2.0.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c"
+                "reference": "f3a0e2b715c40cf1fd270d444901b63311725d63"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
-                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/f3a0e2b715c40cf1fd270d444901b63311725d63",
+                "reference": "f3a0e2b715c40cf1fd270d444901b63311725d63",
                 "shasum": ""
             },
             "require": {
@@ -1444,7 +1544,8 @@
                 "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
                 "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
                 "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
+                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
+                "ext-xml": "Install the XML extension to load XML formatted public keys."
             },
             "type": "library",
             "autoload": {
@@ -1507,7 +1608,25 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2022-04-04T04:57:45+00:00"
+            "support": {
+                "issues": "https://github.com/phpseclib/phpseclib/issues",
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.39"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/terrafrost",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpseclib",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-10-24T10:49:03+00:00"
         },
         {
             "name": "rmariuzzo/jquery-checkboxes",
@@ -1587,6 +1706,23 @@
                 "polyfill",
                 "portable"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T09:01:57+00:00"
         },
         {
@@ -1598,15 +1734,6 @@
             },
             "type": "library"
         },
-        {
-            "name": "tinymce/tinymce4",
-            "version": "4.9.11",
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/tinymce/tinymce-dist/archive/refs/tags/4.9.11.zip"
-            },
-            "type": "library"
-        },
         {
             "name": "tinymce/tinymce5",
             "version": "5.10.3",
@@ -1706,6 +1833,10 @@
             "keywords": [
                 "templating"
             ],
+            "support": {
+                "issues": "https://github.com/twigphp/Twig/issues",
+                "source": "https://github.com/twigphp/Twig/tree/1.x"
+            },
             "time": "2020-02-11T05:59:23+00:00"
         },
         {
@@ -1779,6 +1910,24 @@
                 "regex",
                 "regular expression"
             ],
+            "support": {
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/1.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2022-01-21T20:24:37+00:00"
         },
         {
@@ -1826,20 +1975,39 @@
                 "Xdebug",
                 "performance"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/xdebug-handler/issues",
+                "source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2022-02-24T20:20:32+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.14.0",
+            "version": "v4.15.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
                 "shasum": ""
             },
             "require": {
@@ -1878,20 +2046,24 @@
                 "parser",
                 "php"
             ],
-            "time": "2022-05-31T20:59:12+00:00"
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
+            },
+            "time": "2022-09-04T07:30:47+00:00"
         },
         {
             "name": "pdepend/pdepend",
-            "version": "2.10.3",
+            "version": "2.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "da3166a06b4a89915920a42444f707122a1584c9"
+                "reference": "7a892d56ceafd804b4a2ecc85184640937ce9e84"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/da3166a06b4a89915920a42444f707122a1584c9",
-                "reference": "da3166a06b4a89915920a42444f707122a1584c9",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/7a892d56ceafd804b4a2ecc85184640937ce9e84",
+                "reference": "7a892d56ceafd804b4a2ecc85184640937ce9e84",
                 "shasum": ""
             },
             "require": {
@@ -1925,26 +2097,36 @@
                 "BSD-3-Clause"
             ],
             "description": "Official version of pdepend to be handled with Composer",
-            "time": "2022-02-23T07:53:09+00:00"
+            "support": {
+                "issues": "https://github.com/pdepend/pdepend/issues",
+                "source": "https://github.com/pdepend/pdepend/tree/2.12.1"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/pdepend/pdepend",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-09-08T19:30:37+00:00"
         },
         {
             "name": "phpmd/phpmd",
-            "version": "2.12.0",
+            "version": "2.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec"
+                "reference": "dad0228156856b3ad959992f9748514fa943f3e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/c0b678ba71902f539c27c14332aa0ddcf14388ec",
-                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/dad0228156856b3ad959992f9748514fa943f3e3",
+                "reference": "dad0228156856b3ad959992f9748514fa943f3e3",
                 "shasum": ""
             },
             "require": {
                 "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
                 "ext-xml": "*",
-                "pdepend/pdepend": "^2.10.3",
+                "pdepend/pdepend": "^2.12.1",
                 "php": ">=5.3.9"
             },
             "require-dev": {
@@ -1997,7 +2179,18 @@
                 "phpmd",
                 "pmd"
             ],
-            "time": "2022-03-24T13:33:01+00:00"
+            "support": {
+                "irc": "irc://irc.freenode.org/phpmd",
+                "issues": "https://github.com/phpmd/phpmd/issues",
+                "source": "https://github.com/phpmd/phpmd/tree/2.13.0"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpmd/phpmd",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-09-10T08:44:15+00:00"
         },
         {
             "name": "phpmetrics/phpmetrics",
@@ -2061,6 +2254,10 @@
                 "quality",
                 "testing"
             ],
+            "support": {
+                "issues": "https://github.com/PhpMetrics/PhpMetrics/issues",
+                "source": "https://github.com/phpmetrics/PhpMetrics/tree/v2.8.1"
+            },
             "time": "2022-03-24T10:19:51+00:00"
         },
         {
@@ -2110,6 +2307,10 @@
             "keywords": [
                 "timer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/master"
+            },
             "time": "2017-02-26T11:10:40+00:00"
         },
         {
@@ -2159,6 +2360,10 @@
                 "container-interop",
                 "psr"
             ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/master"
+            },
             "time": "2017-02-14T16:28:37+00:00"
         },
         {
@@ -2206,6 +2411,9 @@
                 "psr",
                 "psr-3"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
             "time": "2021-05-03T11:20:27+00:00"
         },
         {
@@ -2245,6 +2453,10 @@
             ],
             "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
             "homepage": "https://github.com/sebastianbergmann/finder-facade",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/finder-facade/issues",
+                "source": "https://github.com/sebastianbergmann/finder-facade/tree/master"
+            },
             "abandoned": true,
             "time": "2017-11-18T17:31:49+00:00"
         },
@@ -2296,6 +2508,10 @@
             ],
             "description": "Copy/Paste Detector (CPD) for PHP code.",
             "homepage": "https://github.com/sebastianbergmann/phpcpd",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpcpd/issues",
+                "source": "https://github.com/sebastianbergmann/phpcpd/tree/master"
+            },
             "time": "2017-11-16T08:49:28+00:00"
         },
         {
@@ -2339,6 +2555,10 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/master"
+            },
             "time": "2016-10-03T07:35:21+00:00"
         },
         {
@@ -2390,6 +2610,11 @@
                 "phpcs",
                 "standards"
             ],
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
             "time": "2021-12-12T21:44:58+00:00"
         },
         {
@@ -2449,6 +2674,23 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/config/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2516,6 +2758,23 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2567,6 +2826,23 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/debug/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "abandoned": "symfony/error-handler",
             "time": "2020-10-24T10:57:07+00:00"
         },
@@ -2634,6 +2910,23 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/dependency-injection/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2679,6 +2972,23 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2723,6 +3033,23 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-11-16T17:02:08+00:00"
         },
         {
@@ -2786,6 +3113,23 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T09:01:57+00:00"
         },
         {
@@ -2829,6 +3173,10 @@
             ],
             "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
             "homepage": "https://github.com/theseer/fDOMDocument",
+            "support": {
+                "issues": "https://github.com/theseer/fDOMDocument/issues",
+                "source": "https://github.com/theseer/fDOMDocument/tree/1.6.7"
+            },
             "abandoned": true,
             "time": "2022-01-25T23:10:35+00:00"
         }
@@ -2842,5 +3190,5 @@
         "php": ">=5.6.40"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }

From ac1df7691a72d95e33b48e33426ffdb3da03870e Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Fri, 11 Nov 2022 13:54:25 +0100
Subject: [PATCH 004/149] - Added new view
 application/views/system/messages/FAShtmlWriteTemplate.php to be used with
 FAS/SeaMonkey and TinyMCE3 - Replaced TinyMCE V4 with V5 - Dropped TinyMCE V4
 - Added new JS public/js/messaging/fasMessageWrite.js to be included by
 application/views/system/messages/FAShtmlWriteTemplate.php

---
 .../system/messages/FASMessages.php           |   4 +-
 application/views/person/bpk/bpkDetails.php   |   1 -
 .../system/infocenter/infocenterDetails.php   |   2 +-
 .../infocenter/infocenterZgvDetails.php       |   2 +-
 .../system/messages/FAShtmlWriteTemplate.php  | 197 ++++++++++++++++++
 .../views/system/messages/ajaxRead.php        |   2 +-
 .../views/system/messages/ajaxWrite.php       |   2 +-
 .../views/system/messages/ajaxWriteReply.php  |   2 +-
 .../views/system/messages/htmlWriteReply.php  |   2 +-
 .../system/messages/htmlWriteTemplate.php     |   2 +-
 .../views/system/vorlage/templatetextEdit.php |   2 +-
 application/views/templates/FHC-Common.php    |   2 +-
 application/views/templates/FHC-Footer.php    |   4 +-
 application/views/templates/FHC-Header.php    |   3 -
 application/views/templates/header.php        |   2 +-
 application/views/widgets/tinymce.php         |   5 +-
 public/css/{TinyMCE.css => TinyMCE5.css}      |   0
 public/js/messaging/fasMessageWrite.js        | 140 +++++++++++++
 public/js/messaging/messageWrite.js           |  11 +-
 public/js/messaging/write.js                  |   2 +-
 20 files changed, 363 insertions(+), 24 deletions(-)
 create mode 100644 application/views/system/messages/FAShtmlWriteTemplate.php
 rename public/css/{TinyMCE.css => TinyMCE5.css} (100%)
 create mode 100644 public/js/messaging/fasMessageWrite.js

diff --git a/application/controllers/system/messages/FASMessages.php b/application/controllers/system/messages/FASMessages.php
index 55d1da25f..e2169af9b 100644
--- a/application/controllers/system/messages/FASMessages.php
+++ b/application/controllers/system/messages/FASMessages.php
@@ -37,7 +37,7 @@ class FASMessages extends Auth_Controller
 
 		// Loads the view to write a new message with a template
 		$this->load->view(
-			'system/messages/htmlWriteTemplate',
+			'system/messages/FAShtmlWriteTemplate',
 			$this->CLMessagesModel->prepareHtmlWriteTemplatePrestudents($prestudents)
 		);
  	}
@@ -53,7 +53,7 @@ class FASMessages extends Auth_Controller
 
 		// Loads the view to write a new message with a template
 		$this->load->view(
-			'system/messages/htmlWriteTemplate',
+			'system/messages/FAShtmlWriteTemplate',
 			$this->CLMessagesModel->prepareHtmlWriteTemplatePrestudents($prestudents, $message_id, $recipient_id)
 		);
  	}
diff --git a/application/views/person/bpk/bpkDetails.php b/application/views/person/bpk/bpkDetails.php
index 198065c24..6b7d4430d 100644
--- a/application/views/person/bpk/bpkDetails.php
+++ b/application/views/person/bpk/bpkDetails.php
@@ -9,7 +9,6 @@
 			'jqueryui1' => true,
 			'ajaxlib' => true,
 			'tablesorter2' => true,
-			'tinymce4' => true,
 			'sbadmintemplate3' => true,
 			'addons' => true,
 			'navigationwidget' => true,
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php
index 158feeb2c..15eca90c2 100644
--- a/application/views/system/infocenter/infocenterDetails.php
+++ b/application/views/system/infocenter/infocenterDetails.php
@@ -8,7 +8,7 @@
 		'dialoglib' => true,
 		'ajaxlib' => true,
 		'tablesorter2' => true,
-		'tinymce4' => true,
+		'tinymce5' => true,
 		'sbadmintemplate3' => true,
 		'addons' => true,
 		'navigationwidget' => true,
diff --git a/application/views/system/infocenter/infocenterZgvDetails.php b/application/views/system/infocenter/infocenterZgvDetails.php
index cf3ffad8b..bf9f69e18 100644
--- a/application/views/system/infocenter/infocenterZgvDetails.php
+++ b/application/views/system/infocenter/infocenterZgvDetails.php
@@ -10,7 +10,7 @@
 			'dialoglib' => true,
 			'ajaxlib' => true,
 			'tablesorter2' => true,
-			'tinymce4' => true,
+			'tinymce5' => true,
 			'sbadmintemplate3' => true,
 			'addons' => true,
 			'navigationwidget' => true,
diff --git a/application/views/system/messages/FAShtmlWriteTemplate.php b/application/views/system/messages/FAShtmlWriteTemplate.php
new file mode 100644
index 000000000..691629c10
--- /dev/null
+++ b/application/views/system/messages/FAShtmlWriteTemplate.php
@@ -0,0 +1,197 @@
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Write a new message or reply using templates',
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'bootstrap3' => true,
+			'ajaxlib' => true,
+			'fontawesome4' => true,
+			'tinymce3' => true,
+			'sbadmintemplate3' => true,
+			'dialoglib' => true,
+			'widgets' => true,
+			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/fasMessageWrite.js')
+		)
+	);
+?>
+<body>
+	<div id="wrapper">
+		<div id="page-wrapper">
+			<div class="container-fluid">
+				<div class="row">
+					<div class="col-lg-12">
+						<h3 class="page-header">
+
+							<?php echo ucfirst($this->p->t('ui', 'nachrichtSenden')); ?>
+
+						</h3>
+					</div>
+				</div>
+				<form id="sendForm" method="post" action="<?php echo site_url('/system/messages/Messages/sendImplicitTemplate'); ?>">
+					<div class="row">
+						<div class="form-group">
+							<div class="col-lg-1 msgfieldcol-left">
+								<label>
+
+									<?php echo ucfirst($this->p->t('global', 'empfaenger')); ?>:
+
+								</label>
+							</div>
+							<div class="col-lg-11 msgfieldcol-right">
+								<?php echo $recipientsList; ?>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="form-group">
+							<div class="col-lg-1 msgfield msgfieldcol-left">
+								<label>
+
+									<?php echo ucfirst($this->p->t('global', 'betreff')); ?>:
+
+								</label>
+							</div>
+							&nbsp;
+							<div class="col-lg-7">
+								<input id="subject" class="form-control" type="text" value="<?php echo $subject; ?>" name="subject">
+							</div>
+						</div>
+					</div>
+					<br>
+					<div class="row">
+						<div class="col-lg-9">
+							<label>
+
+								<?php echo ucfirst($this->p->t('global', 'nachricht')); ?>:
+
+							</label>
+							<textarea id="bodyTextArea" name="body">
+
+								<?php echo $body; ?>
+
+							</textarea>
+						</div>
+						<div class="col-lg-3">
+							<div class="form-group">
+								<label>
+
+									<?php echo ucfirst($this->p->t('ui', 'felder')); ?>:
+
+								</label>
+
+								<?php
+                                    $size = count($variables) > 19 ? 19 : count($variables);
+									echo $this->widgetlib->widget(
+										'MultipleDropdown_widget',
+										array('elements' => success($variables)),
+										array(
+											'name' => 'variables[]',
+											'id' => 'variables',
+											'size' => $size,
+											'multiple' => true
+										)
+									);
+								?>
+							</div>
+                            <br>
+                            <div class="form-group">
+                                <label>
+									
+									<?php echo ucfirst($this->p->t('ui', 'meineFelder')); ?>:
+
+                                </label>
+								
+								<?php
+								$size = count($user_fields) > 5 ? 5 : count($user_fields);
+								echo $this->widgetlib->widget(
+									'MultipleDropdown_widget',
+									array('elements' => success($user_fields)),
+									array(
+										'name' => 'user_fields[]',
+										'id' => 'user_fields',
+										'size' => $size,
+										'multiple' => true
+									)
+								);
+								?>
+                            </div>
+						</div>
+					</div>
+					<br>
+					<div class="row">
+						<div class="col-xs-3">
+
+							<?php
+								echo $this->widgetlib->widget(
+									'Vorlage_widget',
+									array('oe_kurzbz' => $organisationUnits, 'isAdmin' => $senderIsAdmin),
+									array('name' => 'vorlage', 'id' => 'vorlageDnD')
+								);
+							?>
+
+						</div>
+						<div class="col-xs-6">
+							<button id="sendButton" class="btn btn-default pull-right" type="button">
+
+								<?php echo $this->p->t('ui', 'senden'); ?>
+
+							</button>
+						</div>
+					</div>
+                    <br>
+						<hr>
+						<div class="row">
+							<div class="col-lg-12">
+								<label>
+
+									<?php echo ucfirst($this->p->t('global', 'vorschau')); ?>:
+
+								</label>
+							</div>
+						</div>
+						<div class="well" id="templatePreviewDiv">
+							<div class="row">
+								<div class="col-sm-12" style="display: inline">
+									<div class="form-group form-inline">
+										<div class="input-group">
+										<?php
+											echo $this->widgetlib->widget(
+												'Dropdown_widget',
+												array(
+													'elements' => success($recipientsArray),
+													'emptyElement' => ucfirst($this->p->t('global', 'empfaenger')).'...'
+												),
+												array(
+													'name' => 'recipients[]',
+													'id' => 'recipients'
+												)
+											);
+										?>
+											<span class="input-group-btn">
+												<a class="btn btn-default" href="#templatePreviewDiv" id="refresh">
+													<?php echo ucfirst($this->p->t('ui', 'refresh')); ?>
+												</a>
+											</span>
+										</div>
+									</div>
+								</div>
+							</div>
+							<br>
+							<textarea id="tinymcePreview"></textarea>
+						</div>
+
+					<?php echo $recipients_ids; ?>
+					<?php echo $relationmessage_id; ?>
+					<?php echo $type; ?>
+
+				</form>
+			</div>
+		</div>
+	</div>
+</body>
+
+<?php $this->load->view("templates/FHC-Footer"); ?>
+
diff --git a/application/views/system/messages/ajaxRead.php b/application/views/system/messages/ajaxRead.php
index 2cb88708e..4c1a77deb 100644
--- a/application/views/system/messages/ajaxRead.php
+++ b/application/views/system/messages/ajaxRead.php
@@ -12,7 +12,7 @@
 			'tabulator4' => true,
 			'ajaxlib' => true,
 			'dialoglib' => true,
-			'tinymce4' => true,
+			'tinymce5' => true,
 			'phrases' => array('global', 'ui'),
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/read.js')
diff --git a/application/views/system/messages/ajaxWrite.php b/application/views/system/messages/ajaxWrite.php
index 3b1582f22..b3a598506 100644
--- a/application/views/system/messages/ajaxWrite.php
+++ b/application/views/system/messages/ajaxWrite.php
@@ -10,7 +10,7 @@
 			'sbadmintemplate3' => true,
 			'ajaxlib' => true,
 			'dialoglib' => true,
-			'tinymce4' => true,
+			'tinymce5' => true,
 			'phrases' => array('global', 'ui'),
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/write.js')
diff --git a/application/views/system/messages/ajaxWriteReply.php b/application/views/system/messages/ajaxWriteReply.php
index 0a496c93e..08dc188fa 100644
--- a/application/views/system/messages/ajaxWriteReply.php
+++ b/application/views/system/messages/ajaxWriteReply.php
@@ -10,7 +10,7 @@
 			'sbadmintemplate3' => true,
 			'ajaxlib' => true,
 			'dialoglib' => true,
-			'tinymce4' => true,
+			'tinymce5' => true,
 			'phrases' => array('global', 'ui'),
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/writeReply.js')
diff --git a/application/views/system/messages/htmlWriteReply.php b/application/views/system/messages/htmlWriteReply.php
index 9106d802b..d2150c1fb 100644
--- a/application/views/system/messages/htmlWriteReply.php
+++ b/application/views/system/messages/htmlWriteReply.php
@@ -6,7 +6,7 @@
 			'jquery3' => true,
 			'bootstrap3' => true,
 			'fontawesome4' => true,
-			'tinymce4' => true,
+			'tinymce5' => true,
 			'sbadmintemplate3' => true,
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/messageWriteReply.js')
diff --git a/application/views/system/messages/htmlWriteTemplate.php b/application/views/system/messages/htmlWriteTemplate.php
index 761e05f96..42a31f374 100644
--- a/application/views/system/messages/htmlWriteTemplate.php
+++ b/application/views/system/messages/htmlWriteTemplate.php
@@ -8,7 +8,7 @@
 			'bootstrap3' => true,
 			'ajaxlib' => true,
 			'fontawesome4' => true,
-			'tinymce4' => true,
+			'tinymce5' => true,
 			'sbadmintemplate3' => true,
 			'dialoglib' => true,
 			'widgets' => true,
diff --git a/application/views/system/vorlage/templatetextEdit.php b/application/views/system/vorlage/templatetextEdit.php
index 42efc1519..cc2487959 100644
--- a/application/views/system/vorlage/templatetextEdit.php
+++ b/application/views/system/vorlage/templatetextEdit.php
@@ -1,5 +1,5 @@
 <?php
-	$this->load->view('templates/header', array('title' => 'VorlageEdit', 'tinymce4' => true, 'jsonforms' => true));
+	$this->load->view('templates/header', array('title' => 'VorlageEdit', 'tinymce5' => true, 'jsonforms' => true));
 ?>
 
 <div class="row">
diff --git a/application/views/templates/FHC-Common.php b/application/views/templates/FHC-Common.php
index dd1d8ae1c..27282bc11 100644
--- a/application/views/templates/FHC-Common.php
+++ b/application/views/templates/FHC-Common.php
@@ -23,7 +23,7 @@
 	$tablesorter2 = isset($tablesorter2) ? $tablesorter2 : false;
 	$tabulator4 = isset($tabulator4) ? $tabulator4 : false;
 	$tabulator5 = isset($tabulator5) ? $tabulator5 : false;
-	$tinymce4 = isset($tinymce4) ? $tinymce4 : false;
+	$tinymce3 = isset($tinymce3) ? $tinymce3 : false;
 	$tinymce5 = isset($tinymce5) ? $tinymce5 : false;
 	$vue3 = isset($vue3) ? $vue3 : false;
 	$primevue3 = isset($primevue3) ? $primevue3 : false;
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index 0c3782fea..ee13c69d2 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -100,8 +100,8 @@
 	// Tabulator 5 JS
 	if ($tabulator5 === true) generateJSsInclude('vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js');
 
-	// Tinymce 4 JS
-	if ($tinymce4 === true) generateJSsInclude('vendor/tinymce/tinymce4/tinymce.min.js');
+	// Tinymce 3 JS
+	if ($tinymce3 === true) generateJSsInclude('include/tiny_mce/tiny_mce.js');
 
 	// Tinymce 5 JS
 	if ($tinymce5 === true) generateJSsInclude('vendor/tinymce/tinymce5/tinymce.min.js');
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index aa63541c5..47eea34ec 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -79,9 +79,6 @@
 			// Tabulator 5 CSS
 			if ($tabulator5 === true) generateCSSsInclude('vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css');
 
-			// Tinymce 4 CSS
-			if ($tinymce4 === true) generateCSSsInclude('public/css/TinyMCE4.css');
-
 			// Tinymce 5 CSS
 			if ($tinymce5 === true) generateCSSsInclude('public/css/TinyMCE5.css');
 
diff --git a/application/views/templates/header.php b/application/views/templates/header.php
index 637eb3c7a..e75acca4f 100644
--- a/application/views/templates/header.php
+++ b/application/views/templates/header.php
@@ -95,7 +95,7 @@ if($jqueryV1 && $jqueryV2) show_error("Two JQuery versions used: composer and in
 <?php endif ?>
 
 <?php if($tinymce) : ?>
-	<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce4/tinymce.min.js');?>"></script>
+	<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce5/tinymce.min.js');?>"></script>
 <?php endif ?>
 
 <?php if($textile) : ?>
diff --git a/application/views/widgets/tinymce.php b/application/views/widgets/tinymce.php
index 3e2093e55..618cb4836 100644
--- a/application/views/widgets/tinymce.php
+++ b/application/views/widgets/tinymce.php
@@ -5,5 +5,6 @@
 		plugins: [<?php echo $plugins; ?>],
 		toolbar: "<?php echo $toolbar; ?>"
 	});
-	</script>
-	<<?=$selector?> name="<?=$name?>" style="<?=$style?>"><?=$text?></<?=$selector?>>
+</script>
+<<?=$selector?> name="<?=$name?>" style="<?=$style?>"><?=$text?></<?=$selector?>>
+
diff --git a/public/css/TinyMCE.css b/public/css/TinyMCE5.css
similarity index 100%
rename from public/css/TinyMCE.css
rename to public/css/TinyMCE5.css
diff --git a/public/js/messaging/fasMessageWrite.js b/public/js/messaging/fasMessageWrite.js
new file mode 100644
index 000000000..d32f80fac
--- /dev/null
+++ b/public/js/messaging/fasMessageWrite.js
@@ -0,0 +1,140 @@
+// ********************************************************
+// JS used by view system/messages/htmlWriteTemplate
+// ********************************************************
+
+function tinymcePreviewSetContent()
+{
+	if ($("#tinymcePreview"))
+	{
+		if ($("#recipients").children(":selected").val() > -1)
+		{
+			parseMessageText($("#recipients").children(":selected").val(), tinyMCE.get("bodyTextArea").getContent());
+		}
+		else
+		{
+			tinyMCE.get("tinymcePreview").setContent("");
+		}
+	}
+}
+
+function parseMessageText(receiver_id, text)
+{
+	FHC_AjaxClient.ajaxCallPost(
+		"system/messages/Messages/parseMessageText",
+		{
+			receiver_id: receiver_id,
+			text: text,
+			type: $("#type").val()
+		},
+		{
+			successCallback: function(data, textStatus, jqXHR) {
+
+				if (FHC_AjaxClient.hasData(data))
+				{
+					tinyMCE.get("tinymcePreview").setContent(FHC_AjaxClient.getData(data));
+				}
+				else if (FHC_AjaxClient.isError(data))
+				{
+					FHC_DialogLib.alertError(data.retval);
+				}
+			}
+		}
+	);
+}
+
+$(document).ready(function ()
+{
+
+	tinymce.init({
+		theme : "advanced",
+		mode : "textareas"
+	});
+
+	if ($("#variables"))
+	{
+		$("#variables").dblclick(function ()
+		{
+			if ($("#bodyTextArea"))
+			{
+				//if editor active add at cursor position, otherwise at end
+				if (tinymce.activeEditor.id === "bodyTextArea")
+					tinymce.activeEditor.execCommand('mceInsertContent', false, $(this).children(":selected").val());
+				else
+					tinyMCE.get("bodyTextArea").setContent(tinyMCE.get("bodyTextArea").getContent() + $(this).children(":selected").val());
+			}
+		});
+	}
+
+	if ($("#user_fields"))
+	{
+		$("#user_fields").dblclick(function ()
+		{
+			if ($("#bodyTextArea"))
+			{
+				//if editor active add at cursor position, otherwise at end
+				if (tinymce.activeEditor.id === "bodyTextArea")
+					tinymce.activeEditor.execCommand('mceInsertContent', false, $(this).children(":selected").val());
+				else
+					tinyMCE.get("bodyTextArea").setContent(tinyMCE.get("bodyTextArea").getContent() + $(this).children(":selected").val());
+			}
+		});
+	}
+
+	if ($("#recipients"))
+	{
+		$("#recipients").change(tinymcePreviewSetContent);
+	}
+
+	if ($("#refresh"))
+	{
+		$("#refresh").click(tinymcePreviewSetContent);
+	}
+
+	if ($("#sendButton") && $("#sendForm"))
+	{
+		$("#sendButton").click(function ()
+		{
+			if ($("#subject") && $("#subject").val() != '' && tinyMCE.get("bodyTextArea").getContent() != '')
+			{
+				$("#sendForm").submit();
+			}
+			else
+			{
+				FHC_DialogLib.alertInfo("Subject and text are required fields!");
+			}
+		});
+	}
+
+	if ($("#vorlageDnD"))
+	{
+		$("#vorlageDnD").change(function ()
+		{
+			var vorlage_kurzbz = this.value;
+
+			if (vorlage_kurzbz != '')
+			{
+				FHC_AjaxClient.ajaxCallGet(
+					"system/messages/Messages/getVorlage",
+					{
+						vorlage_kurzbz: vorlage_kurzbz
+					},
+					{
+						successCallback: function(data, textStatus, jqXHR) {
+
+							if (FHC_AjaxClient.hasData(data))
+							{
+								var msg = FHC_AjaxClient.getData(data);
+
+								tinyMCE.get("bodyTextArea").setContent(msg[0].text);
+								$("#subject").val(msg[0].subject);
+							}
+						}
+					}
+				);
+			}
+		});
+	}
+
+	$("#subject").focus();
+
+});
diff --git a/public/js/messaging/messageWrite.js b/public/js/messaging/messageWrite.js
index 8b1d73bdf..382e79948 100644
--- a/public/js/messaging/messageWrite.js
+++ b/public/js/messaging/messageWrite.js
@@ -42,8 +42,8 @@ function parseMessageText(receiver_id, text)
 	);
 }
 
-$(document).ready(function ()
-{
+$(document).ready(function () {
+
 	tinymce.init({
 		selector: "#bodyTextArea",
 		plugins: "autoresize",
@@ -60,7 +60,12 @@ $(document).ready(function ()
 		menubar: false,
 		toolbar: false,
 		statusbar: false,
-		readonly: 1
+		readonly: 1,
+		autoresize_on_init: false,
+		autoresize_min_height: 400,
+		autoresize_max_height: 700,
+		autoresize_bottom_margin: 10,
+		auto_focus: "bodyTextArea"
 	});
 
 	if ($("#variables"))
diff --git a/public/js/messaging/write.js b/public/js/messaging/write.js
index 1370fb2e0..bff451c2e 100644
--- a/public/js/messaging/write.js
+++ b/public/js/messaging/write.js
@@ -63,7 +63,7 @@ $(document).ready(function () {
 	tinymce.init({
 		selector: "#body",
 		plugins: "autoresize",
-		autoresize_min_height: 150,
+		autoresize_min_height: 300,
 		autoresize_max_height: 600,
 		autoresize_bottom_margin: 10
 	});

From 25313a8f527cd7d8964cab01fbb8f5a75298a551 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 23 Mar 2023 14:34:37 +0100
Subject: [PATCH 005/149] Code quality check fixes

---
 application/views/person/bpk/bpkDetails.php          | 12 ++++++++++--
 .../views/system/infocenter/infocenterZgvDetails.php |  6 +++++-
 application/views/templates/FHC-Footer.php           |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/application/views/person/bpk/bpkDetails.php b/application/views/person/bpk/bpkDetails.php
index 6b7d4430d..bd6191c6a 100644
--- a/application/views/person/bpk/bpkDetails.php
+++ b/application/views/person/bpk/bpkDetails.php
@@ -125,10 +125,18 @@
 										</table>
 									</div>
 									<div class="col-lg-4 table-responsive">
-										<form action="<?php echo base_url('soap/datenverbund_client.php?action=pruefeBPK');?>" method="POST" target="_blank">
+										<form
+											action="<?php echo base_url('soap/datenverbund_client.php?action=pruefeBPK');?>"
+											method="POST"
+											target="_blank"
+										>
 											<input type="hidden" name="vorname" value="<?php echo $stammdaten->vorname; ?>"/>
 											<input type="hidden" name="nachname" value="<?php echo $stammdaten->nachname; ?>"/>
-											<input type="hidden" name="geburtsdatum" value="<?php echo mb_str_replace('-', '',$stammdaten->gebdatum); ?>"/>
+											<input
+												type="hidden"
+												name="geburtsdatum"
+												value="<?php echo mb_str_replace('-', '', $stammdaten->gebdatum); ?>"
+											/>
 											<input type="hidden" name="geschlecht" value="<?php echo mb_strtoupper($stammdaten->geschlecht); ?>"/>
 											<input type="submit" value="Namenssuche starten" class="btn btn-default"/>
 										</form>
diff --git a/application/views/system/infocenter/infocenterZgvDetails.php b/application/views/system/infocenter/infocenterZgvDetails.php
index bf9f69e18..3a254b16a 100644
--- a/application/views/system/infocenter/infocenterZgvDetails.php
+++ b/application/views/system/infocenter/infocenterZgvDetails.php
@@ -130,7 +130,11 @@
 									<?php echo $this->p->t('infocenter', 'zgvNichtErfuellt') ?>
 								</button>
 								<?php if ($studiengang_typ === 'm') : ?>
-									<button type="button" class="btn btn-default zgvAkzeptierenPruefung" id="zgvAkzeptierenPruefung_<?php echo $prestudent_id ?>">
+									<button
+										type="button"
+										class="btn btn-default zgvAkzeptierenPruefung"
+										id="zgvAkzeptierenPruefung_<?php echo $prestudent_id ?>"
+									>
 										<?php echo $this->p->t('infocenter', 'zgvErfuelltPruefung') ?>
 									</button>
 								<?php endif; ?>
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index ee13c69d2..a9a44b978 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -107,7 +107,7 @@
 	if ($tinymce5 === true) generateJSsInclude('vendor/tinymce/tinymce5/tinymce.min.js');
 
 	// Vue 3 JS
-	if ($vue3 === true) 
+	if ($vue3 === true)
 	{
 		generateJSsInclude('vendor/vuejs/vuejs3/vue.global.prod.js');
 		generateJSsInclude('vendor/vuejs/vuerouter4/vue-router.global.js');

From 39137d1348a01d90fee89863d7f22bbec9e3b604 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Mon, 24 Apr 2023 17:07:40 +0200
Subject: [PATCH 006/149] Load a model in the filter component controller to
 have the DB functionalities ready

---
 application/controllers/components/Filter.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/controllers/components/Filter.php b/application/controllers/components/Filter.php
index ab7e1493e..bde7d7ed7 100644
--- a/application/controllers/components/Filter.php
+++ b/application/controllers/components/Filter.php
@@ -26,6 +26,9 @@ class Filter extends FHC_Controller
 		// Loads authentication library and starts authentication
 		$this->load->library('AuthLib');
 
+		// Loads the FiltersModel
+		$this->load->model('system/Filters_model', 'FiltersModel');
+
 		// Loads the FilterCmptLib with HTTP GET/POST parameters
 		$this->_startFilterCmptLib();
 	}

From 2b363119c543e2c81d6cf2c3d2035b75e95ebcd9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 16 May 2023 10:33:05 +0200
Subject: [PATCH 007/149] Split the component to improve the quality,
 readability and maintainability

---
 public/js/components/filter/Filter.js | 394 +++++---------------------
 1 file changed, 71 insertions(+), 323 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 2bf878e5a..dbf15a315 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -18,6 +18,8 @@
 import {CoreFilterAPIs} from './API.js';
 import {CoreRESTClient} from '../../RESTClient.js';
 import {CoreFetchCmpt} from '../../components/Fetch.js';
+import FilterConfig from './Filter/Config.js';
+import FilterColumns from './Filter/Columns.js';
 
 //
 const FILTER_COMPONENT_NEW_FILTER = 'Filter Component New Filter';
@@ -29,10 +31,14 @@ var _uuid = 0;
  *
  */
 export const CoreFilterCmpt = {
-	emits: ['nwNewEntry'],
 	components: {
-		CoreFetchCmpt
+		CoreFetchCmpt,
+		FilterConfig,
+		FilterColumns
 	},
+	emits: [
+		'nwNewEntry'
+	],
 	props: {
 		title: String,
 		sideMenu: {
@@ -135,20 +141,17 @@ export const CoreFilterCmpt = {
 			if (!this.uuid)
 				return '';
 			return '-' + this.uuid;
+		},
+		columnsForFilter() {
+			if (!this.filteredColumns || !this.datasetMetadata)
+				return [];
+			const filterTitles = this.filteredColumns.reduce((a,c) => {
+				a[c.field] = c.title;
+				return a;
+			}, {});
+			return this.datasetMetadata.map(el => ({...el, ...{title: filterTitles[el.name]}}));
 		}
 	},
-	beforeCreate() {
-		if (!this.tableOnly == !this.filterType)
-			alert('You can not have a filter-type in table-only mode!');
-	},
-	created() {
-		this.uuid = _uuid++;
-		if (!this.tableOnly)
-			this.getFilter(); // get the filter data
-	},
-	mounted() {
-		this.initTabulator();
-	},
 	methods: {
 		initTabulator() {
 			// Define a default tabulator options in case it was not provided
@@ -230,7 +233,7 @@ export const CoreFilterCmpt = {
 							filter.type = data.datasetMetadata[i].type;
 
 							this.filterFields.push(filter);
-							break;
+							//break;
 						}
 					}
 				}
@@ -266,6 +269,7 @@ export const CoreFilterCmpt = {
 				if (link == null) link = '#';
 
 				filtersArray[filtersArray.length] = {
+					id: filters[filtersCount].filter_id,
 					link: link + filters[filtersCount].filter_id,
 					description: filters[filtersCount].desc,
 					sort: filtersCount,
@@ -280,6 +284,7 @@ export const CoreFilterCmpt = {
 				if (link == null) link = '#';
 
 				filtersArray[filtersArray.length] = {
+					id: personalFilters[filtersCount].filter_id,
 					link: link + personalFilters[filtersCount].filter_id,
 					description: personalFilters[filtersCount].desc,
 					subscriptDescription: personalFilters[filtersCount].subscriptDescription,
@@ -318,6 +323,7 @@ export const CoreFilterCmpt = {
 				if (link == null) link = '#';
 
 				filtersArray[filtersArray.length] = {
+					id: filters[filtersCount].filter_id,
 					option: filters[filtersCount].filter_id,
 					description: filters[filtersCount].desc
 				};
@@ -330,6 +336,7 @@ export const CoreFilterCmpt = {
 				if (link == null) link = '#';
 
 				filtersArray[filtersArray.length] = {
+					id: personalFilters[filtersCount].filter_id,
 					option: personalFilters[filtersCount].filter_id,
 					description: personalFilters[filtersCount].desc
 				};
@@ -366,12 +373,12 @@ export const CoreFilterCmpt = {
 		/**
 		 *
 		 */
-		handlerSaveCustomFilter: function(event) {
+		handlerSaveCustomFilter: function(customFilterName) {
 			//
 			this.startFetchCmpt(
 				CoreFilterAPIs.saveCustomFilter,
 				{
-					customFilterName: this.$refscustomFilterName.value
+					customFilterName
 				},
 				this.getFilter
 			);
@@ -389,150 +396,10 @@ export const CoreFilterCmpt = {
 				this.getFilter
 			);
 		},
-		/**
-		 *
-		 */
-		handlerApplyFilterFields: function(event) {
-			let filterFields = [];
-			let filterFieldDivRows = document.getElementById('filterFields').getElementsByClassName('row');
 
-			for (let i = 0; i< filterFieldDivRows.length; i++)
-			{
-				let filterField = {};
-
-				for (let j = 0; j< filterFieldDivRows[i].children.length; j++)
-				{
-					let filterColumn = filterFieldDivRows[i].children[j];
-					let filterColumnElement = filterColumn.children[0];
-
-					// If the first column then search for the fields dropdown
-					if (j == 0) filterColumnElement = filterColumnElement.querySelector('select[name=fieldName]');
-
-					// If the filter name is _not_ null and it is _not_ a new filter
-					if (filterColumnElement.name != null && filterColumnElement.name != FILTER_COMPONENT_NEW_FILTER)
-					{
-						// Condition
-						if (filterColumnElement.name == 'condition' && filterColumnElement.value == "")
-						{
-							alert("Please fill all the filter options");
-							return;
-						}
-
-						// Name
-						if (filterColumnElement.name == 'fieldName')
-						{
-							filterField.name = filterColumnElement.value;
-						}
-						// Operation
-						if (filterColumnElement.name == 'operation')
-						{
-							filterField.operation = filterColumnElement.value;
-						}
-						// Condition
-						if (filterColumnElement.name == 'condition')
-						{
-							filterField.condition = filterColumnElement.value;
-						}
-						// Option
-						if (filterColumnElement.name == 'option')
-						{
-							filterField.option = filterColumnElement.value;
-						}
-					}
-				}
-
-				if (Object.entries(filterField).length > 0) filterFields.push(filterField);
-			}
-
-			//
-			this.startFetchCmpt(
-				CoreFilterAPIs.applyFilterFields,
-				{
-					filterFields: filterFields
-				},
-				this.getFilter
-			);
-		},
-		/**
-		 *
-		 */
-		handlerChangeFilterField: function(oldValue, newValue) {
-
-			// If an old filter has been changed
-			if (oldValue != "")
-			{
-				for (let i = 0; i < this.filterFields.length; i++)
-				{
-					if (this.filterFields[i].name == oldValue)
-					{
-						this.filterFields.splice(i, 1);
-						break;
-					}
-				}
-			}
-
-			// Then add the new filter
-			for (let i = 0; i < this.datasetMetadata.length; i++)
-			{
-				if (this.datasetMetadata[i].name == newValue)
-				{
-					let filter = {
-						name: this.datasetMetadata[i].name,
-						type: this.datasetMetadata[i].type
-					};
-
-					this.filterFields.push(filter);
-					break;
-				}
-			}
-		},
-		/**
-		 *
-		 */
-		handlerAddNewFilter: function(event) {
-			// Adds a new empty filter
-			this.filterFields.push({
-				name: FILTER_COMPONENT_NEW_FILTER,
-				type: FILTER_COMPONENT_NEW_FILTER_TYPE
-			});
-		},
 		/*
 		 *
 		 */
-		handlerToggleSelectedField(field) {
-
-			// If it is a selected field
-			if (this.selectedFields.indexOf(field) != -1)
-			{
-				// then hide it
-				this.tabulator.hideColumn(field);
-				// and remove it from the this.selectedFields property
-				this.selectedFields.splice(this.selectedFields.indexOf(field), 1);
-			}
-			else // otherwise
-			{
-				// show it
-				this.tabulator.showColumn(field);
-				// and add it to the this.selectedFields property
-				this.selectedFields.push(field);
-			}
-		},
-		/**
-		 *
-		 */
-		handlerRemoveFilterField: function(event) {
-			//
-			this.startFetchCmpt(
-				CoreFilterAPIs.removeFilterField,
-				{
-					filterField: event.currentTarget.getAttribute('field-to-remove')
-				},
-				this.getFilter
-			);
-		},
-		/**
-		 *
-		 */
 		handlerGetFilterById: function(event) {
 
 			let filterId = null;
@@ -550,16 +417,40 @@ export const CoreFilterCmpt = {
 				filterId = attr.substring(1);
 			}
 
+			this.switchFilter(filterId);
+		},
+		switchFilter(filterId) {
 			// Ajax call
 			this.startFetchCmpt(
 				CoreFilterAPIs.getFilterById,
 				{
-					filterId: filterId
+					filterId
 				},
 				this.render
 			);
+		},
+		applyFilterConfig(filterFields) {
+			this.startFetchCmpt(
+				CoreFilterAPIs.applyFilterFields,
+				{
+					filterFields
+				},
+				this.getFilter
+			);
 		}
 	},
+	beforeCreate() {
+		if (!this.tableOnly == !this.filterType)
+			alert('You can not have a filter-type in table-only mode!');
+	},
+	created() {
+		this.uuid = _uuid++;
+		if (!this.tableOnly)
+			this.getFilter(); // get the filter data
+	},
+	mounted() {
+		this.initTabulator();
+	},
 	template: `
 		<!-- Load filter data -->
 		<core-fetch-cmpt
@@ -586,172 +477,29 @@ export const CoreFilterCmpt = {
 				<span data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra" class="filter-header-title-span-icon fa-solid fa-table-columns fa-xl"></span>
 			</div>
 
-			<div :id="'collapseColumns' + idExtra" class="card-body collapse" :data-bs-parent="'#filterCollapsables' + idExtra">
-				<div class="card">
-					<!-- Filter fields options -->
-					<div class="row card-body filter-options-div">
-						<div class="filter-fields-area">
-							<template v-for="fieldToDisplay in fields">
-								<div
-									class="filter-fields-field"
-									v-bind:class="selectedFields.indexOf(fieldToDisplay) != -1 ? 'text-light bg-dark' : '' "
-									@click="handlerToggleSelectedField(fieldToDisplay)"
-								>
-									{{ fieldNames[fieldToDisplay] || fieldToDisplay }}
-								</div>
-							</template>
-						</div>
-					</div>
-				</div>
-			</div>
+			<filter-columns
+				:id="'collapseColumns' + idExtra"
+				class="card-body collapse"
+				:data-bs-parent="'#filterCollapsables' + idExtra"
+				:fields="fields"
+				:selected="selectedFields"
+				:names="fieldNames"
+				@hide="tabulator.hideColumn($event)"
+				@show="tabulator.showColumn($event)"
+			></filter-columns>
 
-			<div v-if="!tableOnly" :id="'collapseFilters' + idExtra" class="card-body collapse" :data-bs-parent="'#filterCollapsables' + idExtra">
-				<div class="card">
-				<!-- Filter options -->
-					<div class="card-body" v-if="!sideMenu">
-						<select
-							class="form-select"
-							@change="handlerGetFilterById"
-						>
-							<option value="">Bitte auswählen...</option>
-							<template v-for="availableFilter in availableFilters">
-								<option v-bind:value="availableFilter.option">{{ availableFilter.description }}</option>
-							</template>
-						</select>
-					</div>
-					<div class="card-body filter-options-div">
-						<div>
-							<span>
-								Neuer Filter
-							</span>
-							<span>
-								<button class="btn btn-outline-dark" type="button" @click=handlerAddNewFilter>+</button>
-							</span>
-						</div>
-						<div :id="'filterFields' + idExtra" class="filter-filter-fields">
-							<template v-for="(filterField, index) in filterFields">
-								<div class="row">
-
-									<div class="col-5">
-										<div class="input-group">
-											<span class="input-group-text">Filter {{ index + 1 }}</span>
-											<select
-												class="form-select"
-												name="fieldName"
-												v-bind:value="filterField.name"
-												@change="handlerChangeFilterField(filterField.name, $event.target.value)"
-											>
-												<option value="">Feld zum Filter hinzufügen...</option>
-												<template v-for="columnAlias in filteredColumns">
-													<option v-bind:value="columnAlias.field">{{ columnAlias.title }}</option>
-												</template>
-											</select>
-										</div>
-									</div>
-
-									<!-- Numeric -->
-									<template
-										v-if="filterField.type.toLowerCase().indexOf('int') >= 0">
-										<div class="col-2">
-											<select class="form-select" name="operation" v-model="filterField.operation">
-												<option value="equal">Gleich</option>
-												<option value="nequal">Nicht gleich</option>
-												<option value="gt">Größer als</option>
-												<option value="lt">Weniger als</option>
-											</select>
-										</div>
-										<div class="col-3">
-											<input type="number" class="form-control" v-bind:value="filterField.condition" name="condition">
-										</div>
-										<div class="col">
-											<button
-												class="btn btn-outline-dark"
-												type="button"
-												v-bind:field-to-remove="filterField.name"
-												@click=handlerRemoveFilterField>
-												&emsp;X&emsp;
-											</button>
-										</div>
-									</template>
-
-									<!-- Text -->
-									<template
-										v-if="filterField.type.toLowerCase().indexOf('varchar') >= 0
-											|| filterField.type.toLowerCase().indexOf('text') >= 0
-											|| filterField.type.toLowerCase().indexOf('bpchar') >= 0">
-										<div class="col-2">
-											<select class="form-select" name="operation" v-model="filterField.operation">
-												<option value="equal">Gleich</option>
-												<option value="nequal">Nicht gleich</option>
-												<option value="contains">Enthält</option>
-												<option value="ncontains">Enthält nicht</option>
-											</select>
-										</div>
-										<div class="col-3">
-											<input type="text" class="form-control" v-bind:value="filterField.condition" name="condition">
-										</div>
-										<div class="col">
-											<button
-												class="btn btn-outline-dark"
-												type="button"
-												v-bind:field-to-remove="filterField.name"
-												@click=handlerRemoveFilterField>
-												&emsp;X&emsp;
-											</button>
-										</div>
-									</template>
-
-									<!-- Timestamp and date -->
-									<template
-										v-if="filterField.type.toLowerCase().indexOf('timestamp') >= 0
-											|| filterField.type.toLowerCase().indexOf('date') >= 0">
-										<div class="col-2">
-											<select class="form-select" name="operation" v-model="filterField.operation">
-												<option value="gt">Größer als</option>
-												<option value="lt">Weniger als</option>
-												<option value="set">Eingestellt ist</option>
-												<option value="nset">Eingestellt nicht ist</option>
-											</select>
-										</div>
-										<div class="col-1">
-											<input type="number" class="form-control" v-bind:value="filterField.condition" name="condition">
-										</div>
-										<div class="col-2">
-											<select class="form-select" name="option" v-model="filterField.option">
-												<option value="minutes">Minuten</option>
-												<option value="hours">Stunden</option>
-												<option value="days">Tage</option>
-												<option value="months">Monate</option>
-											</select>
-										</div>
-										<div class="col">
-											<button
-												class="btn btn-outline-dark"
-												type="button"
-												v-bind:field-to-remove="filterField.name"
-												@click=handlerRemoveFilterField
-											> - </button>
-										</div>
-									</template>
-								</div>
-							</template>
-						</div>
-
-						<!-- Filter save options -->
-						<div class="row">
-							<div class="col-7">
-								<div class="input-group">
-									<input ref="customFilterName" type="text" class="form-control" placeholder="Filternamen eingeben..." :id="'customFilterName' + idExtra">
-									<button type="button" class="btn btn-outline-secondary" @click=handlerSaveCustomFilter>Filter speichern</button>
-								</div>
-							</div>
-							<div class="col">
-								<button type="button" class="btn btn-outline-dark" @click=handlerApplyFilterFields>Filter anwenden</button>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
+			<filter-config
+				v-if="!tableOnly"
+				:id="'collapseFilters' + idExtra"
+				class="card-body collapse"
+				:data-bs-parent="'#filterCollapsables' + idExtra"
+				:filters="!sideMenu ? (availableFilters || []) : []"
+				:columns="columnsForFilter"
+				:fields="filterFields || []"
+				@switch-filter="switchFilter"
+				@apply-filter-config="applyFilterConfig"
+				@save-custom-filter="handlerSaveCustomFilter"
+			></filter-config>
 		</div>
 
 		<!-- Tabulator -->

From 1568e619a585d5cb7dbf3ad7d3c2c96b8c6101b7 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 16 May 2023 10:33:31 +0200
Subject: [PATCH 008/149] Split the component to improve the quality,
 readability and maintainability

---
 public/js/components/filter/Filter/Columns.js |  83 +++++++
 public/js/components/filter/Filter/Config.js  | 215 ++++++++++++++++++
 2 files changed, 298 insertions(+)
 create mode 100644 public/js/components/filter/Filter/Columns.js
 create mode 100644 public/js/components/filter/Filter/Config.js

diff --git a/public/js/components/filter/Filter/Columns.js b/public/js/components/filter/Filter/Columns.js
new file mode 100644
index 000000000..448d05d17
--- /dev/null
+++ b/public/js/components/filter/Filter/Columns.js
@@ -0,0 +1,83 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *
+ */
+export default {
+	props: {
+		fields: Array,
+		selected: {
+			type: Array,
+			default: []
+		},
+		names: {
+			type: Array,
+			default: []
+		}
+	},
+	emits: [
+		'hide',
+		'show'
+	],
+	data: function() {
+		return {
+			selectedFields: []
+		};
+	},
+	computed: {
+		
+	},
+	watch: {
+		selected(n) {
+			this.selectedFields = n;
+		}
+	},
+	methods: {
+		toggle(field) {
+			if (this.selectedFields.indexOf(field) != -1)
+			{
+				this.selectedFields.splice(this.selectedFields.indexOf(field), 1);
+				this.$emit('hide', field);
+			}
+			else
+			{
+				this.selectedFields.push(field);
+				this.$emit('show', field);
+			}
+		}
+	},
+	template: `
+	<div class="filter-columns">
+		<div class="card">
+			<div class="row card-body filter-options-div">
+				<div class="filter-fields-area">
+					<div
+						v-for="fieldToDisplay in fields"
+						class="filter-fields-field"
+						:class="selected.indexOf(fieldToDisplay) != -1 ? 'text-light bg-dark' : '' "
+						@click="toggle(fieldToDisplay)"
+					>
+						{{ names[fieldToDisplay] || fieldToDisplay }}
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	`
+};
+
diff --git a/public/js/components/filter/Filter/Config.js b/public/js/components/filter/Filter/Config.js
new file mode 100644
index 000000000..6869c1599
--- /dev/null
+++ b/public/js/components/filter/Filter/Config.js
@@ -0,0 +1,215 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+const FILTER_COMPONENT_NEW_FILTER = 'Filter Component New Filter';
+
+/**
+ *
+ */
+export default {
+	props: {
+		filters: {
+			type: Array,
+			default: []
+		},
+		columns: {
+			type: Array,
+			default: []
+		},
+		fields: {
+			type: Array,
+			default: []
+		}
+	},
+	emits: [
+		'switchFilter',
+		'applyFilterConfig',
+		'saveCustomFilter'
+	],
+	data: function() {
+		return {
+			currentFields: []
+		};
+	},
+	computed: {
+		types() {
+			return this.columns.reduce((a,c) => {
+				let type = c.type.toLowerCase();
+				if (type.indexOf('int') >= 0)
+					a[c.name] = 'Numeric';
+				else if (
+					type.indexOf('varchar') >= 0 || 
+					type.indexOf('text') >= 0 || 
+					type.indexOf('bpchar') >= 0
+				)
+					a[c.name] = 'Text';
+				else if (
+					type.indexOf('timestamp') >= 0 || 
+					type.indexOf('date') >= 0
+				)
+					a[c.name] = 'Date';
+				else
+					a[c.name] = '';
+				return a;
+			}, {});
+		}
+	},
+	watch: {
+		fields(n) {
+			this.currentFields = n;
+		}
+	},
+	methods: {
+		switchFilter(evt) {
+			this.$emit('switchFilter', evt.currentTarget.value);
+		},
+		applyFilterConfig() {
+			const filteredFields = this.currentFields.filter(el => el.name != FILTER_COMPONENT_NEW_FILTER);
+			if (filteredFields.filter(el => el.condition == "").length)
+				alert("Please fill all the filter options");
+			else
+				this.$emit('applyFilterConfig', filteredFields);
+		},
+		addField(evt) {
+			this.currentFields.push({
+				name: FILTER_COMPONENT_NEW_FILTER
+			});
+		},
+		removeField(index) {
+			this.currentFields.splice(index, 1);
+		}
+	},
+	template: `
+	<div class="filter-config">
+		<div class="card">
+			<div class="card-body">
+				<div v-if="filters.length" class="mb-4">
+					<select class="form-select" @change="switchFilter">
+						<option value="">Bitte auswählen...</option>
+						<option v-for="filter in filters" :value="filter.id">
+							{{ filter.description }}
+						</option>
+					</select>
+				</div>
+				<div>
+					<button class="btn btn-outline-dark" type="button" @click=addField>
+						<span class="fa-solid fa-plus" aria-hidden="true"></span> Neuer Filter
+					</button>
+				</div>
+				<div class="filter-config-fields my-3">
+					<div v-for="(filterField, index) in currentFields" class="filter-config-field row">
+
+						<div class="col-5">
+							<div class="input-group">
+								<span class="input-group-text">Filter {{ index + 1 }}</span>
+								<select
+									class="form-select"
+									v-model="filterField.name"
+								>
+									<option value="">Feld zum Filter hinzufügen...</option>
+									<option v-for="col in columns" :value="col.name">
+										{{ col.title }}
+									</option>
+								</select>
+							</div>
+						</div>
+
+						<!-- Numeric -->
+						<template v-if="types[filterField.name] == 'Numeric'">
+							<div class="col-2">
+								<select class="form-select" v-model="filterField.operation">
+									<option value="equal">Gleich</option>
+									<option value="nequal">Nicht gleich</option>
+									<option value="gt">Größer als</option>
+									<option value="lt">Weniger als</option>
+								</select>
+							</div>
+							<div class="col-3">
+								<input type="number" class="form-control" v-model="filterField.condition">
+							</div>
+						</template>
+
+						<!-- Text -->
+						<template v-if="types[filterField.name] == 'Text'">
+							<div class="col-2">
+								<select class="form-select" v-model="filterField.operation">
+									<option value="equal">Gleich</option>
+									<option value="nequal">Nicht gleich</option>
+									<option value="contains">Enthält</option>
+									<option value="ncontains">Enthält nicht</option>
+								</select>
+							</div>
+							<div class="col-3">
+								<input type="text" class="form-control" v-model="filterField.condition">
+							</div>
+						</template>
+
+						<!-- Timestamp and date -->
+						<template v-if="types[filterField.name] == 'Date'">
+							<div class="col-2">
+								<select class="form-select" v-model="filterField.operation">
+									<option value="gt">Größer als</option>
+									<option value="lt">Weniger als</option>
+									<option value="set">Eingestellt ist</option>
+									<option value="nset">Eingestellt nicht ist</option>
+								</select>
+							</div>
+							<div class="col-1">
+								<input type="number" class="form-control" v-model="filterField.condition">
+							</div>
+							<div class="col-2">
+								<select class="form-select" v-model="filterField.option">
+									<option value="minutes">Minuten</option>
+									<option value="hours">Stunden</option>
+									<option value="days">Tage</option>
+									<option value="months">Monate</option>
+								</select>
+							</div>
+						</template>
+
+						<div class="col text-end">
+							<button
+								class="btn btn-outline-dark"
+								type="button"
+								@click="removeField(index)"
+								title="Filter entfernen"
+								aria-title="Filter entfernen"
+							>
+								<span class="fa-solid fa-minus" aria-hidden="true"></span>
+							</button>
+						</div>
+					</div>
+				</div>
+
+				<!-- Filter save options -->
+				<div class="row">
+					<div class="col-7">
+						<div class="input-group">
+							<input ref="filterName" type="text" class="form-control" placeholder="Filternamen eingeben...">
+							<button type="button" class="btn btn-outline-secondary" @click="$emit('saveCustomFilter', $refs.filterName.value)">Filter speichern</button>
+						</div>
+					</div>
+					<div class="col">
+						<button type="button" class="btn btn-outline-dark" @click="applyFilterConfig">Filter anwenden</button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	`
+};
+

From 38f2bb89a45a902d655971a3fec9ddaa3bb7e6cf Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 16 May 2023 10:40:58 +0200
Subject: [PATCH 009/149] readability

---
 public/js/components/filter/Filter/Columns.js |  8 ++++----
 public/js/components/filter/Filter/Config.js  | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/js/components/filter/Filter/Columns.js b/public/js/components/filter/Filter/Columns.js
index 448d05d17..ca8fc0aec 100644
--- a/public/js/components/filter/Filter/Columns.js
+++ b/public/js/components/filter/Filter/Columns.js
@@ -30,10 +30,10 @@ export default {
 			default: []
 		}
 	},
-	emits: [
-		'hide',
-		'show'
-	],
+	emits: {
+		hide: ['fieldName'],
+		show: ['fieldName']
+	},
 	data: function() {
 		return {
 			selectedFields: []
diff --git a/public/js/components/filter/Filter/Config.js b/public/js/components/filter/Filter/Config.js
index 6869c1599..3c75c5a3c 100644
--- a/public/js/components/filter/Filter/Config.js
+++ b/public/js/components/filter/Filter/Config.js
@@ -35,11 +35,11 @@ export default {
 			default: []
 		}
 	},
-	emits: [
-		'switchFilter',
-		'applyFilterConfig',
-		'saveCustomFilter'
-	],
+	emits: {
+		switchFilter: ['filterId'],
+		applyFilterConfig: ['filterFields'],
+		saveCustomFilter: ['customFilterName']
+	},
 	data: function() {
 		return {
 			currentFields: []

From 76fd4250275887e9378dc7cd952721a654d209d1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 16 May 2023 14:12:46 +0200
Subject: [PATCH 010/149] assert valid nw-new-entry listener if side-menu is
 enabled

---
 public/js/components/filter/Filter.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index dbf15a315..eb5f1a005 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -40,6 +40,7 @@ export const CoreFilterCmpt = {
 		'nwNewEntry'
 	],
 	props: {
+		onNwNewEntry: Function, // NOTE(chris): Hack to get the nwNewEntry listener into $props
 		title: String,
 		sideMenu: {
 			type: Boolean,
@@ -444,6 +445,8 @@ export const CoreFilterCmpt = {
 			alert('You can not have a filter-type in table-only mode!');
 	},
 	created() {
+		if (this.sideMenu && (!this.$props.onNwNewEntry || !(this.$props.onNwNewEntry instanceof Function)))
+			alert('"nwNewEntry" listener is mandatory when sideMenu is true');
 		this.uuid = _uuid++;
 		if (!this.tableOnly)
 			this.getFilter(); // get the filter data
@@ -451,7 +454,7 @@ export const CoreFilterCmpt = {
 	mounted() {
 		this.initTabulator();
 	},
-	template: `
+	template: `{{$attrs}}
 		<!-- Load filter data -->
 		<core-fetch-cmpt
 			v-if="!tableOnly"

From 4154df17046b71556b7179912049a6b7d482a9aa Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 19 May 2023 14:47:05 +0200
Subject: [PATCH 011/149] Property to Enable/disable the download button

---
 public/js/components/filter/Filter.js         |  13 +-
 public/js/components/filter/Table/Download.js | 246 ++++++++++++++++++
 2 files changed, 256 insertions(+), 3 deletions(-)
 create mode 100644 public/js/components/filter/Table/Download.js

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index eb5f1a005..ae2ab9e7a 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -20,6 +20,7 @@ import {CoreRESTClient} from '../../RESTClient.js';
 import {CoreFetchCmpt} from '../../components/Fetch.js';
 import FilterConfig from './Filter/Config.js';
 import FilterColumns from './Filter/Columns.js';
+import TableDownload from './Table/Download.js';
 
 //
 const FILTER_COMPONENT_NEW_FILTER = 'Filter Component New Filter';
@@ -34,7 +35,8 @@ export const CoreFilterCmpt = {
 	components: {
 		CoreFetchCmpt,
 		FilterConfig,
-		FilterColumns
+		FilterColumns,
+		TableDownload
 	},
 	emits: [
 		'nwNewEntry'
@@ -52,7 +54,11 @@ export const CoreFilterCmpt = {
 		},
 		tabulatorOptions: Object,
 		tabulatorEvents: Array,
-		tableOnly: Boolean
+		tableOnly: Boolean,
+		download: {
+			type: [Boolean, String, Function, Array, Object],
+			default: false
+		}
 	},
 	data: function() {
 		return {
@@ -454,7 +460,7 @@ export const CoreFilterCmpt = {
 	mounted() {
 		this.initTabulator();
 	},
-	template: `{{$attrs}}
+	template: `
 		<!-- Load filter data -->
 		<core-fetch-cmpt
 			v-if="!tableOnly"
@@ -478,6 +484,7 @@ export const CoreFilterCmpt = {
 				<span v-if="!tableOnly" class="filter-header-title-span-filter">[ {{ filterName }} ]</span>
 				<span v-if="!tableOnly" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra" class="filter-header-title-span-icon fa-solid fa-filter fa-xl"></span>
 				<span data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra" class="filter-header-title-span-icon fa-solid fa-table-columns fa-xl"></span>
+				<table-download class="filter-header-title-span-icon fa-xl text-dark" :tabulator="tabulator" :config="download"></table-download>
 			</div>
 
 			<filter-columns
diff --git a/public/js/components/filter/Table/Download.js b/public/js/components/filter/Table/Download.js
new file mode 100644
index 000000000..7d4512d55
--- /dev/null
+++ b/public/js/components/filter/Table/Download.js
@@ -0,0 +1,246 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+const DEFAULT_ICONS = {
+	jsonLines: 'fa-file-lines',
+	xlsx: 'fa-file-excel',
+	pdf: 'fa-file-pdf',
+	html: 'fa-file-code',
+	json: 'fa-file',
+	csv: 'fa-file-csv'
+};
+const DEFAULT_LABELS = {
+	jsonLines: 'Download as JSONLINES',
+	xlsx: 'Download as XLSX',
+	pdf: 'Download as PDF',
+	html: 'Download as HTML',
+	json: 'Download as JSON',
+	csv: 'Download as CSV '
+};
+
+
+/**
+ *
+ */
+export default {
+	props: {
+		tabulator: Object,
+		config: {
+			type: [Boolean, String, Function, Array, Object],
+			default: false
+		}
+	},
+	computed: {
+		currentConfig() {
+			if (!this.config)
+				return false;
+
+			let config = this.config;
+
+			if (config instanceof Function)
+				return [config];
+
+			if (config === null)
+				return [];
+
+			if (this.config === true)
+				config = ['csv'];
+
+			if (Object.prototype.toString.call(config) === "[object String]")
+				config = config.split(',');
+
+			if (typeof config === 'object' && !Array.isArray(config)) {
+				let newConfig = [];
+				for (var k in config) {
+					var v = config[k], type;
+					
+					if (!v)
+						continue;
+					
+					if (Object.prototype.toString.call(v) === "[object String]") {
+						type = this.stringToFileFormatter(v);
+						if (type !== null) {
+							newConfig.push({
+								icon: 'fa-solid ' + DEFAULT_ICONS[type],
+								label: v === k ? DEFAULT_LABELS[type] : k,
+								formatter: type
+							});
+						} else {
+							type = this.stringToFileFormatter(k);
+							if(type !== null) {
+								newConfig.push({
+									icon: 'fa-solid ' + DEFAULT_ICONS[type],
+									label: v,
+									formatter: type
+								});
+							} else {
+								alert('neither ' + k + ' nor ' + v + ' are supported download file types');
+							}
+						}
+					} else if (typeof v === 'object' && !Array.isArray(v)) {
+						type = this.stringToFileFormatter(k);
+						if (type !== null) {
+							if (v.formatter === undefined)
+								v.formatter = type;
+							if (v.label === undefined)
+								v.label = DEFAULT_LABELS[type];
+							if (v.icon === undefined)
+								v.icon = DEFAULT_ICONS[type];
+							newConfig.push(v);
+						} else {
+							if (v.label === undefined)
+								v.label = k;
+							newConfig.push(v);
+						}
+					} else {
+						type = this.stringToFileFormatter(k);
+						if (type !== null) {
+							newConfig.push({
+								icon: 'fa-solid ' + DEFAULT_ICONS[type],
+								label: DEFAULT_LABELS[type],
+								formatter: type
+							});
+						} else {
+							alert(k + ' is not a supported download file type');
+						}
+					}
+				}
+				config = newConfig;
+			}
+
+			if (Array.isArray(config))
+			{
+				config = config.map(el => {
+					if (Object.prototype.toString.call(el) === "[object String]") {
+						let formatter = this.stringToFileFormatter(el);
+						if (formatter === null)
+							return null;
+						return {
+							icon: 'fa-solid ' + DEFAULT_ICONS[formatter],
+							label: DEFAULT_LABELS[formatter],
+							formatter
+						};
+					}
+					
+					if (el instanceof Function)
+						return {
+							formatter: el
+						}
+					
+					if (typeof el === 'object' && !Array.isArray(el) && el !== null) {
+						if (el.formatter instanceof Function)
+							return el;
+						if (this.validateFileFormatter(el.formatter))
+							return el;
+					}
+					
+					return null;
+				}).filter(el => el !== null);
+
+				if (config.length < 2)
+					return config;
+
+				if (config.filter(el => el.label || el.icon).length == config.length)
+					return config;
+
+				alert('Config not valid');
+			}
+
+			return [];
+		}
+	},
+	methods: {
+		stringToFileFormatter(input) {
+			let lcInput = input.toLowerCase();
+			
+			if (lcInput == 'jsonlines')
+				return 'jsonLines';
+			
+			if (['xlsx', 'pdf', 'html', 'json', 'csv'].includes(lcInput))
+				return lcInput;
+
+			return null;
+		},
+		validateFileFormatter(input) {
+			let formatter = this.stringToFileFormatter(input);
+			if (!formatter) {
+				alert(input + ' is not a supported file formatter');
+				return false;
+			}
+			if (formatter == 'xlsx') {
+				if (!window.XLSX) {
+					alert('XLSX Library not loaded');
+					return false;
+				}
+			}
+			if (formatter == 'pdf') {
+				if (!window.jspdf) {
+					alert('jsPDF Library not loaded');
+					return false;
+				}
+				var doc = new jspdf.jsPDF({});
+				if (!doc.autoTable) {
+					alert('jsPDF-AutoTable Plugin not loaded');
+					return false;
+				}
+			}
+			return true;
+		},
+		download(config) {
+			this.tabulator.download(config.formatter, config.file, config.options)
+		}
+	},
+	template: `
+	<template v-if="currentConfig">
+		<template v-if="currentConfig.length == 1">
+			<a
+				href="#"
+				class="table-download"
+				v-bind="$attrs"
+				title="Download"
+				aria-title="Download"
+				@click.prevent="download(currentConfig[0])"
+			>
+				<span class="fa-solid fa-download" aria-hidden="true"></span>
+			</a>
+		</template>
+		<div v-else class="dropdown d-inline">
+			<a
+				href="#"
+				class="table-download"
+				v-bind="$attrs"
+				title="Download"
+				aria-title="Download"
+				role="button"
+				data-bs-toggle="dropdown"
+				aria-expanded="false"
+			>
+				<span class="fa-solid fa-download" aria-hidden="true"></span>
+			</a>
+			<ul class="dropdown-menu dropdown-menu-end">
+				<li v-for="(conf, i) in currentConfig" :key="i">
+					<a class="dropdown-item" href="#" @click.prevent="download(conf)">
+						<span v-if="conf.icon" :class="conf.icon" aria-hidden="true"></span>
+						{{conf.label}}
+					</a>
+				</li>
+			</ul>
+		</div>
+	</template>
+	`
+};
+

From 429c595e0455baea02e272e0b72f816b708d9178 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 22 May 2023 11:59:26 +0200
Subject: [PATCH 012/149] Reload Button

---
 public/js/components/filter/Filter.js | 54 +++++++++++++++++++--------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index ae2ab9e7a..7fbeb84bc 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -55,6 +55,7 @@ export const CoreFilterCmpt = {
 		tabulatorOptions: Object,
 		tabulatorEvents: Array,
 		tableOnly: Boolean,
+		reload: Boolean,
 		download: {
 			type: [Boolean, String, Function, Array, Object],
 			default: false
@@ -73,6 +74,7 @@ export const CoreFilterCmpt = {
 			filterFields: null,
 
 			availableFilters: null,
+			selectedFilter: null,
 
 			// FetchCmpt binded properties
 			fetchCmptRefresh: false,
@@ -160,6 +162,12 @@ export const CoreFilterCmpt = {
 		}
 	},
 	methods: {
+		reloadTable() {
+			if (this.tableOnly)
+				this.tabulator.reload();
+			else
+				this.getFilter();
+		},
 		initTabulator() {
 			// Define a default tabulator options in case it was not provided
 			let tabulatorOptions = {...{
@@ -211,8 +219,16 @@ export const CoreFilterCmpt = {
 		 *
 		 */
 		getFilter: function() {
-			//
-			this.startFetchCmpt(CoreFilterAPIs.getFilter, null, this.render);
+			if (this.selectedFilter === null)
+				this.startFetchCmpt(CoreFilterAPIs.getFilter, null, this.render);
+			else
+				this.startFetchCmpt(
+					CoreFilterAPIs.getFilterById,
+					{
+						filterId: this.selectedFilter
+					},
+					this.render
+				);
 		},
 		/**
 		 *
@@ -381,6 +397,7 @@ export const CoreFilterCmpt = {
 		 *
 		 */
 		handlerSaveCustomFilter: function(customFilterName) {
+			this.selectedFilter = null;
 			//
 			this.startFetchCmpt(
 				CoreFilterAPIs.saveCustomFilter,
@@ -394,11 +411,14 @@ export const CoreFilterCmpt = {
 		 *
 		 */
 		handlerRemoveCustomFilter: function(event) {
+			filterId = event.currentTarget.getAttribute("href").substring(1);
+			if (filterId === this.selectedFilter)
+				this.selectedFilter = null;
 			//
 			this.startFetchCmpt(
 				CoreFilterAPIs.removeCustomFilter,
 				{
-					filterId: event.currentTarget.getAttribute("href").substring(1)
+					filterId: filterId
 				},
 				this.getFilter
 			);
@@ -427,16 +447,11 @@ export const CoreFilterCmpt = {
 			this.switchFilter(filterId);
 		},
 		switchFilter(filterId) {
-			// Ajax call
-			this.startFetchCmpt(
-				CoreFilterAPIs.getFilterById,
-				{
-					filterId
-				},
-				this.render
-			);
+			this.selectedFilter = filterId;
+			this.getFilter();
 		},
 		applyFilterConfig(filterFields) {
+			this.selectedFilter = null;
 			this.startFetchCmpt(
 				CoreFilterAPIs.applyFilterFields,
 				{
@@ -480,11 +495,18 @@ export const CoreFilterCmpt = {
 
 		<div :id="'filterCollapsables' + idExtra">
 
-			<div class="filter-header-title">
-				<span v-if="!tableOnly" class="filter-header-title-span-filter">[ {{ filterName }} ]</span>
-				<span v-if="!tableOnly" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra" class="filter-header-title-span-icon fa-solid fa-filter fa-xl"></span>
-				<span data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra" class="filter-header-title-span-icon fa-solid fa-table-columns fa-xl"></span>
-				<table-download class="filter-header-title-span-icon fa-xl text-dark" :tabulator="tabulator" :config="download"></table-download>
+			<div class="d-flex flex-row-reverse justify-content-between">
+				<div class="filter-header-title">
+					<span v-if="!tableOnly" class="filter-header-title-span-filter">[ {{ filterName }} ]</span>
+					<span v-if="!tableOnly" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra" class="filter-header-title-span-icon fa-solid fa-filter fa-xl"></span>
+					<span data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra" class="filter-header-title-span-icon fa-solid fa-table-columns fa-xl"></span>
+					<table-download class="filter-header-title-span-icon fa-xl text-dark" :tabulator="tabulator" :config="download"></table-download>
+				</div>
+				<div v-if="reload" class="filter-header-title">
+					<button v-if="reload" class="btn btn-outline-secondary" aria-label="Reload" @click="reloadTable">
+						<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
+					</button>
+				</div>
 			</div>
 
 			<filter-columns

From d10a229b59aabbee3bed36c2a27d46081e7585ed Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 23 May 2023 14:56:31 +0200
Subject: [PATCH 013/149] Slot for action buttons

---
 public/js/components/filter/Filter.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 7fbeb84bc..cf0fcf5e1 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -83,7 +83,9 @@ export const CoreFilterCmpt = {
 			fetchCmptDataFetched: null,
 
 			tabulator: null,
-			tableBuilt: false
+			tableBuilt: false,
+			tabulatorHasSelector: false,
+			selectedData: []
 		};
 	},
 	computed: {
@@ -130,6 +132,8 @@ export const CoreFilterCmpt = {
 				{
 					// If the column has to be displayed or not
 					col.visible = selectedFields.indexOf(col.field) >= 0;
+					if (col.formatter == 'rowSelection')
+						col.visible = true;
 
 					if (col.hasOwnProperty('resizable'))
 						col.resizable = col.visible;
@@ -182,6 +186,9 @@ export const CoreFilterCmpt = {
 				tabulatorOptions.columns = this.filteredColumns;
 			}
 
+			if (tabulatorOptions.columns && tabulatorOptions.columns.filter(el => el.formatter == 'rowSelection').length)
+				this.tabulatorHasSelector = true;
+
 			// Start the tabulator with the build options
 			this.tabulator = new Tabulator(
 				this.$refs.table,
@@ -195,6 +202,9 @@ export const CoreFilterCmpt = {
 					this.tabulator.on(evt.event, evt.handler);
 			}
 			this.tabulator.on('tableBuilt', () => this.tableBuilt = true);
+			this.tabulator.on("rowSelectionChanged", data => {
+				this.selectedData = data;
+			});
 			if (this.tableOnly) {
 				this.tabulator.on('tableBuilt', () => {
 					const cols = this.tabulator.getColumns();
@@ -213,6 +223,7 @@ export const CoreFilterCmpt = {
 		},
 		_updateTabulator() {
 			this.tabulator.setData(this.filteredData);
+			this.tabulatorHasSelector = this.filteredColumns.filter(el => el.formatter == 'rowSelection').length;
 			this.tabulator.setColumns(this.filteredColumns);
 		},
 		/**
@@ -502,10 +513,12 @@ export const CoreFilterCmpt = {
 					<span data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra" class="filter-header-title-span-icon fa-solid fa-table-columns fa-xl"></span>
 					<table-download class="filter-header-title-span-icon fa-xl text-dark" :tabulator="tabulator" :config="download"></table-download>
 				</div>
-				<div v-if="reload" class="filter-header-title">
+				<div v-if="reload || $slots.actions" class="filter-header-title">
 					<button v-if="reload" class="btn btn-outline-secondary" aria-label="Reload" @click="reloadTable">
 						<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
 					</button>
+					<span v-if="$slots.actions && tabulatorHasSelector">Mit {{selectedData.length}} ausgewählten: </span>
+					<slot name="actions" v-bind="tabulatorHasSelector ? selectedData : []"></slot>
 				</div>
 			</div>
 

From 94a15093ac3c14788f0764158301a0eaa11e3e1b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 23 May 2023 15:26:49 +0200
Subject: [PATCH 014/149] New Button

---
 public/js/components/filter/Filter.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index cf0fcf5e1..ed9452925 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -59,7 +59,11 @@ export const CoreFilterCmpt = {
 		download: {
 			type: [Boolean, String, Function, Array, Object],
 			default: false
-		}
+		},
+		newBtnShow: Boolean,
+		newBtnClass: [String, Array, Object],
+		newBtnDisabled: Boolean,
+		newBtnLabel: String
 	},
 	data: function() {
 		return {
@@ -513,7 +517,11 @@ export const CoreFilterCmpt = {
 					<span data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra" class="filter-header-title-span-icon fa-solid fa-table-columns fa-xl"></span>
 					<table-download class="filter-header-title-span-icon fa-xl text-dark" :tabulator="tabulator" :config="download"></table-download>
 				</div>
-				<div v-if="reload || $slots.actions" class="filter-header-title">
+				<div v-if="newBtnShow || reload || $slots.actions" class="filter-header-title d-flex gap-2 align-items-baseline">
+					<button v-if="newBtnShow" class="btn btn-outline-secondary" :class="newBtnClass" :title="newBtnLabel ? undefined : 'New'" :aria-label="newBtnLabel ? undefined : 'New'" @click="$emit('click:new', $event)" :disabled="newBtnDisabled">
+						<span class="fa-solid fa-plus" aria-hidden="true"></span>
+						{{ newBtnLabel }}
+					</button>
 					<button v-if="reload" class="btn btn-outline-secondary" aria-label="Reload" @click="reloadTable">
 						<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
 					</button>

From f6f2defc8c6fa9587dbbc1680bae95965d5595e1 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Tue, 23 May 2023 18:48:18 +0200
Subject: [PATCH 015/149] Bismeldestichtag: added table

---
 system/dbupdate_3.4.php                       |  2 +
 ...student_status_nach_bismeldung_sperren.php | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 679c21b87..01dd9ea8f 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -37,6 +37,7 @@ require_once('dbupdate_3.4/10001_tempus_mitarbeiter_kurzbz_bei_reservierungen_an
 require_once('dbupdate_3.4/27949_infocenter_zurueckstellen_mit_grund.php');
 require_once('dbupdate_3.4/27107_vilesci_erfassung_abwesenheiten_reinigung.php');
 require_once('dbupdate_3.4/24913_tabelle_raumtyp_neues_attribut_aktiv.php');
+require_once('dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -55,6 +56,7 @@ $tabellen=array(
 	"bis.tbl_bisfunktion"  => array("bisverwendung_id","studiengang_kz","sws","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"bis.tbl_bisio"  => array("bisio_id","mobilitaetsprogramm_code","nation_code","von","bis","zweck_code","student_uid","updateamum","updatevon","insertamum","insertvon","ext_id","ort","universitaet","lehreinheit_id","ects_erworben","ects_angerechnet","herkunftsland_code"),
 	"bis.tbl_bisio_zweck"  => array("bisio_id","zweck_code"),
+	"bis.tbl_bismeldestichtag"  => array("studiensemester_kurzbz","meldestichtag"),
 	"bis.tbl_bisstandort"  => array("standort_code","bezeichnung","aktiv","insertamum","insertvon","updateamum","updatevon"),
 	"bis.tbl_bisverwendung"  => array("bisverwendung_id","ba1code","ba2code","vertragsstunden","beschausmasscode","verwendung_code","mitarbeiter_uid","hauptberufcode","hauptberuflich","habilitation","beginn","ende","updateamum","updatevon","insertamum","insertvon","ext_id","dv_art","inkludierte_lehre","zeitaufzeichnungspflichtig","azgrelevant", "homeoffice"),
 	"bis.tbl_bundesland"  => array("bundesland_code","kurzbz","bezeichnung"),
diff --git a/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php b/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
new file mode 100644
index 000000000..0d5819c49
--- /dev/null
+++ b/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
@@ -0,0 +1,39 @@
+<?php
+
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Creates table bis.tbl_bismeldestichtag if it doesn't exist and grants privileges
+if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_bismeldestichtag LIMIT 1'))
+{
+	$qry = 'CREATE TABLE bis.tbl_bismeldestichtag (
+				studiensemester_kurzbz varchar(16),
+				meldestichtag date NOT NULL,
+				insertamum timestamp DEFAULT NOW(),
+				insertvon varchar(32),
+				updateamum timestamp,
+				updatevon varchar(32)
+			);
+
+			COMMENT ON TABLE bis.tbl_bismeldestichtag IS \'Deadline Dates for BIS reporting\';
+
+			ALTER TABLE bis.tbl_bismeldestichtag ADD CONSTRAINT pk_bismeldestichtag PRIMARY KEY (studiensemester_kurzbz);
+
+			ALTER TABLE bis.tbl_bismeldestichtag ADD CONSTRAINT fk_bismeldestichtag_studiensemester_kurzbz FOREIGN KEY (studiensemester_kurzbz) REFERENCES public.tbl_studiensemester(studiensemester_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;';
+
+	if (!$db->db_query($qry))
+		echo '<strong>bis.tbl_bismeldestichtag: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>bis.tbl_bismeldestichtag table created';
+
+	$qry = 'GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE bis.tbl_bismeldestichtag TO web;';
+	if (!$db->db_query($qry))
+		echo '<strong>bis.tbl_bismeldestichtag: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Granted privileges to <strong>web</strong> on bis.tbl_bismeldestichtag';
+
+	$qry = 'GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE bis.tbl_bismeldestichtag TO vilesci;';
+	if (!$db->db_query($qry))
+		echo '<strong>bis.tbl_bismeldestichtag: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Granted privileges to <strong>vilesci</strong> on bis.tbl_bismeldestichtag';
+}

From be331d6200bbe87d70dc8bcc79b02a3602f3719c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 24 May 2023 12:05:36 +0200
Subject: [PATCH 016/149] Styles

---
 public/js/components/filter/Filter.js         | 20 +++++++++++--------
 public/js/components/filter/Filter/Columns.js | 18 ++++++++---------
 public/js/components/filter/Table/Download.js |  7 ++++---
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index ed9452925..776405614 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -510,14 +510,8 @@ export const CoreFilterCmpt = {
 
 		<div :id="'filterCollapsables' + idExtra">
 
-			<div class="d-flex flex-row-reverse justify-content-between">
-				<div class="filter-header-title">
-					<span v-if="!tableOnly" class="filter-header-title-span-filter">[ {{ filterName }} ]</span>
-					<span v-if="!tableOnly" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra" class="filter-header-title-span-icon fa-solid fa-filter fa-xl"></span>
-					<span data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra" class="filter-header-title-span-icon fa-solid fa-table-columns fa-xl"></span>
-					<table-download class="filter-header-title-span-icon fa-xl text-dark" :tabulator="tabulator" :config="download"></table-download>
-				</div>
-				<div v-if="newBtnShow || reload || $slots.actions" class="filter-header-title d-flex gap-2 align-items-baseline">
+			<div class="d-flex flex-row justify-content-between flex-wrap">
+				<div v-if="newBtnShow || reload || $slots.actions" class="d-flex gap-2 align-items-baseline flex-wrap">
 					<button v-if="newBtnShow" class="btn btn-outline-secondary" :class="newBtnClass" :title="newBtnLabel ? undefined : 'New'" :aria-label="newBtnLabel ? undefined : 'New'" @click="$emit('click:new', $event)" :disabled="newBtnDisabled">
 						<span class="fa-solid fa-plus" aria-hidden="true"></span>
 						{{ newBtnLabel }}
@@ -528,6 +522,16 @@ export const CoreFilterCmpt = {
 					<span v-if="$slots.actions && tabulatorHasSelector">Mit {{selectedData.length}} ausgewählten: </span>
 					<slot name="actions" v-bind="tabulatorHasSelector ? selectedData : []"></slot>
 				</div>
+				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">
+					<span v-if="!tableOnly">[ {{ filterName }} ]</span>
+					<a v-if="!tableOnly" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
+						<span class="fa-solid fa-xl fa-filter"></span>
+					</a>
+					<a href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra">
+						<span class="fa-solid fa-xl fa-table-columns"></span>
+					</a>
+					<table-download class="btn btn-link px-0 text-dark" :tabulator="tabulator" :config="download"></table-download>
+				</div>
 			</div>
 
 			<filter-columns
diff --git a/public/js/components/filter/Filter/Columns.js b/public/js/components/filter/Filter/Columns.js
index ca8fc0aec..8c26df984 100644
--- a/public/js/components/filter/Filter/Columns.js
+++ b/public/js/components/filter/Filter/Columns.js
@@ -64,16 +64,14 @@ export default {
 	template: `
 	<div class="filter-columns">
 		<div class="card">
-			<div class="row card-body filter-options-div">
-				<div class="filter-fields-area">
-					<div
-						v-for="fieldToDisplay in fields"
-						class="filter-fields-field"
-						:class="selected.indexOf(fieldToDisplay) != -1 ? 'text-light bg-dark' : '' "
-						@click="toggle(fieldToDisplay)"
-					>
-						{{ names[fieldToDisplay] || fieldToDisplay }}
-					</div>
+			<div class="d-flex flex-wrap gap-2 p-3 justify-content-center">
+				<div
+					v-for="fieldToDisplay in fields"
+					class="btn"
+					:class="selected.indexOf(fieldToDisplay) != -1 ? 'btn-dark' : 'btn-outline-dark' "
+					@click="toggle(fieldToDisplay)"
+				>
+					{{ names[fieldToDisplay] || fieldToDisplay }}
 				</div>
 			</div>
 		</div>
diff --git a/public/js/components/filter/Table/Download.js b/public/js/components/filter/Table/Download.js
index 7d4512d55..057fdad5e 100644
--- a/public/js/components/filter/Table/Download.js
+++ b/public/js/components/filter/Table/Download.js
@@ -42,7 +42,8 @@ export default {
 		config: {
 			type: [Boolean, String, Function, Array, Object],
 			default: false
-		}
+		},
+		iconClass: [String, Array, Object]
 	},
 	computed: {
 		currentConfig() {
@@ -215,7 +216,7 @@ export default {
 				aria-title="Download"
 				@click.prevent="download(currentConfig[0])"
 			>
-				<span class="fa-solid fa-download" aria-hidden="true"></span>
+				<span :class="iconClass || 'fa-solid fa-xl fa-download'" aria-hidden="true"></span>
 			</a>
 		</template>
 		<div v-else class="dropdown d-inline">
@@ -229,7 +230,7 @@ export default {
 				data-bs-toggle="dropdown"
 				aria-expanded="false"
 			>
-				<span class="fa-solid fa-download" aria-hidden="true"></span>
+				<span :class="iconClass || 'fa-solid fa-xl fa-download'" aria-hidden="true"></span>
 			</a>
 			<ul class="dropdown-menu dropdown-menu-end">
 				<li v-for="(conf, i) in currentConfig" :key="i">

From 0a179c963f6a77af978432baaf2f432e50cf4e2a Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Thu, 25 May 2023 16:35:44 +0200
Subject: [PATCH 017/149] bismeldestichtag: added meldestichtag_id to table,
 created bismeldestichtag class, improved comment for prestudentstatuschecks
 in studentDBML

---
 content/student/studentDBDML.php              |   7 +-
 include/bismeldestichtag.class.php            | 144 ++++++++++++++++++
 system/dbupdate_3.4.php                       |   2 +-
 ...student_status_nach_bismeldung_sperren.php |  25 ++-
 4 files changed, 172 insertions(+), 6 deletions(-)
 create mode 100644 include/bismeldestichtag.class.php

diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 2d5c9e0b8..c5818ebb3 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -74,6 +74,7 @@ require_once('../../include/reihungstest.class.php');
 require_once('../../include/studienplan.class.php');
 require_once('../../include/mobilitaet.class.php');
 require_once('../../include/studienordnung.class.php');
+require_once('../../include/bismeldestichtag.class.php');
 
 $user = get_uid();
 $db = new basis_db();
@@ -383,7 +384,7 @@ function isBuchungAllowedToChange($buchung_obj)
  * @param $new_status_ausbildungssemester Ausbildungssemester des neuen/zu ändernen Status
  * @param $old_status_studiensemester Studiensemester des alten Status, leer wenn neuer Status
  * @param $old_status_ausbildungssemester Ausbildungssemester des alten Status, leer wenn neuer Status
- * @return array
+ * @return array mit error = true und Fehlerbeschreibung wenn ungültig, andernfalls error = false
  */
 function checkStatusaenderung(
 	$prestudent_id, $status_kurzbz, $new_status_studiensemester, $new_status_datum, $new_status_ausbildungssemester,
@@ -417,7 +418,7 @@ function checkStatusaenderung(
 	$studiensemester->load($new_status_studiensemester);
 	$new_status_semesterstart = new DateTime($studiensemester->start);
 
-	// Alle bisherigen prestudentstatus nach Datum sortiert
+	// Alle prestudentstatus nach Datum sortiert
 	$qry = "SELECT status_kurzbz, studiensemester_kurzbz, ausbildungssemester, datum, sem.start AS studiensemester_start
 			FROM public.tbl_prestudentstatus pss
 			JOIN public.tbl_studiensemester sem USING (studiensemester_kurzbz)
@@ -464,7 +465,7 @@ function checkStatusaenderung(
 				// Gültige Zeitabfolge, bestehenden Status hinzufügen
 				$statusArr[] = $row;
 			}
-			// oder Neuer/editierter Statuseintrag nach bestehendem Statuseintrag
+			// oder Neuer/editierter Statuseintrag vor bestehendem Statuseintrag
 			elseif ($new_status_datum <= $status_datum && $new_status_semesterstart <= $studiensemester_start)
 			{
 				// Gültige Zeitabfolge, bestehenden Status hinzufügen
diff --git a/include/bismeldestichtag.class.php b/include/bismeldestichtag.class.php
new file mode 100644
index 000000000..e4b3746a6
--- /dev/null
+++ b/include/bismeldestichtag.class.php
@@ -0,0 +1,144 @@
+<?php
+/* Copyright (C) 2007 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Alexei Karpenko <karpenko@technikum-wien.at>,
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+
+class bismeldestichtag extends basis_db
+{
+	//Tabellenspalten
+	public $meldestichtag_id;		// integer
+	public $meldestichtag;			// date
+	public $studiensemester_kurzbz;	// varchar(16)
+	public $insertamum;				// timestamp
+	public $insertvon;				// varchar(16)
+	public $updateamum;				// timestamp
+	public $updatevon;				// varchar(16)
+
+	// ErgebnisArray
+	public $result=array();
+
+	/**
+	 * Konstruktor - Uebergibt die Connection und laedt optional einen Meldestichtag
+	 * @param $meldestichtag_id Stichtag der geladen werden soll (default=null)
+	 */
+	public function __construct($meldestichtag_id=null)
+	{
+		parent::__construct();
+
+		if(!is_null($meldestichtag_id))
+			$this->load($meldestichtag_id);
+	}
+
+	/**
+	 * Laedt Meldestichtag mit der uebergebenen ID
+	 * @param $meldestichtag_id ID des Stichtags der geladen werden soll
+	 */
+	public function load($meldestichtag_id)
+	{
+		$qry = "SELECT * FROM bis.tbl_meldestichtag WHERE meldestichtag_id=".$this->db_add_param($meldestichtag_id, FHC_INTEGER);
+
+		if($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				$this->meldestichtag_id = $row->meldestichtag_id;
+				$this->meldestichtag = $row->meldestichtag;
+				$this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
+				$this->insertamum = $row->insertamum;
+				$this->insertvon = $row->insertvon;
+				$this->updateamum = $row->updateamum;
+				$this->updatevon = $row->updatevon;
+				return true;
+			}
+			else
+			{
+				$this->errormsg = 'Kein Eintrag gefunden';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = "Fehler beim Laden des Stichtags";
+			return false;
+		}
+	}
+
+	/**
+	 * Prueft die Variablen vor dem Speichern
+	 * auf Gueltigkeit.
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	protected function validate()
+	{
+		return true;
+	}
+
+	/**
+	 * Liefert die Antwort eines Pruefling zu einer Frage
+	 *
+	 * @param $pruefling_id
+	 * @param $frage_id
+	 * @return boolean
+	 */
+	public function getLastMeldestichtag($studiensemester_kurzbz = null)
+	{
+		$qry = "SELECT
+					meldestichtag, studiensemester_kurzbz
+				FROM
+					bis.tbl_meldestichtag";
+
+		if (isset($studiensemester_kurzbz))
+		{
+			$qry .=	"
+				WHERE
+					studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
+		}
+
+		$qry .= "
+				ORDER BY
+					meldestichtag DESC
+				LIMIT 1;"
+
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$obj = new antwort();
+
+				$obj->meldestichtag_id = $row->meldestichtag_id;
+				$obj->meldestichtag = $row->meldestichtag;
+				$obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+				$obj->updateamum = $row->updateamum;
+				$obj->updatevon = $row->updatevon;
+
+				$this->result[] = $obj;
+			}
+
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Meldestichtag konnte nicht geladen werden';
+			return false;
+		}
+	}
+}
+?>
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 01dd9ea8f..f9920900b 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -56,7 +56,7 @@ $tabellen=array(
 	"bis.tbl_bisfunktion"  => array("bisverwendung_id","studiengang_kz","sws","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"bis.tbl_bisio"  => array("bisio_id","mobilitaetsprogramm_code","nation_code","von","bis","zweck_code","student_uid","updateamum","updatevon","insertamum","insertvon","ext_id","ort","universitaet","lehreinheit_id","ects_erworben","ects_angerechnet","herkunftsland_code"),
 	"bis.tbl_bisio_zweck"  => array("bisio_id","zweck_code"),
-	"bis.tbl_bismeldestichtag"  => array("studiensemester_kurzbz","meldestichtag"),
+	"bis.tbl_bismeldestichtag"  => array("meldestichtag_id", "meldestichtag", "studiensemester_kurzbz"),
 	"bis.tbl_bisstandort"  => array("standort_code","bezeichnung","aktiv","insertamum","insertvon","updateamum","updatevon"),
 	"bis.tbl_bisverwendung"  => array("bisverwendung_id","ba1code","ba2code","vertragsstunden","beschausmasscode","verwendung_code","mitarbeiter_uid","hauptberufcode","hauptberuflich","habilitation","beginn","ende","updateamum","updatevon","insertamum","insertvon","ext_id","dv_art","inkludierte_lehre","zeitaufzeichnungspflichtig","azgrelevant", "homeoffice"),
 	"bis.tbl_bundesland"  => array("bundesland_code","kurzbz","bezeichnung"),
diff --git a/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php b/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
index 0d5819c49..b3e2eed7c 100644
--- a/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
+++ b/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
@@ -6,8 +6,9 @@ if (! defined('DB_NAME')) exit('No direct script access allowed');
 if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_bismeldestichtag LIMIT 1'))
 {
 	$qry = 'CREATE TABLE bis.tbl_bismeldestichtag (
-				studiensemester_kurzbz varchar(16),
+				meldestichtag_id integer,
 				meldestichtag date NOT NULL,
+				studiensemester_kurzbz varchar(16) NOT NULL,
 				insertamum timestamp DEFAULT NOW(),
 				insertvon varchar(32),
 				updateamum timestamp,
@@ -16,7 +17,15 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_bismeldestichtag LIMIT 1'))
 
 			COMMENT ON TABLE bis.tbl_bismeldestichtag IS \'Deadline Dates for BIS reporting\';
 
-			ALTER TABLE bis.tbl_bismeldestichtag ADD CONSTRAINT pk_bismeldestichtag PRIMARY KEY (studiensemester_kurzbz);
+			ALTER TABLE bis.tbl_bismeldestichtag ADD CONSTRAINT pk_bismeldestichtag PRIMARY KEY (meldestichtag_id);
+
+			CREATE SEQUENCE bis.tbl_meldestichtag_meldestichtag_id_seq
+				INCREMENT BY 1
+				NO MAXVALUE
+				NO MINVALUE
+				CACHE 1;
+
+			ALTER TABLE bis.tbl_bismeldestichtag ALTER COLUMN meldestichtag_id SET DEFAULT nextval(\'tbl_meldestichtag_meldestichtag_id_seq\');
 
 			ALTER TABLE bis.tbl_bismeldestichtag ADD CONSTRAINT fk_bismeldestichtag_studiensemester_kurzbz FOREIGN KEY (studiensemester_kurzbz) REFERENCES public.tbl_studiensemester(studiensemester_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;';
 
@@ -36,4 +45,16 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_bismeldestichtag LIMIT 1'))
 		echo '<strong>bis.tbl_bismeldestichtag: '.$db->db_last_error().'</strong><br>';
 	else
 		echo '<br>Granted privileges to <strong>vilesci</strong> on bis.tbl_bismeldestichtag';
+
+	$qry = 'GRANT SELECT, UPDATE ON SEQUENCE bis.tbl_meldestichtag_meldestichtag_id_seq TO web;';
+	if (!$db->db_query($qry))
+		echo '<strong>bis.tbl_meldestichtag_meldestichtag_id_seq: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Granted privileges to <strong>web</strong> on bis.tbl_meldestichtag_meldestichtag_id_seq';
+
+	$qry = 'GRANT SELECT, UPDATE ON SEQUENCE bis.tbl_meldestichtag_meldestichtag_id_seq TO vilesci;';
+	if (!$db->db_query($qry))
+		echo '<strong>bis.tbl_meldestichtag_meldestichtag_id_seq: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Granted privileges to <strong>vilesci</strong> on bis.tbl_meldestichtag_meldestichtag_id_seq';
 }

From bf344df8d6c96d1987b4ab00180471cdbf2c494b Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 1 Jun 2023 07:12:40 +0200
Subject: [PATCH 018/149] - abgabetool anpassungen

---
 cis/private/lehre/abgabe_lektor_zusatz.php   |  6 ++--
 cis/private/lehre/abgabe_student_details.php | 29 ++------------------
 vilesci/lehre/abgabe_assistenz_zusatz.php    |  6 ++--
 3 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/cis/private/lehre/abgabe_lektor_zusatz.php b/cis/private/lehre/abgabe_lektor_zusatz.php
index 39488b6c3..b764fd556 100644
--- a/cis/private/lehre/abgabe_lektor_zusatz.php
+++ b/cis/private/lehre/abgabe_lektor_zusatz.php
@@ -121,15 +121,15 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 				<td><input  type="text" name="sprache" id="sprache" value="'.$db->convert_html_chars($row_zd->sprache).'" size="10" maxlength="8" readonly="readonly"></td>
 			</tr>
 			<tr>
-				<td width="30%"><b>'.$p->t('abgabetool/kontrollierteSchlagwoerter').':*</b></td>
+				<td width="30%"><b>'.$p->t('abgabetool/kontrollierteSchlagwoerter').':</b></td>
 				<td width="40%"><input type="text" name="kontrollschlagwoerter" id="kontrollschlagwoerter" value="'.$db->convert_html_chars($row_zd->kontrollschlagwoerter).'" size="60" maxlength="150" readonly="readonly"></td>
 			</tr>
 			<tr>
-				<td><b>'.$p->t('abgabetool/deutscheSchlagwoerter').': </b></td>
+				<td><b>'.$p->t('abgabetool/deutscheSchlagwoerter').':* </b></td>
 				<td><input type="text" name="schlagwoerter" value="'.$db->convert_html_chars($row_zd->schlagwoerter).'" size="60" maxlength="150" readonly="readonly"></td>
 			</tr>
 			<tr>
-				<td><b>'.$p->t('abgabetool/englischeSchlagwoerter').': </b></td>
+				<td><b>'.$p->t('abgabetool/englischeSchlagwoerter').':* </b></td>
 				<td><input type="text" name="schlagwoerter_en" value="'.$db->convert_html_chars($row_zd->schlagwoerter_en).'" size="60" maxlength="150" readonly="readonly"></td>
 			</tr>
 			<tr>
diff --git a/cis/private/lehre/abgabe_student_details.php b/cis/private/lehre/abgabe_student_details.php
index 6575dcf70..9171a978c 100644
--- a/cis/private/lehre/abgabe_student_details.php
+++ b/cis/private/lehre/abgabe_student_details.php
@@ -64,7 +64,6 @@ if(!isset($_POST['uid']))
 	$fixtermin = false;
 	$datum = '01.01.1980';
 	$kurzbz = '';
-	$kontrollschlagwoerter = '';
 	$schlagwoerter = '';
 	$schlagwoerter_en = '';
 	$abstract = '';
@@ -88,7 +87,6 @@ else
 	$kurzbz = (isset($_POST['kurzbz'])?$_POST['kurzbz']:'');
 	$betreuer = (isset($_POST['betreuer'])?$_POST['betreuer']:'-1');
 	$sprache = (isset($_POST['sprache'])?$_POST['sprache']:'German');
-	$kontrollschlagwoerter = (isset($_POST['kontrollschlagwoerter'])?$_POST['kontrollschlagwoerter']:'-1');
 	$schlagwoerter = (isset($_POST['schlagwoerter'])?$_POST['schlagwoerter']:'-1');
 	$schlagwoerter_en = (isset($_POST['schlagwoerter_en'])?$_POST['schlagwoerter_en']:'-1');
 	$abstract = (isset($_POST['abstract'])?$_POST['abstract']:'-1');
@@ -211,23 +209,7 @@ if($command=='add')
 	{
 		//zusätzliche Daten bearbeiten
 		//Check der Eingabedaten
-		if(strlen($kontrollschlagwoerter)<1)
-		{
-			$error=true;
-		}
-		if(mb_strlen($kontrollschlagwoerter)>=150)
-		{
-			$kontrollschlagwoerter = mb_substr($kontrollschlagwoerter, 0, 146).'...';
-		}
-		if(strlen($abstract)<1)
-		{
-			$error=true;
-		}
-		if(strlen($abstract_en)<1)
-		{
-			$error=true;
-		}
-		if($seitenanzahl<1)
+		if((strlen($schlagwoerter) < 1) || (strlen($schlagwoerter_en) < 1) || (strlen($abstract) < 1) || (strlen($abstract_en) < 1) || ($seitenanzahl < 1))
 		{
 			$error=true;
 		}
@@ -237,7 +219,6 @@ if($command=='add')
 					seitenanzahl = ".$db->db_add_param($seitenanzahl).",
 					abgabedatum = now(),
 					sprache = ".$db->db_add_param($sprache).",
-					kontrollschlagwoerter = ".$db->db_add_param($kontrollschlagwoerter).",
 					schlagwoerter_en = ".$db->db_add_param($schlagwoerter_en).",
 					schlagwoerter = ".$db->db_add_param($schlagwoerter).",
 					abstract = ".$db->db_add_param($abstract).",
@@ -413,12 +394,9 @@ if($command=="update" && $error!=true)
 							        $htmlstr .= "</SELECT> \n";
 							    }
 							    $htmlstr .= "</td></tr>\n";
-								$htmlstr .= '<tr><td width="30%"><b>'.$p->t('abgabetool/kontrollierteSchlagwoerter').':*</b></td>
-											<td width="40%"><input type="text" name="kontrollschlagwoerter" id="kontrollschlagwoerter" value="'.$db->convert_html_chars($kontrollschlagwoerter).'" size="60" maxlength="150"></td>
-											<td  width="30%" align="left"><input type="button" name="SWD" value="    SWD    " onclick="window.open(\'swd.php\')"></td></tr>'."\n";
-								$htmlstr .= '<tr><td><b>'.$p->t('abgabetool/deutscheSchlagwoerter').':</b></td>
+								$htmlstr .= '<tr><td><b>'.$p->t('abgabetool/deutscheSchlagwoerter').':*</b></td>
 											<td><input  type="text" name="schlagwoerter" value="'.$db->convert_html_chars($schlagwoerter).'" size="60" maxlength="150"></td></tr>'."\n";
-								$htmlstr .= '<tr><td><b>'.$p->t('abgabetool/englischeSchlagwoerter').':</b></td>
+								$htmlstr .= '<tr><td><b>'.$p->t('abgabetool/englischeSchlagwoerter').':*</b></td>
 											<td><input type="text" name="schlagwoerter_en" value="'.$db->convert_html_chars($schlagwoerter_en).'" size="60" maxlength="150"></td></tr>'."\n";
 								$htmlstr .= '<tr><td valign="top"><b>'.$p->t('abgabetool/abstract').' </b>'.$p->t('abgabetool/maxZeichen').':*</td>
 											<td><textarea name="abstract" cols="46"  rows="7">'.$db->convert_html_chars($abstract).'</textarea></td></tr>'."\n";
@@ -657,7 +635,6 @@ if($command!="add")
 			$htmlstr .= '<input type="hidden" name="uid" value="'.$db->convert_html_chars($uid).'">'."\n";
 			$htmlstr .= '<input type="hidden" name="betreuer" value="'.$db->convert_html_chars($betreuer).'">'."\n";
 			$htmlstr .= '<input type="hidden" name="command" value="update">'."\n";
-			$htmlstr .= '<input type="hidden" name="kontrollschlagwoerter" value="'.$db->convert_html_chars($kontrollschlagwoerter).'">'."\n";
 			$htmlstr .= '<input type="hidden" name="schlagwoerter" value="'.$db->convert_html_chars($schlagwoerter).'">'."\n";
 			$htmlstr .= '<input type="hidden" name="schlagwoerter_en" value="'.$db->convert_html_chars($schlagwoerter_en).'">'."\n";
 			$htmlstr .= '<input type="hidden" name="abstract" value="'.$db->convert_html_chars($abstract).'">'."\n";
diff --git a/vilesci/lehre/abgabe_assistenz_zusatz.php b/vilesci/lehre/abgabe_assistenz_zusatz.php
index 20dbe9d97..724658d24 100644
--- a/vilesci/lehre/abgabe_assistenz_zusatz.php
+++ b/vilesci/lehre/abgabe_assistenz_zusatz.php
@@ -120,15 +120,15 @@ echo '<div>Student: <b>'.$uid.'</b><br>Titel: <b>'.
 	<td><input type="text" name="sprache" id="sprache" value="'.(isset($row_zd->sprache)?$db->convert_html_chars($row_zd->sprache):'').'" size="10" maxlength="8" readonly="readonly"></td>
 </tr>
 <tr>
-	<td width="30%"><b>Kontrollierte Schlagw&ouml;rter:*</b></td>
+	<td width="30%"><b>Kontrollierte Schlagw&ouml;rter:</b></td>
 	<td width="40%"><input type="text" name="kontrollschlagwoerter" id="kontrollschlagwoerter" value="'.(isset($row_zd->kontrollschlagwoerter)?$db->convert_html_chars($row_zd->kontrollschlagwoerter):'').'" size="60" maxlength="150" readonly="readonly"></td>
 </tr>
 <tr>
-	<td><b>Dt. Schlagw&ouml;rter:</b></td>
+	<td><b>Dt. Schlagw&ouml;rter:*</b></td>
 	<td><input type="text" name="schlagwoerter" value="'.(isset($row_zd->schlagwoerter)?$db->convert_html_chars($row_zd->schlagwoerter):'').'" size="60" maxlength="150" readonly="readonly"></td>
 </tr>
 <tr>
-	<td><b>Engl. Schlagw&ouml;rter:</b></td>
+	<td><b>Engl. Schlagw&ouml;rter:*</b></td>
 	<td><input  type="text" name="schlagwoerter_en" value="'.(isset($row_zd->schlagwoerter_en)?$db->convert_html_chars($row_zd->schlagwoerter_en):'').'" size="60" maxlength="150" readonly="readonly"></td>
 </tr>
 <tr>

From 9f13f876ef587ae07ae960789a45f300dca0a657 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 1 Jun 2023 07:39:56 +0200
Subject: [PATCH 019/149] - swd.php entfernt

---
 cis/private/lehre/swd.php | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 cis/private/lehre/swd.php

diff --git a/cis/private/lehre/swd.php b/cis/private/lehre/swd.php
deleted file mode 100644
index 248779aac..000000000
--- a/cis/private/lehre/swd.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$url = "https://ognd.bsz-bw.de/";
-$zielfeld = "kontrollschlagwoerter";
-$url = $url."?zielfeld=".$zielfeld;
-header('Content-Type: text/html; charset=utf-8');
-$content = file_get_contents($url);
-if($content)
-	print $content;
-else
-	echo "Der Schlagwortdienst ist derzeit nicht erreichbar. Bitte füllen Sie die Schlagwörter manuell aus um den Upload abzuschließen";
-?>

From 9e883a48a05eb8ae56414a574461ad4db20a61db Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 2 Jun 2023 09:02:47 +0200
Subject: [PATCH 020/149] Adaptierungen Icalfiles Coole

---
 cis/public/coodle.php    |  93 ++---
 include/coodle.class.php | 722 ++++++++++++++++++++-------------------
 2 files changed, 420 insertions(+), 395 deletions(-)

diff --git a/cis/public/coodle.php b/cis/public/coodle.php
index 721f2d3c0..2b8421db0 100644
--- a/cis/public/coodle.php
+++ b/cis/public/coodle.php
@@ -571,7 +571,7 @@ if (isset($_GET['resend']))
 
 			echo "<div id='coodle_content' >
 						<form action='' method='POST'>
-	
+
 					<table class='table-bordered'>
 					<tr><td></td>";
 			// Für Colspan bei Datum
@@ -675,7 +675,6 @@ if (isset($_GET['resend']))
 				}
 				else
 				{
-
 					// Ort-Ressourcen ueberspringen
 					if ($ressource->ort_kurzbz != '')
 					{
@@ -761,8 +760,8 @@ if (isset($_GET['resend']))
 								echo '	<td class="'.$class.'" align="center" '.$style.'>
 									<div class="checkbox">
 										<label style="font-size: 1.5em; padding-left: 10px">
-											<input  type="checkbox" 
-													value="" 
+											<input  type="checkbox"
+													value=""
 													'.($checked ? 'checked="checked"' : '').'
 													'.($termin->datum == '1900-01-01' ? 'id="disableCheckboxes"' : '').'
 													name="check_'.$ressource->coodle_ressource_id.'_'.$termin->coodle_termin_id.'"
@@ -867,8 +866,8 @@ if (isset($_GET['resend']))
 			<span class="glyphicon glyphicon-info-sign"></span>
 			Sie können ihre vorläufigen Terminzusagen in ihr Kalendersystem einbinden.<br>
 			Importieren Sie dazu die .ics-Datei des folgenden Links in ihren Kalender:<br>
-			<a href="'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid,LVPLAN_CYPHER_KEY).'" target="_blank">
-			'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid,LVPLAN_CYPHER_KEY).'
+			<a href="'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid, LVPLAN_CYPHER_KEY).'" target="_blank">
+			'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid, LVPLAN_CYPHER_KEY).'
 			</a>
 			<br><br>
 			Die Datei enthält ihre Terminzusagen aus <b>allen laufenden Umfragen</b>    .
@@ -999,7 +998,7 @@ function sendEmail($coodle_id)
 			else
 				$partstat = 'TENTATIVE';
 
-			$teilnehmer .= 'ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT='.$partstat.';CN='.$name."\n :MAILTO:".$mail."\n";
+			$teilnehmer .= $coodle->foldContentLine('ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT='.$partstat.';CN='.$name.":MAILTO:".$mail) . "\r\n";
 		}
 	}
 	$date = new DateTime($coodle_help->datum.' '.$coodle_help->uhrzeit);
@@ -1015,44 +1014,48 @@ function sendEmail($coodle_id)
 	$benutzer = new benutzer();
 	$benutzer->load($coodle->ersteller_uid);
 	$erstellername = trim($benutzer->titelpre.' '.$benutzer->vorname.' '.$benutzer->nachname.' '.$benutzer->titelpost);
+
+	$beschreibung = "DESCRIPTION:" . strip_tags(html_entity_decode($coodle->beschreibung, ENT_QUOTES, 'UTF-8'), '<br>');
+	$terminbeschreibung= $coodle->foldContentLine($beschreibung);
+
 	// Ical File erstellen
-	$ical = "BEGIN:VCALENDAR
-PRODID:-//Microsoft Corporation//Outlook 11.0 MIMEDIR//EN
-VERSION:2.0
-METHOD:PUBLISH
-BEGIN:VTIMEZONE
-TZID:Europe/Vienna
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-DTSTART:19810329T020000
-TZNAME:GMT+02:00
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-DTSTART:19961027T030000
-TZNAME:GMT+01:00
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-ORGANIZER:MAILTO:".$erstellername." <".$coodle->ersteller_uid."@".DOMAIN."
-".$teilnehmer."
-DTSTART;TZID=Europe/Vienna:".$dtstart."
-DTEND;TZID=Europe/Vienna:".$dtend."
-LOCATION:".$ort."
-TRANSP:OPAQUE
-SEQUENCE:0
-UID:FHCompleteCoodle".$coodle_id."
-DTSTAMP;TZID=Europe/Vienna:".$dtstamp."
-DESCRIPTION:".strip_tags(html_entity_decode($coodle->beschreibung, ENT_QUOTES, 'UTF-8'))."
-SUMMARY:".strip_tags($coodle->titel)."
-PRIORITY:5
-CLASS:PUBLIC
-END:VEVENT
-END:VCALENDAR";
+	$ical = "BEGIN:VCALENDAR\r\n"
+			."PRODID:-//Microsoft Corporation//Outlook 11.0 MIMEDIR//EN\r\n"
+			."VERSION:2.0\r\n"
+			."METHOD:PUBLISH\r\n"
+			."BEGIN:VTIMEZONE\r\n"
+			."TZID:Europe/Vienna\r\n"
+			."BEGIN:DAYLIGHT\r\n"
+			."TZOFFSETFROM:+0100\r\n"
+			."RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\n"
+			."DTSTART:19810329T020000\r\n"
+			."TZNAME:GMT+02:00\r\n"
+			."TZOFFSETTO:+0200\r\n"
+			."END:DAYLIGHT\r\n"
+			."BEGIN:STANDARD\r\n"
+			."TZOFFSETFROM:+0200\r\n"
+			."RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\n"
+			."DTSTART:19961027T030000\r\n"
+			."TZNAME:GMT+01:00\r\n"
+			."TZOFFSETTO:+0100\r\n"
+			."END:STANDARD\r\n"
+			."END:VTIMEZONE\r\n"
+			."BEGIN:VEVENT\r\n"
+			.$coodle->foldContentLine("ORGANIZER:MAILTO:".$erstellername." <".$coodle->ersteller_uid."@".DOMAIN)."\r\n"
+			.rtrim($teilnehmer)."\r\n"
+			."DTSTART;TZID=Europe/Vienna:".$dtstart."\r\n"
+			."DTEND;TZID=Europe/Vienna:".$dtend."\r\n"
+			."LOCATION:".$ort."\r\n"
+			."TRANSP:OPAQUE\r\n"
+			."SEQUENCE:0\r\n"
+			."UID:FHCompleteCoodle".$coodle_id."\r\n"
+			."DTSTAMP;TZID=Europe/Vienna:".$dtstamp."\r\n"
+			.$terminbeschreibung."\r\n"
+			."SUMMARY:".strip_tags($coodle->titel)."\r\n"
+			."PRIORITY:5\r\n"
+			."CLASS:PUBLIC\r\n"
+			."END:VEVENT\r\n"
+			."END:VCALENDAR\r\n";
 
 	if (count($coodle_ressource->result) > 0)
 	{
@@ -1173,4 +1176,4 @@ function RaumBelegt($ort_kurzbz, $datum, $stunden)
 	return false;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/include/coodle.class.php b/include/coodle.class.php
index 9f23f88da..9e4a57b6d 100644
--- a/include/coodle.class.php
+++ b/include/coodle.class.php
@@ -32,7 +32,7 @@ class coodle extends basis_db
 	public $coodle_id;				// integer
 	public $ersteller_uid;			// varchar(32)
 	public $coodle_status_kurzbz;	// varchar(32)
-	public $titel; 					// varchar(64)  
+	public $titel; 					// varchar(64)
 	public $beschreibung;			// text
 	public $dauer;					// smallint
 	public $endedatum;            	// date
@@ -43,7 +43,7 @@ class coodle extends basis_db
 	public $mailversand;			// boolean
 	public $teilnehmer_anonym;		// boolean
 	public $termine_anonym;			// boolean
-    
+
     // tbl_coodle_ressource
     public $coodle_ressource_id;    // integer
     public $uid;                    // varchar(32)
@@ -51,14 +51,14 @@ class coodle extends basis_db
     public $email;                  // varchar(128)
     public $name;                   // varchar(256)
     public $zugangscode;            // varchar(64)
-    
+
     // tbl_coodle_termin
     public $coodle_termin_id;       // integer
     public $datum;                  // date
     public $uhrzeit;                // date
     public $auswahl;                // boolean
-    
-    public $status_arr;	
+
+    public $status_arr;
 
 	/**
 	 * Konstruktor
@@ -67,7 +67,7 @@ class coodle extends basis_db
 	public function __construct($coodle_id=null)
 	{
 		parent::__construct();
-		
+
 		if(!is_null($coodle_id))
 			$this->load($coodle_id);
 	}
@@ -138,11 +138,11 @@ class coodle extends basis_db
 			$this->errormsg = 'titel darf nicht länger als 64 Zeichen sein';
 			return false;
 		}
-		
+
 		$this->errormsg = '';
 		return true;
 	}
-	
+
 	/**
 	 * Speichert den aktuellen Datensatz in die Datenbank
 	 * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
@@ -153,7 +153,7 @@ class coodle extends basis_db
 	{
 		if(is_null($new))
 			$new = $this->new;
-		
+
 		//Variablen pruefen
 		if(!$this->validate())
 			return false;
@@ -199,7 +199,7 @@ class coodle extends basis_db
 				' termine_anonym='.$this->db_add_param($this->termine_anonym, FHC_BOOLEAN).' '.
 		      	'WHERE coodle_id='.$this->db_add_param($this->coodle_id, FHC_INTEGER, false).';';
 		}
-		
+
 		if($this->db_query($qry))
 		{
 			if($new)
@@ -251,8 +251,8 @@ class coodle extends basis_db
 		}
 
 		//loeschen des Datensatzes
-		$qry="UPDATE campus.tbl_coodle SET coodle_status_kurzbz = 'storniert' 
-            WHERE 
+		$qry="UPDATE campus.tbl_coodle SET coodle_status_kurzbz = 'storniert'
+            WHERE
             coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false).';';
 
 		if($this->db_query($qry))
@@ -265,10 +265,10 @@ class coodle extends basis_db
 			return false;
 		}
 	}
-    
+
     /**
      * Liefert alle Ressourcen zurück, die einer Coodleumfrage zugeteilt sind
-     * @param type $coodle_id 
+     * @param type $coodle_id
      * @return true wenn ok, false im Fehlerfall
      */
     public function getRessourcen($coodle_id)
@@ -276,42 +276,42 @@ class coodle extends basis_db
         if(!is_numeric($coodle_id) || $coodle_id == '')
         {
             $this->errormsg = 'Coodle_id muss eine gültige Zahl sein'."\n";
-            return false; 
+            return false;
         }
-        
+
         $qry ="SELECT * FROM campus.tbl_coodle_ressource WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false);
-        
+
         if(!$this->db_query($qry))
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten!'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten!';
+            return false;
         }
-        
+
         while($row = $this->db_fetch_object())
         {
-            $coodle_ressource = new coodle(); 
-            
-            $coodle_ressource->coodle_ressource_id = $row->coodle_ressource_id; 
-            $coodle_ressource->coodle_id = $row->coodle_id; 
-            $coodle_ressource->uid = $row->uid; 
-            $coodle_ressource->ort_kurzbz = $row->ort_kurzbz; 
-            $coodle_ressource->email = $row->email; 
-            $coodle_ressource->name = $row->name; 
-            $coodle_ressource->zugangscode = $row->zugangscode; 
-            $coodle_ressource->insertamum = $row->insertamum; 
-            $coodle_ressource->insertvon = $row->insertvon; 
-            $coodle_ressource->updateamum = $row->updateamum; 
-            $coodle_ressource->updatevon = $row->updatevon; 
-            
-            $this->result[] = $coodle_ressource; 
+            $coodle_ressource = new coodle();
+
+            $coodle_ressource->coodle_ressource_id = $row->coodle_ressource_id;
+            $coodle_ressource->coodle_id = $row->coodle_id;
+            $coodle_ressource->uid = $row->uid;
+            $coodle_ressource->ort_kurzbz = $row->ort_kurzbz;
+            $coodle_ressource->email = $row->email;
+            $coodle_ressource->name = $row->name;
+            $coodle_ressource->zugangscode = $row->zugangscode;
+            $coodle_ressource->insertamum = $row->insertamum;
+            $coodle_ressource->insertvon = $row->insertvon;
+            $coodle_ressource->updateamum = $row->updateamum;
+            $coodle_ressource->updatevon = $row->updatevon;
+
+            $this->result[] = $coodle_ressource;
         }
-        
-        return true; 
+
+        return true;
     }
-    
+
     /**
-     * Lädt eine Ressource 
-     * @param type $coodle_ressource_id 
+     * Lädt eine Ressource
+     * @param type $coodle_ressource_id
      * @return true wenn ok, false im Fehlerfall
      */
     public function getRessourceFromId($coodle_ressource_id)
@@ -319,95 +319,95 @@ class coodle extends basis_db
         if(!is_numeric($coodle_ressource_id) || $coodle_ressource_id=='')
         {
             $this->errormsg = 'Coodle_id muss eine gültige Zahl sein'."\n";
-            return false; 
+            return false;
         }
-        
-        $qry = "SELECT * FROM campus.tbl_coodle_ressource WHERE coodle_ressource_id =".$this->db_add_param($coodle_ressource_id, FHC_INTEGER, false); 
-        
+
+        $qry = "SELECT * FROM campus.tbl_coodle_ressource WHERE coodle_ressource_id =".$this->db_add_param($coodle_ressource_id, FHC_INTEGER, false);
+
         if(!$this->db_query($qry))
         {
             $this->errormsg = 'Fehler bei der Abfrage aufgetreten'."\n";
-            return false; 
+            return false;
         }
-        
+
         if($row = $this->db_fetch_object())
         {
-            $this->coodle_ressource_id = $row->coodle_ressource_id; 
-            $this->coodle_id = $row->coodle_id; 
-            $this->uid = $row->uid; 
-            $this->ort_kurzbz = $row->ort_kurzbz; 
-            $this->email = $row->email; 
-            $this->name = $row->name; 
-            $this->zugangscode = $row->zugangscode; 
-            $this->insertamum = $row->insertamum; 
-            $this->insertvon = $row->insertvon; 
-            $this->updateamum = $row->updateamum; 
-            $this->updatevon = $row->updatevon; 
+            $this->coodle_ressource_id = $row->coodle_ressource_id;
+            $this->coodle_id = $row->coodle_id;
+            $this->uid = $row->uid;
+            $this->ort_kurzbz = $row->ort_kurzbz;
+            $this->email = $row->email;
+            $this->name = $row->name;
+            $this->zugangscode = $row->zugangscode;
+            $this->insertamum = $row->insertamum;
+            $this->insertvon = $row->insertvon;
+            $this->updateamum = $row->updateamum;
+            $this->updatevon = $row->updatevon;
         }
         else
         {
 			$this->errormsg = 'Es ist kein Datensatz mit dieser ID vorhanden';
-            return false; 
+            return false;
         }
-        
-        return true; 
+
+        return true;
     }
-    
+
     /**
-     * Liefert alle Coodle Umfragen zurück wo Benutzer entweder Ersteller oder Ressource ist 
+     * Liefert alle Coodle Umfragen zurück wo Benutzer entweder Ersteller oder Ressource ist
      * und das Endedatum vor 20 Tagen oder in der Zukunft liegt
-     * @param type $uid 
-     * @return true wenn ok, false im Fehlerfall 
+     * @param type $uid
+     * @return true wenn ok, false im Fehlerfall
      */
     public function getCoodleFromUser($uid)
     {
         if($uid == '')
         {
-            $this->errormsg = 'keine gültige uid'; 
-            return false; 
+            $this->errormsg = 'keine gültige uid';
+            return false;
         }
-                
-        $qry = "SELECT distinct campus.tbl_coodle.* 
-                    FROM campus.tbl_coodle 
-                    LEFT JOIN campus.tbl_coodle_ressource USING(coodle_id) 
-                WHERE 
-					(uid =".$this->db_add_param($uid, FHC_STRING, false)." 
+
+        $qry = "SELECT distinct campus.tbl_coodle.*
+                    FROM campus.tbl_coodle
+                    LEFT JOIN campus.tbl_coodle_ressource USING(coodle_id)
+                WHERE
+					(uid =".$this->db_add_param($uid, FHC_STRING, false)."
                     OR ersteller_uid =".$this->db_add_param($uid, FHC_STRING, false).")
                     AND endedatum >= CURRENT_DATE - interval '90 days';";
-        
+
         if(!$this->db_query($qry))
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
-        
+
         while($row = $this->db_fetch_object())
         {
-            $coodle = new coodle(); 
-            $coodle->coodle_id = $row->coodle_id; 
-            $coodle->titel = $row->titel; 
-            $coodle->beschreibung = $row->beschreibung; 
-            $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz; 
-            $coodle->dauer = $row->dauer; 
-            $coodle->insertamum = $row->insertamum; 
-            $coodle->insertvon = $row->insertvon; 
-            $coodle->updateamum = $row->updateamum; 
-            $coodle->updatevon = $row->updatevon; 
-            $coodle->endedatum = $row->endedatum; 
-            $coodle->ersteller_uid = $row->ersteller_uid; 
-            $coodle->mailversand = $row->mailversand; 
-            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym; 
-            $coodle->termine_anonym = $row->termine_anonym; 
-            
-            $this->result[] = $coodle; 
+            $coodle = new coodle();
+            $coodle->coodle_id = $row->coodle_id;
+            $coodle->titel = $row->titel;
+            $coodle->beschreibung = $row->beschreibung;
+            $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz;
+            $coodle->dauer = $row->dauer;
+            $coodle->insertamum = $row->insertamum;
+            $coodle->insertvon = $row->insertvon;
+            $coodle->updateamum = $row->updateamum;
+            $coodle->updatevon = $row->updatevon;
+            $coodle->endedatum = $row->endedatum;
+            $coodle->ersteller_uid = $row->ersteller_uid;
+            $coodle->mailversand = $row->mailversand;
+            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym;
+            $coodle->termine_anonym = $row->termine_anonym;
+
+            $this->result[] = $coodle;
         }
-        
-        return true; 
+
+        return true;
     }
 
 	/**
 	 * Prueft ob eine Ressource bereits zu einer Umfrage zugeteilt ist
-	 * 
+	 *
 	 * @param $coodle_id ID der CoodleUmfrage
 	 * @param $uid UID des Benutzers
 	 * @param $ort_kurzbz Ort
@@ -423,7 +423,7 @@ class coodle extends basis_db
 			$qry.=' AND ort_kurzbz='.$this->db_add_param($ort_kurzbz, FHC_STRING, false);
 		if($email!='')
 			$qry.=' AND email='.$this->db_add_param($email, FHC_STRING, false);
-        
+
         $qry.=';';
 
 		if($result = $this->db_query($qry))
@@ -437,7 +437,7 @@ class coodle extends basis_db
 				return false;
 		}
 	}
-   
+
 	/**
 	 * Validiert die Ressourcedaten vor dem Speichern
 	 */
@@ -456,7 +456,7 @@ class coodle extends basis_db
 	{
 		if(is_null($new))
 			$new = $this->new;
-		
+
 		//Variablen pruefen
 		if(!$this->validateRessource())
 			return false;
@@ -482,7 +482,7 @@ class coodle extends basis_db
 			$this->errormsg = 'Update not Implemented';
 			return false;
 		}
-		
+
 		if($this->db_query($qry))
 		{
 			if($new)
@@ -518,7 +518,7 @@ class coodle extends basis_db
 			return false;
 		}
 	}
-    
+
     /**
 	 * Speichert die Terminwahl der Ressource in die Datenbank
 	 * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
@@ -529,17 +529,17 @@ class coodle extends basis_db
 	{
 		if(is_null($new))
 			$new = $this->new;
-		
+
 		//Variablen pruefen
 		if(!$this->validateRessource())
 			return false;
 
 		if($new)
-		{            
+		{
 			//Neuen Datensatz einfuegen
 			$qry='INSERT INTO campus.tbl_coodle_ressource_termin(coodle_ressource_id, coodle_termin_id, insertamum, insertvon) VALUES('.
                   $this->db_add_param($this->coodle_ressource_id, FHC_INTEGER, false).', '.
-			      $this->db_add_param($this->coodle_termin_id, FHC_INTEGER, false).', 
+			      $this->db_add_param($this->coodle_termin_id, FHC_INTEGER, false).',
                     CURRENT_TIMESTAMP, '.
 			      $this->db_add_param($this->insertvon, FHC_STRING).');';
 		}
@@ -548,7 +548,7 @@ class coodle extends basis_db
 			$this->errormsg = 'Update not Implemented';
 			return false;
 		}
-		
+
 		if(!$this->db_query($qry))
 		{
 			$this->errormsg = 'Fehler beim Speichern des Datensatzes';
@@ -557,23 +557,23 @@ class coodle extends basis_db
         else
             return true;
 	}
-    
+
     /**
      * Lädt eine Ressource zur übergebenen $coodle_id und $uid oder $zugangscode
      * @param Integer $coodle_id
      * @param varchar $uid
      * @param varchar $zugangscode
-     * @return boolean 
+     * @return boolean
      */
     public function getRessourceFromUser($coodle_id, $uid='', $zugangscode='')
     {
 
         $qry ="SELECT * FROM campus.tbl_coodle_ressource
-            WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false); 
-        
+            WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false);
+
         if($uid != '')
-            $qry.= " AND uid = ".$this->db_add_param($uid, FHC_STRING, false); 
-        
+            $qry.= " AND uid = ".$this->db_add_param($uid, FHC_STRING, false);
+
         if ($zugangscode != '')
             $qry.= " AND zugangscode = ".$this->db_add_param($zugangscode, FHC_STRING, false);
         $qry.= ';';
@@ -581,89 +581,89 @@ class coodle extends basis_db
         if(!$this->db_query($qry))
         {
           $this->errormsg = 'Fehler bei einer Datenbankabfrage';
-            return false;  
-        }  
-           
+            return false;
+        }
+
         if ($row = $this->db_fetch_object())
         {
             $this->coodle_ressource_id  = $row->coodle_ressource_id;
-            $this->coodle_id            = $row->coodle_id; 
-            $this->uid                  = $row->uid; 
-            $this->ort_kurzbz           = $row->ort_kurzbz; 
-            $this->email                = $row->email; 
-            $this->name                 = $row->name; 
-            $this->zugangscode          = $row->zugangscode; 
-            $this->insertamum           = $row->insertamum; 
-            $this->insertvon            = $row->insertvon; 
-            $this->updateamum           = $row->updateamum; 
-            $this->updatevon            = $row->updatevon; 
+            $this->coodle_id            = $row->coodle_id;
+            $this->uid                  = $row->uid;
+            $this->ort_kurzbz           = $row->ort_kurzbz;
+            $this->email                = $row->email;
+            $this->name                 = $row->name;
+            $this->zugangscode          = $row->zugangscode;
+            $this->insertamum           = $row->insertamum;
+            $this->insertvon            = $row->insertvon;
+            $this->updateamum           = $row->updateamum;
+            $this->updatevon            = $row->updatevon;
         }
         else
         {
             $this->errormsg = "Fehler bei der Abfrage aufgetreten";
-            return false; 
-        }       
-        return true;             
+            return false;
+        }
+        return true;
     }
-    
+
     /**
      * Löscht alle Termine einer Ressource zu einer übergebenen Coodleumfrage
      * @param Integer $coodle_id
      * @param Integer $ressource_id
-     * @return boolean 
+     * @return boolean
      */
     public function deleteRessourceTermin($coodle_id, $ressource_id)
     {
         if($ressource_id == '' || !is_numeric($ressource_id) || $coodle_id == '' || !is_numeric($coodle_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
+
         $qry="DELETE FROM campus.tbl_coodle_ressource_termin
             WHERE coodle_ressource_id =".$this->db_add_param($ressource_id, FHC_INTEGER)."
-                AND coodle_termin_id IN 
-                    (SELECT coodle_termin_id FROM campus.tbl_coodle_termin 
+                AND coodle_termin_id IN
+                    (SELECT coodle_termin_id FROM campus.tbl_coodle_termin
                         WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER).");";
-        
-        $this->errormsg = $qry; 
-        
+
+        $this->errormsg = $qry;
+
         if($this->db_query($qry))
-            return true; 
+            return true;
         else
-            return false; 
+            return false;
     }
 
     /**
      * Überprüft ob die übergebene Ressource den übergebenen Termin ausgewählt hat
      * @param Integer $termin_id
      * @param Integer $ressource_id
-     * @return boolean 
+     * @return boolean
      */
     public function checkTermin($termin_id, $ressource_id)
     {
         if($ressource_id == '' || !is_numeric($ressource_id) || $termin_id == '' || !is_numeric($termin_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
-        $qry="SELECT * FROM campus.tbl_coodle_ressource_termin 
+
+        $qry="SELECT * FROM campus.tbl_coodle_ressource_termin
             WHERE coodle_ressource_id =".$this->db_add_param($ressource_id, FHC_INTEGER)."
                 AND coodle_termin_id=".$this->db_add_param($termin_id, FHC_INTEGER).';';
-         
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_row($result))
             {
-                return true; 
+                return true;
             }
-            return false; 
+            return false;
         }
-        
-        return false; 
+
+        return false;
     }
-    
+
 	/**
      * Überprüft ob der übergebenen Termin schon von einer Ressource gewählt wurde
      * @param Integer $termin_id
@@ -674,83 +674,83 @@ class coodle extends basis_db
         if( $termin_id == '' || !is_numeric($termin_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
-        $qry="SELECT * FROM campus.tbl_coodle_ressource_termin 
+
+        $qry="SELECT * FROM campus.tbl_coodle_ressource_termin
             WHERE coodle_termin_id=".$this->db_add_param($termin_id, FHC_INTEGER).';';
-         
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_row($result))
             {
-                return true; 
+                return true;
             }
-            return false; 
+            return false;
         }
-        
-        return false; 
+
+        return false;
     }
-    
+
 	/**
      * Zählt, wie oft ein Termin gewählt wurde
      * @param Integer $termin_id
      * @param Integer $ressource_id
-     * @return boolean 
+     * @return boolean
      */
     public function countTermin($termin_id)
     {
         if($termin_id == '' || !is_numeric($termin_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
-        $qry="SELECT count(*) AS anzahl FROM campus.tbl_coodle_ressource_termin 
+
+        $qry="SELECT count(*) AS anzahl FROM campus.tbl_coodle_ressource_termin
             WHERE coodle_termin_id=".$this->db_add_param($termin_id, FHC_INTEGER).';';
-         
+
    		if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_object($result))
             {
-                $this->anzahl = $row->anzahl; 
+                $this->anzahl = $row->anzahl;
             }
             else
             {
-                return false; 
+                return false;
             }
-            return true; 
+            return true;
         }
         else
         {
             $this->errormsg = "Fehler bei der Abfrage aufgetreten";
-            return false; 
+            return false;
         }
     }
-    
+
     /**
-     * 
+     *
      * Laedt alle Termine einer Umfrage zu denen eine Ressource zugesagt hat
      * @param $coodle_id ID der Umfrage
      * @param $ressource_id ID der Ressource
      */
     public function getRessourceTermin($coodle_id, $ressource_id)
     {
-    	$qry = "SELECT 
-    				* 
-    			FROM 
-    				campus.tbl_coodle_ressource_termin 
+    	$qry = "SELECT
+    				*
+    			FROM
+    				campus.tbl_coodle_ressource_termin
     				JOIN campus.tbl_coodle_termin USING(coodle_termin_id)
-    			WHERE 
+    			WHERE
     				coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER)."
     				AND coodle_ressource_id=".$this->db_add_param($ressource_id, FHC_INTEGER).";";
-    				
+
     	if($result = $this->db_query($qry))
     	{
     		while($row = $this->db_fetch_object($result))
     		{
     			$obj = new coodle();
-    			
+
     			$obj->coodle_id = $row->coodle_id;
     			$obj->coodle_termin_id = $row->coodle_termin_id;
     			$obj->datum = $row->datum;
@@ -760,7 +760,7 @@ class coodle extends basis_db
     			$obj->coodle_termin_id = $row->coodle_termin_id;
     			$obj->insertamum = $row->insertamum;
     			$obj->insertvon = $row->insertvon;
-    			
+
     			$this->result[] = $obj;
     		}
     		return true;
@@ -771,66 +771,66 @@ class coodle extends basis_db
     		return false;
     	}
     }
-    
+
     /**
      * Überprüfut ob der Benutzer entweder der Ersteller oder eine Ressource der Coodleumfrage ist
      * @param Integer $coodle_id
      * @param Integer $uid
      * @param varchar $zugangscode
-     * @return boolean 
+     * @return boolean
      */
     public function checkBerechtigung($coodle_id, $uid='', $zugangscode='')
     {
         if($coodle_id =='' ||  !is_numeric($coodle_id))
         {
             $this->errormsg = 'Ungültige Id übergeben.';
-            return false; 
+            return false;
         }
-        
+
         if($uid != '' && $zugangscode != '')
         {
-            $this->errormsg = 'Uid oder Zuganscode übergeben'; 
-            return false; 
+            $this->errormsg = 'Uid oder Zuganscode übergeben';
+            return false;
         }
-        
+
         $qry ="SELECT 1 FROM campus.tbl_coodle_ressource WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false).' AND ';
-        
+
         if($uid != '')
-            $qry.= ' uid = '.$this->db_add_param($uid, FHC_STRING, false); 
-        
+            $qry.= ' uid = '.$this->db_add_param($uid, FHC_STRING, false);
+
         if($zugangscode != '')
             $qry.= ' zugangscode ='.$this->db_add_param($zugangscode, FHC_STRING, false);
-         
+
         $qry.="UNION SELECT 1 FROM campus.tbl_coodle WHERE ersteller_uid=".$this->db_add_param($uid).";";
-        
-        
+
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_object($result))
-                return true; 
+                return true;
             else
-                return false; 
+                return false;
         }
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
     }
-        
+
 	/**
 	 * Entfernt eine Ressourcezuteilung von einer Umfrage
 	 * @param $coodle_ressource_id ID der Ressourcezuteilung
 	 * @return boolean true wenn ok, false im Fehlerfall
-	 */	
+	 */
 	public function deleteRessource($coodle_ressource_id)
 	{
         if($coodle_ressource_id == '' || !is_numeric($coodle_ressource_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
+
 		$qry = "DELETE FROM campus.tbl_coodle_ressource_termin WHERE coodle_ressource_id=".$this->db_add_param($coodle_ressource_id, FHC_INTEGER, false).";
 				DELETE FROM campus.tbl_coodle_ressource WHERE coodle_ressource_id=".$this->db_add_param($coodle_ressource_id, FHC_INTEGER, false).";";
 
@@ -851,7 +851,7 @@ class coodle extends basis_db
 		return true;
 	}
 
-	/** 
+	/**
 	 * Speichert einen Termin
      * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
 	 * andernfalls wird der Datensatz mit der ID in $coodle_termin_id aktualisiert
@@ -862,7 +862,7 @@ class coodle extends basis_db
 	{
 		if(is_null($new))
 			$new = $this->new;
-		
+
 		//Variablen pruefen
 		if(!$this->validateTermin())
 			return false;
@@ -883,7 +883,7 @@ class coodle extends basis_db
                 ' auswahl='.$this->db_add_param($this->auswahl, FHC_BOOLEAN, false).
 				' WHERE coodle_termin_id='.$this->db_add_param($this->coodle_termin_id, FHC_INTEGER, false).';';
 		}
-		
+
 		if($this->db_query($qry))
 		{
 			if($new)
@@ -930,21 +930,21 @@ class coodle extends basis_db
 	{
 		if($coodle_id == '' || !is_numeric($coodle_id))
 		{
-			$this->errormsg = "Ungültige Coodle_id"; 
-			return false; 
+			$this->errormsg = "Ungültige Coodle_id";
+			return false;
 		}
-		
+
 		$qry = "(SELECT * FROM campus.tbl_coodle_termin
-					WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false)." 
+					WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
 					AND datum != '1900-01-01'
 					ORDER BY datum, uhrzeit)
-							
-				UNION ALL 
-							
+
+				UNION ALL
+
 				(SELECT * FROM campus.tbl_coodle_termin
 					WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
 					AND datum = '1900-01-01');";
-		
+
 		if($result = $this->db_query($qry))
 		{
 			while($row = $this->db_fetch_object($result))
@@ -955,7 +955,7 @@ class coodle extends basis_db
 				$obj->datum = $row->datum;
 				$obj->uhrzeit = $row->uhrzeit;
 				$obj->auswahl = $this->db_parse_bool($row->auswahl);
-	
+
 				$this->result[] = $obj;
 			}
 			return true;
@@ -967,47 +967,47 @@ class coodle extends basis_db
 		}
 	}
 
-        
+
     /**
      * Gibt die Coodle Umfrage zurück in der sich die Ressource mit dem übergebenen Zugangscode befindet
      * @param string $zugangscode
-     * @return boolean 
+     * @return boolean
      */
     public function getCoodleFromZugangscode($zugangscode)
     {
-        $qry = "SELECT tbl_coodle.* from campus.tbl_coodle 
-            JOIN campus.tbl_coodle_ressource USING(coodle_id) 
-            WHERE zugangscode =".$this->db_add_param($zugangscode, FHC_STRING).';'; 
-        
+        $qry = "SELECT tbl_coodle.* from campus.tbl_coodle
+            JOIN campus.tbl_coodle_ressource USING(coodle_id)
+            WHERE zugangscode =".$this->db_add_param($zugangscode, FHC_STRING).';';
+
         if($result = $this->db_query($qry))
         {
             while($row = $this->db_fetch_object($result))
             {
-                $coodle = new coodle(); 
-                
-                $coodle->coodle_id = $row->coodle_id; 
-                $coodle->ersteller_uid = $row->ersteller_uid; 
-                $coodle->titel = $row->titel; 
-                $coodle->beschreibung = $row->beschreibung; 
-                $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz; 
-                $coodle->dauer = $row->dauer; 
-                $coodle->endedatum = $row->endedatum; 
-                $coodle->insertamum = $row->insertamum; 
+                $coodle = new coodle();
+
+                $coodle->coodle_id = $row->coodle_id;
+                $coodle->ersteller_uid = $row->ersteller_uid;
+                $coodle->titel = $row->titel;
+                $coodle->beschreibung = $row->beschreibung;
+                $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz;
+                $coodle->dauer = $row->dauer;
+                $coodle->endedatum = $row->endedatum;
+                $coodle->insertamum = $row->insertamum;
                 $coodle->insertvon = $row->insertvon;
-                $coodle->updateamum = $row->updateamum; 
-                $coodle->updatevon = $row->updatevon; 
-                $coodle->mailversand = $row->mailversand; 
-	            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym; 
-	            $coodle->termine_anonym = $row->termine_anonym; 
-                
-                $this->result[] = $coodle; 
+                $coodle->updateamum = $row->updateamum;
+                $coodle->updatevon = $row->updatevon;
+                $coodle->mailversand = $row->mailversand;
+	            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym;
+	            $coodle->termine_anonym = $row->termine_anonym;
+
+                $this->result[] = $coodle;
             }
-            return true; 
+            return true;
         }
         else
         {
             $this->errormsg = 'Fehler beim Laden der Daten';
-            return false; 
+            return false;
         }
     }
 
@@ -1019,7 +1019,7 @@ class coodle extends basis_db
 	 */
 	public function loadTermin($coodle_termin_id)
 	{
-		$qry = "SELECT * FROM campus.tbl_coodle_termin 
+		$qry = "SELECT * FROM campus.tbl_coodle_termin
                     WHERE coodle_termin_id=".$this->db_add_param($coodle_termin_id, FHC_INTEGER).';';
 
 		if($result = $this->db_query($qry))
@@ -1055,13 +1055,13 @@ class coodle extends basis_db
 	{
         if($coodle_termin_id == '' || !is_numeric($coodle_termin_id))
         {
-            $this->errormsg = 'Ungültige Id übergeben'; 
-            return false; 
+            $this->errormsg = 'Ungültige Id übergeben';
+            return false;
         }
-        
-		$qry = "DELETE FROM campus.tbl_coodle_termin 
+
+		$qry = "DELETE FROM campus.tbl_coodle_termin
                     WHERE coodle_termin_id=".$this->db_add_param($coodle_termin_id, FHC_INTEGER, false).';';
-		
+
 		if($this->db_query($qry))
 			return true;
 		else
@@ -1069,188 +1069,188 @@ class coodle extends basis_db
 			$this->errormsg = 'Fehler beim Löschen des Eintrags';
 		}
 	}
-    
+
     /**
      * Überprüft ob die übergebene Coodleumfrage den Status laufend oder abgeschlossen hat
      * @param Integer $coodle_id
-     * @return boolean 
+     * @return boolean
      */
     public function checkStatus($coodle_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = 'Coodle_id muss eine Zahl sein'; 
-            return false; 
+            $this->errormsg = 'Coodle_id muss eine Zahl sein';
+            return false;
         }
-        
-        $qry ="SELECT 1 FROM campus.tbl_coodle 
+
+        $qry ="SELECT 1 FROM campus.tbl_coodle
                 WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
                 AND coodle_status_kurzbz IN('laufend','abgeschlossen');";
-        
+
         if($result = $this->db_query($qry))
         {
             if($this->db_fetch_object($result))
-                return true; 
+                return true;
             else
             {
-                $this->errormsg = "Kein passender Status vorhanden"; 
-                return false; 
+                $this->errormsg = "Kein passender Status vorhanden";
+                return false;
             }
         }
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
     }
 
     /**
      * Setzt die Auswahl aller Termine auf false
      * @param Integer $coodle_id
-     * @return boolean 
+     * @return boolean
      */
     public function setTerminFalse($coodle_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = "Coodle_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "Coodle_id muss eine gültige Zahl sein";
+            return false;
         }
-        
-        $qry ="UPDATE campus.tbl_coodle_termin set auswahl='false' 
-                WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false).';'; 
-        
+
+        $qry ="UPDATE campus.tbl_coodle_termin set auswahl='false'
+                WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false).';';
+
         if($result=$this->db_query($qry))
-            return true; 
+            return true;
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
     }
-    
+
     /**
      * Gibt true zurück wenn der übergeben termin der ausgewählte ist für die übergebene coodle_id
-     * @param Integer $coodle_id 
-     * @param Integer $coodle_termin_id 
-     * @return boolean 
+     * @param Integer $coodle_id
+     * @param Integer $coodle_termin_id
+     * @return boolean
      */
     public function checkTerminAuswahl($coodle_id, $coodle_termin_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = "Coodle_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "Coodle_id muss eine gültige Zahl sein";
+            return false;
         }
-        
+
         if($coodle_termin_id == '' || !is_numeric($coodle_termin_id))
         {
-            $this->errormsg = "termin_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "termin_id muss eine gültige Zahl sein";
+            return false;
         }
-        
-        $qry = "Select * FROM campus.tbl_coodle_termin 
-                    WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)." 
+
+        $qry = "Select * FROM campus.tbl_coodle_termin
+                    WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
                     AND coodle_termin_id = ".$this->db_add_param($coodle_termin_id, FHC_INTEGER, false)."
                     AND auswahl is true";
-        
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_object($result))
-                return true; 
+                return true;
         }
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
-        
-        return false; 
+
+        return false;
     }
-    
-    
+
+
     /**
      * Gibt die Id des ausgewählten Termines der Coodleumfrage zurück
-     * @param Integer $coodle_id 
-     * @param Integer $coodle_termin_id 
-     * @return boolean 
+     * @param Integer $coodle_id
+     * @param Integer $coodle_termin_id
+     * @return boolean
      */
     public function getTerminAuswahl($coodle_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = "Coodle_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "Coodle_id muss eine gültige Zahl sein";
+            return false;
         }
-        
-        $qry = "Select * FROM campus.tbl_coodle_termin 
-                    WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)." 
+
+        $qry = "Select * FROM campus.tbl_coodle_termin
+                    WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
                     AND auswahl is true";
-        
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_object($result))
-                return $row->coodle_termin_id; 
+                return $row->coodle_termin_id;
         }
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
-        
-        return false; 
+
+        return false;
     }
-    
+
     /**
      * Liefert alle Räume die als Ressource zu einer Umfrage eingetragen sind
      * @param Integer $coodle_id
-     * @return boolean 
+     * @return boolean
      */
     public function getRaumeFromId($coodle_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = "Coodle_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "Coodle_id muss eine gültige Zahl sein";
+            return false;
         }
-        
+
         $qry ="SELECT * FROM campus.tbl_coodle_ressource
-                WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false)." 
-                    AND ort_kurzbz is not null"; 
-        
+                WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
+                    AND ort_kurzbz is not null";
+
         if($result = $this->db_query($qry))
         {
             while($row = $this->db_fetch_object($result))
             {
-                $ressource = new coodle(); 
-                
-                $ressource->coodle_ressource_id = $row->coodle_ressource_id; 
-                $ressource->coodle_id = $row->coodle_id; 
+                $ressource = new coodle();
+
+                $ressource->coodle_ressource_id = $row->coodle_ressource_id;
+                $ressource->coodle_id = $row->coodle_id;
                 $ressource->ort_kurzbz = $row->ort_kurzbz;
-                $ressource->insertamum = $row->insertamum; 
-                $ressource->insertvon = $row->insertvon; 
-                $ressource->updateamum = $row->updateamum; 
-                $ressource->updatevon = $row->updatevon; 
-                
-                $this->result[] = $ressource; 
-                
+                $ressource->insertamum = $row->insertamum;
+                $ressource->insertvon = $row->insertvon;
+                $ressource->updateamum = $row->updateamum;
+                $ressource->updatevon = $row->updatevon;
+
+                $this->result[] = $ressource;
+
             }
-            return true; 
+            return true;
         }
         else
         {
-            $this->erromsg = "Fehler bei der Abfrage aufgetreten"; 
-            return false; 
+            $this->erromsg = "Fehler bei der Abfrage aufgetreten";
+            return false;
         }
     }
-    
+
     /**
      * Laedt alle Stati
      */
     public function loadStatus()
     {
     	$qry = "SELECT * FROM campus.tbl_coodle_status";
-    	
+
     	if($result = $this->db_query($qry))
     	{
     		while($row = $this->db_fetch_object($result))
@@ -1265,48 +1265,70 @@ class coodle extends basis_db
     		return false;
     	}
     }
-    
+
 	/**
-     * Liefert alle Coodle Umfragen die das Beendigungsdatum erreicht haben 
+     * Liefert alle Coodle Umfragen die das Beendigungsdatum erreicht haben
      * und noch nicht abgeschlossen sind
-     * @return true wenn ok, false im Fehlerfall 
+     * @return true wenn ok, false im Fehlerfall
      */
     public function getCoodleBeendet()
     {
-        $qry = "SELECT * 
-                    FROM campus.tbl_coodle 
-                WHERE 
+        $qry = "SELECT *
+                    FROM campus.tbl_coodle
+                WHERE
                     endedatum = CURRENT_DATE - interval '1 day'
-                    AND coodle_status_kurzbz='laufend';"; 
-        
+                    AND coodle_status_kurzbz='laufend';";
+
         if(!$this->db_query($qry))
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
-        
+
         while($row = $this->db_fetch_object())
         {
-            $coodle = new coodle(); 
-            $coodle->coodle_id = $row->coodle_id; 
-            $coodle->titel = $row->titel; 
-            $coodle->beschreibung = $row->beschreibung; 
-            $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz; 
-            $coodle->dauer = $row->dauer; 
-            $coodle->insertamum = $row->insertamum; 
-            $coodle->insertvon = $row->insertvon; 
-            $coodle->updateamum = $row->updateamum; 
-            $coodle->updatevon = $row->updatevon; 
-            $coodle->endedatum = $row->endedatum; 
-            $coodle->ersteller_uid = $row->ersteller_uid; 
-            $coodle->mailversand = $row->mailversand; 
-            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym; 
-            $coodle->termine_anonym = $row->termine_anonym; 
-            
-            $this->result[] = $coodle; 
+            $coodle = new coodle();
+            $coodle->coodle_id = $row->coodle_id;
+            $coodle->titel = $row->titel;
+            $coodle->beschreibung = $row->beschreibung;
+            $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz;
+            $coodle->dauer = $row->dauer;
+            $coodle->insertamum = $row->insertamum;
+            $coodle->insertvon = $row->insertvon;
+            $coodle->updateamum = $row->updateamum;
+            $coodle->updatevon = $row->updatevon;
+            $coodle->endedatum = $row->endedatum;
+            $coodle->ersteller_uid = $row->ersteller_uid;
+            $coodle->mailversand = $row->mailversand;
+            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym;
+            $coodle->termine_anonym = $row->termine_anonym;
+
+            $this->result[] = $coodle;
         }
-        
-        return true; 
+
+        return true;
     }
+
+	/**
+	 * Führt 2 Formatierungen bestehender Contentlines durch
+	 * Umwandeln (Maskieren) bestehender Breaks in \n
+	 * Einfügen von breaks nach 74 Zeichen, da content line <= 75 chars sein muss
+	 * @param $contentline zu formatierender Input
+	 * @return param formatierter Output
+	 */
+	public function foldContentLine($contentline)
+	{
+		$linebreaksreplaced = strtr($contentline, array(
+			"\r\n"	=> "\\n",
+			"\r" 	=> "",
+			"\n" 	=> "\\n",
+			"<br>" 	=> "\\n",
+			"<br />"=> "\\n"
+		));
+
+		$foldedcontentline = wordwrap($linebreaksreplaced, 74, "\r\n ", true);
+
+		return $foldedcontentline;
+	}
 }
 ?>

From 42197c39ed188cb2f6b74972b9d627e83b2c3899 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Sat, 3 Jun 2023 15:18:06 +0200
Subject: [PATCH 021/149] FAS prestudents status: check is Meldestichtag is
 reached and disable input if it is, bismeldestichtag table: added sequence
 primary key

---
 content/student/studentDBDML.php              | 38 +++++++++++++++-
 content/student/studentoverlay.js.php         |  8 +++-
 content/student/studentrolledialog.xul.php    | 30 ++++++++-----
 include/bismeldestichtag.class.php            | 45 ++++++++++++++++---
 ...student_status_nach_bismeldung_sperren.php |  9 ++--
 5 files changed, 104 insertions(+), 26 deletions(-)

diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index c5818ebb3..b08d977e8 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -995,6 +995,18 @@ if(!$error)
 								{
 									$new_status_datum = isset($_POST['datum']) ? $_POST['datum'] : date('Y-m-d');
 
+									$bismeldestichtag = new bismeldestichtag();
+
+									$meldestichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($studiensemester, $new_status_datum);
+
+									if ($meldestichtag_erreicht === true)
+									{
+										$return = false;
+										$error = true;
+										$errormsg .= 'Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag können nicht hinzugefügt werden.';
+										$anzahl_fehler++;
+									}
+
 									$check_statusaenderung_result = checkStatusaenderung(
 										$prestudent_id,
 										$_POST['status_kurzbz'],
@@ -1205,13 +1217,24 @@ if(!$error)
 
 		if(isset($_POST['studiensemester_kurzbz']) && isset($_POST['status_kurzbz']) &&
 		   isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']) &&
-		   isset($_POST['ausbildungssemester']) && is_numeric($_POST['ausbildungssemester']))
+		   isset($_POST['ausbildungssemester']) && is_numeric($_POST['ausbildungssemester']) &&
+		   isset($_POST['datum']))
 		{
-			if($_POST['status_kurzbz']=='Student' && !$rechte->isBerechtigt('admin', null, 'suid') && !$rechte->isBerechtigt('student/keine_studstatuspruefung', null, 'suid'))
+			$erweiterteBerechtigungen = $rechte->isBerechtigt('admin', null, 'suid') || $rechte->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
+
+			$bismeldestichtag = new bismeldestichtag();
+			$meldestichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($_POST['studiensemester_kurzbz'], $_POST['datum']);
+
+			if($_POST['status_kurzbz']=='Student' && !$erweiterteBerechtigungen)
 			{
 				$return = false;
 				$errormsg = 'Studentenrolle kann nur durch den Administrator geloescht werden';
 			}
+			elseif ($meldestichtag_erreicht && !$erweiterteBerechtigungen)
+			{
+				$return = false;
+				$errormsg = 'Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag können nicht gelöscht werden.';
+			}
 			else
 			{
 				$qry = "SELECT count(*) as anzahl FROM public.tbl_prestudentstatus WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
@@ -1531,6 +1554,17 @@ if(!$error)
 							$error = true;
 							$errormsg = isset($check_statusaenderung_result['errormsg']) ? $check_statusaenderung_result['errormsg'] : '';
 						}
+
+						// Prüfung, ob Meldestichtag erreicht ist
+						$bismeldestichtag = new bismeldestichtag();
+						$meldestichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($_POST['studiensemester_kurzbz'], $_POST['datum']);
+
+						if ($meldestichtag_erreicht === true)
+						{
+							$return = false;
+							$error = true;
+							$errormsg = 'Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag können nicht hinzugefügt werden.';
+						}
 					}
 
 					if(!$error)
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index d9686d5e3..f2dffc041 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -2000,6 +2000,7 @@ function StudentPrestudentRolleDelete()
 	var studiensemester_kurzbz = getTreeCellText(tree, 'student-prestudent-tree-rolle-studiensemester_kurzbz', tree.currentIndex);
 	var prestudent_id = getTreeCellText(tree, 'student-prestudent-tree-rolle-prestudent_id', tree.currentIndex);
 	var ausbildungssemester = getTreeCellText(tree, 'student-prestudent-tree-rolle-ausbildungssemester', tree.currentIndex);
+	var datum = getTreeCellText(tree, 'student-prestudent-tree-rolle-datum', tree.currentIndex);
 
 	studiengang_kz = document.getElementById('student-prestudent-menulist-studiengang_kz').value;
 	if(confirm('Diese Rolle wirklich loeschen?'))
@@ -2028,6 +2029,7 @@ function StudentPrestudentRolleDelete()
 				req.add('studiensemester_kurzbz', studiensemester_kurzbz);
 				req.add('ausbildungssemester', ausbildungssemester);
 				req.add('studiengang_kz', studiengang_kz);
+				req.add('datum', datum);
 
 				var response = req.executePOST();
 
@@ -2059,6 +2061,7 @@ function StudentPrestudentRolleDelete()
 			req.add('studiensemester_kurzbz', studiensemester_kurzbz);
 			req.add('ausbildungssemester', ausbildungssemester);
 			req.add('studiengang_kz', studiengang_kz);
+			req.add('datum', datum);
 
 			var response = req.executePOST();
 
@@ -2151,8 +2154,9 @@ function StudentRolleBearbeiten()
 	var studiensemester_kurzbz = getTreeCellText(tree, 'student-prestudent-tree-rolle-studiensemester_kurzbz', tree.currentIndex);
 	var prestudent_id = getTreeCellText(tree, 'student-prestudent-tree-rolle-prestudent_id', tree.currentIndex);
 	var ausbildungssemester = getTreeCellText(tree, 'student-prestudent-tree-rolle-ausbildungssemester', tree.currentIndex);
+	var datum = getTreeCellText(tree, 'student-prestudent-tree-rolle-datum', tree.currentIndex);
 
-	window.open('<?php echo APP_ROOT?>content/student/studentrolledialog.xul.php?prestudent_id='+prestudent_id+'&status_kurzbz='+status_kurzbz+'&studiensemester_kurzbz='+studiensemester_kurzbz+'&ausbildungssemester='+ausbildungssemester,"Status","status=no, width=500, height=450, centerscreen, resizable");
+	window.open('<?php echo APP_ROOT?>content/student/studentrolledialog.xul.php?prestudent_id='+prestudent_id+'&status_kurzbz='+status_kurzbz+'&studiensemester_kurzbz='+studiensemester_kurzbz+'&ausbildungssemester='+ausbildungssemester+'&datum='+datum,"Status","status=no, width=500, height=450, centerscreen, resizable");
 }
 
 // ****
@@ -2210,7 +2214,7 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_
 					timepart_arr[i] = '00';
 				}
 			}
-			
+
 			arr = datepart.split('.');
 
 			if(arr[0].length==1)
diff --git a/content/student/studentrolledialog.xul.php b/content/student/studentrolledialog.xul.php
index ef2c0919a..37ec0e983 100644
--- a/content/student/studentrolledialog.xul.php
+++ b/content/student/studentrolledialog.xul.php
@@ -31,6 +31,7 @@ require_once('../../include/person.class.php');
 require_once('../../include/prestudent.class.php');
 require_once('../../include/studienplan.class.php');
 require_once('../../include/benutzerberechtigung.class.php');
+require_once('../../include/bismeldestichtag.class.php');
 
 echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
 
@@ -58,6 +59,11 @@ if(isset($_GET['ausbildungssemester']))
 else
 	$ausbildungssemester='';
 
+if(isset($_GET['datum']))
+	$datum=$_GET['datum'];
+else
+	$datum='';
+
 $vorname = '';
 $nachname = '';
 if($prestudent_id!='')
@@ -67,6 +73,10 @@ if($prestudent_id!='')
 
 	$vorname = $prestudent->vorname;
 	$nachname = $prestudent->nachname;
+
+	// Prüfen, ob Studnetrolle vor dem aktuellen Meldestichtag ist. In diesem Fall darf die Rolle nicht mehr bearbeitet werden.
+	$bismeldestichtag = new bismeldestichtag();
+	$disabled = $bismeldestichtag->checkMeldestichtagErreicht($studiensemester_kurzbz, $datum) ? ' disabled="true"' : '';
 }
 $db = new basis_db();
 $user=get_uid();
@@ -112,7 +122,7 @@ $user=get_uid();
 					<label value="Studiensemester" control="student-rolle-menulist-studiensemester"/>
 					<menulist id="student-rolle-menulist-studiensemester"
 					          datasources="<?php echo APP_ROOT ?>rdf/studiensemester.rdf.php?order=desc" flex="1"
-					          ref="http://www.technikum-wien.at/studiensemester/liste" >
+					          ref="http://www.technikum-wien.at/studiensemester/liste"<?php echo $disabled ?> >
 						<template>
 							<menupopup>
 								<menuitem value="rdf:http://www.technikum-wien.at/studiensemester/rdf#kurzbz"
@@ -124,7 +134,7 @@ $user=get_uid();
 	  			</row>
 	  			<row>
 	  				<label value="Ausbildungssemester" control="student-rolle-menulist-ausbildungssemester"/>
-					<menulist id="student-rolle-menulist-ausbildungssemester" >
+					<menulist id="student-rolle-menulist-ausbildungssemester"<?php echo $disabled ?> >
 						<menupopup>
 						<?php
 
@@ -163,7 +173,7 @@ $user=get_uid();
 				?>
 				<row hidden="<?php echo $hidden; ?>">
 					<label value="Organisationsform" control="student-rolle-menulist-orgform_kurzbz"/>
-					<menulist id="student-rolle-menulist-orgform_kurzbz" >
+					<menulist id="student-rolle-menulist-orgform_kurzbz"<?php echo $disabled ?> >
 						<menupopup>
 						<menuitem value="" label="-- keine Auswahl --"/>
 						<?php
@@ -181,13 +191,13 @@ $user=get_uid();
 				</row>
 				<row>
 					<label value="Datum" control="student-rolle-datum-datum"/>
-					<box class='Datum' id="student-rolle-datum-datum" />
+					<box class='Datum' id="student-rolle-datum-datum"<?php echo $disabled ?>/>
 				</row>
 				<row>
 					<label value="Bestätigt am" control="student-rolle-datum-bestaetigt_datum"/>
-					<box class='Datum' id="student-rolle-datum-bestaetigt_datum" />
+					<box class='Datum' id="student-rolle-datum-bestaetigt_datum"<?php echo $disabled ?> />
 				</row>
-				<?php 
+				<?php
 						$readonly = 'readonly="true"';
 						$rechte = new benutzerberechtigung();
 						$rechte->getBerechtigungen($user);
@@ -196,11 +206,11 @@ $user=get_uid();
 					?>
 				<row>
 					<label value="Bewerbung abgeschickt am" control="student-rolle-datum-bewerbung_abgeschicktamum"/>
-					<textbox id="student-rolle-datum-bewerbung_abgeschicktamum" <?php echo $readonly ?>/>
+					<textbox id="student-rolle-datum-bewerbung_abgeschicktamum" <?php echo $readonly ?><?php echo $disabled ?>/>
 				</row>
 				<row>
 					<label value="Studienplan" control="student-rolle-menulist-studienplan"/>
-					<menulist id="student-rolle-menulist-studienplan" >
+					<menulist id="student-rolle-menulist-studienplan"<?php echo $disabled ?> >
 						<menupopup>
 						<menuitem value="" label="-- keine Auswahl --"/>
 						<?php
@@ -217,7 +227,7 @@ $user=get_uid();
 				</row>
 				<row>
 					<label value="Anmerkung"/>
-					<textbox id="student-rolle-textbox-anmerkung" multiline="true" />
+					<textbox id="student-rolle-textbox-anmerkung" multiline="true"<?php echo $disabled ?> />
 				</row>
 				<row>
 					<label value="Aufnahmestufe"/>
@@ -248,7 +258,7 @@ $user=get_uid();
 	</grid>
 	<hbox>
 		<spacer flex="1" />
-		<button id="student-rolle-button-speichern" oncommand="StudentRolleSpeichern()" label="Speichern" />
+		<button id="student-rolle-button-speichern" oncommand="StudentRolleSpeichern()" label="Speichern"<?php echo $disabled ?> />
 	</hbox>
 </groupbox>
 </vbox>
diff --git a/include/bismeldestichtag.class.php b/include/bismeldestichtag.class.php
index e4b3746a6..675dc4953 100644
--- a/include/bismeldestichtag.class.php
+++ b/include/bismeldestichtag.class.php
@@ -18,6 +18,7 @@
  * Authors: Alexei Karpenko <karpenko@technikum-wien.at>,
  */
 require_once(dirname(__FILE__).'/basis_db.class.php');
+require_once(dirname(__FILE__).'/studiensemester.class.php');
 
 class bismeldestichtag extends basis_db
 {
@@ -51,7 +52,7 @@ class bismeldestichtag extends basis_db
 	 */
 	public function load($meldestichtag_id)
 	{
-		$qry = "SELECT * FROM bis.tbl_meldestichtag WHERE meldestichtag_id=".$this->db_add_param($meldestichtag_id, FHC_INTEGER);
+		$qry = "SELECT * FROM bis.tbl_bismeldestichtag WHERE meldestichtag_id=".$this->db_add_param($meldestichtag_id, FHC_INTEGER);
 
 		if($this->db_query($qry))
 		{
@@ -96,30 +97,32 @@ class bismeldestichtag extends basis_db
 	 * @param $frage_id
 	 * @return boolean
 	 */
-	public function getLastMeldestichtag($studiensemester_kurzbz = null)
+	public function getLastReachedMeldestichtag($studiensemester_kurzbz = null)
 	{
 		$qry = "SELECT
-					meldestichtag, studiensemester_kurzbz
+					meldestichtag_id, meldestichtag, studiensemester_kurzbz, insertamum, insertvon, updateamum, updatevon
 				FROM
-					bis.tbl_meldestichtag";
+					bis.tbl_bismeldestichtag
+				WHERE
+					meldestichtag < NOW()";
 
 		if (isset($studiensemester_kurzbz))
 		{
 			$qry .=	"
-				WHERE
+				AND
 					studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
 		}
 
 		$qry .= "
 				ORDER BY
 					meldestichtag DESC
-				LIMIT 1;"
+				LIMIT 1;";
 
 		if($this->db_query($qry))
 		{
 			while($row = $this->db_fetch_object())
 			{
-				$obj = new antwort();
+				$obj = new bismeldestichtag();
 
 				$obj->meldestichtag_id = $row->meldestichtag_id;
 				$obj->meldestichtag = $row->meldestichtag;
@@ -140,5 +143,33 @@ class bismeldestichtag extends basis_db
 			return false;
 		}
 	}
+
+	/**
+	 * Prüft, ob Meldestichtag für ein bestimmtes Studiensemester und Statusdatum erreicht ist.
+	 *
+	 * @param $studiensemester_kurzbz
+	 * @param $status_datum
+	 * @return boolean true wenn erreicht, oder false
+	 */
+	public function checkMeldestichtagErreicht($studiensemester_kurzbz, $status_datum)
+	{
+		$erreicht = false;
+		// Studiensemester ende holen
+		$studiensemester = new studiensemester();
+		if ($studiensemester->load($studiensemester_kurzbz))
+			$studiensemester_ende = new DateTime($studiensemester->ende);
+
+		// letztes erreichtes Bismeldedatum holen
+		if ($this->getLastReachedMeldestichtag() && isset($this->result[0]))
+			$lastReachedMeldestichtag = new DateTime($this->result[0]->meldestichtag);
+
+		$statusDatum = new DateTime($status_datum);
+
+		// Prüfen, ob Studentstatusdatum oder Studiensemester vor dem Stichtagsdatum liegen
+		if (isset($studiensemester_ende) && isset($lastReachedMeldestichtag) && isset($statusDatum))
+			$erreicht = $statusDatum < $lastReachedMeldestichtag || $studiensemester_ende < $lastReachedMeldestichtag;
+
+		return $erreicht;
+	}
 }
 ?>
diff --git a/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php b/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
index b3e2eed7c..cf281d426 100644
--- a/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
+++ b/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
@@ -5,7 +5,7 @@ if (! defined('DB_NAME')) exit('No direct script access allowed');
 // Creates table bis.tbl_bismeldestichtag if it doesn't exist and grants privileges
 if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_bismeldestichtag LIMIT 1'))
 {
-	$qry = 'CREATE TABLE bis.tbl_bismeldestichtag (
+	$qry = "CREATE TABLE bis.tbl_bismeldestichtag (
 				meldestichtag_id integer,
 				meldestichtag date NOT NULL,
 				studiensemester_kurzbz varchar(16) NOT NULL,
@@ -15,7 +15,7 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_bismeldestichtag LIMIT 1'))
 				updatevon varchar(32)
 			);
 
-			COMMENT ON TABLE bis.tbl_bismeldestichtag IS \'Deadline Dates for BIS reporting\';
+			COMMENT ON TABLE bis.tbl_bismeldestichtag IS 'Deadline Dates for BIS reporting';
 
 			ALTER TABLE bis.tbl_bismeldestichtag ADD CONSTRAINT pk_bismeldestichtag PRIMARY KEY (meldestichtag_id);
 
@@ -25,9 +25,8 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_bismeldestichtag LIMIT 1'))
 				NO MINVALUE
 				CACHE 1;
 
-			ALTER TABLE bis.tbl_bismeldestichtag ALTER COLUMN meldestichtag_id SET DEFAULT nextval(\'tbl_meldestichtag_meldestichtag_id_seq\');
-
-			ALTER TABLE bis.tbl_bismeldestichtag ADD CONSTRAINT fk_bismeldestichtag_studiensemester_kurzbz FOREIGN KEY (studiensemester_kurzbz) REFERENCES public.tbl_studiensemester(studiensemester_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;';
+			ALTER TABLE bis.tbl_bismeldestichtag ALTER COLUMN meldestichtag_id SET DEFAULT nextval('bis.tbl_meldestichtag_meldestichtag_id_seq');
+			ALTER TABLE bis.tbl_bismeldestichtag ADD CONSTRAINT fk_bismeldestichtag_studiensemester_kurzbz FOREIGN KEY (studiensemester_kurzbz) REFERENCES public.tbl_studiensemester(studiensemester_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;";
 
 	if (!$db->db_query($qry))
 		echo '<strong>bis.tbl_bismeldestichtag: '.$db->db_last_error().'</strong><br>';

From ae1817fc7b863d81c795f016904b390456cfb9b7 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Mon, 5 Jun 2023 16:36:01 +0200
Subject: [PATCH 022/149] hide bismelden checkbox if no
 keine_studstatuspruefung right

---
 content/student/studentdetailoverlay.xul.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 845d48397..f309a4e91 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -675,8 +675,11 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
                             <label value="Anmerkung" control="student-prestudent-textbox-anmerkung"/>
                             <textbox id="student-prestudent-textbox-anmerkung" disabled="true"/>
                             <hbox>
-                                <label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
-                                <checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
+                                <?php $keine_studstatuspruefung = $rechte->isBerechtigt('student/keine_studstatuspruefung'); ?>
+                                <label value="Bismelden" control="student-prestudent-checkbox-bismelden"
+                                <?php echo $keine_studstatuspruefung?'':' hidden="true"'; ?>/>
+                                <checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"
+                                <?php echo $keine_studstatuspruefung?'':' hidden="true"'; ?>/>
                             </hbox>
 							<hbox>
 								<label value="Duales Studium" control="student-prestudent-checkbox-dual"/>

From c490aa004088e92cb5d4b6001ae27d8d739fb034 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Wed, 7 Jun 2023 13:31:30 +0200
Subject: [PATCH 023/149] Revert "hide bismelden checkbox if no
 keine_studstatuspruefung right"

This reverts commit ae1817fc7b863d81c795f016904b390456cfb9b7.
---
 content/student/studentdetailoverlay.xul.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index f309a4e91..845d48397 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -675,11 +675,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
                             <label value="Anmerkung" control="student-prestudent-textbox-anmerkung"/>
                             <textbox id="student-prestudent-textbox-anmerkung" disabled="true"/>
                             <hbox>
-                                <?php $keine_studstatuspruefung = $rechte->isBerechtigt('student/keine_studstatuspruefung'); ?>
-                                <label value="Bismelden" control="student-prestudent-checkbox-bismelden"
-                                <?php echo $keine_studstatuspruefung?'':' hidden="true"'; ?>/>
-                                <checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"
-                                <?php echo $keine_studstatuspruefung?'':' hidden="true"'; ?>/>
+                                <label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
+                                <checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
                             </hbox>
 							<hbox>
 								<label value="Duales Studium" control="student-prestudent-checkbox-dual"/>

From dd98434522d03059aaa7c18c305e28721e35cc56 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Wed, 7 Jun 2023 13:33:43 +0200
Subject: [PATCH 024/149] added new right for editing bismelden property,
 disabled bismelden checkbox in FAS if no right

---
 content/student/studentoverlay.js.php             | 15 ++++++++++++++-
 system/dbupdate_3.4.php                           |  2 +-
 ..._prestudent_status_nach_bismeldung_sperren.php | 14 ++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index f2dffc041..6708c045d 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -1796,7 +1796,6 @@ function StudentPrestudentDisableFields(val)
 
 	document.getElementById('student-prestudent-menulist-aufnahmeschluessel').disabled=val;
 	document.getElementById('student-prestudent-checkbox-facheinschlberuf').disabled=val;
-	document.getElementById('student-prestudent-checkbox-bismelden').disabled=val;
 	document.getElementById('student-prestudent-menulist-foerderrelevant').disabled=val;
 	document.getElementById('student-prestudent-checkbox-dual').disabled=val;
 	document.getElementById('student-prestudent-button-save').disabled=val;
@@ -1843,6 +1842,20 @@ function StudentPrestudentDisableFields(val)
 		document.getElementById('student-prestudent-menulist-zgvmastercode').disabled=true;
 	}
 
+	// bismelden checkbox deaktivieren wenn Recht nicht vorhanden ist
+	<?php
+		$editBismelden = $rechte->isBerechtigt('student/editBismelden') ? 'true' : 'false';
+		echo ' var editBismelden = '.$editBismelden.';';
+	?>
+	if (editBismelden == true)
+	{
+		document.getElementById('student-prestudent-checkbox-bismelden').disabled=val;
+	}
+	else
+	{
+		document.getElementById('student-prestudent-checkbox-bismelden').disabled=true;
+	}
+
 	//Status Tree leeren
 	rollentree = document.getElementById('student-prestudent-tree-rolle');
 
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index f9920900b..f4fbd38c4 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -56,7 +56,7 @@ $tabellen=array(
 	"bis.tbl_bisfunktion"  => array("bisverwendung_id","studiengang_kz","sws","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"bis.tbl_bisio"  => array("bisio_id","mobilitaetsprogramm_code","nation_code","von","bis","zweck_code","student_uid","updateamum","updatevon","insertamum","insertvon","ext_id","ort","universitaet","lehreinheit_id","ects_erworben","ects_angerechnet","herkunftsland_code"),
 	"bis.tbl_bisio_zweck"  => array("bisio_id","zweck_code"),
-	"bis.tbl_bismeldestichtag"  => array("meldestichtag_id", "meldestichtag", "studiensemester_kurzbz"),
+	"bis.tbl_bismeldestichtag"  => array("meldestichtag_id", "meldestichtag", "studiensemester_kurzbz", "insertamum", "insertvon", "updateamum", "updatevon"),
 	"bis.tbl_bisstandort"  => array("standort_code","bezeichnung","aktiv","insertamum","insertvon","updateamum","updatevon"),
 	"bis.tbl_bisverwendung"  => array("bisverwendung_id","ba1code","ba2code","vertragsstunden","beschausmasscode","verwendung_code","mitarbeiter_uid","hauptberufcode","hauptberuflich","habilitation","beginn","ende","updateamum","updatevon","insertamum","insertvon","ext_id","dv_art","inkludierte_lehre","zeitaufzeichnungspflichtig","azgrelevant", "homeoffice"),
 	"bis.tbl_bundesland"  => array("bundesland_code","kurzbz","bezeichnung"),
diff --git a/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php b/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
index cf281d426..e39921239 100644
--- a/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
+++ b/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
@@ -57,3 +57,17 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_bismeldestichtag LIMIT 1'))
 	else
 		echo '<br>Granted privileges to <strong>vilesci</strong> on bis.tbl_meldestichtag_meldestichtag_id_seq';
 }
+
+// Add permission for edit Bismelden flag
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'student/editBismelden';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('student/editBismelden', 'Ändern des Bismelden Attributs pro Student');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+		else
+			echo ' system.tbl_berechtigung: Added permission editBismelden<br>';
+	}
+}

From f95c5ec7cf4bc44fe97638dd86017dafbe34e8c5 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Wed, 7 Jun 2023 19:25:23 +0200
Subject: [PATCH 025/149] added overview for editing Bismeldestichtage

---
 .../components/filters/Bismeldestichtag.php   | 17 +++++++
 .../controllers/codex/Bismeldestichtag.php    | 44 ++++++++++++++++++
 application/views/codex/bismeldestichtag.php  | 41 +++++++++++++++++
 .../apps/Bismeldestichtag/Bismeldestichtag.js | 43 +++++++++++++++++
 .../apps/Bismeldestichtag/TabulatorSetup.js   | 46 +++++++++++++++++++
 system/filtersupdate.php                      | 19 ++++++++
 6 files changed, 210 insertions(+)
 create mode 100644 application/components/filters/Bismeldestichtag.php
 create mode 100644 application/controllers/codex/Bismeldestichtag.php
 create mode 100644 application/views/codex/bismeldestichtag.php
 create mode 100644 public/js/apps/Bismeldestichtag/Bismeldestichtag.js
 create mode 100644 public/js/apps/Bismeldestichtag/TabulatorSetup.js

diff --git a/application/components/filters/Bismeldestichtag.php b/application/components/filters/Bismeldestichtag.php
new file mode 100644
index 000000000..d7900a9b1
--- /dev/null
+++ b/application/components/filters/Bismeldestichtag.php
@@ -0,0 +1,17 @@
+<?php
+	$filterCmptArray = array(
+		'app' => 'core',
+		'datasetName' => 'bismeldestichtag',
+		'query' => '
+			SELECT
+				bmt.meldestichtag_id AS "Id",
+				bmt.meldestichtag AS "Meldestichtag",
+				bmt.studiensemester_kurzbz AS "Studiensemester"
+			 FROM
+				bis.tbl_bismeldestichtag bmt
+		 ORDER BY
+			meldestichtag DESC, meldestichtag_id DESC
+		',
+		'requiredPermissions' => 'admin'
+	);
+
diff --git a/application/controllers/codex/Bismeldestichtag.php b/application/controllers/codex/Bismeldestichtag.php
new file mode 100644
index 000000000..3c76486ca
--- /dev/null
+++ b/application/controllers/codex/Bismeldestichtag.php
@@ -0,0 +1,44 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Overview on Bismeldestichtage
+ */
+class Bismeldestichtag extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'admin:r'
+			)
+		);
+
+		// Loads WidgetLib
+		$this->load->library('WidgetLib');
+
+		// Loads phrases system
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui',
+				'filter'
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Everything has a beginning
+	 */
+	public function index()
+	{
+		$this->load->view('codex/bismeldestichtag.php');
+	}
+}
diff --git a/application/views/codex/bismeldestichtag.php b/application/views/codex/bismeldestichtag.php
new file mode 100644
index 000000000..cb4b1de7f
--- /dev/null
+++ b/application/views/codex/bismeldestichtag.php
@@ -0,0 +1,41 @@
+<?php
+	$includesArray = array(
+		'title' => 'Logs Viewer',
+		'axios027' => true,
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'vue3' => true,
+		'filtercomponent' => true,
+		'navigationcomponent' => true,
+		'tabulator5' => true,
+		'phrases' => array(
+			'global' => array('mailAnXversandt'),
+			'ui' => array('bitteEintragWaehlen')
+		),
+		'customJSModules' => array('public/js/apps/Bismeldestichtag/Bismeldestichtag.js')
+	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+	<div id="main">
+
+		<!-- Navigation component -->
+		<core-navigation-cmpt v-bind:add-side-menu-entries="appSideMenuEntries"></core-navigation-cmpt>
+
+		<div id="content">
+			<div>
+				<!-- Filter component -->
+				<core-filter-cmpt
+					title="Bismeldestichtage verwalten"
+					filter-type="Bismeldestichtag"
+					:tabulator-options="bismeldestichtagTabulatorOptions"
+					:tabulator-events="bismeldestichtagTabulatorEventHandlers"
+					@nw-new-entry="newSideMenuEntryHandler">
+				</core-filter-cmpt>
+			</div>
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
new file mode 100644
index 000000000..f2be375b9
--- /dev/null
+++ b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
@@ -0,0 +1,43 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {BismeldestichtagTabulatorOptions} from './TabulatorSetup.js';
+import {BismeldestichtagTabulatorEventHandlers} from './TabulatorSetup.js';
+
+import {CoreFilterCmpt} from '../../components/filter/Filter.js';
+import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
+
+const bismeldestichtagApp = Vue.createApp({
+	data: function() {
+		return {
+			appSideMenuEntries: {},
+			bismeldestichtagTabulatorOptions: BismeldestichtagTabulatorOptions,
+			bismeldestichtagTabulatorEventHandlers: BismeldestichtagTabulatorEventHandlers
+		};
+	},
+	components: {
+		CoreNavigationCmpt,
+		CoreFilterCmpt
+	},
+	methods: {
+		newSideMenuEntryHandler: function(payload) {
+			this.appSideMenuEntries = payload;
+		}
+	}
+});
+
+bismeldestichtagApp.mount('#main');
diff --git a/public/js/apps/Bismeldestichtag/TabulatorSetup.js b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
new file mode 100644
index 000000000..eb63b8eed
--- /dev/null
+++ b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
@@ -0,0 +1,46 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *
+ */
+export const BismeldestichtagTabulatorOptions = {
+	height: 700,
+	layout: 'fitColumns',
+	columns: [
+		{title: 'ID', field: 'Id', headerFilter: true},
+		{title: 'Meldestichtag', field: 'Meldestichtag', headerFilter: true},
+		{title: 'Studiensemester', field: 'Studiensemester', headerFilter: true}
+	],
+	rowFormatter: function(row) {
+
+		let data = row.getData(); // get data for this row
+	}
+};
+
+/**
+ *
+ */
+export const BismeldestichtagTabulatorEventHandlers = [
+	{
+		event: "rowClick",
+		handler: function(e, row) {
+			alert(row.getData().Data);
+		}
+	}
+];
+
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 241e44f2f..d71d8ea33 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1256,6 +1256,25 @@ $filters = array(
 			}
 		',
 		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'bismeldestichtag',
+		'filter_kurzbz' => 'bismeldestichtag',
+		'description' => '{Bismeldestichtage verwalten}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "bismeldestichtag",
+				"columns": [
+					{"name": "Meldestichtag"},
+					{"name": "Studiensemester"}
+				],
+				"filters": []
+			}
+		',
+		'oe_kurzbz' => null,
 	)
 );
 

From e6b47266b972a06a4e565c278958de092ba82ba8 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Sat, 10 Jun 2023 21:40:28 +0200
Subject: [PATCH 026/149] Added GUI for adding Bismeldestichtag

---
 .../controllers/codex/Bismeldestichtag.php    | 72 ++++++++++++++-
 .../models/codex/Bismeldestichtag_model.php   | 14 +++
 application/views/codex/bismeldestichtag.php  | 54 ++++++++---
 public/js/apps/Bismeldestichtag/API.js        | 52 +++++++++++
 .../apps/Bismeldestichtag/Bismeldestichtag.js | 90 ++++++++++++++++++-
 .../apps/Bismeldestichtag/TabulatorSetup.js   | 14 +--
 system/phrasesupdate.php                      | 40 +++++++++
 7 files changed, 309 insertions(+), 27 deletions(-)
 create mode 100644 application/models/codex/Bismeldestichtag_model.php
 create mode 100644 public/js/apps/Bismeldestichtag/API.js

diff --git a/application/controllers/codex/Bismeldestichtag.php b/application/controllers/codex/Bismeldestichtag.php
index 3c76486ca..98b76f5ae 100644
--- a/application/controllers/codex/Bismeldestichtag.php
+++ b/application/controllers/codex/Bismeldestichtag.php
@@ -14,19 +14,23 @@ class Bismeldestichtag extends Auth_Controller
 	{
 		parent::__construct(
 			array(
-				'index' => 'admin:r'
+				'index' => 'admin:r',
+				'addBismeldestichtag' => 'admin:rw',
+				'getStudiensemester' => 'admin:r'
 			)
 		);
 
 		// Loads WidgetLib
 		$this->load->library('WidgetLib');
 
+		// Load models
+		$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
 		// Loads phrases system
 		$this->loadPhrases(
 			array(
-				'global',
-				'ui',
-				'filter'
+				'bismeldestichtag'
 			)
 		);
 	}
@@ -41,4 +45,64 @@ class Bismeldestichtag extends Auth_Controller
 	{
 		$this->load->view('codex/bismeldestichtag.php');
 	}
+
+	public function getStudiensemester()
+	{
+		// load semester list
+		$semList = array();
+		$this->StudiensemesterModel->addSelect('studiensemester_kurzbz');
+		$this->StudiensemesterModel->addOrder('start', 'DESC');
+		$semRes = $this->StudiensemesterModel->load();
+
+		if (hasData($semRes))
+		{
+			$semList = getData($semRes);
+		}
+
+		// load current semester
+		$currSem = null;
+		$semRes = $this->StudiensemesterModel->getAkt();
+
+		if (hasData($semRes))
+		{
+			$currSem = getData($semRes)[0]->studiensemester_kurzbz;
+		}
+
+		// output data
+		$this->outputJsonSuccess(
+			array('semList' => $semList, 'currSem' => $currSem)
+		);
+	}
+
+	public function addBismeldestichtag()
+	{
+		// get request data
+		$request = $this->getPostJSON();
+
+		// check request data
+		if (!property_exists($request, 'meldestichtag') || isEmptyString($request->meldestichtag))
+			$this->terminateWithJsonError('Error occured: Meldestichtag missing');
+		if (!property_exists($request, 'studiensemester_kurzbz') || isEmptyString($request->studiensemester_kurzbz))
+			$this->terminateWithJsonError('Error occured: Studiensemester missing');
+
+		$meldestichtag = $request->meldestichtag;
+		$studiensemester_kurzbz = $request->studiensemester_kurzbz;
+
+		// check if Bismeldestichtag already exists
+		$this->BismeldestichtagModel->addSelect('1');
+		$bismeldestichtagRes = $this->BismeldestichtagModel->loadWhere(
+			array('meldestichtag' => $meldestichtag, 'studiensemester_kurzbz' => $studiensemester_kurzbz)
+		);
+
+		// return success if already exists
+		if (hasData($bismeldestichtagRes))
+			$this->outputJsonSuccess('Bismeldestichtag already exists');
+		else
+		{
+			// insert new if Stichtag does not exist
+			$this->outputJson($this->BismeldestichtagModel->insert(
+				array('meldestichtag' => $request->meldestichtag, 'studiensemester_kurzbz' => $request->studiensemester_kurzbz)
+			));
+		}
+	}
 }
diff --git a/application/models/codex/Bismeldestichtag_model.php b/application/models/codex/Bismeldestichtag_model.php
new file mode 100644
index 000000000..1a45f0fbd
--- /dev/null
+++ b/application/models/codex/Bismeldestichtag_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bismeldestichtag_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_bismeldestichtag';
+		$this->pk = 'meldestichtag_id';
+	}
+}
diff --git a/application/views/codex/bismeldestichtag.php b/application/views/codex/bismeldestichtag.php
index cb4b1de7f..1953cf095 100644
--- a/application/views/codex/bismeldestichtag.php
+++ b/application/views/codex/bismeldestichtag.php
@@ -1,6 +1,6 @@
 <?php
 	$includesArray = array(
-		'title' => 'Logs Viewer',
+		'title' => 'Bismeldestichtage',
 		'axios027' => true,
 		'bootstrap5' => true,
 		'fontawesome6' => true,
@@ -8,34 +8,60 @@
 		'filtercomponent' => true,
 		'navigationcomponent' => true,
 		'tabulator5' => true,
-		'phrases' => array(
-			'global' => array('mailAnXversandt'),
-			'ui' => array('bitteEintragWaehlen')
+		'customCSSs' => array(
+			'public/css/components/verticalsplit.css'
 		),
 		'customJSModules' => array('public/js/apps/Bismeldestichtag/Bismeldestichtag.js')
 	);
 
 	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
-
+	<!-- Load Studiensemester -->
 	<div id="main">
 
 		<!-- Navigation component -->
 		<core-navigation-cmpt v-bind:add-side-menu-entries="appSideMenuEntries"></core-navigation-cmpt>
 
+		<!-- fetch component -->
+		<core-fetch-cmpt
+			v-bind:api-function="fetchCmptApiFunction"
+			v-bind:api-function-parameters="fetchCmptApiFunctionParams"
+			v-bind:refresh="fetchCmptRefresh"
+			@data-fetched="fetchCmptDataFetched">
+		</core-fetch-cmpt>
+
 		<div id="content">
 			<div>
-				<!-- Filter component -->
-				<core-filter-cmpt
-					title="Bismeldestichtage verwalten"
-					filter-type="Bismeldestichtag"
-					:tabulator-options="bismeldestichtagTabulatorOptions"
-					:tabulator-events="bismeldestichtagTabulatorEventHandlers"
-					@nw-new-entry="newSideMenuEntryHandler">
-				</core-filter-cmpt>
+				<verticalsplit>
+					<template #top>
+						<!-- input fields -->
+						<div class="input-group">
+							<input type="date" class="form-control" name="meldestichtag" v-model="meldestichtag">
+							<select class="form-control" name="studiensemester_kurzbz" v-model="currSem">
+								<option v-for="sem in semList" :value="sem.studiensemester_kurzbz">
+									{{ sem.studiensemester_kurzbz }}
+								</option>
+							</select>
+							<div class="input-group-btn">
+								<button type="button" class="btn btn-secondary" @click="handlerAddBismeldestichtag">
+									<?php echo $this->p->t('bismeldestichtag', 'stichtagHinzufuegen') ?>
+								</button>
+							</div>
+						</div>
+					</template>
+					<template #bottom>
+						<!-- Filter component -->
+						<core-filter-cmpt
+							title="<?php echo $this->p->t('bismeldestichtag', 'stichtageVerwalten') ?>"
+							filter-type="Bismeldestichtag"
+							:tabulator-options="bismeldestichtagTabulatorOptions"
+							:tabulator-events="bismeldestichtagTabulatorEventHandlers"
+							@nw-new-entry="newSideMenuEntryHandler">
+						</core-filter-cmpt>
+					</template>
+				</verticalsplit>
 			</div>
 		</div>
 	</div>
 
 <?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-
diff --git a/public/js/apps/Bismeldestichtag/API.js b/public/js/apps/Bismeldestichtag/API.js
new file mode 100644
index 000000000..1644d6e49
--- /dev/null
+++ b/public/js/apps/Bismeldestichtag/API.js
@@ -0,0 +1,52 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {CoreRESTClient} from '../../RESTClient.js';
+
+//
+const CORE_BISMELDESTICHTAG_CMPT_TIMEOUT = 2000;
+
+/**
+ *
+ */
+export const BismeldestichtagAPIs = {
+	/**
+	 *
+	 */
+	getStudiensemester: function() {
+		return CoreRESTClient.get(
+			'codex/Bismeldestichtag/getStudiensemester',
+			null,
+			{
+				timeout: CORE_BISMELDESTICHTAG_CMPT_TIMEOUT
+			}
+		);
+	},
+	addBismeldestichtag: function(wsParams) {
+		return CoreRESTClient.post(
+			'codex/Bismeldestichtag/addBismeldestichtag',
+			{
+				meldestichtag: wsParams.meldestichtag,
+				studiensemester_kurzbz: wsParams.studiensemester_kurzbz
+			},
+			{
+				timeout: CORE_BISMELDESTICHTAG_CMPT_TIMEOUT
+			}
+		);
+	}
+};
+
diff --git a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
index f2be375b9..1c2749dea 100644
--- a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
+++ b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
@@ -20,22 +20,108 @@ import {BismeldestichtagTabulatorEventHandlers} from './TabulatorSetup.js';
 
 import {CoreFilterCmpt} from '../../components/filter/Filter.js';
 import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
+import {CoreRESTClient} from '../../RESTClient.js';
+import {CoreFetchCmpt} from '../../components/Fetch.js';
+import {BismeldestichtagAPIs} from './API.js';
+import verticalsplit from '../../components/verticalsplit/verticalsplit.js';
 
 const bismeldestichtagApp = Vue.createApp({
 	data: function() {
 		return {
 			appSideMenuEntries: {},
 			bismeldestichtagTabulatorOptions: BismeldestichtagTabulatorOptions,
-			bismeldestichtagTabulatorEventHandlers: BismeldestichtagTabulatorEventHandlers
+			bismeldestichtagTabulatorEventHandlers: BismeldestichtagTabulatorEventHandlers,
+			meldestichtag: null, // date of Meldestichtag
+			semList: null, // all Studiensemester for dropdown
+			currSem: null, // selected Studiensemester
+			fetchCmptApiFunction: {}, // api function call
+			fetchCmptApiFunctionParams: null, // parameters for api function call
+			fetchCmptDataFetched: null, // function to execute after call
+			fetchCmptRefresh: true // for refreshing
 		};
 	},
 	components: {
 		CoreNavigationCmpt,
-		CoreFilterCmpt
+		CoreFilterCmpt,
+		BismeldestichtagAPIs,
+		CoreFetchCmpt,
+		verticalsplit
+	},
+	created() {
+		this.handlerStudiensemester();
 	},
 	methods: {
 		newSideMenuEntryHandler: function(payload) {
 			this.appSideMenuEntries = payload;
+		},
+		/**
+		 * Define Studiensemester call and method to be executed after the call
+		 */
+		handlerStudiensemester: function() {
+			this.startFetchCmpt(
+				BismeldestichtagAPIs.getStudiensemester,
+				null,
+				this.fetchCmptDataFetchedStudiensemester
+			);
+		},
+		/**
+		 * Define Bismeldestichtag call and method to be executed after the call
+		 */
+		handlerAddBismeldestichtag: function(event) {
+			this.startFetchCmpt(
+				BismeldestichtagAPIs.addBismeldestichtag,
+				{
+					meldestichtag: this.meldestichtag,
+					studiensemester_kurzbz: this.currSem
+				},
+				this.fetchCmptDataFetchedAddBismeldestichtag
+			);
+		},
+		/**
+		 * Called after Studiensemester response is received
+		 */
+		fetchCmptDataFetchedStudiensemester: function(data) {
+			if (CoreRESTClient.isError(data)) alert(CoreRESTClient.getError(data));
+			if (CoreRESTClient.hasData(data))
+			{
+				let semRes = CoreRESTClient.getData(data);
+				this.semList = semRes.semList;
+				this.currSem = semRes.currSem;
+			}
+			else
+				alert("No response data");
+		},
+		/**
+		 * Called after Bismeldestichtag response is received
+		 */
+		fetchCmptDataFetchedAddBismeldestichtag: function(data) {
+			if (CoreRESTClient.isError(data))
+				alert(CoreRESTClient.getError(data));
+			else if (CoreRESTClient.hasData(data))
+			{
+				window.location.reload();
+				alert("Successfully added Bismeldestichtag");
+			}
+			else
+				alert("No response data");
+		},
+		/**
+		 * Used to start/refresh the FetchCmpt
+		 */
+		startFetchCmpt: function(apiFunction, apiFunctionParameters, dataFetchedCallback) {
+			// Assign the function api of the FetchCmpt binded property
+			this.fetchCmptApiFunction = apiFunction;
+
+			// In case a null value is provided set the parameters as an empty object
+			if (apiFunctionParameters == null) apiFunctionParameters = {};
+
+			// Assign parameters to the FetchCmpt binded properties
+			this.fetchCmptApiFunctionParams = apiFunctionParameters;
+			// Assign data fetch callback to the FetchCmpt binded properties
+			this.fetchCmptDataFetched = dataFetchedCallback;
+			// Set the FetchCmpt binded property refresh to have the component to refresh
+			// NOTE: this should be the last one to be called because it triggers the FetchCmpt to start to refresh
+			this.fetchCmptRefresh === true ? this.fetchCmptRefresh = false : this.fetchCmptRefresh = true;
 		}
 	}
 });
diff --git a/public/js/apps/Bismeldestichtag/TabulatorSetup.js b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
index eb63b8eed..21690a794 100644
--- a/public/js/apps/Bismeldestichtag/TabulatorSetup.js
+++ b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
@@ -23,13 +23,12 @@ export const BismeldestichtagTabulatorOptions = {
 	layout: 'fitColumns',
 	columns: [
 		{title: 'ID', field: 'Id', headerFilter: true},
-		{title: 'Meldestichtag', field: 'Meldestichtag', headerFilter: true},
+		{title: 'Meldestichtag',field: 'Meldestichtag', headerFilter: true, formatter: function(cell){
+				return cell.getValue().replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
+			}
+		},
 		{title: 'Studiensemester', field: 'Studiensemester', headerFilter: true}
-	],
-	rowFormatter: function(row) {
-
-		let data = row.getData(); // get data for this row
-	}
+	]
 };
 
 /**
@@ -39,7 +38,8 @@ export const BismeldestichtagTabulatorEventHandlers = [
 	{
 		event: "rowClick",
 		handler: function(e, row) {
-			alert(row.getData().Data);
+			let data = row.getData();
+			alert(data.Studiensemester + ': ' + data.Meldestichtag);
 		}
 	}
 ];
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0bc748c80..93522b722 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18123,6 +18123,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'bismeldestichtag',
+		'phrase' => 'stichtagHinzufuegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Meldestichtag hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add report target date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bismeldestichtag',
+		'phrase' => 'stichtageVerwalten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bismeldestichtage verwalten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Manage report target dates',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From fe9bf1dc8a341f9e2fb2a1cc7ac145e00de9d42c Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Sun, 11 Jun 2023 11:07:28 +0200
Subject: [PATCH 027/149] Bismeldestichtag: prestudentstatus is displayed as
 inaktive in FAS list if Stichtag is reached, fixed comments

---
 content/student/studentdetailoverlay.xul.php | 36 ++++++++++----------
 content/student/studentrolledialog.xul.php   |  3 ++
 include/bismeldestichtag.class.php           |  5 ++-
 rdf/prestudentrolle.rdf.php                  | 20 +++++++++++
 skin/tempus.css                              | 16 +++++++++
 5 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 845d48397..4b4fbdd63 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -806,24 +806,24 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									<treechildren flex="1" >
 										<treeitem uri="rdf:*">
 											<treerow>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#status_kurzbz"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#lehrverband"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#anmerkung"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_von"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_am"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bewerbung_abgeschicktamum"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#statusgrund"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#insertamum"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#insertvon"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updateamum"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#status_kurzbz"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#lehrverband"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#anmerkung"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_von"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_am"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bewerbung_abgeschicktamum"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#statusgrund"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#insertamum"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#insertvon"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updateamum"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon"/>
 											</treerow>
 										</treeitem>
 									</treechildren>
diff --git a/content/student/studentrolledialog.xul.php b/content/student/studentrolledialog.xul.php
index 37ec0e983..615531e82 100644
--- a/content/student/studentrolledialog.xul.php
+++ b/content/student/studentrolledialog.xul.php
@@ -93,6 +93,9 @@ $user=get_uid();
 <vbox>
 <textbox id="student-rolle-textbox-prestudent_id" value="" hidden="true" />
 <groupbox id="student-rolle-groupbox" flex="1">
+	<?php if ($disabled): ?>
+		<label class="warning">Meldestichtag erreicht - Bearbeiten nicht mehr möglich</label>
+	<?php endif; ?>
 	<caption label="Details<?php echo ($nachname!=''?" $nachname $vorname":'');?>"/>
 		<grid id="student-rolle-grid-detail" style="margin:4px;" flex="1">
 		  	<columns  >
diff --git a/include/bismeldestichtag.class.php b/include/bismeldestichtag.class.php
index 675dc4953..a12716bed 100644
--- a/include/bismeldestichtag.class.php
+++ b/include/bismeldestichtag.class.php
@@ -91,10 +91,9 @@ class bismeldestichtag extends basis_db
 	}
 
 	/**
-	 * Liefert die Antwort eines Pruefling zu einer Frage
+	 * Liefert zuletzt erreichten Meldestichtag
 	 *
-	 * @param $pruefling_id
-	 * @param $frage_id
+	 * @param $studiensemester_kurzbz
 	 * @return boolean
 	 */
 	public function getLastReachedMeldestichtag($studiensemester_kurzbz = null)
diff --git a/rdf/prestudentrolle.rdf.php b/rdf/prestudentrolle.rdf.php
index 7a3dd636b..6592043bf 100644
--- a/rdf/prestudentrolle.rdf.php
+++ b/rdf/prestudentrolle.rdf.php
@@ -35,6 +35,7 @@ require_once('../include/prestudent.class.php');
 require_once('../include/datum.class.php');
 require_once('../include/statusgrund.class.php');
 require_once('../include/student.class.php');
+require_once('../include/bismeldestichtag.class.php');
 
 $rdf_url='http://www.technikum-wien.at/prestudentrolle';
 $datum = new datum();
@@ -80,6 +81,8 @@ foreach($statusgrund->result as $row)
 $studentlehrverband = new student();
 $uid = $studentlehrverband->getUid($prestudent_id);
 
+
+$erstes_stichtag_inaktiv = true;
 foreach($ps->result as $row)
 {
 	$lehrverband = '-';
@@ -99,6 +102,21 @@ foreach($ps->result as $row)
 		}
 	}
 
+	// prüfen, ob Meldestichtag erreicht
+	$bismeldestichtag = new bismeldestichtag();
+	$stichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($row->studiensemester_kurzbz, $row->datum);
+
+	// Variablen für layout von prestudentstatus Anzeige
+	$stichtagsaktiv = $stichtag_erreicht ? 'stichtagsinaktiv' : 'stichtagsaktiv';
+	$aktiv = $stichtag_erreicht ? 'false' : 'true';
+
+	// erstes mal stichtag erreicht -> anderes layout
+	if ($stichtag_erreicht && $erstes_stichtag_inaktiv)
+	{
+		$stichtagsaktiv = 'erstes_stichtagsinaktiv';
+		$erstes_stichtag_inaktiv = false;
+	}
+
 	echo '
 	  <RDF:li>
       	<RDF:Description  id="'.$row->prestudent_id.'/'.$row->status_kurzbz.'/'.$row->studiensemester_kurzbz.'/'.$row->ausbildungssemester.'"  about="'.$rdf_url.'/'.$row->prestudent_id.'/'.$row->status_kurzbz.'/'.$row->studiensemester_kurzbz.'/'.$row->ausbildungssemester.'" >
@@ -123,6 +141,8 @@ foreach($ps->result as $row)
 			<ROLLE:insertvon><![CDATA['.$row->insertvon.']]></ROLLE:insertvon>
 			<ROLLE:updateamum><![CDATA['.$datum->formatDatum($row->updateamum,'d.m.Y H:i:s').']]></ROLLE:updateamum>
 			<ROLLE:updatevon><![CDATA['.$row->updatevon.']]></ROLLE:updatevon>
+			<ROLLE:stichtagsaktiv><![CDATA['.$stichtagsaktiv.']]></ROLLE:stichtagsaktiv>
+			<ROLLE:aktiv><![CDATA['.$aktiv.']]></ROLLE:aktiv>
       	</RDF:Description>
       </RDF:li>
 	';
diff --git a/skin/tempus.css b/skin/tempus.css
index 7684fddb1..597be41f8 100644
--- a/skin/tempus.css
+++ b/skin/tempus.css
@@ -234,3 +234,19 @@ treechildren::-moz-tree-row(makeItMarked)
    width: 25px;
    height:25px;
 }
+
+treechildren::-moz-tree-cell(stichtagsinaktiv)
+{
+	background-color: #e6e6e6;
+}
+
+treechildren::-moz-tree-cell(erstes_stichtagsinaktiv)
+{
+	background-color: #e6e6e6;
+	border-top: 1px solid grey;
+}
+
+label.warning
+{
+	font-weight: bold;
+}

From f865d09033c0c9ccabb96dc14780e8df13328319 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Tue, 13 Jun 2023 16:14:38 +0200
Subject: [PATCH 028/149] manage Bismeldestichtage: added possibility to delete
 a report target date

---
 .../controllers/codex/Bismeldestichtag.php    | 40 ++++++++++++++++++-
 application/views/codex/bismeldestichtag.php  | 29 +++++++++-----
 public/js/apps/Bismeldestichtag/API.js        | 12 ++++++
 .../apps/Bismeldestichtag/Bismeldestichtag.js | 31 +++++++++++++-
 system/phrasesupdate.php                      | 20 ++++++++++
 5 files changed, 119 insertions(+), 13 deletions(-)

diff --git a/application/controllers/codex/Bismeldestichtag.php b/application/controllers/codex/Bismeldestichtag.php
index 98b76f5ae..ca175e1fc 100644
--- a/application/controllers/codex/Bismeldestichtag.php
+++ b/application/controllers/codex/Bismeldestichtag.php
@@ -15,8 +15,9 @@ class Bismeldestichtag extends Auth_Controller
 		parent::__construct(
 			array(
 				'index' => 'admin:r',
+				'getStudiensemester' => 'admin:r',
 				'addBismeldestichtag' => 'admin:rw',
-				'getStudiensemester' => 'admin:r'
+				'deleteBismeldestichtag' => 'admin:rw'
 			)
 		);
 
@@ -105,4 +106,41 @@ class Bismeldestichtag extends Auth_Controller
 			));
 		}
 	}
+
+	public function deleteBismeldestichtag()
+	{
+		// get request data
+		$request = $this->getPostJSON();
+
+		// check request data
+		if (!property_exists($request, 'meldestichtag') || isEmptyString($request->meldestichtag))
+			$this->terminateWithJsonError('Error occured: Meldestichtag missing');
+		if (!property_exists($request, 'studiensemester_kurzbz') || isEmptyString($request->studiensemester_kurzbz))
+			$this->terminateWithJsonError('Error occured: Studiensemester missing');
+
+		$meldestichtag = $request->meldestichtag;
+		$studiensemester_kurzbz = $request->studiensemester_kurzbz;
+
+		// check if Bismeldestichtag already exists
+		$this->BismeldestichtagModel->addSelect('meldestichtag_id');
+		$bismeldestichtagRes = $this->BismeldestichtagModel->loadWhere(
+			array('meldestichtag' => $meldestichtag, 'studiensemester_kurzbz' => $studiensemester_kurzbz)
+		);
+
+		if (hasData($bismeldestichtagRes))
+		{
+			$meldestichtag_id = getData($bismeldestichtagRes)[0]->meldestichtag_id;
+
+			// delete if Stichtag does exist
+			$this->outputJson($this->BismeldestichtagModel->delete(
+				array('meldestichtag_id' => $meldestichtag_id)
+			));
+
+		}
+		else
+		{
+			// return error if not exists
+			$this->outputJsonError('Bismeldestichtag does not exist');
+		}
+	}
 }
diff --git a/application/views/codex/bismeldestichtag.php b/application/views/codex/bismeldestichtag.php
index 1953cf095..0166666af 100644
--- a/application/views/codex/bismeldestichtag.php
+++ b/application/views/codex/bismeldestichtag.php
@@ -35,16 +35,25 @@
 				<verticalsplit>
 					<template #top>
 						<!-- input fields -->
-						<div class="input-group">
-							<input type="date" class="form-control" name="meldestichtag" v-model="meldestichtag">
-							<select class="form-control" name="studiensemester_kurzbz" v-model="currSem">
-								<option v-for="sem in semList" :value="sem.studiensemester_kurzbz">
-									{{ sem.studiensemester_kurzbz }}
-								</option>
-							</select>
-							<div class="input-group-btn">
-								<button type="button" class="btn btn-secondary" @click="handlerAddBismeldestichtag">
-									<?php echo $this->p->t('bismeldestichtag', 'stichtagHinzufuegen') ?>
+						<div class="row">
+							<div class="col-9">
+								<div class="input-group">
+									<input type="date" class="form-control" name="meldestichtag" v-model="meldestichtag">
+									<select class="form-control" name="studiensemester_kurzbz" v-model="currSem">
+										<option v-for="sem in semList" :value="sem.studiensemester_kurzbz">
+											{{ sem.studiensemester_kurzbz }}
+										</option>
+									</select>
+									<div class="input-group-btn">
+										<button type="button" class="btn btn-dark" @click="handlerAddBismeldestichtag">
+											<?php echo $this->p->t('bismeldestichtag', 'stichtagHinzufuegen') ?>
+										</button>
+									</div>
+								</div>
+							</div>
+							<div class="col-3 text-center">
+								<button type="button" class="btn btn-dark" @click="handlerDeleteBismeldestichtag">
+									<?php echo $this->p->t('bismeldestichtag', 'stichtagLoeschen') ?>
 								</button>
 							</div>
 						</div>
diff --git a/public/js/apps/Bismeldestichtag/API.js b/public/js/apps/Bismeldestichtag/API.js
index 1644d6e49..b6b2a0105 100644
--- a/public/js/apps/Bismeldestichtag/API.js
+++ b/public/js/apps/Bismeldestichtag/API.js
@@ -47,6 +47,18 @@ export const BismeldestichtagAPIs = {
 				timeout: CORE_BISMELDESTICHTAG_CMPT_TIMEOUT
 			}
 		);
+	},
+	deleteBismeldestichtag: function(wsParams) {
+		return CoreRESTClient.post(
+			'codex/Bismeldestichtag/deleteBismeldestichtag',
+			{
+				meldestichtag: wsParams.meldestichtag,
+				studiensemester_kurzbz: wsParams.studiensemester_kurzbz
+			},
+			{
+				timeout: CORE_BISMELDESTICHTAG_CMPT_TIMEOUT
+			}
+		);
 	}
 };
 
diff --git a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
index 1c2749dea..ce464eaf5 100644
--- a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
+++ b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
@@ -65,7 +65,7 @@ const bismeldestichtagApp = Vue.createApp({
 			);
 		},
 		/**
-		 * Define Bismeldestichtag call and method to be executed after the call
+		 * Define add Bismeldestichtag call and method to be executed after the call
 		 */
 		handlerAddBismeldestichtag: function(event) {
 			this.startFetchCmpt(
@@ -77,6 +77,19 @@ const bismeldestichtagApp = Vue.createApp({
 				this.fetchCmptDataFetchedAddBismeldestichtag
 			);
 		},
+		/**
+		 * Define delete Bismeldestichtag call and method to be executed after the call
+		 */
+		handlerDeleteBismeldestichtag: function(event) {
+			this.startFetchCmpt(
+				BismeldestichtagAPIs.deleteBismeldestichtag,
+				{
+					meldestichtag: this.meldestichtag,
+					studiensemester_kurzbz: this.currSem
+				},
+				this.fetchCmptDataFetchedDeleteBismeldestichtag
+			);
+		},
 		/**
 		 * Called after Studiensemester response is received
 		 */
@@ -92,7 +105,7 @@ const bismeldestichtagApp = Vue.createApp({
 				alert("No response data");
 		},
 		/**
-		 * Called after Bismeldestichtag response is received
+		 * Called after Add Bismeldestichtag response is received
 		 */
 		fetchCmptDataFetchedAddBismeldestichtag: function(data) {
 			if (CoreRESTClient.isError(data))
@@ -105,6 +118,20 @@ const bismeldestichtagApp = Vue.createApp({
 			else
 				alert("No response data");
 		},
+		/**
+		 * Called after Add Bismeldestichtag response is received
+		 */
+		fetchCmptDataFetchedDeleteBismeldestichtag: function(data) {
+			if (CoreRESTClient.isError(data))
+				alert(CoreRESTClient.getError(data));
+			else if (CoreRESTClient.hasData(data))
+			{
+				window.location.reload();
+				alert("Successfully deletted Bismeldestichtag");
+			}
+			else
+				alert("No response data");
+		},
 		/**
 		 * Used to start/refresh the FetchCmpt
 		 */
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 93522b722..0ef86e618 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18163,6 +18163,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'bismeldestichtag',
+		'phrase' => 'stichtagLoeschen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Meldestichtag löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete report target date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	)
 );
 
 

From f29d5a7b50a4805d4646580f39447af2551cea12 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Sat, 17 Jun 2023 21:00:52 +0200
Subject: [PATCH 029/149] Bismeldestichtage management: added menu entry,
 changed size of filter widget table to auto

---
 application/config/navigation.php                 | 8 ++++++++
 public/js/apps/Bismeldestichtag/TabulatorSetup.js | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/application/config/navigation.php b/application/config/navigation.php
index 56d142d08..c61b6de4f 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -31,6 +31,14 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 20,
 					'requiredPermissions' => 'admin:w'
+				),
+				'bismeldestichtagsverwaltung' => array(
+					'link' => site_url('codex/Bismeldestichtag'),
+					'icon' => '',
+					'description' => 'Bismeldestichtagsverwaltung',
+					'expand' => true,
+					'sort' => 30,
+					'requiredPermissions' => 'admin:w'
 				)
 			)
 		),
diff --git a/public/js/apps/Bismeldestichtag/TabulatorSetup.js b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
index 21690a794..05e1a593a 100644
--- a/public/js/apps/Bismeldestichtag/TabulatorSetup.js
+++ b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
@@ -19,7 +19,8 @@
  *
  */
 export const BismeldestichtagTabulatorOptions = {
-	height: 700,
+	maxHeight: "100%",
+	minHeight: 50,
 	layout: 'fitColumns',
 	columns: [
 		{title: 'ID', field: 'Id', headerFilter: true},

From 18d25069f339c542b6a2f712580b1480eb593dcd Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Thu, 29 Jun 2023 19:17:38 +0200
Subject: [PATCH 030/149] tbl_bismeldestichtag: removed edit permissions for
 web user

---
 .../29144_prestudent_status_nach_bismeldung_sperren.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php b/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
index e39921239..e473eb37a 100644
--- a/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
+++ b/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
@@ -33,7 +33,7 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_bismeldestichtag LIMIT 1'))
 	else
 		echo '<br>bis.tbl_bismeldestichtag table created';
 
-	$qry = 'GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE bis.tbl_bismeldestichtag TO web;';
+	$qry = 'GRANT SELECT ON TABLE bis.tbl_bismeldestichtag TO web;';
 	if (!$db->db_query($qry))
 		echo '<strong>bis.tbl_bismeldestichtag: '.$db->db_last_error().'</strong><br>';
 	else

From 74814db900642bdf9c518cc300cbf052f630a277 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Thu, 29 Jun 2023 19:19:00 +0200
Subject: [PATCH 031/149] Bismeldestichtag Management: improved GUI layout,
 studiensemester is optional for "bismeldestichtag reached" check

---
 application/views/codex/bismeldestichtag.php  | 87 +++++++++++--------
 content/student/studentDBDML.php              |  6 +-
 content/student/studentrolledialog.xul.php    |  2 +-
 include/bismeldestichtag.class.php            | 33 ++++---
 .../apps/Bismeldestichtag/Bismeldestichtag.js |  4 +-
 rdf/prestudentrolle.rdf.php                   |  2 +-
 6 files changed, 81 insertions(+), 53 deletions(-)

diff --git a/application/views/codex/bismeldestichtag.php b/application/views/codex/bismeldestichtag.php
index 0166666af..8973454aa 100644
--- a/application/views/codex/bismeldestichtag.php
+++ b/application/views/codex/bismeldestichtag.php
@@ -8,9 +8,6 @@
 		'filtercomponent' => true,
 		'navigationcomponent' => true,
 		'tabulator5' => true,
-		'customCSSs' => array(
-			'public/css/components/verticalsplit.css'
-		),
 		'customJSModules' => array('public/js/apps/Bismeldestichtag/Bismeldestichtag.js')
 	);
 
@@ -31,35 +28,55 @@
 		</core-fetch-cmpt>
 
 		<div id="content">
-			<div>
-				<verticalsplit>
-					<template #top>
-						<!-- input fields -->
-						<div class="row">
-							<div class="col-9">
-								<div class="input-group">
-									<input type="date" class="form-control" name="meldestichtag" v-model="meldestichtag">
-									<select class="form-control" name="studiensemester_kurzbz" v-model="currSem">
-										<option v-for="sem in semList" :value="sem.studiensemester_kurzbz">
-											{{ sem.studiensemester_kurzbz }}
-										</option>
-									</select>
-									<div class="input-group-btn">
-										<button type="button" class="btn btn-dark" @click="handlerAddBismeldestichtag">
-											<?php echo $this->p->t('bismeldestichtag', 'stichtagHinzufuegen') ?>
-										</button>
-									</div>
-								</div>
-							</div>
-							<div class="col-3 text-center">
-								<button type="button" class="btn btn-dark" @click="handlerDeleteBismeldestichtag">
-									<?php echo $this->p->t('bismeldestichtag', 'stichtagLoeschen') ?>
-								</button>
-							</div>
-						</div>
-					</template>
-					<template #bottom>
-						<!-- Filter component -->
+				<!-- input fields -->
+<!--
+				<div class="row">
+					<div class="col-6">
+							<input type="date" class="form-control" name="meldestichtag" v-model="meldestichtag">
+					</div>
+					<div class="col-3">
+							<select class="form-control" name="studiensemester_kurzbz" v-model="currSem">
+								<option v-for="sem in semList" :value="sem.studiensemester_kurzbz">
+									{{ sem.studiensemester_kurzbz }}
+								</option>
+							</select>
+					</div>
+					<div class="col-3 text-center">
+							<button type="button" class="btn btn-primary" @click="handlerAddBismeldestichtag">
+								<?php //echo $this->p->t('bismeldestichtag', 'stichtagHinzufuegen') ?>
+							</button>
+					</div>
+-->
+
+			<div class="input-group">
+				<input type="date" class="form-control" name="meldestichtag" v-model="meldestichtag">
+				<select class="form-select" name="studiensemester_kurzbz" v-model="currSem">
+					<option v-for="sem in semList" :value="sem.studiensemester_kurzbz">
+						{{ sem.studiensemester_kurzbz }}
+					</option>
+				</select>
+				<div class="input-group-btn">
+					<button type="button" class="btn btn-primary" @click="handlerAddBismeldestichtag">
+						<?php echo $this->p->t('bismeldestichtag', 'stichtagHinzufuegen') ?>
+					</button>
+				</div>
+			</div>
+<!--
+					<div class="col-2 text-center">
+						<button type="button" class="btn btn-primary" @click="handlerDeleteBismeldestichtag">
+							<?php echo $this->p->t('bismeldestichtag', 'stichtagLoeschen') ?>
+						</button>
+					</div>
+-->
+<!--
+				</div>
+-->
+				<br />
+				<!-- Filter component -->
+<!--
+				<div class="row">
+					<div class="col-12">
+-->
 						<core-filter-cmpt
 							title="<?php echo $this->p->t('bismeldestichtag', 'stichtageVerwalten') ?>"
 							filter-type="Bismeldestichtag"
@@ -67,8 +84,10 @@
 							:tabulator-events="bismeldestichtagTabulatorEventHandlers"
 							@nw-new-entry="newSideMenuEntryHandler">
 						</core-filter-cmpt>
-					</template>
-				</verticalsplit>
+<!--
+					</div>
+				</div>
+-->
 			</div>
 		</div>
 	</div>
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index b08d977e8..35833fc64 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -997,7 +997,7 @@ if(!$error)
 
 									$bismeldestichtag = new bismeldestichtag();
 
-									$meldestichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($studiensemester, $new_status_datum);
+									$meldestichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($new_status_datum);
 
 									if ($meldestichtag_erreicht === true)
 									{
@@ -1223,7 +1223,7 @@ if(!$error)
 			$erweiterteBerechtigungen = $rechte->isBerechtigt('admin', null, 'suid') || $rechte->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
 
 			$bismeldestichtag = new bismeldestichtag();
-			$meldestichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($_POST['studiensemester_kurzbz'], $_POST['datum']);
+			$meldestichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($_POST['datum']);
 
 			if($_POST['status_kurzbz']=='Student' && !$erweiterteBerechtigungen)
 			{
@@ -1557,7 +1557,7 @@ if(!$error)
 
 						// Prüfung, ob Meldestichtag erreicht ist
 						$bismeldestichtag = new bismeldestichtag();
-						$meldestichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($_POST['studiensemester_kurzbz'], $_POST['datum']);
+						$meldestichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($_POST['datum']);
 
 						if ($meldestichtag_erreicht === true)
 						{
diff --git a/content/student/studentrolledialog.xul.php b/content/student/studentrolledialog.xul.php
index 615531e82..7e2177a90 100644
--- a/content/student/studentrolledialog.xul.php
+++ b/content/student/studentrolledialog.xul.php
@@ -76,7 +76,7 @@ if($prestudent_id!='')
 
 	// Prüfen, ob Studnetrolle vor dem aktuellen Meldestichtag ist. In diesem Fall darf die Rolle nicht mehr bearbeitet werden.
 	$bismeldestichtag = new bismeldestichtag();
-	$disabled = $bismeldestichtag->checkMeldestichtagErreicht($studiensemester_kurzbz, $datum) ? ' disabled="true"' : '';
+	$disabled = $bismeldestichtag->checkMeldestichtagErreicht($datum) ? ' disabled="true"' : '';
 }
 $db = new basis_db();
 $user=get_uid();
diff --git a/include/bismeldestichtag.class.php b/include/bismeldestichtag.class.php
index a12716bed..143096dd8 100644
--- a/include/bismeldestichtag.class.php
+++ b/include/bismeldestichtag.class.php
@@ -27,9 +27,9 @@ class bismeldestichtag extends basis_db
 	public $meldestichtag;			// date
 	public $studiensemester_kurzbz;	// varchar(16)
 	public $insertamum;				// timestamp
-	public $insertvon;				// varchar(16)
+	public $insertvon;				// varchar(32)
 	public $updateamum;				// timestamp
-	public $updatevon;				// varchar(16)
+	public $updatevon;				// varchar(32)
 
 	// ErgebnisArray
 	public $result=array();
@@ -144,19 +144,23 @@ class bismeldestichtag extends basis_db
 	}
 
 	/**
-	 * Prüft, ob Meldestichtag für ein bestimmtes Studiensemester und Statusdatum erreicht ist.
+	 * Prüft, ob Meldestichtag für ein bestimmtes Statusdatum und Studiensemester erreicht ist.
 	 *
-	 * @param $studiensemester_kurzbz
 	 * @param $status_datum
+	 * @param $studiensemester_kurzbz
 	 * @return boolean true wenn erreicht, oder false
 	 */
-	public function checkMeldestichtagErreicht($studiensemester_kurzbz, $status_datum)
+	public function checkMeldestichtagErreicht($status_datum, $studiensemester_kurzbz = null)
 	{
 		$erreicht = false;
-		// Studiensemester ende holen
-		$studiensemester = new studiensemester();
-		if ($studiensemester->load($studiensemester_kurzbz))
-			$studiensemester_ende = new DateTime($studiensemester->ende);
+
+		if (isset($studiensemester_kurzbz))
+		{
+			// Studiensemester ende holen
+			$studiensemester = new studiensemester();
+			if ($studiensemester->load($studiensemester_kurzbz))
+				$studiensemester_ende = new DateTime($studiensemester->ende);
+		}
 
 		// letztes erreichtes Bismeldedatum holen
 		if ($this->getLastReachedMeldestichtag() && isset($this->result[0]))
@@ -165,8 +169,15 @@ class bismeldestichtag extends basis_db
 		$statusDatum = new DateTime($status_datum);
 
 		// Prüfen, ob Studentstatusdatum oder Studiensemester vor dem Stichtagsdatum liegen
-		if (isset($studiensemester_ende) && isset($lastReachedMeldestichtag) && isset($statusDatum))
-			$erreicht = $statusDatum < $lastReachedMeldestichtag || $studiensemester_ende < $lastReachedMeldestichtag;
+		if (isset($statusDatum))
+		{
+			if (isset($lastReachedMeldestichtag))
+				$erreicht = $statusDatum < $lastReachedMeldestichtag;
+
+			if (isset($studiensemester_ende))
+				$erreicht = $erreicht || $studiensemester_ende < $lastReachedMeldestichtag;
+
+		}
 
 		return $erreicht;
 	}
diff --git a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
index ce464eaf5..edc665f2d 100644
--- a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
+++ b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
@@ -23,7 +23,6 @@ import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
 import {CoreRESTClient} from '../../RESTClient.js';
 import {CoreFetchCmpt} from '../../components/Fetch.js';
 import {BismeldestichtagAPIs} from './API.js';
-import verticalsplit from '../../components/verticalsplit/verticalsplit.js';
 
 const bismeldestichtagApp = Vue.createApp({
 	data: function() {
@@ -44,8 +43,7 @@ const bismeldestichtagApp = Vue.createApp({
 		CoreNavigationCmpt,
 		CoreFilterCmpt,
 		BismeldestichtagAPIs,
-		CoreFetchCmpt,
-		verticalsplit
+		CoreFetchCmpt
 	},
 	created() {
 		this.handlerStudiensemester();
diff --git a/rdf/prestudentrolle.rdf.php b/rdf/prestudentrolle.rdf.php
index 6592043bf..0a6caf05c 100644
--- a/rdf/prestudentrolle.rdf.php
+++ b/rdf/prestudentrolle.rdf.php
@@ -104,7 +104,7 @@ foreach($ps->result as $row)
 
 	// prüfen, ob Meldestichtag erreicht
 	$bismeldestichtag = new bismeldestichtag();
-	$stichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($row->studiensemester_kurzbz, $row->datum);
+	$stichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($row->datum);
 
 	// Variablen für layout von prestudentstatus Anzeige
 	$stichtagsaktiv = $stichtag_erreicht ? 'stichtagsinaktiv' : 'stichtagsaktiv';

From f6661fabeac8f492daa4a083252f59a8b85458ba Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Fri, 30 Jun 2023 13:33:52 +0200
Subject: [PATCH 032/149] bismeldestichtage GUI: added delete button again (for
 now...)

---
 application/views/codex/bismeldestichtag.php | 79 +++++++-------------
 1 file changed, 27 insertions(+), 52 deletions(-)

diff --git a/application/views/codex/bismeldestichtag.php b/application/views/codex/bismeldestichtag.php
index 8973454aa..47e891648 100644
--- a/application/views/codex/bismeldestichtag.php
+++ b/application/views/codex/bismeldestichtag.php
@@ -29,65 +29,40 @@
 
 		<div id="content">
 				<!-- input fields -->
-<!--
-				<div class="row">
-					<div class="col-6">
-							<input type="date" class="form-control" name="meldestichtag" v-model="meldestichtag">
-					</div>
-					<div class="col-3">
-							<select class="form-control" name="studiensemester_kurzbz" v-model="currSem">
-								<option v-for="sem in semList" :value="sem.studiensemester_kurzbz">
-									{{ sem.studiensemester_kurzbz }}
-								</option>
-							</select>
-					</div>
-					<div class="col-3 text-center">
+			<div class="row">
+				<div class="col-9">
+					<div class="input-group">
+						<input type="date" class="form-control" name="meldestichtag" v-model="meldestichtag">
+						<select class="form-select" name="studiensemester_kurzbz" v-model="currSem">
+							<option v-for="sem in semList" :value="sem.studiensemester_kurzbz">
+								{{ sem.studiensemester_kurzbz }}
+							</option>
+						</select>
+						<div class="input-group-btn">
 							<button type="button" class="btn btn-primary" @click="handlerAddBismeldestichtag">
-								<?php //echo $this->p->t('bismeldestichtag', 'stichtagHinzufuegen') ?>
+								<?php echo $this->p->t('bismeldestichtag', 'stichtagHinzufuegen') ?>
 							</button>
+						</div>
 					</div>
--->
-
-			<div class="input-group">
-				<input type="date" class="form-control" name="meldestichtag" v-model="meldestichtag">
-				<select class="form-select" name="studiensemester_kurzbz" v-model="currSem">
-					<option v-for="sem in semList" :value="sem.studiensemester_kurzbz">
-						{{ sem.studiensemester_kurzbz }}
-					</option>
-				</select>
-				<div class="input-group-btn">
-					<button type="button" class="btn btn-primary" @click="handlerAddBismeldestichtag">
-						<?php echo $this->p->t('bismeldestichtag', 'stichtagHinzufuegen') ?>
+				</div>
+				<div class="col-3 text-center">
+					<button type="button" class="btn btn-primary" @click="handlerDeleteBismeldestichtag">
+						<?php echo $this->p->t('bismeldestichtag', 'stichtagLoeschen') ?>
 					</button>
 				</div>
 			</div>
-<!--
-					<div class="col-2 text-center">
-						<button type="button" class="btn btn-primary" @click="handlerDeleteBismeldestichtag">
-							<?php echo $this->p->t('bismeldestichtag', 'stichtagLoeschen') ?>
-						</button>
-					</div>
--->
-<!--
+			<br />
+			<!-- Filter component -->
+			<div class="row">
+				<div class="col-12">
+					<core-filter-cmpt
+						title="<?php echo $this->p->t('bismeldestichtag', 'stichtageVerwalten') ?>"
+						filter-type="Bismeldestichtag"
+						:tabulator-options="bismeldestichtagTabulatorOptions"
+						:tabulator-events="bismeldestichtagTabulatorEventHandlers"
+						@nw-new-entry="newSideMenuEntryHandler">
+					</core-filter-cmpt>
 				</div>
--->
-				<br />
-				<!-- Filter component -->
-<!--
-				<div class="row">
-					<div class="col-12">
--->
-						<core-filter-cmpt
-							title="<?php echo $this->p->t('bismeldestichtag', 'stichtageVerwalten') ?>"
-							filter-type="Bismeldestichtag"
-							:tabulator-options="bismeldestichtagTabulatorOptions"
-							:tabulator-events="bismeldestichtagTabulatorEventHandlers"
-							@nw-new-entry="newSideMenuEntryHandler">
-						</core-filter-cmpt>
-<!--
-					</div>
-				</div>
--->
 			</div>
 		</div>
 	</div>

From 16356d8a5c4c60e5ced65ab159383023cab2fcf9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 4 Jul 2023 10:42:06 +0200
Subject: [PATCH 033/149] reverse order setColumns & setData

---
 public/js/components/filter/Filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 776405614..453face96 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -226,9 +226,9 @@ export const CoreFilterCmpt = {
 			}
 		},
 		_updateTabulator() {
-			this.tabulator.setData(this.filteredData);
 			this.tabulatorHasSelector = this.filteredColumns.filter(el => el.formatter == 'rowSelection').length;
 			this.tabulator.setColumns(this.filteredColumns);
+			this.tabulator.setData(this.filteredData);
 		},
 		/**
 		 *

From 3798720ee0ed5fe1a42e0240ac7fd7ffbfa6ecc9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 4 Jul 2023 14:38:20 +0200
Subject: [PATCH 034/149] +emit: click:new

---
 public/js/components/filter/Filter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 453face96..2b6a4fe6d 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -39,7 +39,8 @@ export const CoreFilterCmpt = {
 		TableDownload
 	},
 	emits: [
-		'nwNewEntry'
+		'nwNewEntry',
+		'click:new'
 	],
 	props: {
 		onNwNewEntry: Function, // NOTE(chris): Hack to get the nwNewEntry listener into $props

From b7a1add2f3c161820724dcf74e0b2d53195235ed Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Fri, 7 Jul 2023 02:12:14 +0200
Subject: [PATCH 035/149] bismeldestichtage gui: removed filters, now just
 simple tabulator

---
 .../components/filters/Bismeldestichtag.php   | 17 ---------
 .../controllers/codex/Bismeldestichtag.php    | 14 ++++++++
 application/views/codex/bismeldestichtag.php  |  9 ++---
 public/js/apps/Bismeldestichtag/API.js        |  9 +++++
 .../apps/Bismeldestichtag/Bismeldestichtag.js | 35 ++++++++++++++-----
 .../apps/Bismeldestichtag/TabulatorSetup.js   |  5 ++-
 system/filtersupdate.php                      | 19 ----------
 7 files changed, 57 insertions(+), 51 deletions(-)
 delete mode 100644 application/components/filters/Bismeldestichtag.php

diff --git a/application/components/filters/Bismeldestichtag.php b/application/components/filters/Bismeldestichtag.php
deleted file mode 100644
index d7900a9b1..000000000
--- a/application/components/filters/Bismeldestichtag.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-	$filterCmptArray = array(
-		'app' => 'core',
-		'datasetName' => 'bismeldestichtag',
-		'query' => '
-			SELECT
-				bmt.meldestichtag_id AS "Id",
-				bmt.meldestichtag AS "Meldestichtag",
-				bmt.studiensemester_kurzbz AS "Studiensemester"
-			 FROM
-				bis.tbl_bismeldestichtag bmt
-		 ORDER BY
-			meldestichtag DESC, meldestichtag_id DESC
-		',
-		'requiredPermissions' => 'admin'
-	);
-
diff --git a/application/controllers/codex/Bismeldestichtag.php b/application/controllers/codex/Bismeldestichtag.php
index ca175e1fc..4956ea71e 100644
--- a/application/controllers/codex/Bismeldestichtag.php
+++ b/application/controllers/codex/Bismeldestichtag.php
@@ -16,6 +16,7 @@ class Bismeldestichtag extends Auth_Controller
 			array(
 				'index' => 'admin:r',
 				'getStudiensemester' => 'admin:r',
+				'getBismeldestichtage' => 'admin:r',
 				'addBismeldestichtag' => 'admin:rw',
 				'deleteBismeldestichtag' => 'admin:rw'
 			)
@@ -75,6 +76,19 @@ class Bismeldestichtag extends Auth_Controller
 		);
 	}
 
+	public function getBismeldestichtage()
+	{
+		$this->BismeldestichtagModel->addSelect('meldestichtag, studiensemester_kurzbz');
+		$this->BismeldestichtagModel->addOrder('meldestichtag', 'DESC');
+		$this->BismeldestichtagModel->addOrder('meldestichtag_id', 'DESC');
+		$this->outputJson($this->BismeldestichtagModel->load());
+
+		//~ if (hasData($bismeldestichtagRes))
+			//~ $this->outputJsonSuccess(getData($bismeldestichtagRes));
+		//~ else
+			//~ $this->outputJsonSuccess(array());
+	}
+
 	public function addBismeldestichtag()
 	{
 		// get request data
diff --git a/application/views/codex/bismeldestichtag.php b/application/views/codex/bismeldestichtag.php
index 47e891648..ba225e19a 100644
--- a/application/views/codex/bismeldestichtag.php
+++ b/application/views/codex/bismeldestichtag.php
@@ -17,9 +17,9 @@
 	<div id="main">
 
 		<!-- Navigation component -->
-		<core-navigation-cmpt v-bind:add-side-menu-entries="appSideMenuEntries"></core-navigation-cmpt>
+		<core-navigation-cmpt></core-navigation-cmpt>
 
-		<!-- fetch component -->
+		<!-- Fetch component -->
 		<core-fetch-cmpt
 			v-bind:api-function="fetchCmptApiFunction"
 			v-bind:api-function-parameters="fetchCmptApiFunctionParams"
@@ -57,10 +57,11 @@
 				<div class="col-12">
 					<core-filter-cmpt
 						title="<?php echo $this->p->t('bismeldestichtag', 'stichtageVerwalten') ?>"
-						filter-type="Bismeldestichtag"
+						ref="bismeldestichtageTable"
+						:side-menu="false"
 						:tabulator-options="bismeldestichtagTabulatorOptions"
 						:tabulator-events="bismeldestichtagTabulatorEventHandlers"
-						@nw-new-entry="newSideMenuEntryHandler">
+						:table-only="true">
 					</core-filter-cmpt>
 				</div>
 			</div>
diff --git a/public/js/apps/Bismeldestichtag/API.js b/public/js/apps/Bismeldestichtag/API.js
index b6b2a0105..2b6457ea3 100644
--- a/public/js/apps/Bismeldestichtag/API.js
+++ b/public/js/apps/Bismeldestichtag/API.js
@@ -36,6 +36,15 @@ export const BismeldestichtagAPIs = {
 			}
 		);
 	},
+	getBismeldestichtage: function() {
+		return CoreRESTClient.get(
+			'codex/Bismeldestichtag/getBismeldestichtage',
+			null,
+			{
+				timeout: CORE_BISMELDESTICHTAG_CMPT_TIMEOUT
+			}
+		);
+	},
 	addBismeldestichtag: function(wsParams) {
 		return CoreRESTClient.post(
 			'codex/Bismeldestichtag/addBismeldestichtag',
diff --git a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
index edc665f2d..4c7c7374c 100644
--- a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
+++ b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
@@ -27,7 +27,6 @@ import {BismeldestichtagAPIs} from './API.js';
 const bismeldestichtagApp = Vue.createApp({
 	data: function() {
 		return {
-			appSideMenuEntries: {},
 			bismeldestichtagTabulatorOptions: BismeldestichtagTabulatorOptions,
 			bismeldestichtagTabulatorEventHandlers: BismeldestichtagTabulatorEventHandlers,
 			meldestichtag: null, // date of Meldestichtag
@@ -49,9 +48,6 @@ const bismeldestichtagApp = Vue.createApp({
 		this.handlerStudiensemester();
 	},
 	methods: {
-		newSideMenuEntryHandler: function(payload) {
-			this.appSideMenuEntries = payload;
-		},
 		/**
 		 * Define Studiensemester call and method to be executed after the call
 		 */
@@ -62,6 +58,16 @@ const bismeldestichtagApp = Vue.createApp({
 				this.fetchCmptDataFetchedStudiensemester
 			);
 		},
+		/**
+		 * Define Studiensemester call and method to be executed after the call
+		 */
+		handlerBismeldestichtage: function() {
+			this.startFetchCmpt(
+				BismeldestichtagAPIs.getBismeldestichtage,
+				null,
+				this.fetchCmptDataFetchedBismeldestichtage
+			);
+		},
 		/**
 		 * Define add Bismeldestichtag call and method to be executed after the call
 		 */
@@ -98,6 +104,21 @@ const bismeldestichtagApp = Vue.createApp({
 				let semRes = CoreRESTClient.getData(data);
 				this.semList = semRes.semList;
 				this.currSem = semRes.currSem;
+				this.handlerBismeldestichtage();
+			}
+			else
+				alert("No response data");
+		},
+		/**
+		 * Called after Bismeldestichtage response is received
+		 */
+		fetchCmptDataFetchedBismeldestichtage: function(data) {
+			console.log(data);
+			if (CoreRESTClient.isError(data)) alert(CoreRESTClient.getError(data));
+			if (CoreRESTClient.hasData(data))
+			{
+				let meldestichtage = CoreRESTClient.getData(data);
+				this.$refs.bismeldestichtageTable.tabulator.setData(meldestichtage);
 			}
 			else
 				alert("No response data");
@@ -110,8 +131,7 @@ const bismeldestichtagApp = Vue.createApp({
 				alert(CoreRESTClient.getError(data));
 			else if (CoreRESTClient.hasData(data))
 			{
-				window.location.reload();
-				alert("Successfully added Bismeldestichtag");
+				this.handlerBismeldestichtage();
 			}
 			else
 				alert("No response data");
@@ -124,8 +144,7 @@ const bismeldestichtagApp = Vue.createApp({
 				alert(CoreRESTClient.getError(data));
 			else if (CoreRESTClient.hasData(data))
 			{
-				window.location.reload();
-				alert("Successfully deletted Bismeldestichtag");
+				this.handlerBismeldestichtage();
 			}
 			else
 				alert("No response data");
diff --git a/public/js/apps/Bismeldestichtag/TabulatorSetup.js b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
index 05e1a593a..d1cc39bcc 100644
--- a/public/js/apps/Bismeldestichtag/TabulatorSetup.js
+++ b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
@@ -23,12 +23,11 @@ export const BismeldestichtagTabulatorOptions = {
 	minHeight: 50,
 	layout: 'fitColumns',
 	columns: [
-		{title: 'ID', field: 'Id', headerFilter: true},
-		{title: 'Meldestichtag',field: 'Meldestichtag', headerFilter: true, formatter: function(cell){
+		{title: 'Meldestichtag',field: 'meldestichtag', headerFilter: true, formatter: function(cell){
 				return cell.getValue().replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
 			}
 		},
-		{title: 'Studiensemester', field: 'Studiensemester', headerFilter: true}
+		{title: 'Studiensemester', field: 'studiensemester_kurzbz', headerFilter: true}
 	]
 };
 
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index d71d8ea33..241e44f2f 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1256,25 +1256,6 @@ $filters = array(
 			}
 		',
 		'oe_kurzbz' => null,
-	),
-	array(
-		'app' => 'core',
-		'dataset_name' => 'bismeldestichtag',
-		'filter_kurzbz' => 'bismeldestichtag',
-		'description' => '{Bismeldestichtage verwalten}',
-		'sort' => 1,
-		'default_filter' => true,
-		'filter' => '
-			{
-				"name": "bismeldestichtag",
-				"columns": [
-					{"name": "Meldestichtag"},
-					{"name": "Studiensemester"}
-				],
-				"filters": []
-			}
-		',
-		'oe_kurzbz' => null,
 	)
 );
 

From 7ab5d3add66904be665db94f44b68e941394f8f0 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Mon, 17 Jul 2023 12:11:15 +0200
Subject: [PATCH 036/149] Bismeldestichtage Management GUI: added row delete
 button

---
 .../controllers/codex/Bismeldestichtag.php    | 39 +++----------------
 application/views/codex/bismeldestichtag.php  |  9 +----
 public/js/apps/Bismeldestichtag/API.js        |  3 +-
 .../apps/Bismeldestichtag/Bismeldestichtag.js | 32 +++++++++++----
 .../apps/Bismeldestichtag/TabulatorSetup.js   | 13 +++++--
 5 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/application/controllers/codex/Bismeldestichtag.php b/application/controllers/codex/Bismeldestichtag.php
index 4956ea71e..0da8003ee 100644
--- a/application/controllers/codex/Bismeldestichtag.php
+++ b/application/controllers/codex/Bismeldestichtag.php
@@ -78,15 +78,10 @@ class Bismeldestichtag extends Auth_Controller
 
 	public function getBismeldestichtage()
 	{
-		$this->BismeldestichtagModel->addSelect('meldestichtag, studiensemester_kurzbz');
+		$this->BismeldestichtagModel->addSelect('meldestichtag_id, meldestichtag, studiensemester_kurzbz');
 		$this->BismeldestichtagModel->addOrder('meldestichtag', 'DESC');
 		$this->BismeldestichtagModel->addOrder('meldestichtag_id', 'DESC');
 		$this->outputJson($this->BismeldestichtagModel->load());
-
-		//~ if (hasData($bismeldestichtagRes))
-			//~ $this->outputJsonSuccess(getData($bismeldestichtagRes));
-		//~ else
-			//~ $this->outputJsonSuccess(array());
 	}
 
 	public function addBismeldestichtag()
@@ -127,34 +122,12 @@ class Bismeldestichtag extends Auth_Controller
 		$request = $this->getPostJSON();
 
 		// check request data
-		if (!property_exists($request, 'meldestichtag') || isEmptyString($request->meldestichtag))
-			$this->terminateWithJsonError('Error occured: Meldestichtag missing');
-		if (!property_exists($request, 'studiensemester_kurzbz') || isEmptyString($request->studiensemester_kurzbz))
-			$this->terminateWithJsonError('Error occured: Studiensemester missing');
+		if (!property_exists($request, 'meldestichtag_id'))
+			$this->terminateWithJsonError('Error occured: Meldestichtag Id missing');
 
-		$meldestichtag = $request->meldestichtag;
-		$studiensemester_kurzbz = $request->studiensemester_kurzbz;
+		$meldestichtag_id = $request->meldestichtag_id;
 
-		// check if Bismeldestichtag already exists
-		$this->BismeldestichtagModel->addSelect('meldestichtag_id');
-		$bismeldestichtagRes = $this->BismeldestichtagModel->loadWhere(
-			array('meldestichtag' => $meldestichtag, 'studiensemester_kurzbz' => $studiensemester_kurzbz)
-		);
-
-		if (hasData($bismeldestichtagRes))
-		{
-			$meldestichtag_id = getData($bismeldestichtagRes)[0]->meldestichtag_id;
-
-			// delete if Stichtag does exist
-			$this->outputJson($this->BismeldestichtagModel->delete(
-				array('meldestichtag_id' => $meldestichtag_id)
-			));
-
-		}
-		else
-		{
-			// return error if not exists
-			$this->outputJsonError('Bismeldestichtag does not exist');
-		}
+		// deletetion
+		$this->outputJson($this->BismeldestichtagModel->delete($meldestichtag_id));
 	}
 }
diff --git a/application/views/codex/bismeldestichtag.php b/application/views/codex/bismeldestichtag.php
index ba225e19a..fccaafa41 100644
--- a/application/views/codex/bismeldestichtag.php
+++ b/application/views/codex/bismeldestichtag.php
@@ -28,9 +28,9 @@
 		</core-fetch-cmpt>
 
 		<div id="content">
-				<!-- input fields -->
+			<!-- input fields -->
 			<div class="row">
-				<div class="col-9">
+				<div class="col-12">
 					<div class="input-group">
 						<input type="date" class="form-control" name="meldestichtag" v-model="meldestichtag">
 						<select class="form-select" name="studiensemester_kurzbz" v-model="currSem">
@@ -45,11 +45,6 @@
 						</div>
 					</div>
 				</div>
-				<div class="col-3 text-center">
-					<button type="button" class="btn btn-primary" @click="handlerDeleteBismeldestichtag">
-						<?php echo $this->p->t('bismeldestichtag', 'stichtagLoeschen') ?>
-					</button>
-				</div>
 			</div>
 			<br />
 			<!-- Filter component -->
diff --git a/public/js/apps/Bismeldestichtag/API.js b/public/js/apps/Bismeldestichtag/API.js
index 2b6457ea3..6a2989d5c 100644
--- a/public/js/apps/Bismeldestichtag/API.js
+++ b/public/js/apps/Bismeldestichtag/API.js
@@ -61,8 +61,7 @@ export const BismeldestichtagAPIs = {
 		return CoreRESTClient.post(
 			'codex/Bismeldestichtag/deleteBismeldestichtag',
 			{
-				meldestichtag: wsParams.meldestichtag,
-				studiensemester_kurzbz: wsParams.studiensemester_kurzbz
+				meldestichtag_id: wsParams.meldestichtag_id
 			},
 			{
 				timeout: CORE_BISMELDESTICHTAG_CMPT_TIMEOUT
diff --git a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
index 4c7c7374c..2f3ac7680 100644
--- a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
+++ b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
@@ -84,12 +84,11 @@ const bismeldestichtagApp = Vue.createApp({
 		/**
 		 * Define delete Bismeldestichtag call and method to be executed after the call
 		 */
-		handlerDeleteBismeldestichtag: function(event) {
+		handlerDeleteBismeldestichtag: function(meldestichtag_id) {
 			this.startFetchCmpt(
 				BismeldestichtagAPIs.deleteBismeldestichtag,
 				{
-					meldestichtag: this.meldestichtag,
-					studiensemester_kurzbz: this.currSem
+					meldestichtag_id: meldestichtag_id
 				},
 				this.fetchCmptDataFetchedDeleteBismeldestichtag
 			);
@@ -107,21 +106,38 @@ const bismeldestichtagApp = Vue.createApp({
 				this.handlerBismeldestichtage();
 			}
 			else
-				alert("No response data");
+				alert("No Studiensemester data");
 		},
 		/**
 		 * Called after Bismeldestichtage response is received
 		 */
 		fetchCmptDataFetchedBismeldestichtage: function(data) {
-			console.log(data);
 			if (CoreRESTClient.isError(data)) alert(CoreRESTClient.getError(data));
 			if (CoreRESTClient.hasData(data))
 			{
-				let meldestichtage = CoreRESTClient.getData(data);
-				this.$refs.bismeldestichtageTable.tabulator.setData(meldestichtage);
+				// set the Meldestichtagedata
+				this.$refs.bismeldestichtageTable.tabulator.setData(CoreRESTClient.getData(data));
+
+				// save delete Bismeldestichtag function
+				let funcDeleteBismeldestichtag = this.handlerDeleteBismeldestichtag;
+
+				let btns = document.getElementsByClassName('delete-btn');
+
+				// add click events for deletion
+				for (let btn in btns)
+				{
+					if (btns[btn].addEventListener)
+					{
+						btns[btn].addEventListener('click',
+							function(){
+								funcDeleteBismeldestichtag(btns[btn].getAttribute('data-meldestichtag-id'));
+							}
+						);
+					}
+				}
 			}
 			else
-				alert("No response data");
+				this.$refs.bismeldestichtageTable.tabulator.setData([]);
 		},
 		/**
 		 * Called after Add Bismeldestichtag response is received
diff --git a/public/js/apps/Bismeldestichtag/TabulatorSetup.js b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
index d1cc39bcc..333c07865 100644
--- a/public/js/apps/Bismeldestichtag/TabulatorSetup.js
+++ b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
@@ -27,7 +27,11 @@ export const BismeldestichtagTabulatorOptions = {
 				return cell.getValue().replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
 			}
 		},
-		{title: 'Studiensemester', field: 'studiensemester_kurzbz', headerFilter: true}
+		{title: 'Studiensemester', field: 'studiensemester_kurzbz', headerFilter: true},
+		{title: 'Löschen', field: 'meldestichtag_id', headerFilter: false, formatter:function(cell){
+				return '<button class="btn btn-primary delete-btn" data-meldestichtag-id="'+cell.getValue()+'">Löschen</button>';
+			}
+		}
 	]
 };
 
@@ -38,8 +42,11 @@ export const BismeldestichtagTabulatorEventHandlers = [
 	{
 		event: "rowClick",
 		handler: function(e, row) {
-			let data = row.getData();
-			alert(data.Studiensemester + ': ' + data.Meldestichtag);
+			if (e.target.nodeName == 'DIV')
+			{
+				let data = row.getData();
+				alert(data.studiensemester_kurzbz + ': ' + data.meldestichtag_id);
+			}
 		}
 	}
 ];

From c6fee48c8c73e2a4f72e2dcce3a5d7724bac12ea Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Mon, 17 Jul 2023 12:31:45 +0200
Subject: [PATCH 037/149] bismeldestichtage GUI: correct date format on row
 click

---
 public/js/apps/Bismeldestichtag/TabulatorSetup.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/js/apps/Bismeldestichtag/TabulatorSetup.js b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
index 333c07865..b7da6c1e1 100644
--- a/public/js/apps/Bismeldestichtag/TabulatorSetup.js
+++ b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
@@ -24,7 +24,7 @@ export const BismeldestichtagTabulatorOptions = {
 	layout: 'fitColumns',
 	columns: [
 		{title: 'Meldestichtag',field: 'meldestichtag', headerFilter: true, formatter: function(cell){
-				return cell.getValue().replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
+				return BismeldestichtagTabulatorHelperFunctions._formatDate(cell.getValue());
 			}
 		},
 		{title: 'Studiensemester', field: 'studiensemester_kurzbz', headerFilter: true},
@@ -45,9 +45,14 @@ export const BismeldestichtagTabulatorEventHandlers = [
 			if (e.target.nodeName == 'DIV')
 			{
 				let data = row.getData();
-				alert(data.studiensemester_kurzbz + ': ' + data.meldestichtag_id);
+				alert(data.studiensemester_kurzbz + ': ' + BismeldestichtagTabulatorHelperFunctions._formatDate(data.meldestichtag));
 			}
 		}
 	}
 ];
 
+let BismeldestichtagTabulatorHelperFunctions = {
+	_formatDate: function(date){
+		return date.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
+	}
+}

From c2962f51e1667cbd838d8cd2a6ba5a78a6ee7d4d Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Mon, 17 Jul 2023 21:03:51 +0200
Subject: [PATCH 038/149] Bismeldestichtag gui: added vue date picker

---
 application/views/codex/bismeldestichtag.php  |   39 +-
 composer.json                                 |   22 +
 composer.lock                                 | 1972 ++++++++++++++++-
 .../apps/Bismeldestichtag/Bismeldestichtag.js |    3 +-
 4 files changed, 1981 insertions(+), 55 deletions(-)

diff --git a/application/views/codex/bismeldestichtag.php b/application/views/codex/bismeldestichtag.php
index fccaafa41..84f529273 100644
--- a/application/views/codex/bismeldestichtag.php
+++ b/application/views/codex/bismeldestichtag.php
@@ -8,12 +8,13 @@
 		'filtercomponent' => true,
 		'navigationcomponent' => true,
 		'tabulator5' => true,
+		'customCSSs' => array('vendor/vuejs/vuedatepicker_css/main.css'),
+		'customJSs' => array('vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'),
 		'customJSModules' => array('public/js/apps/Bismeldestichtag/Bismeldestichtag.js')
 	);
 
 	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
-	<!-- Load Studiensemester -->
 	<div id="main">
 
 		<!-- Navigation component -->
@@ -30,26 +31,32 @@
 		<div id="content">
 			<!-- input fields -->
 			<div class="row">
-				<div class="col-12">
-					<div class="input-group">
-						<input type="date" class="form-control" name="meldestichtag" v-model="meldestichtag">
-						<select class="form-select" name="studiensemester_kurzbz" v-model="currSem">
-							<option v-for="sem in semList" :value="sem.studiensemester_kurzbz">
-								{{ sem.studiensemester_kurzbz }}
-							</option>
-						</select>
-						<div class="input-group-btn">
-							<button type="button" class="btn btn-primary" @click="handlerAddBismeldestichtag">
-								<?php echo $this->p->t('bismeldestichtag', 'stichtagHinzufuegen') ?>
-							</button>
-						</div>
-					</div>
+				<div class="col-5">
+					<datepicker v-model="meldestichtag"
+						v-bind:enable-time-picker="false"
+						v-bind:placeholder="'Meldestichtag'"
+						locale="de"
+						format="dd.MM.yyyy"
+						model-type="yyyy-MM-dd">
+					</datepicker>
+				</div>
+				<div class="col-4">
+					<select class="form-select" name="studiensemester_kurzbz" v-model="currSem">
+						<option v-for="sem in semList" :value="sem.studiensemester_kurzbz">
+							{{ sem.studiensemester_kurzbz }}
+						</option>
+					</select>
+				</div>
+				<div class="col-3">
+					<button type="button" class="btn btn-primary" @click="handlerAddBismeldestichtag">
+						<?php echo $this->p->t('bismeldestichtag', 'stichtagHinzufuegen') ?>
+					</button>
 				</div>
 			</div>
 			<br />
 			<!-- Filter component -->
 			<div class="row">
-				<div class="col-12">
+				<div class="col">
 					<core-filter-cmpt
 						title="<?php echo $this->p->t('bismeldestichtag', 'stichtageVerwalten') ?>"
 						ref="bismeldestichtageTable"
diff --git a/composer.json b/composer.json
index 825ed5625..44403a843 100644
--- a/composer.json
+++ b/composer.json
@@ -348,6 +348,28 @@
 				}
 			}
 		},
+		{
+			"type": "package",
+			"package": {
+					"name": "vuejs/vuedatepicker_js",
+					"version": "4.2.3",
+					"dist": {
+							"url": "https://unpkg.com/@vuepic/vue-datepicker@4.2.3/dist/vue-datepicker.iife.js",
+							"type": "file"
+					}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+					"name": "vuejs/vuedatepicker_css",
+					"version": "4.2.3",
+					"dist": {
+							"url": "https://unpkg.com/@vuepic/vue-datepicker@4.2.3/dist/main.css",
+							"type": "file"
+					}
+			}
+		},
 		{
 			"type": "composer",
 			"url": "https://asset-packagist.org"
diff --git a/composer.lock b/composer.lock
index 72f13c76f..e5a839b3b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d530cc4d7bd81812535eb64e87ba04f4",
+    "content-hash": "12acec21673c71641f7f1a6586ec666f",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -35,6 +35,10 @@
             ],
             "description": "Defacto way to enable use of HTML5 sectioning elements in legacy Internet Explorer.",
             "homepage": "http://paulirish.com/2011/the-history-of-the-html5-shiv/",
+            "support": {
+                "issues": "https://github.com/aFarkas/html5shiv/issues",
+                "source": "https://github.com/aFarkas/html5shiv/tree/3.7.3"
+            },
             "time": "2015-07-20T20:04:00+00:00"
         },
         {
@@ -130,6 +134,16 @@
             "keywords": [
                 "qr code"
             ],
+            "support": {
+                "issues": "https://github.com/chillerlan/php-qrcode/issues",
+                "source": "https://github.com/chillerlan/php-qrcode/tree/v2.0.x"
+            },
+            "funding": [
+                {
+                    "url": "https://ko-fi.com/codemasher",
+                    "type": "ko_fi"
+                }
+            ],
             "time": "2020-04-12T07:38:35+00:00"
         },
         {
@@ -178,6 +192,10 @@
                 "helper",
                 "trait"
             ],
+            "support": {
+                "issues": "https://github.com/chillerlan/php-traits/issues",
+                "source": "https://github.com/chillerlan/php-traits"
+            },
             "abandoned": true,
             "time": "2018-06-22T00:30:47+00:00"
         },
@@ -218,6 +236,10 @@
             ],
             "description": "REST Server for the CodeIgniter framework",
             "homepage": "https://github.com/chriskacerguis/codeigniter-restserver",
+            "support": {
+                "issues": "https://github.com/chriskacerguis/codeigniter-restserver/issues",
+                "source": "https://github.com/chriskacerguis/codeigniter-restserver"
+            },
             "time": "2017-09-23T16:44:55+00:00"
         },
         {
@@ -236,6 +258,10 @@
             },
             "type": "library",
             "notification-url": "https://packagist.org/downloads/",
+            "support": {
+                "issues": "https://github.com/akiyatkin/tablesorter/issues",
+                "source": "https://github.com/akiyatkin/tablesorter/tree/master"
+            },
             "time": "2016-09-02T11:31:54+00:00"
         },
         {
@@ -269,6 +295,13 @@
             ],
             "description": "The CodeIgniter framework",
             "homepage": "https://codeigniter.com",
+            "support": {
+                "forum": "http://forum.codeigniter.com/",
+                "issues": "https://github.com/bcit-ci/CodeIgniter/issues",
+                "slack": "https://codeigniterchat.slack.com",
+                "source": "https://github.com/bcit-ci/CodeIgniter",
+                "wiki": "https://github.com/bcit-ci/CodeIgniter/wiki"
+            },
             "time": "2022-03-03T13:21:49+00:00"
         },
         {
@@ -573,6 +606,10 @@
             ],
             "description": "Shim repository for Angular.js",
             "homepage": "http://angularjs.org",
+            "support": {
+                "issues": "https://github.com/components/angular.js/issues",
+                "source": "https://github.com/components/angular.js/tree/master"
+            },
             "time": "2015-06-07T20:10:38+00:00"
         },
         {
@@ -615,6 +652,13 @@
             ],
             "description": "jQuery JavaScript Library",
             "homepage": "http://jquery.com",
+            "support": {
+                "forum": "http://forum.jquery.com",
+                "irc": "irc://irc.freenode.org/jquery",
+                "issues": "https://github.com/jquery/jquery/issues",
+                "source": "https://github.com/jquery/jquery",
+                "wiki": "http://docs.jquery.com/"
+            },
             "time": "2021-03-20T19:13:42+00:00"
         },
         {
@@ -700,6 +744,10 @@
                 }
             ],
             "description": "jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library. Whether you're building highly interactive web applications or you just need to add a date picker to a form control, jQuery UI is the perfect choice.",
+            "support": {
+                "issues": "https://github.com/components/jqueryui/issues",
+                "source": "https://github.com/components/jqueryui/tree/master"
+            },
             "time": "2016-09-16T05:47:55+00:00"
         },
         {
@@ -749,6 +797,10 @@
                 "captcha",
                 "security"
             ],
+            "support": {
+                "issues": "https://github.com/dapphp/securimage/issues",
+                "source": "https://github.com/dapphp/securimage/tree/master"
+            },
             "abandoned": true,
             "time": "2018-03-09T06:07:41+00:00"
         },
@@ -812,6 +864,12 @@
                 "rdfa",
                 "sparql"
             ],
+            "support": {
+                "forum": "http://groups.google.com/group/easyrdf/",
+                "irc": "irc://chat.freenode.net/easyrdf",
+                "issues": "http://github.com/njh/easyrdf/issues",
+                "source": "https://github.com/easyrdf/easyrdf/tree/0.9.1"
+            },
             "time": "2015-02-27T09:45:49+00:00"
         },
         {
@@ -890,6 +948,10 @@
                 "faker",
                 "fixtures"
             ],
+            "support": {
+                "issues": "https://github.com/fzaninotto/Faker/issues",
+                "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2"
+            },
             "abandoned": true,
             "time": "2020-12-11T09:56:16+00:00"
         },
@@ -1012,6 +1074,10 @@
                 "json",
                 "schema"
             ],
+            "support": {
+                "issues": "https://github.com/justinrainbow/json-schema/issues",
+                "source": "https://github.com/justinrainbow/json-schema/tree/master"
+            },
             "time": "2014-08-25T02:48:14+00:00"
         },
         {
@@ -1046,6 +1112,10 @@
                 }
             ],
             "description": "A framework-agnostic PHP Implementation for generating simple forms based on json-schema",
+            "support": {
+                "issues": "https://github.com/kingsquare/json-schema-form/issues",
+                "source": "https://github.com/kingsquare/json-schema-form/tree/master"
+            },
             "time": "2014-07-10T12:27:19+00:00"
         },
         {
@@ -1106,6 +1176,10 @@
             "keywords": [
                 "markdown"
             ],
+            "support": {
+                "issues": "https://github.com/michelf/php-markdown/issues",
+                "source": "https://github.com/michelf/php-markdown/tree/lib"
+            },
             "time": "2015-03-01T12:03:08+00:00"
         },
         {
@@ -1153,20 +1227,24 @@
                 "uri",
                 "url"
             ],
+            "support": {
+                "issues": "https://github.com/lanthaler/IRI/issues",
+                "source": "https://github.com/lanthaler/IRI/tree/master"
+            },
             "time": "2014-01-21T13:43:39+00:00"
         },
         {
             "name": "ml/json-ld",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lanthaler/JsonLD.git",
-                "reference": "c74a1aed5979ed1cfb1be35a55a305fd30e30b93"
+                "reference": "537e68e87a6bce23e57c575cd5dcac1f67ce25d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/c74a1aed5979ed1cfb1be35a55a305fd30e30b93",
-                "reference": "c74a1aed5979ed1cfb1be35a55a305fd30e30b93",
+                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/537e68e87a6bce23e57c575cd5dcac1f67ce25d8",
+                "reference": "537e68e87a6bce23e57c575cd5dcac1f67ce25d8",
                 "shasum": ""
             },
             "require": {
@@ -1202,7 +1280,11 @@
                 "JSON-LD",
                 "jsonld"
             ],
-            "time": "2020-06-16T17:45:06+00:00"
+            "support": {
+                "issues": "https://github.com/lanthaler/JsonLD/issues",
+                "source": "https://github.com/lanthaler/JsonLD/tree/1.2.1"
+            },
+            "time": "2022-09-29T08:45:17+00:00"
         },
         {
             "name": "moment/momentjs",
@@ -1262,6 +1344,14 @@
                 "sorting",
                 "table"
             ],
+            "support": {
+                "docs": "https://mottie.github.io/tablesorter/docs/index.html",
+                "email": "wowmotty@gmail.com",
+                "irc": "irc://irc.freenode.org/tablesorter",
+                "issues": "https://github.com/Mottie/tablesorter/issues",
+                "source": "https://github.com/Mottie/tablesorter",
+                "wiki": "https://github.com/Mottie/tablesorter/wiki"
+            },
             "time": "2020-03-03T13:46:03+00:00"
         },
         {
@@ -1312,6 +1402,10 @@
                 "rest",
                 "restful"
             ],
+            "support": {
+                "issues": "https://github.com/nategood/httpful/issues",
+                "source": "https://github.com/nategood/httpful/tree/v0.2.20"
+            },
             "time": "2015-10-26T16:11:30+00:00"
         },
         {
@@ -1365,6 +1459,12 @@
                 "plaintext",
                 "textile"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/textile",
+                "issues": "https://github.com/textile/php-textile/issues",
+                "source": "https://github.com/textile/php-textile",
+                "wiki": "https://github.com/textile/php-textile/wiki"
+            },
             "time": "2022-05-01T17:05:16+00:00"
         },
         {
@@ -1420,16 +1520,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.37",
+            "version": "2.0.42",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c"
+                "reference": "665d289f59e646a259ebf13f29be7f6f54cab24b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
-                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/665d289f59e646a259ebf13f29be7f6f54cab24b",
+                "reference": "665d289f59e646a259ebf13f29be7f6f54cab24b",
                 "shasum": ""
             },
             "require": {
@@ -1444,7 +1544,8 @@
                 "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
                 "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
                 "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
+                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
+                "ext-xml": "Install the XML extension to load XML formatted public keys."
             },
             "type": "library",
             "autoload": {
@@ -1507,7 +1608,25 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2022-04-04T04:57:45+00:00"
+            "support": {
+                "issues": "https://github.com/phpseclib/phpseclib/issues",
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.42"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/terrafrost",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpseclib",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-03-06T12:45:53+00:00"
         },
         {
             "name": "rmariuzzo/jquery-checkboxes",
@@ -1587,6 +1706,23 @@
                 "polyfill",
                 "portable"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T09:01:57+00:00"
         },
         {
@@ -1706,8 +1842,30 @@
             "keywords": [
                 "templating"
             ],
+            "support": {
+                "issues": "https://github.com/twigphp/Twig/issues",
+                "source": "https://github.com/twigphp/Twig/tree/1.x"
+            },
             "time": "2020-02-11T05:59:23+00:00"
         },
+        {
+            "name": "vuejs/vuedatepicker_css",
+            "version": "4.2.3",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@4.2.3/dist/main.css"
+            },
+            "type": "library"
+        },
+        {
+            "name": "vuejs/vuedatepicker_js",
+            "version": "4.2.3",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@4.2.3/dist/vue-datepicker.iife.js"
+            },
+            "type": "library"
+        },
         {
             "name": "vuejs/vuejs3",
             "version": "3.2.33",
@@ -1779,6 +1937,24 @@
                 "regex",
                 "regular expression"
             ],
+            "support": {
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/1.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2022-01-21T20:24:37+00:00"
         },
         {
@@ -1826,20 +2002,160 @@
                 "Xdebug",
                 "performance"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/xdebug-handler/issues",
+                "source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2022-02-24T20:20:32+00:00"
         },
         {
-            "name": "nikic/php-parser",
-            "version": "v4.14.0",
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2015-06-14T21:17:01+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.0",
+                "doctrine/common": "^2.6",
+                "phpunit/phpunit": "^4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.x"
+            },
+            "time": "2017-10-19T19:58:43+00:00"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v4.15.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e",
+                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e",
                 "shasum": ""
             },
             "require": {
@@ -1878,20 +2194,24 @@
                 "parser",
                 "php"
             ],
-            "time": "2022-05-31T20:59:12+00:00"
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5"
+            },
+            "time": "2023-05-19T20:20:00+00:00"
         },
         {
             "name": "pdepend/pdepend",
-            "version": "2.10.3",
+            "version": "2.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "da3166a06b4a89915920a42444f707122a1584c9"
+                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/da3166a06b4a89915920a42444f707122a1584c9",
-                "reference": "da3166a06b4a89915920a42444f707122a1584c9",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1121d4b04af06e33e9659bac3a6741b91cab1de1",
+                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1",
                 "shasum": ""
             },
             "require": {
@@ -1925,26 +2245,315 @@
                 "BSD-3-Clause"
             ],
             "description": "Official version of pdepend to be handled with Composer",
-            "time": "2022-02-23T07:53:09+00:00"
+            "keywords": [
+                "PHP Depend",
+                "PHP_Depend",
+                "dev",
+                "pdepend"
+            ],
+            "support": {
+                "issues": "https://github.com/pdepend/pdepend/issues",
+                "source": "https://github.com/pdepend/pdepend/tree/2.14.0"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/pdepend/pdepend",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-05-26T13:15:18+00:00"
         },
         {
-            "name": "phpmd/phpmd",
-            "version": "2.12.0",
+            "name": "phar-io/manifest",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec"
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/c0b678ba71902f539c27c14332aa0ddcf14388ec",
-                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
+                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-phar": "*",
+                "phar-io/version": "^1.0.1",
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/master"
+            },
+            "time": "2017-03-05T18:14:27+00:00"
+        },
+        {
+            "name": "phar-io/version",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/master"
+            },
+            "time": "2017-03-05T17:38:23+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/master"
+            },
+            "time": "2017-09-11T18:02:19+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "4.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c",
+                "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
+                "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "doctrine/instantiator": "^1.0.5",
+                "mockery/mockery": "^1.0",
+                "phpdocumentor/type-resolver": "0.4.*",
+                "phpunit/phpunit": "^6.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/release/4.x"
+            },
+            "time": "2019-12-28T18:55:12+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "cf842904952e64e703800d094cdf34e715a8a3ae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/cf842904952e64e703800d094cdf34e715a8a3ae",
+                "reference": "cf842904952e64e703800d094cdf34e715a8a3ae",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^6.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/master"
+            },
+            "time": "2017-12-30T13:23:38+00:00"
+        },
+        {
+            "name": "phpmd/phpmd",
+            "version": "2.13.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpmd/phpmd.git",
+                "reference": "dad0228156856b3ad959992f9748514fa943f3e3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/dad0228156856b3ad959992f9748514fa943f3e3",
+                "reference": "dad0228156856b3ad959992f9748514fa943f3e3",
                 "shasum": ""
             },
             "require": {
                 "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
                 "ext-xml": "*",
-                "pdepend/pdepend": "^2.10.3",
+                "pdepend/pdepend": "^2.12.1",
                 "php": ">=5.3.9"
             },
             "require-dev": {
@@ -1997,20 +2606,31 @@
                 "phpmd",
                 "pmd"
             ],
-            "time": "2022-03-24T13:33:01+00:00"
+            "support": {
+                "irc": "irc://irc.freenode.org/phpmd",
+                "issues": "https://github.com/phpmd/phpmd/issues",
+                "source": "https://github.com/phpmd/phpmd/tree/2.13.0"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpmd/phpmd",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-09-10T08:44:15+00:00"
         },
         {
             "name": "phpmetrics/phpmetrics",
-            "version": "v2.8.1",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmetrics/PhpMetrics.git",
-                "reference": "e279f7317390f642339941b693359e9a181817a7"
+                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/e279f7317390f642339941b693359e9a181817a7",
-                "reference": "e279f7317390f642339941b693359e9a181817a7",
+                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/4b77140a11452e63c7a9b98e0648320bf6710090",
+                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090",
                 "shasum": ""
             },
             "require": {
@@ -2061,7 +2681,242 @@
                 "quality",
                 "testing"
             ],
-            "time": "2022-03-24T10:19:51+00:00"
+            "support": {
+                "issues": "https://github.com/PhpMetrics/PhpMetrics/issues",
+                "source": "https://github.com/phpmetrics/PhpMetrics/tree/v2.8.2"
+            },
+            "time": "2023-03-08T15:03:36+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.10.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "451c3cd1418cf640de218914901e51b064abb093"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
+                "reference": "451c3cd1418cf640de218914901e51b064abb093",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
+                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5 || ^3.2",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Prophecy\\": "src/Prophecy"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "support": {
+                "issues": "https://github.com/phpspec/prophecy/issues",
+                "source": "https://github.com/phpspec/prophecy/tree/v1.10.3"
+            },
+            "time": "2020-03-05T15:02:03+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "5.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.0",
+                "phpunit/php-file-iterator": "^1.4.2",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-token-stream": "^2.0.1",
+                "sebastian/code-unit-reverse-lookup": "^1.0.1",
+                "sebastian/environment": "^3.0",
+                "sebastian/version": "^2.0.1",
+                "theseer/tokenizer": "^1.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "suggest": {
+                "ext-xdebug": "^2.5.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/5.3"
+            },
+            "time": "2018-04-06T15:36:58+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "support": {
+                "irc": "irc://irc.freenode.net/phpunit",
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/1.4.5"
+            },
+            "time": "2017-11-27T13:52:08+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+            },
+            "time": "2015-06-21T13:50:34+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -2110,8 +2965,218 @@
             "keywords": [
                 "timer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/master"
+            },
             "time": "2017-02-26T11:10:40+00:00"
         },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "791198a2c6254db10131eecfe8c06670700904db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
+                "reference": "791198a2c6254db10131eecfe8c06670700904db",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.2.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
+                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master"
+            },
+            "abandoned": true,
+            "time": "2017-11-27T05:48:46+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "6.5.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7",
+                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "myclabs/deep-copy": "^1.6.1",
+                "phar-io/manifest": "^1.0.1",
+                "phar-io/version": "^1.0",
+                "php": "^7.0",
+                "phpspec/prophecy": "^1.7",
+                "phpunit/php-code-coverage": "^5.3",
+                "phpunit/php-file-iterator": "^1.4.3",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-timer": "^1.0.9",
+                "phpunit/phpunit-mock-objects": "^5.0.9",
+                "sebastian/comparator": "^2.1",
+                "sebastian/diff": "^2.0",
+                "sebastian/environment": "^3.1",
+                "sebastian/exporter": "^3.1",
+                "sebastian/global-state": "^2.0",
+                "sebastian/object-enumerator": "^3.0.3",
+                "sebastian/resource-operations": "^1.0",
+                "sebastian/version": "^2.0.1"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "3.0.2",
+                "phpunit/dbunit": "<3.0"
+            },
+            "require-dev": {
+                "ext-pdo": "*"
+            },
+            "suggest": {
+                "ext-xdebug": "*",
+                "phpunit/php-invoker": "^1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.5.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/6.5.14"
+            },
+            "time": "2019-02-01T05:22:47+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "5.0.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.5",
+                "php": "^7.0",
+                "phpunit/php-text-template": "^1.2.1",
+                "sebastian/exporter": "^3.1"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<6.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.5.11"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit-mock-objects/tree/5.0.10"
+            },
+            "abandoned": true,
+            "time": "2018-08-09T05:50:03+00:00"
+        },
         {
             "name": "psr/container",
             "version": "1.0.0",
@@ -2159,6 +3224,10 @@
                 "container-interop",
                 "psr"
             ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/master"
+            },
             "time": "2017-02-14T16:28:37+00:00"
         },
         {
@@ -2206,8 +3275,321 @@
                 "psr",
                 "psr-3"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
             "time": "2021-05-03T11:20:27+00:00"
         },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T08:15:22+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "2.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "sebastian/diff": "^2.0 || ^3.0",
+                "sebastian/exporter": "^3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/master"
+            },
+            "time": "2018-02-01T13:46:46+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/master"
+            },
+            "time": "2017-08-03T08:09:46+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/master"
+            },
+            "time": "2017-07-01T08:51:00+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "3.1.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6",
+                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0",
+                "sebastian/recursion-context": "^3.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^8.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-09-14T06:00:17+00:00"
+        },
         {
             "name": "sebastian/finder-facade",
             "version": "1.2.2",
@@ -2245,9 +3627,180 @@
             ],
             "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
             "homepage": "https://github.com/sebastianbergmann/finder-facade",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/finder-facade/issues",
+                "source": "https://github.com/sebastianbergmann/finder-facade/tree/master"
+            },
             "abandoned": true,
             "time": "2017-11-18T17:31:49+00:00"
         },
+        {
+            "name": "sebastian/global-state",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/2.0.0"
+            },
+            "time": "2017-04-27T15:39:26+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "3.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0",
+                "sebastian/object-reflector": "^1.1.1",
+                "sebastian/recursion-context": "^3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:40:27+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:37:18+00:00"
+        },
         {
             "name": "sebastian/phpcpd",
             "version": "3.0.1",
@@ -2296,8 +3849,122 @@
             ],
             "description": "Copy/Paste Detector (CPD) for PHP code.",
             "homepage": "https://github.com/sebastianbergmann/phpcpd",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpcpd/issues",
+                "source": "https://github.com/sebastianbergmann/phpcpd/tree/master"
+            },
+            "abandoned": true,
             "time": "2017-11-16T08:49:28+00:00"
         },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:34:24+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/master"
+            },
+            "time": "2015-07-28T20:34:47+00:00"
+        },
         {
             "name": "sebastian/version",
             "version": "2.0.1",
@@ -2339,6 +4006,10 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/master"
+            },
             "time": "2016-10-03T07:35:21+00:00"
         },
         {
@@ -2390,6 +4061,11 @@
                 "phpcs",
                 "standards"
             ],
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
             "time": "2021-12-12T21:44:58+00:00"
         },
         {
@@ -2449,6 +4125,23 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/config/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2516,6 +4209,23 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2567,6 +4277,23 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/debug/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "abandoned": "symfony/error-handler",
             "time": "2020-10-24T10:57:07+00:00"
         },
@@ -2634,6 +4361,23 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/dependency-injection/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2679,6 +4423,23 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2723,6 +4484,23 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-11-16T17:02:08+00:00"
         },
         {
@@ -2786,6 +4564,23 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T09:01:57+00:00"
         },
         {
@@ -2829,8 +4624,109 @@
             ],
             "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
             "homepage": "https://github.com/theseer/fDOMDocument",
+            "support": {
+                "issues": "https://github.com/theseer/fDOMDocument/issues",
+                "source": "https://github.com/theseer/fDOMDocument/tree/1.6.7"
+            },
             "abandoned": true,
             "time": "2022-01-25T23:10:35+00:00"
+        },
+        {
+            "name": "theseer/tokenizer",
+            "version": "1.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/master"
+            },
+            "time": "2019-06-13T22:48:21+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.9.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozarts/assert.git",
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0 || ^8.0",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<0.12.20",
+                "vimeo/psalm": "<3.9.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "support": {
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.9.1"
+            },
+            "time": "2020-07-08T17:02:28+00:00"
         }
     ],
     "aliases": [],
@@ -2842,5 +4738,5 @@
         "php": ">=5.6.40"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
index 2f3ac7680..79b73a2e5 100644
--- a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
+++ b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
@@ -42,7 +42,8 @@ const bismeldestichtagApp = Vue.createApp({
 		CoreNavigationCmpt,
 		CoreFilterCmpt,
 		BismeldestichtagAPIs,
-		CoreFetchCmpt
+		CoreFetchCmpt,
+		"datepicker": VueDatePicker
 	},
 	created() {
 		this.handlerStudiensemester();

From 459f06876576954c023f8e317bea52d858829f14 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Wed, 26 Jul 2023 20:59:05 +0200
Subject: [PATCH 039/149] bismeldestichtag gui: added icon to delete button,
 added id field

---
 public/js/apps/Bismeldestichtag/TabulatorSetup.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/public/js/apps/Bismeldestichtag/TabulatorSetup.js b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
index b7da6c1e1..ffc8a6e3a 100644
--- a/public/js/apps/Bismeldestichtag/TabulatorSetup.js
+++ b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
@@ -22,14 +22,18 @@ export const BismeldestichtagTabulatorOptions = {
 	maxHeight: "100%",
 	minHeight: 50,
 	layout: 'fitColumns',
+	index: 'meldestichtag_id',
 	columns: [
 		{title: 'Meldestichtag',field: 'meldestichtag', headerFilter: true, formatter: function(cell){
 				return BismeldestichtagTabulatorHelperFunctions._formatDate(cell.getValue());
 			}
 		},
 		{title: 'Studiensemester', field: 'studiensemester_kurzbz', headerFilter: true},
-		{title: 'Löschen', field: 'meldestichtag_id', headerFilter: false, formatter:function(cell){
-				return '<button class="btn btn-primary delete-btn" data-meldestichtag-id="'+cell.getValue()+'">Löschen</button>';
+		{title: 'ID', field: 'meldestichtag_id', headerFilter: true, visible: false},
+		{title: 'Löschen', field: 'loeschen', headerFilter: false, formatter:function(cell){
+				return	'<button class="btn btn-outline-secondary delete-btn" data-meldestichtag-id="'+cell.getRow().getIndex()+'">'+
+							'<i class="fa fa-xmark"></i>'+
+						'</button>';
 			}
 		}
 	]
@@ -42,8 +46,7 @@ export const BismeldestichtagTabulatorEventHandlers = [
 	{
 		event: "rowClick",
 		handler: function(e, row) {
-			if (e.target.nodeName == 'DIV')
-			{
+			if (e.target.nodeName == 'DIV') {
 				let data = row.getData();
 				alert(data.studiensemester_kurzbz + ': ' + BismeldestichtagTabulatorHelperFunctions._formatDate(data.meldestichtag));
 			}
@@ -52,7 +55,7 @@ export const BismeldestichtagTabulatorEventHandlers = [
 ];
 
 let BismeldestichtagTabulatorHelperFunctions = {
-	_formatDate: function(date){
+	_formatDate: function(date) {
 		return date.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
 	}
 }

From 3ea74ab23c5ebb4db74e482515ac9d9f6f086d86 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Thu, 10 Aug 2023 23:15:44 +0200
Subject: [PATCH 040/149] Bismeldestichtage GUI: improved datepicker, correct
 Studiensemester sort, insertamum is set when inserting

---
 .../controllers/codex/Bismeldestichtag.php      | 17 ++++++++++++-----
 application/views/codex/bismeldestichtag.php    |  2 ++
 .../js/apps/Bismeldestichtag/TabulatorSetup.js  | 16 +++++++++++++++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/application/controllers/codex/Bismeldestichtag.php b/application/controllers/codex/Bismeldestichtag.php
index 0da8003ee..2723b2f7c 100644
--- a/application/controllers/codex/Bismeldestichtag.php
+++ b/application/controllers/codex/Bismeldestichtag.php
@@ -22,9 +22,6 @@ class Bismeldestichtag extends Auth_Controller
 			)
 		);
 
-		// Loads WidgetLib
-		$this->load->library('WidgetLib');
-
 		// Load models
 		$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
@@ -78,7 +75,13 @@ class Bismeldestichtag extends Auth_Controller
 
 	public function getBismeldestichtage()
 	{
-		$this->BismeldestichtagModel->addSelect('meldestichtag_id, meldestichtag, studiensemester_kurzbz');
+		$this->BismeldestichtagModel->addSelect(
+			'meldestichtag_id, meldestichtag,
+			tbl_bismeldestichtag.studiensemester_kurzbz, sem.start AS semester_start,
+			tbl_bismeldestichtag.insertamum, tbl_bismeldestichtag.insertvon, tbl_bismeldestichtag.updateamum, tbl_bismeldestichtag.updatevon'
+		);
+		$this->BismeldestichtagModel->addJoin('public.tbl_studiensemester sem', 'studiensemester_kurzbz', 'LEFT');
+		$this->BismeldestichtagModel->addOrder('semester_start');
 		$this->BismeldestichtagModel->addOrder('meldestichtag', 'DESC');
 		$this->BismeldestichtagModel->addOrder('meldestichtag_id', 'DESC');
 		$this->outputJson($this->BismeldestichtagModel->load());
@@ -111,7 +114,11 @@ class Bismeldestichtag extends Auth_Controller
 		{
 			// insert new if Stichtag does not exist
 			$this->outputJson($this->BismeldestichtagModel->insert(
-				array('meldestichtag' => $request->meldestichtag, 'studiensemester_kurzbz' => $request->studiensemester_kurzbz)
+				array(
+					'meldestichtag' => $request->meldestichtag,
+					'studiensemester_kurzbz' => $request->studiensemester_kurzbz,
+					'insertvon' => getAuthUID()
+				)
 			));
 		}
 	}
diff --git a/application/views/codex/bismeldestichtag.php b/application/views/codex/bismeldestichtag.php
index 84f529273..37af16cc6 100644
--- a/application/views/codex/bismeldestichtag.php
+++ b/application/views/codex/bismeldestichtag.php
@@ -35,6 +35,8 @@
 					<datepicker v-model="meldestichtag"
 						v-bind:enable-time-picker="false"
 						v-bind:placeholder="'Meldestichtag'"
+						v-bind:text-input="true"
+						v-bind:auto-apply="true"
 						locale="de"
 						format="dd.MM.yyyy"
 						model-type="yyyy-MM-dd">
diff --git a/public/js/apps/Bismeldestichtag/TabulatorSetup.js b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
index ffc8a6e3a..d98cc993c 100644
--- a/public/js/apps/Bismeldestichtag/TabulatorSetup.js
+++ b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
@@ -28,8 +28,22 @@ export const BismeldestichtagTabulatorOptions = {
 				return BismeldestichtagTabulatorHelperFunctions._formatDate(cell.getValue());
 			}
 		},
-		{title: 'Studiensemester', field: 'studiensemester_kurzbz', headerFilter: true},
+		{title: 'Studiensemester', field: 'studiensemester_kurzbz', headerFilter: true, sorter:function(a, b, aRow, bRow, column, dir, sorterParams) {
+
+				//aRow, bRow - the row components for the values being compared
+				let semesterStartA = new Date(aRow.getData().semester_start);
+				let semesterStartB = new Date(bRow.getData().semester_start);
+
+				return semesterStartA - semesterStartB; // difference between studiensemester start dates
+			}
+		},
+		{title: 'Semesterstart',field: 'semester_start', headerFilter: true, visible: false, formatter: function(cell){
+				return BismeldestichtagTabulatorHelperFunctions._formatDate(cell.getValue());
+			}
+		},
 		{title: 'ID', field: 'meldestichtag_id', headerFilter: true, visible: false},
+		{title: 'Insertamum', field: 'insertamum', headerFilter: true, visible: false},
+		{title: 'Insertvon', field: 'insertvon', headerFilter: true, visible: false},
 		{title: 'Löschen', field: 'loeschen', headerFilter: false, formatter:function(cell){
 				return	'<button class="btn btn-outline-secondary delete-btn" data-meldestichtag-id="'+cell.getRow().getIndex()+'">'+
 							'<i class="fa fa-xmark"></i>'+

From 8122ab0292ec016571d6d9bf52589adadf489804 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Tue, 15 Aug 2023 19:27:39 +0200
Subject: [PATCH 041/149] simplified error message for invalid status dates

---
 content/student/studentDBDML.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 35833fc64..49928072e 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -476,8 +476,7 @@ function checkStatusaenderung(
 				// Zeitabfolge ungültig, Fehler
 				return array(
 					'error' => true,
-					'errormsg' => 'Datum des Statuseintrags muss nach dem Statusdatum,'
-						.' Semesterstartdatum nach Semesterstartdatum des vorherigen Statuseintrags sein'
+					'errormsg' => 'Ungültige Zeitabfolge der Statuseinträge (Statusdatum oder Semester)'
 				);
 			}
 		}

From 07deb7b6c5a5d84bbaba19c884a921ec0656fdc3 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 4 Sep 2023 13:34:42 +0200
Subject: [PATCH 042/149] - textanpassung

---
 cis/testtool/login.php    | 8 --------
 locale/de-AT/testtool.php | 2 +-
 locale/en-US/testtool.php | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/cis/testtool/login.php b/cis/testtool/login.php
index 0ff84f4a0..475ee9f00 100644
--- a/cis/testtool/login.php
+++ b/cis/testtool/login.php
@@ -126,10 +126,6 @@ if (isset($_REQUEST['prestudent']))
 			$rt->getReihungstestPerson($ps->person_id);
 			if (isset($rt->result[0]))
 				$reihungstest_id = $rt->result[0]->reihungstest_id;
-			else
-			{
-				$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestKannNichtGeladenWerden').'</div>';
-			}
 		}
 		else
 		{
@@ -138,10 +134,6 @@ if (isset($_REQUEST['prestudent']))
 				// TODO Was ist wenn da mehrere Zurueckkommen?!
 				if (isset($rt->result[0]))
 					$reihungstest_id = $rt->result[0]->reihungstest_id;
-				else
-				{
-					$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestKannNichtGeladenWerden').'</div>';
-				}
 			}
 			else
 			{
diff --git a/locale/de-AT/testtool.php b/locale/de-AT/testtool.php
index 80b3b4bdc..059cd33c5 100644
--- a/locale/de-AT/testtool.php
+++ b/locale/de-AT/testtool.php
@@ -17,7 +17,7 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basisgebiete';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='Der zuteilte Reihungstest ist noch nicht freigeschaltet';
-$this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='Der Reihungstest dem Sie zugeteilt sind, kann nicht geladen werden';
+$this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='Der Reihungstest dem Sie zugeteilt sind, kann nicht geladen werden. Melden Sie sich bitte bei der Reihungstestaufsicht.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Ihr Geburtsdatum stimmt nicht mit unseren Daten überein. Bitte wenden Sie sich an die Aufsichtsperson';
 $this->phrasen['testtool/home']='Home';
 $this->phrasen['testtool/teilnehmerIn']='TeilnehmerIn';
diff --git a/locale/en-US/testtool.php b/locale/en-US/testtool.php
index b44d717e2..260b5ceea 100644
--- a/locale/en-US/testtool.php
+++ b/locale/en-US/testtool.php
@@ -17,7 +17,7 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basic test';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='The entrance examination assigned has not yet been activated.';
-$this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='The entrance examination assigned to you can not be loaded.';
+$this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='The placement test you are assigned to could not be loaded. Please contact the placement test supervisior.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Your date of birth does not correspond to the data we have. Please speak to the supervisor. ';
 $this->phrasen['testtool/home']='Home';
 $this->phrasen['testtool/teilnehmerIn']='Participant';

From 0e1f4148f524e0446c49193eba8a73614fb23d43 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 7 Sep 2023 14:34:20 +0200
Subject: [PATCH 043/149] - anpassungen fuer bewerberautofill

---
 application/controllers/jobs/ReihungstestJob.php | 2 +-
 application/models/crm/Reihungstest_model.php    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/jobs/ReihungstestJob.php b/application/controllers/jobs/ReihungstestJob.php
index 431ac5b04..8a1729d95 100644
--- a/application/controllers/jobs/ReihungstestJob.php
+++ b/application/controllers/jobs/ReihungstestJob.php
@@ -467,7 +467,7 @@ class ReihungstestJob extends JOB_Controller
 		$this->PrestudentstatusModel->addJoin('public.tbl_person', 'person_id');
 
 		$yesterdays_applicants_arr = $this->PrestudentstatusModel->loadWhere('
-			status_kurzbz = \'Interessent\' AND
+			status_kurzbz IN (\'Interessent\', \'Bewerber\') AND
 			typ = \'b\' AND
 			bestaetigtam = current_date - 1
 		');
diff --git a/application/models/crm/Reihungstest_model.php b/application/models/crm/Reihungstest_model.php
index ec1982ea6..86ebfd0af 100644
--- a/application/models/crm/Reihungstest_model.php
+++ b/application/models/crm/Reihungstest_model.php
@@ -322,7 +322,7 @@ class Reihungstest_model extends DB_Model
 			JOIN lehre.tbl_studienplan ON (tbl_prestudentstatus.studienplan_id = tbl_studienplan.studienplan_id)
 			LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
 			WHERE rt_id = ?
-				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
+				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) IN (\'Interessent\', \'Bewerber\')
 				AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
 				AND bewerbung_abgeschicktamum IS NOT NULL
 				AND bestaetigtam IS NOT NULL
@@ -411,7 +411,7 @@ class Reihungstest_model extends DB_Model
 			JOIN lehre.tbl_studienplan ON (tbl_prestudentstatus.studienplan_id = tbl_studienplan.studienplan_id)
 			LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
 			WHERE rt.studiengang_kz = ?
-				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
+				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) IN (\'Interessent\', \'Bewerber\')
 				AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
 				AND bewerbung_abgeschicktamum IS NOT NULL
 				AND bestaetigtam IS NOT NULL
@@ -462,7 +462,7 @@ class Reihungstest_model extends DB_Model
 			LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
 			LEFT JOIN PUBLIC.tbl_ort ON (tbl_rt_person.ort_kurzbz = tbl_ort.ort_kurzbz)
 			WHERE rt_id = ?
-				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
+				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) IN (\'Interessent\', \'Bewerber\')
 				AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
 				AND bewerbung_abgeschicktamum IS NOT NULL
 				AND bestaetigtam IS NOT NULL

From 91f3197c24c963d8f904f8586da1012c4f4fd297 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 14 Sep 2023 11:56:26 +0200
Subject: [PATCH 044/149] - added link option - styling

---
 .../system/messages/FAShtmlWriteTemplate.php     |  4 ++--
 public/js/infocenter/messageList.js              |  1 +
 public/js/messaging/fasMessageWrite.js           | 16 +++++++++++++++-
 public/js/messaging/messageWrite.js              |  7 ++++++-
 public/js/messaging/messageWriteReply.js         |  4 +++-
 public/js/messaging/read.js                      |  1 +
 public/js/messaging/write.js                     |  5 ++++-
 public/js/messaging/writeReply.js                |  4 +++-
 8 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/application/views/system/messages/FAShtmlWriteTemplate.php b/application/views/system/messages/FAShtmlWriteTemplate.php
index 691629c10..83f895d14 100644
--- a/application/views/system/messages/FAShtmlWriteTemplate.php
+++ b/application/views/system/messages/FAShtmlWriteTemplate.php
@@ -68,7 +68,7 @@
 								<?php echo ucfirst($this->p->t('global', 'nachricht')); ?>:
 
 							</label>
-							<textarea id="bodyTextArea" name="body">
+							<textarea id="bodyTextArea" class="bodyTextArea" name="body">
 
 								<?php echo $body; ?>
 
@@ -180,7 +180,7 @@
 								</div>
 							</div>
 							<br>
-							<textarea id="tinymcePreview"></textarea>
+							<textarea id="tinymcePreview" class="tinymcePreview"></textarea>
 						</div>
 
 					<?php echo $recipients_ids; ?>
diff --git a/public/js/infocenter/messageList.js b/public/js/infocenter/messageList.js
index 6146c7639..f6eb6218a 100644
--- a/public/js/infocenter/messageList.js
+++ b/public/js/infocenter/messageList.js
@@ -15,6 +15,7 @@ var MessageList = {
 			statusbar: false,
 			plugins: "autoresize",
 			autoresize_bottom_margin: 10,
+			max_height:495,
 			autoresize_min_height: 140,
 			autoresize_max_height: 495,
 			//callback to avoid conflict with ajax (for getting body of first message)
diff --git a/public/js/messaging/fasMessageWrite.js b/public/js/messaging/fasMessageWrite.js
index d32f80fac..ee480eb31 100644
--- a/public/js/messaging/fasMessageWrite.js
+++ b/public/js/messaging/fasMessageWrite.js
@@ -47,7 +47,21 @@ $(document).ready(function ()
 
 	tinymce.init({
 		theme : "advanced",
-		mode : "textareas"
+		mode : "specific_textareas",
+		editor_selector: "bodyTextArea",
+		theme_advanced_buttons2: "undo, redo, outdent, indent, bullist, numlist, link",
+		theme_advanced_buttons3: "",
+		theme_advanced_buttons4: "",
+		theme_advanced_toolbar_location: "top",
+		height: "400px",
+	});
+
+	tinymce.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: "tinymcePreview",
+		height: 400,
+		readonly: 1,
 	});
 
 	if ($("#variables"))
diff --git a/public/js/messaging/messageWrite.js b/public/js/messaging/messageWrite.js
index 382e79948..5132c0b7f 100644
--- a/public/js/messaging/messageWrite.js
+++ b/public/js/messaging/messageWrite.js
@@ -46,7 +46,10 @@ $(document).ready(function () {
 
 	tinymce.init({
 		selector: "#bodyTextArea",
-		plugins: "autoresize",
+		plugins: "link",
+		toolbar: "undo redo | presentation | bold italic | link | alignleft aligncenter alignright alignjustify | outdent indent",
+		min_height: 400,
+		max_height: 700,
 		autoresize_on_init: false,
 		autoresize_min_height: 400,
 		autoresize_max_height: 400,
@@ -61,6 +64,8 @@ $(document).ready(function () {
 		toolbar: false,
 		statusbar: false,
 		readonly: 1,
+		min_height: 400,
+		max_height: 700,
 		autoresize_on_init: false,
 		autoresize_min_height: 400,
 		autoresize_max_height: 700,
diff --git a/public/js/messaging/messageWriteReply.js b/public/js/messaging/messageWriteReply.js
index c6401ded2..318a83280 100644
--- a/public/js/messaging/messageWriteReply.js
+++ b/public/js/messaging/messageWriteReply.js
@@ -6,7 +6,9 @@ $(document).ready(function ()
 {
 	tinymce.init({
 		selector: "#bodyTextArea",
-		plugins: "autoresize",
+		plugins: "autoresize, link",
+		toolbar: "undo redo | presentation | bold italic | link | alignleft aligncenter alignright alignjustify | outdent indent",
+		max_height: 600,
 		autoresize_min_height: 150,
 		autoresize_max_height: 600,
 		autoresize_bottom_margin: 10,
diff --git a/public/js/messaging/read.js b/public/js/messaging/read.js
index b4b1573a2..d38365467 100644
--- a/public/js/messaging/read.js
+++ b/public/js/messaging/read.js
@@ -220,6 +220,7 @@ $(document).ready(function () {
 		statusbar: false,
 		readonly: 1,
 		autoresize_min_height: 300,
+		max_height: 600,
 		autoresize_bottom_margin: 0
 	});
 
diff --git a/public/js/messaging/write.js b/public/js/messaging/write.js
index bff451c2e..46336b8eb 100644
--- a/public/js/messaging/write.js
+++ b/public/js/messaging/write.js
@@ -62,7 +62,10 @@ $(document).ready(function () {
 	//
 	tinymce.init({
 		selector: "#body",
-		plugins: "autoresize",
+		plugins: "autoresize, link",
+		toolbar: "undo redo | presentation | bold italic | link | alignleft aligncenter alignright alignjustify | outdent indent",
+		min_height: 300,
+		max_height: 600,
 		autoresize_min_height: 300,
 		autoresize_max_height: 600,
 		autoresize_bottom_margin: 10
diff --git a/public/js/messaging/writeReply.js b/public/js/messaging/writeReply.js
index c78748889..df195d20f 100644
--- a/public/js/messaging/writeReply.js
+++ b/public/js/messaging/writeReply.js
@@ -37,7 +37,9 @@ $(document).ready(function () {
 	//
 	tinymce.init({
 		selector: "#body",
-		plugins: "autoresize",
+		plugins: "autoresize, link",
+		toolbar: "undo redo | presentation | bold italic | link | alignleft aligncenter alignright alignjustify | outdent indent",
+		max_height: 600,
 		autoresize_min_height: 150,
 		autoresize_max_height: 600,
 		autoresize_bottom_margin: 10

From 9b11b19cf9a4d4bf2e16a92141768e1c25ebec18 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 22 Sep 2023 13:33:54 +0200
Subject: [PATCH 045/149] Zeitsperre: Maxwert bei Bisdatum

---
 cis/private/profile/zeitsperre_resturlaub.php | 106 +++++++++++-------
 config/cis.config-default.inc.php             |   2 +
 locale/de-AT/zeitsperre.php                   |   1 +
 locale/en-US/zeitsperre.php                   |   1 +
 4 files changed, 69 insertions(+), 41 deletions(-)

diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php
index 46d342971..7f13e0da4 100644
--- a/cis/private/profile/zeitsperre_resturlaub.php
+++ b/cis/private/profile/zeitsperre_resturlaub.php
@@ -79,7 +79,21 @@ else if (defined('CIS_ZEITAUFZEICHNUNG_GESPERRT_BIS') && CIS_ZEITAUFZEICHNUNG_GE
 else
 	$gesperrt_bis = '2015-08-31';
 
-//echo $gesperrt_bis;
+$todayDate = new DateTime();
+$today = strtotime($todayDate->format('Y-m-d'));
+
+//MaxDatum für BisFeld berechnen: Default 2 Jahre, über Config veränderbar
+$maxPeriodeBisDatum = '+2 years';
+
+if (defined('CIS_MAXTIME_ENDEDATUM') && CIS_MAXTIME_ENDEDATUM != '') {
+	$maxPeriodeBisDatum = CIS_MAXTIME_ENDEDATUM;
+}
+$maxBisDatum = strtotime($maxPeriodeBisDatum, $today);
+
+$maxBisDatumDate = new DateTime($maxBisDatum);
+$maxInterval = $todayDate->diff($maxBisDatumDate);
+$diffTageMax = $maxInterval->days;
+echo "<input type ='hidden' value='$diffTageMax' id=maxdiff>";
 
 //Stundentabelleholen
 if(! $result_stunde=$db->db_query("SELECT * FROM lehre.tbl_stunde ORDER BY stunde"))
@@ -96,7 +110,7 @@ $num_rows_stunde=$db->db_num_rows($result_stunde);
 <script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
 <script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
-<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
+<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script-->
 <script src="../../../vendor/fgelinas/timepicker/jquery.ui.timepicker.js" type="text/javascript" ></script>
 <link href="../../../skin/jquery.css" rel="stylesheet" type="text/css"/>
 <link href="../../../vendor/fgelinas/timepicker/jquery.ui.timepicker.css" rel="stylesheet" type="text/css"/>
@@ -204,65 +218,65 @@ function berechnen()
 
 function checkdatum()
 {
-	if(document.getElementById('vondatum').value.length<10)
+	if (document.getElementById('vondatum').value.length < 10)
 	{
 		alert('<?php echo $p->t('zeitsperre/vonDatumIstUngueltigNullenAngeben');?>');
 		return false;
 	}
 
-	if(document.getElementById('bisdatum').value.length<10)
+	if (document.getElementById('bisdatum').value.length < 10)
 	{
 		alert('<?php echo $p->t('zeitsperre/bisDatumIstUngueltigNullenAngeben');?>');
 		return false;
 	}
 
-      var Datum, Tag, Monat,Jahr,vonDatum,bisDatum, diff;
+	var Datum, Tag, Monat, Jahr, vonDatum, bisDatum, diff, diffmax;
 
-	  Datum=document.getElementById('vondatum').value;
-      Tag=Datum.substring(0,2);
-      Monat=Datum.substring(3,5);
-	  if (parseInt(Monat,10)<1 || parseInt(Monat,10)>12)
-	  {
-		alert('<?php echo $p->t('zeitsperre/vonDatumMonat');?>'+ document.getElementById('vondatum').value+ ' <?php echo $p->t('zeitsperre/istNichtRichtig');?>.');
+	Datum = document.getElementById('vondatum').value;
+	Tag = Datum.substring(0, 2);
+	Monat = Datum.substring(3, 5);
+	if (parseInt(Monat, 10) < 1 || parseInt(Monat, 10) > 12)
+	{
+		alert('<?php echo $p->t('zeitsperre/vonDatumMonat');?>' + document.getElementById('vondatum').value + ' <?php echo $p->t('zeitsperre/istNichtRichtig');?>.');
 		document.getElementById('vondatum').focus();
-	  	return false;
-	  }
+		return false;
+	}
 
-      Jahr=Datum.substring(6,10);
+	Jahr = Datum.substring(6, 10);
 
-	  vonDatum=Jahr+''+Monat+''+Tag;
+	vonDatum = Jahr + '' + Monat + '' + Tag;
 
-	  Datum=document.getElementById('bisdatum').value;
-      Tag=Datum.substring(0,2);
-      Monat=Datum.substring(3,5);
-	  if (parseInt(Monat,10)<1 || parseInt(Monat,10)>12)
-	  {
-		alert('<?php echo $p->t('zeitsperre/bisDatumMonat');?>'+ document.getElementById('bisdatum').value+ ' <?php echo $p->t('zeitsperre/istNichtRichtig');?>.');
+	Datum = document.getElementById('bisdatum').value;
+	Tag = Datum.substring(0, 2);
+	Monat = Datum.substring(3, 5);
+	if (parseInt(Monat, 10) < 1 || parseInt(Monat, 10) > 12) {
+		alert('<?php echo $p->t('zeitsperre/bisDatumMonat');?>' + document.getElementById('bisdatum').value + ' <?php echo $p->t('zeitsperre/istNichtRichtig');?>.');
 		document.getElementById('bisdatum').focus();
-	  	return false;
-	  }
+		return false;
+	}
 
-      Jahr=Datum.substring(6,10);
+	Jahr = Datum.substring(6, 10);
+	bisDatum = Jahr + '' + Monat + '' + Tag;
 
-	  bisDatum=Jahr+''+Monat+''+Tag;
+	diff = bisDatum - vonDatum;
+	diffmax = $("#maxdiff").val();
 
-	  diff=bisDatum-vonDatum;
-
-	  if (vonDatum>bisDatum)
-	  {
-		alert('<?php echo $p->t('zeitsperre/vonDatum');?> '+ document.getElementById('vondatum').value+ ' <?php echo $p->t('zeitsperre/istGroesserAlsBisDatum');?> '+document.getElementById('bisdatum').value);
+	if (vonDatum > bisDatum) {
+		alert('<?php echo $p->t('zeitsperre/vonDatum');?> ' + document.getElementById('vondatum').value + ' <?php echo $p->t('zeitsperre/istGroesserAlsBisDatum');?> ' + document.getElementById('bisdatum').value);
 		document.getElementById('vondatum').focus();
-	  	return false;
-	  }
-      else if (diff>14)
-      {
-      	Check = confirm('<?php echo $p->t('zeitaufzeichnung/zeitraumAuffallendHoch');?>');
+		return false;
+	} else if (diff > 14 && diff < diffmax) {
+		Check = confirm('<?php echo $p->t('zeitaufzeichnung/zeitraumAuffallendHoch');?>');
 		document.getElementById('bisdatum').focus();
-	      if (Check == false)
-		      return false;
-	      else
-		      return true;
-	  }
+		if (Check == false)
+			return false;
+		else
+			return true;
+	} else if (diff >= diffmax){
+		alert('<?php echo $p->t('zeitsperre/bisDatumGroesserMax');?> ');
+		document.getElementById('bisdatum').focus();
+		return false;
+	}
 
 	return true;
 }
@@ -445,7 +459,8 @@ if(isset($_GET['type']) && ($_GET['type']=='edit_sperre' || $_GET['type']=='new_
 		$date=explode('.',$_POST['bisdatum']);
 		if (@checkdate($date[1], $date[0], $date[2]))
 		{
-			 $bisdatum=$date[2].$date[1].$date[0];
+			$bisdatum=$date[2].$date[1].$date[0];
+			$bisdatum_iso = $date[2].'-'.$date[1].'-'.$date[0];
 		}
 		else
 		{
@@ -464,6 +479,15 @@ if(isset($_GET['type']) && ($_GET['type']=='edit_sperre' || $_GET['type']=='new_
 		$error_msg .= $p->t('zeitsperre/vonDatumGroesserAlsBisDatum').'! ';
 	}
 
+	//check if bis-Datum > MaxDatum
+	$bis = new DateTime($bisdatum);
+
+	if (strtotime($bis->format('Y-m-d')) > $maxBisDatum)
+	{
+		$error=true;
+		$error_msg .= $p->t('zeitsperre/bisDatumGroesserMax',date('d.m.Y', $maxBisDatum)).' ';
+	}
+
 	//von-datum pruefen TODO
 	if($vondatum_iso < $gesperrt_bis && in_array($_POST['zeitsperretyp_kurzbz'],$typen_arr))
 	{
diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index 27e0a9a70..a2d61dbcb 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -294,5 +294,7 @@ define ('DEFAULT_ALLIN_DIENSTVERTRAG',[111]);
 //Echter Dienstvertrag
 define ('DEFAULT_ECHTER_DIENSTVERTRAG',[103,111]);
 
+//Max-Ende-Datum für Zeitsperren (Aktuelles Datum + angegebenes Intervall
+define('CIS_MAXTIME_ENDEDATUM', '+2 years');
 
 ?>
diff --git a/locale/de-AT/zeitsperre.php b/locale/de-AT/zeitsperre.php
index 463c092cf..c3acd00d0 100644
--- a/locale/de-AT/zeitsperre.php
+++ b/locale/de-AT/zeitsperre.php
@@ -26,6 +26,7 @@ $this->phrasen['zeitsperre/vonDatumMonat']='Von-Datum Monat';
 $this->phrasen['zeitsperre/bisDatumMonat']='Bis-Datum Monat';
 $this->phrasen['zeitsperre/istGroesserAlsBisDatum']='ist größer als das Bis-Datum';
 $this->phrasen['zeitsperre/vonDatum']='Von-Datum';
+$this->phrasen['zeitsperre/bisDatumGroesserMax']='Datumswert liegt zu weit in der Zukunft, nicht zulässig!';
 
 $this->phrasen['zeitsperre/resturlaubstage']='Resturlaubstage';
 $this->phrasen['zeitsperre/aktuellerStand']='aktueller Stand';
diff --git a/locale/en-US/zeitsperre.php b/locale/en-US/zeitsperre.php
index 44123529f..5f54250b8 100644
--- a/locale/en-US/zeitsperre.php
+++ b/locale/en-US/zeitsperre.php
@@ -26,6 +26,7 @@ $this->phrasen['zeitsperre/vonDatumMonat']='From-date month';
 $this->phrasen['zeitsperre/bisDatumMonat']='To-date month';
 $this->phrasen['zeitsperre/istGroesserAlsBisDatum']='is later than To-date';
 $this->phrasen['zeitsperre/vonDatum']='From-date';
+$this->phrasen['zeitsperre/bisDatumGroesserMax']='Date value is too far in the future, action not permitted';
 
 $this->phrasen['zeitsperre/resturlaubstage']='Carry-over days';
 $this->phrasen['zeitsperre/aktuellerStand']='Available vacation';

From 9eeeeca62cc261b54e38c4275aa3a861bccd3641 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 25 Sep 2023 09:54:49 +0200
Subject: [PATCH 046/149] Fix format

---
 cis/private/profile/zeitsperre_resturlaub.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php
index 7f13e0da4..007ae18f9 100644
--- a/cis/private/profile/zeitsperre_resturlaub.php
+++ b/cis/private/profile/zeitsperre_resturlaub.php
@@ -89,9 +89,9 @@ if (defined('CIS_MAXTIME_ENDEDATUM') && CIS_MAXTIME_ENDEDATUM != '') {
 	$maxPeriodeBisDatum = CIS_MAXTIME_ENDEDATUM;
 }
 $maxBisDatum = strtotime($maxPeriodeBisDatum, $today);
-
-$maxBisDatumDate = new DateTime($maxBisDatum);
+$maxBisDatumDate = new DateTime($maxPeriodeBisDatum);
 $maxInterval = $todayDate->diff($maxBisDatumDate);
+
 $diffTageMax = $maxInterval->days;
 echo "<input type ='hidden' value='$diffTageMax' id=maxdiff>";
 

From f71b0e500e9fa43a466d2e39e3c8ee9c28560249 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 25 Sep 2023 14:15:33 +0200
Subject: [PATCH 047/149] Adaptierung Berechnung diff

---
 cis/private/profile/zeitsperre_resturlaub.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php
index 007ae18f9..0e9c46cc1 100644
--- a/cis/private/profile/zeitsperre_resturlaub.php
+++ b/cis/private/profile/zeitsperre_resturlaub.php
@@ -230,7 +230,7 @@ function checkdatum()
 		return false;
 	}
 
-	var Datum, Tag, Monat, Jahr, vonDatum, bisDatum, diff, diffmax;
+	var Datum, Tag, Monat, Jahr, vonDatum, bisDatum, vonDatumDate, bisDatumDate, diff, diffTime, diffmax;
 
 	Datum = document.getElementById('vondatum').value;
 	Tag = Datum.substring(0, 2);
@@ -245,6 +245,7 @@ function checkdatum()
 	Jahr = Datum.substring(6, 10);
 
 	vonDatum = Jahr + '' + Monat + '' + Tag;
+	vonDatumDate = Jahr + '-' + Monat + '-' + Tag;
 
 	Datum = document.getElementById('bisdatum').value;
 	Tag = Datum.substring(0, 2);
@@ -257,8 +258,13 @@ function checkdatum()
 
 	Jahr = Datum.substring(6, 10);
 	bisDatum = Jahr + '' + Monat + '' + Tag;
+	bisDatumDate = Jahr + '-' + Monat + '-' + Tag;
 
-	diff = bisDatum - vonDatum;
+	bisDatumDate = new Date(bisDatumDate);
+	vonDatumDate = new Date(vonDatumDate);
+
+	diffTime = bisDatumDate.getTime() - vonDatumDate.getTime();
+	diff = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
 	diffmax = $("#maxdiff").val();
 
 	if (vonDatum > bisDatum) {

From 746ee76a3b30a1d5ea48011ab5ec4ce73deaf545 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 25 Sep 2023 15:11:14 +0200
Subject: [PATCH 048/149] Validierungen Von- und Bis-Felder vilesci

---
 vilesci/personen/urlaubsverwaltung.php | 34 ++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/vilesci/personen/urlaubsverwaltung.php b/vilesci/personen/urlaubsverwaltung.php
index 274a04b94..be3647732 100644
--- a/vilesci/personen/urlaubsverwaltung.php
+++ b/vilesci/personen/urlaubsverwaltung.php
@@ -34,6 +34,7 @@ require_once('../../include/datum.class.php');
 require_once('../../include/benutzerberechtigung.class.php');
 require_once('../../include/addon.class.php');
 require_once('../../include/benutzerfunktion.class.php');
+require_once('../../include/phrasen.class.php');
 
 if (!$db = new basis_db())
 	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
@@ -63,6 +64,17 @@ $message='';
 $error=false;
 $mlAbgeschickt = '';
 
+//Phrasen
+$sprache = getSprache();
+$p = new phrasen($sprache);
+
+//MaxDatum für BisFeld berechnen: Default 2 Jahre, über Config veränderbar
+$maxPeriodeBisDatum = '+2 years';
+
+if (defined('MAXTIME_ENDEDATUM') && MAXTIME_ENDEDATUM != '') {
+	$maxPeriodeBisDatum = MAXTIME_ENDEDATUM;
+}
+
 //prüfen, ob addon casetime aktiviert ist
 $addon_obj = new addon();
 $addoncasetime = $addon_obj->checkActiveAddon("casetime");
@@ -205,6 +217,26 @@ if(isset($_POST['save']))
 	if(!$berechtigt)
 		die('Sie haben keine Berechtigung für diese Aktion');
 
+	//Validierungen Felder Bis-Datum und Von-Datum
+	if($vondatum > $bisdatum)
+	{
+		$errormsg = $p->t('zeitsperre/vonDatumGroesserAlsBisDatum').'! ';
+		$error=true;
+	}
+
+	//check if bis-Datum > MaxDatum
+	$von = new DateTime($vondatum);
+	$bis = new DateTime($bisdatum);
+	$vonTime = strtotime($von->format('Y-m-d'));
+	$maxBisDatum = strtotime($maxPeriodeBisDatum, $vonTime);
+	$maxBisDatumDate = new DateTime($maxPeriodeBisDatum);
+
+	if (strtotime($bis->format('Y-m-d')) > $maxBisDatum)
+	{
+		$error=true;
+		$errormsg = $p->t('zeitsperre/bisDatumGroesserMax',date('d.m.Y', $maxBisDatum)).' ';
+	}
+
 	//Speichern der Daten
 	$zeitsperre = new zeitsperre();
 
@@ -225,6 +257,8 @@ if(isset($_POST['save']))
 		$zeitsperre->mitarbeiter_uid=$uid;
 	}
 
+
+
 	if(!$error)
 	{
 		$zeitsperre->zeitsperretyp_kurzbz=$zeitsperretyp_kurzbz;

From b1f3916e49f02fef05893ccf2d355b0926bb4a2e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 25 Sep 2023 15:33:17 +0200
Subject: [PATCH 049/149] Adaptierung bismax-Validierung

---
 cis/private/profile/zeitsperre_resturlaub.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php
index 0e9c46cc1..174d341f0 100644
--- a/cis/private/profile/zeitsperre_resturlaub.php
+++ b/cis/private/profile/zeitsperre_resturlaub.php
@@ -79,20 +79,14 @@ else if (defined('CIS_ZEITAUFZEICHNUNG_GESPERRT_BIS') && CIS_ZEITAUFZEICHNUNG_GE
 else
 	$gesperrt_bis = '2015-08-31';
 
-$todayDate = new DateTime();
-$today = strtotime($todayDate->format('Y-m-d'));
-
 //MaxDatum für BisFeld berechnen: Default 2 Jahre, über Config veränderbar
 $maxPeriodeBisDatum = '+2 years';
+$diffTageMax = $maxPeriodeBisDatum *365;
 
 if (defined('CIS_MAXTIME_ENDEDATUM') && CIS_MAXTIME_ENDEDATUM != '') {
 	$maxPeriodeBisDatum = CIS_MAXTIME_ENDEDATUM;
 }
-$maxBisDatum = strtotime($maxPeriodeBisDatum, $today);
-$maxBisDatumDate = new DateTime($maxPeriodeBisDatum);
-$maxInterval = $todayDate->diff($maxBisDatumDate);
 
-$diffTageMax = $maxInterval->days;
 echo "<input type ='hidden' value='$diffTageMax' id=maxdiff>";
 
 //Stundentabelleholen
@@ -110,7 +104,7 @@ $num_rows_stunde=$db->db_num_rows($result_stunde);
 <script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
 <script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
-<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script-->
+<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
 <script src="../../../vendor/fgelinas/timepicker/jquery.ui.timepicker.js" type="text/javascript" ></script>
 <link href="../../../skin/jquery.css" rel="stylesheet" type="text/css"/>
 <link href="../../../vendor/fgelinas/timepicker/jquery.ui.timepicker.css" rel="stylesheet" type="text/css"/>
@@ -488,6 +482,13 @@ if(isset($_GET['type']) && ($_GET['type']=='edit_sperre' || $_GET['type']=='new_
 	//check if bis-Datum > MaxDatum
 	$bis = new DateTime($bisdatum);
 
+/*	$todayDate = new DateTime();
+	$today = strtotime($todayDate->format('Y-m-d'));*/
+
+	$vonDate = new DateTime($vondatum);
+	$von = strtotime($vonDate->format('Y-m-d'));
+	$maxBisDatum = strtotime($maxPeriodeBisDatum, $von);
+
 	if (strtotime($bis->format('Y-m-d')) > $maxBisDatum)
 	{
 		$error=true;

From be3e4e552bc55598e968610f5c4a82a564f917e7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 25 Sep 2023 15:44:48 +0200
Subject: [PATCH 050/149] Adapt diffTageMax

---
 cis/private/profile/zeitsperre_resturlaub.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php
index 174d341f0..861317bfb 100644
--- a/cis/private/profile/zeitsperre_resturlaub.php
+++ b/cis/private/profile/zeitsperre_resturlaub.php
@@ -81,12 +81,11 @@ else
 
 //MaxDatum für BisFeld berechnen: Default 2 Jahre, über Config veränderbar
 $maxPeriodeBisDatum = '+2 years';
-$diffTageMax = $maxPeriodeBisDatum *365;
 
 if (defined('CIS_MAXTIME_ENDEDATUM') && CIS_MAXTIME_ENDEDATUM != '') {
 	$maxPeriodeBisDatum = CIS_MAXTIME_ENDEDATUM;
 }
-
+$diffTageMax = $maxPeriodeBisDatum *365;
 echo "<input type ='hidden' value='$diffTageMax' id=maxdiff>";
 
 //Stundentabelleholen

From 1809ff30084f8ee3f5ef7e41328122519d65429c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 27 Sep 2023 08:30:03 +0200
Subject: [PATCH 051/149] accept days, weeks, month and years in config

---
 cis/private/profile/zeitsperre_resturlaub.php | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php
index 861317bfb..f85cfcb88 100644
--- a/cis/private/profile/zeitsperre_resturlaub.php
+++ b/cis/private/profile/zeitsperre_resturlaub.php
@@ -79,14 +79,23 @@ else if (defined('CIS_ZEITAUFZEICHNUNG_GESPERRT_BIS') && CIS_ZEITAUFZEICHNUNG_GE
 else
 	$gesperrt_bis = '2015-08-31';
 
-//MaxDatum für BisFeld berechnen: Default 2 Jahre, über Config veränderbar
-$maxPeriodeBisDatum = '+2 years';
+//MaxDatum für BisFeld berechnen: Default 730 Tage (2 Jahre), über Config veränderbar
+$maxPeriodeBisDatum = '+730 days';
 
-if (defined('CIS_MAXTIME_ENDEDATUM') && CIS_MAXTIME_ENDEDATUM != '') {
+if (defined('CIS_MAXTIME_ENDEDATUM') && CIS_MAXTIME_ENDEDATUM != '' && CIS_MAXTIME_ENDEDATUM != 0) {
 	$maxPeriodeBisDatum = CIS_MAXTIME_ENDEDATUM;
 }
-$diffTageMax = $maxPeriodeBisDatum *365;
-echo "<input type ='hidden' value='$diffTageMax' id=maxdiff>";
+
+if (strpos($maxPeriodeBisDatum,'day') != false)
+		$diffTageMax = $maxPeriodeBisDatum * 1;
+elseif (strpos($maxPeriodeBisDatum,'week')!= false)
+	$diffTageMax = $maxPeriodeBisDatum * 7;
+elseif (strpos($maxPeriodeBisDatum,'month')!= false)
+	$diffTageMax = $maxPeriodeBisDatum * 30;
+elseif (strpos($maxPeriodeBisDatum,'year') != false)
+	$diffTageMax = $maxPeriodeBisDatum * 365;
+else
+	$diffTageMax = 730;
 
 //Stundentabelleholen
 if(! $result_stunde=$db->db_query("SELECT * FROM lehre.tbl_stunde ORDER BY stunde"))
@@ -271,7 +280,7 @@ function checkdatum()
 			return false;
 		else
 			return true;
-	} else if (diff >= diffmax){
+	} else if (diff >= diffmax) {
 		alert('<?php echo $p->t('zeitsperre/bisDatumGroesserMax');?> ');
 		document.getElementById('bisdatum').focus();
 		return false;
@@ -1013,6 +1022,7 @@ echo "<td class='tdvertical'>";
 echo $content_form;
 echo '</td>';
 echo "<td class='tdvertical'><div id='resturlaub' style='visibility:hidden;'></div></td>";
+echo "<input type ='hidden' value='$diffTageMax' id=maxdiff>";
 echo '</tr><tr><td colspan=2>';
 echo $content_table;
 echo '</td>';

From 2d963c92cc55e66236b564b0daa3a133f799a8d1 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 27 Sep 2023 10:38:44 +0200
Subject: [PATCH 052/149] - msg aus rtverwaltung moeglich

---
 vilesci/stammdaten/reihungstestverwaltung.php | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php
index 6fac37be7..2fd3d6d04 100644
--- a/vilesci/stammdaten/reihungstestverwaltung.php
+++ b/vilesci/stammdaten/reihungstestverwaltung.php
@@ -1027,18 +1027,30 @@ if(isset($_GET['excel']))
 						$("#"+v.id).checkboxes('toggle');
 						e.preventDefault();
 						if ($("input.chkbox:checked").size() > 0)
+						{
 							$("#mailSendButton").html('Mail an markierte Personen senden');
+							$("#msgSendButton").html('Message an markierte Personen senden');
+						}
 						else
+						{
 							$("#mailSendButton").html('Mail an alle senden');
+							$("#msgSendButton").html('Message an alle senden');
+						}
 					});
 
 					$("#uncheck_"+v.id).on('click', function(e) {
 						$("#"+v.id).checkboxes('uncheck');
 						e.preventDefault();
 						if ($("input.chkbox:checked").size() > 0)
+						{
 							$("#mailSendButton").html('Mail an markierte Personen senden');
+							$("#msgSendButton").html('Message an markierte Personen senden');
+						}
 						else
+						{
 							$("#mailSendButton").html('Mail an alle senden');
+							$("#msgSendButton").html('Message an alle senden');
+						}
 					});
 
 					$("#"+v.id).checkboxes('range', true);
@@ -1114,9 +1126,15 @@ if(isset($_GET['excel']))
 				$('.chkbox').change(function()
 				{
 					if ($("input.chkbox:checked").size() > 0)
+					{
 						$("#mailSendButton").html('Mail an markierte Personen senden');
+						$("#msgSendButton").html('Message an markierte Personen senden');
+					}
 					else
+					{
 						$("#mailSendButton").html('Mail an alle senden');
+						$("#msgSendButton").html('Message an alle senden');
+					}
 				});
 
 				$('#toggle_bearbeitenForm').click(function()
@@ -1227,6 +1245,23 @@ if(isset($_GET['excel']))
 				});
 				window.location.href = "mailto:?bcc="+mailadressen;
 			}
+			
+			function SendMessage()
+			{
+				// Wenn Checkboxen markiert sind, an diese senden, sonst an alle
+				if ($("input.chkbox:checked").size() > 0)
+					var elements = $("input.chkbox:checked");
+				else
+					var elements = $("input.chkbox");
+				var form = $("#sendMsgForm");
+				form.find("input[type=hidden]").remove();
+				$.each(elements, function(index, item)
+				{
+					let person_id = $(this).closest('tr').find('td.clm_person_id').text();
+					form.append("<input type='hidden' name='person_id[]' value='" + person_id + "'>");
+				});
+				form.submit();
+			}
 		</script>
 		<style type="text/css">
 		.active
@@ -2264,7 +2299,7 @@ $studienplaene_list = implode(',', array_keys($studienplaene_arr));
 								echo '<option value="2" '.($reihungstest->stufe == 2 ? 'selected' : '').'>2 (Interview)</option>';
 								echo '<option value="3" '.($reihungstest->stufe == 3 ? 'selected' : '').'>3</option>';
 							}
-							else 
+							else
 							{
 								echo '<option value="1" '.($reihungstest->stufe == 1 ? 'selected' : '').'>1</option>';
 								echo '<option value="2" '.($reihungstest->stufe == 2 ? 'selected' : '').'>2</option>';
@@ -2583,6 +2618,9 @@ if($reihungstest_id!='')
 	echo '<a class="buttongreen" href="'.$_SERVER['PHP_SELF'].'?reihungstest_id='.$reihungstest_id.'&excel=true">Excel Export</a>';
 	//echo '<a class="buttongreen" href="'.$_SERVER['PHP_SELF'].'?reihungstest_id='.$reihungstest_id.'&type=saveallrtpunkte">Punkte ins FAS &uuml;bertragen</a>';
 	echo '<a class="buttongreen" href="#" onclick="SendMail()" id="mailSendButton">Mail an alle BewerberInnen senden</a>';
+	echo '<form id="sendMsgForm" method="post" action="'. APP_ROOT .'index.ci.php/system/messages/Messages/writeTemplate" target="_blank" style="display:inline-block">
+			<a class="buttongreen" href="javascript:void(0)" onclick="SendMessage()" id="msgSendButton">Message an alle BewerberInnen senden</a>
+			</form>';
 }
 if (defined('CAMPUS_NAME') && CAMPUS_NAME == 'FH Technikum Wien')
 {

From 285af0a7f46af22799d003a1be44568a7e5f6f29 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Wed, 27 Sep 2023 13:52:31 +0200
Subject: [PATCH 053/149] composer: updated datepicker

---
 composer.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 44403a843..fb6914d86 100644
--- a/composer.json
+++ b/composer.json
@@ -352,7 +352,7 @@
 			"type": "package",
 			"package": {
 					"name": "vuejs/vuedatepicker_js",
-					"version": "4.2.3",
+					"version": "5.4.0",
 					"dist": {
 							"url": "https://unpkg.com/@vuepic/vue-datepicker@4.2.3/dist/vue-datepicker.iife.js",
 							"type": "file"
@@ -363,7 +363,7 @@
 			"type": "package",
 			"package": {
 					"name": "vuejs/vuedatepicker_css",
-					"version": "4.2.3",
+					"version": "5.4.0",
 					"dist": {
 							"url": "https://unpkg.com/@vuepic/vue-datepicker@4.2.3/dist/main.css",
 							"type": "file"
@@ -442,7 +442,9 @@
 		"twbs/bootstrap5": "5.1.*",
 
 		"vuejs/vuejs3": "3.2.33",
-		"vuejs/vuerouter4": "4.1.3"
+		"vuejs/vuerouter4": "4.1.3",
+		"vuejs/vuedatepicker_js": "5.4.0",
+		"vuejs/vuedatepicker_css": "5.4.0"
 	},
 	"config": {
 		"bin-dir": "vendor/bin"

From f9af5638f59781496273b2cfe7019f48cae22f09 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 28 Sep 2023 09:31:40 +0200
Subject: [PATCH 054/149] =?UTF-8?q?Update=20Config:=20Format=20in=20Tagen?=
 =?UTF-8?q?=20f=C3=BCr=20Validierung=20JS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/profile/zeitsperre_resturlaub.php | 17 ++++-------------
 config/cis.config-default.inc.php             |  4 ++--
 config/vilesci.config-default.inc.php         |  3 +++
 vilesci/personen/urlaubsverwaltung.php        |  4 ++--
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php
index f85cfcb88..bf81562a9 100644
--- a/cis/private/profile/zeitsperre_resturlaub.php
+++ b/cis/private/profile/zeitsperre_resturlaub.php
@@ -81,22 +81,13 @@ else
 
 //MaxDatum für BisFeld berechnen: Default 730 Tage (2 Jahre), über Config veränderbar
 $maxPeriodeBisDatum = '+730 days';
+$diffTageMax = 730;
 
-if (defined('CIS_MAXTIME_ENDEDATUM') && CIS_MAXTIME_ENDEDATUM != '' && CIS_MAXTIME_ENDEDATUM != 0) {
-	$maxPeriodeBisDatum = CIS_MAXTIME_ENDEDATUM;
+if (defined('MAXTIME_FROM_ENDEDATUM') && MAXTIME_FROM_ENDEDATUM != '') {
+	$maxPeriodeBisDatum = MAXTIME_FROM_ENDEDATUM[0];
+	$diffTageMax = MAXTIME_FROM_ENDEDATUM[1];
 }
 
-if (strpos($maxPeriodeBisDatum,'day') != false)
-		$diffTageMax = $maxPeriodeBisDatum * 1;
-elseif (strpos($maxPeriodeBisDatum,'week')!= false)
-	$diffTageMax = $maxPeriodeBisDatum * 7;
-elseif (strpos($maxPeriodeBisDatum,'month')!= false)
-	$diffTageMax = $maxPeriodeBisDatum * 30;
-elseif (strpos($maxPeriodeBisDatum,'year') != false)
-	$diffTageMax = $maxPeriodeBisDatum * 365;
-else
-	$diffTageMax = 730;
-
 //Stundentabelleholen
 if(! $result_stunde=$db->db_query("SELECT * FROM lehre.tbl_stunde ORDER BY stunde"))
 	die($db->db_last_error());
diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index a2d61dbcb..a9a5f5a18 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -294,7 +294,7 @@ define ('DEFAULT_ALLIN_DIENSTVERTRAG',[111]);
 //Echter Dienstvertrag
 define ('DEFAULT_ECHTER_DIENSTVERTRAG',[103,111]);
 
-//Max-Ende-Datum für Zeitsperren (Aktuelles Datum + angegebenes Intervall
-define('CIS_MAXTIME_ENDEDATUM', '+2 years');
+//Max-Ende-Datum für Zeitsperren (Parameter 1: Intervall serverside, Parameter 2: Tage clientside)
+define('MAXTIME_FROM_ENDEDATUM', ['+2 years', 730]);
 
 ?>
diff --git a/config/vilesci.config-default.inc.php b/config/vilesci.config-default.inc.php
index fdd971be0..2c56ed6e3 100644
--- a/config/vilesci.config-default.inc.php
+++ b/config/vilesci.config-default.inc.php
@@ -289,4 +289,7 @@ define ('DEFAULT_LEHRMODUS','regulaer');
 //Echter Dienstvertrag
 define ('DEFAULT_ECHTER_DIENSTVERTRAG',[103,110]);
 
+//Max-Ende-Datum für Zeitsperren (Parameter 1: Intervall serverside, Parameter 2: Tage clientside)
+define('MAXTIME_FROM_ENDEDATUM', ['+2 years', 730]);
+
 ?>
diff --git a/vilesci/personen/urlaubsverwaltung.php b/vilesci/personen/urlaubsverwaltung.php
index be3647732..6aa901aab 100644
--- a/vilesci/personen/urlaubsverwaltung.php
+++ b/vilesci/personen/urlaubsverwaltung.php
@@ -71,8 +71,8 @@ $p = new phrasen($sprache);
 //MaxDatum für BisFeld berechnen: Default 2 Jahre, über Config veränderbar
 $maxPeriodeBisDatum = '+2 years';
 
-if (defined('MAXTIME_ENDEDATUM') && MAXTIME_ENDEDATUM != '') {
-	$maxPeriodeBisDatum = MAXTIME_ENDEDATUM;
+if (defined('MAXTIME_FROM_ENDEDATUM') && MAXTIME_FROM_ENDEDATUM != '') {
+	$maxPeriodeBisDatum = MAXTIME_FROM_ENDEDATUM[0];
 }
 
 //prüfen, ob addon casetime aktiviert ist

From dc7866043319a8c5bb12ff02b3a1a97aa65aaca0 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Fri, 29 Sep 2023 09:49:12 +0200
Subject: [PATCH 055/149] - fix for fas

---
 vilesci/stammdaten/reihungstestverwaltung.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php
index 2fd3d6d04..b7cc41348 100644
--- a/vilesci/stammdaten/reihungstestverwaltung.php
+++ b/vilesci/stammdaten/reihungstestverwaltung.php
@@ -1257,7 +1257,7 @@ if(isset($_GET['excel']))
 				form.find("input[type=hidden]").remove();
 				$.each(elements, function(index, item)
 				{
-					let person_id = $(this).closest('tr').find('td.clm_person_id').text();
+					var person_id = $(this).closest('tr').find('td.clm_person_id').text();
 					form.append("<input type='hidden' name='person_id[]' value='" + person_id + "'>");
 				});
 				form.submit();

From 6c8b3b4ec40fc8bfafaa245959f28bec5a92d187 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 2 Oct 2023 14:12:03 +0200
Subject: [PATCH 056/149] - nur an markierte msg moeglich

---
 vilesci/stammdaten/reihungstestverwaltung.php | 44 +++++++------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php
index b7cc41348..491cfea8b 100644
--- a/vilesci/stammdaten/reihungstestverwaltung.php
+++ b/vilesci/stammdaten/reihungstestverwaltung.php
@@ -1027,30 +1027,18 @@ if(isset($_GET['excel']))
 						$("#"+v.id).checkboxes('toggle');
 						e.preventDefault();
 						if ($("input.chkbox:checked").size() > 0)
-						{
 							$("#mailSendButton").html('Mail an markierte Personen senden');
-							$("#msgSendButton").html('Message an markierte Personen senden');
-						}
 						else
-						{
 							$("#mailSendButton").html('Mail an alle senden');
-							$("#msgSendButton").html('Message an alle senden');
-						}
 					});
 
 					$("#uncheck_"+v.id).on('click', function(e) {
 						$("#"+v.id).checkboxes('uncheck');
 						e.preventDefault();
 						if ($("input.chkbox:checked").size() > 0)
-						{
 							$("#mailSendButton").html('Mail an markierte Personen senden');
-							$("#msgSendButton").html('Message an markierte Personen senden');
-						}
 						else
-						{
 							$("#mailSendButton").html('Mail an alle senden');
-							$("#msgSendButton").html('Message an alle senden');
-						}
 					});
 
 					$("#"+v.id).checkboxes('range', true);
@@ -1126,15 +1114,9 @@ if(isset($_GET['excel']))
 				$('.chkbox').change(function()
 				{
 					if ($("input.chkbox:checked").size() > 0)
-					{
 						$("#mailSendButton").html('Mail an markierte Personen senden');
-						$("#msgSendButton").html('Message an markierte Personen senden');
-					}
 					else
-					{
 						$("#mailSendButton").html('Mail an alle senden');
-						$("#msgSendButton").html('Message an alle senden');
-					}
 				});
 
 				$('#toggle_bearbeitenForm').click(function()
@@ -1250,17 +1232,21 @@ if(isset($_GET['excel']))
 			{
 				// Wenn Checkboxen markiert sind, an diese senden, sonst an alle
 				if ($("input.chkbox:checked").size() > 0)
-					var elements = $("input.chkbox:checked");
-				else
-					var elements = $("input.chkbox");
-				var form = $("#sendMsgForm");
-				form.find("input[type=hidden]").remove();
-				$.each(elements, function(index, item)
 				{
-					var person_id = $(this).closest('tr').find('td.clm_person_id').text();
-					form.append("<input type='hidden' name='person_id[]' value='" + person_id + "'>");
-				});
-				form.submit();
+					var elements = $("input.chkbox:checked");
+					var form = $("#sendMsgForm");
+					form.find("input[type=hidden]").remove();
+					$.each(elements, function(index, item)
+					{
+						var person_id = $(this).closest('tr').find('td.clm_person_id').text();
+						form.append("<input type='hidden' name='person_id[]' value='" + person_id + "'>");
+					});
+					form.submit();
+				}
+				else
+				{
+					alert("Keine Personen markiert");
+				}
 			}
 		</script>
 		<style type="text/css">
@@ -2619,7 +2605,7 @@ if($reihungstest_id!='')
 	//echo '<a class="buttongreen" href="'.$_SERVER['PHP_SELF'].'?reihungstest_id='.$reihungstest_id.'&type=saveallrtpunkte">Punkte ins FAS &uuml;bertragen</a>';
 	echo '<a class="buttongreen" href="#" onclick="SendMail()" id="mailSendButton">Mail an alle BewerberInnen senden</a>';
 	echo '<form id="sendMsgForm" method="post" action="'. APP_ROOT .'index.ci.php/system/messages/Messages/writeTemplate" target="_blank" style="display:inline-block">
-			<a class="buttongreen" href="javascript:void(0)" onclick="SendMessage()" id="msgSendButton">Message an alle BewerberInnen senden</a>
+			<a class="buttongreen" href="javascript:void(0)" onclick="SendMessage()" id="msgSendButton">Message an markierte BewerberInnen senden</a>
 			</form>';
 }
 if (defined('CAMPUS_NAME') && CAMPUS_NAME == 'FH Technikum Wien')

From cda93ce85be022f9caecb8fd7fb73a14abf9f1ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 5 Oct 2023 08:14:32 +0200
Subject: [PATCH 057/149] Fixed PHP81 Warning on Loading Adresses

---
 rdf/adresse.rdf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rdf/adresse.rdf.php b/rdf/adresse.rdf.php
index ac557fb98..fd6a76d19 100644
--- a/rdf/adresse.rdf.php
+++ b/rdf/adresse.rdf.php
@@ -100,7 +100,7 @@ function draw_rdf($row)
             <ADRESSE:gemeinde><![CDATA['.$row->gemeinde.']]></ADRESSE:gemeinde>
             <ADRESSE:nation><![CDATA['.$row->nation.']]></ADRESSE:nation>
             <ADRESSE:typ><![CDATA['.$row->typ.']]></ADRESSE:typ>
-            <ADRESSE:typ_name><![CDATA['.$row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE].']]></ADRESSE:typ_name>
+            <ADRESSE:typ_name><![CDATA['.(isset($row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE])?$row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE]:'').']]></ADRESSE:typ_name>
             <ADRESSE:heimatadresse><![CDATA['.($row->heimatadresse?'Ja':'Nein').']]></ADRESSE:heimatadresse>
             <ADRESSE:zustelladresse><![CDATA['.($row->zustelladresse?'Ja':'Nein').']]></ADRESSE:zustelladresse>
             <ADRESSE:co_name><![CDATA['. $row->co_name.']]></ADRESSE:co_name>

From e30ad887c96ec01da55723aae7ce9f0c43c74440 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 5 Oct 2023 10:26:19 +0200
Subject: [PATCH 058/149] - msg an alle moeglich

---
 vilesci/stammdaten/reihungstestverwaltung.php | 40 +++++++++++++------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php
index 491cfea8b..b7cc41348 100644
--- a/vilesci/stammdaten/reihungstestverwaltung.php
+++ b/vilesci/stammdaten/reihungstestverwaltung.php
@@ -1027,18 +1027,30 @@ if(isset($_GET['excel']))
 						$("#"+v.id).checkboxes('toggle');
 						e.preventDefault();
 						if ($("input.chkbox:checked").size() > 0)
+						{
 							$("#mailSendButton").html('Mail an markierte Personen senden');
+							$("#msgSendButton").html('Message an markierte Personen senden');
+						}
 						else
+						{
 							$("#mailSendButton").html('Mail an alle senden');
+							$("#msgSendButton").html('Message an alle senden');
+						}
 					});
 
 					$("#uncheck_"+v.id).on('click', function(e) {
 						$("#"+v.id).checkboxes('uncheck');
 						e.preventDefault();
 						if ($("input.chkbox:checked").size() > 0)
+						{
 							$("#mailSendButton").html('Mail an markierte Personen senden');
+							$("#msgSendButton").html('Message an markierte Personen senden');
+						}
 						else
+						{
 							$("#mailSendButton").html('Mail an alle senden');
+							$("#msgSendButton").html('Message an alle senden');
+						}
 					});
 
 					$("#"+v.id).checkboxes('range', true);
@@ -1114,9 +1126,15 @@ if(isset($_GET['excel']))
 				$('.chkbox').change(function()
 				{
 					if ($("input.chkbox:checked").size() > 0)
+					{
 						$("#mailSendButton").html('Mail an markierte Personen senden');
+						$("#msgSendButton").html('Message an markierte Personen senden');
+					}
 					else
+					{
 						$("#mailSendButton").html('Mail an alle senden');
+						$("#msgSendButton").html('Message an alle senden');
+					}
 				});
 
 				$('#toggle_bearbeitenForm').click(function()
@@ -1232,21 +1250,17 @@ if(isset($_GET['excel']))
 			{
 				// Wenn Checkboxen markiert sind, an diese senden, sonst an alle
 				if ($("input.chkbox:checked").size() > 0)
-				{
 					var elements = $("input.chkbox:checked");
-					var form = $("#sendMsgForm");
-					form.find("input[type=hidden]").remove();
-					$.each(elements, function(index, item)
-					{
-						var person_id = $(this).closest('tr').find('td.clm_person_id').text();
-						form.append("<input type='hidden' name='person_id[]' value='" + person_id + "'>");
-					});
-					form.submit();
-				}
 				else
+					var elements = $("input.chkbox");
+				var form = $("#sendMsgForm");
+				form.find("input[type=hidden]").remove();
+				$.each(elements, function(index, item)
 				{
-					alert("Keine Personen markiert");
-				}
+					var person_id = $(this).closest('tr').find('td.clm_person_id').text();
+					form.append("<input type='hidden' name='person_id[]' value='" + person_id + "'>");
+				});
+				form.submit();
 			}
 		</script>
 		<style type="text/css">
@@ -2605,7 +2619,7 @@ if($reihungstest_id!='')
 	//echo '<a class="buttongreen" href="'.$_SERVER['PHP_SELF'].'?reihungstest_id='.$reihungstest_id.'&type=saveallrtpunkte">Punkte ins FAS &uuml;bertragen</a>';
 	echo '<a class="buttongreen" href="#" onclick="SendMail()" id="mailSendButton">Mail an alle BewerberInnen senden</a>';
 	echo '<form id="sendMsgForm" method="post" action="'. APP_ROOT .'index.ci.php/system/messages/Messages/writeTemplate" target="_blank" style="display:inline-block">
-			<a class="buttongreen" href="javascript:void(0)" onclick="SendMessage()" id="msgSendButton">Message an markierte BewerberInnen senden</a>
+			<a class="buttongreen" href="javascript:void(0)" onclick="SendMessage()" id="msgSendButton">Message an alle BewerberInnen senden</a>
 			</form>';
 }
 if (defined('CAMPUS_NAME') && CAMPUS_NAME == 'FH Technikum Wien')

From 23aeba4620800698b924b2bd6e7e8289d2c489a3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 6 Oct 2023 12:30:14 +0200
Subject: [PATCH 059/149] Verwendung von datetime-funktionen anstelle von
 strtotime, Adaptierung config-eintrag, update Phrasen

---
 cis/private/profile/zeitsperre_resturlaub.php | 32 +++++++------------
 config/cis.config-default.inc.php             |  3 --
 config/global.config-default.inc.php          |  3 ++
 config/vilesci.config-default.inc.php         |  3 --
 locale/de-AT/zeitsperre.php                   |  2 +-
 locale/en-US/zeitsperre.php                   |  2 +-
 vilesci/personen/urlaubsverwaltung.php        | 19 +++++------
 7 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php
index bf81562a9..ffd179401 100644
--- a/cis/private/profile/zeitsperre_resturlaub.php
+++ b/cis/private/profile/zeitsperre_resturlaub.php
@@ -79,13 +79,11 @@ else if (defined('CIS_ZEITAUFZEICHNUNG_GESPERRT_BIS') && CIS_ZEITAUFZEICHNUNG_GE
 else
 	$gesperrt_bis = '2015-08-31';
 
-//MaxDatum für BisFeld berechnen: Default 730 Tage (2 Jahre), über Config veränderbar
-$maxPeriodeBisDatum = '+730 days';
-$diffTageMax = 730;
+//Default-Wert für Max-Intervall in Tagen für Zeitsperre, über Config veränderbar
+$maxDauerZS = 730;
 
-if (defined('MAXTIME_FROM_ENDEDATUM') && MAXTIME_FROM_ENDEDATUM != '') {
-	$maxPeriodeBisDatum = MAXTIME_FROM_ENDEDATUM[0];
-	$diffTageMax = MAXTIME_FROM_ENDEDATUM[1];
+if (defined('CIS_ZEITSPERREN_MAX_DAUER') && CIS_ZEITSPERREN_MAX_DAUER != '') {
+	$maxDauerZS = CIS_ZEITSPERREN_MAX_DAUER;
 }
 
 //Stundentabelleholen
@@ -258,13 +256,14 @@ function checkdatum()
 
 	diffTime = bisDatumDate.getTime() - vonDatumDate.getTime();
 	diff = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
-	diffmax = $("#maxdiff").val();
+	diffmax = <?php echo $maxDauerZS ;?>
 
 	if (vonDatum > bisDatum) {
 		alert('<?php echo $p->t('zeitsperre/vonDatum');?> ' + document.getElementById('vondatum').value + ' <?php echo $p->t('zeitsperre/istGroesserAlsBisDatum');?> ' + document.getElementById('bisdatum').value);
 		document.getElementById('vondatum').focus();
 		return false;
-	} else if (diff > 14 && diff < diffmax) {
+	}
+	else if (diff > 14 && diff < diffmax) {
 		Check = confirm('<?php echo $p->t('zeitaufzeichnung/zeitraumAuffallendHoch');?>');
 		document.getElementById('bisdatum').focus();
 		if (Check == false)
@@ -276,7 +275,6 @@ function checkdatum()
 		document.getElementById('bisdatum').focus();
 		return false;
 	}
-
 	return true;
 }
 
@@ -478,20 +476,15 @@ if(isset($_GET['type']) && ($_GET['type']=='edit_sperre' || $_GET['type']=='new_
 		$error_msg .= $p->t('zeitsperre/vonDatumGroesserAlsBisDatum').'! ';
 	}
 
-	//check if bis-Datum > MaxDatum
+	//check if bis-Datum zu weit in der Zukunft
 	$bis = new DateTime($bisdatum);
+	$von = new DateTime($vondatum);
 
-/*	$todayDate = new DateTime();
-	$today = strtotime($todayDate->format('Y-m-d'));*/
-
-	$vonDate = new DateTime($vondatum);
-	$von = strtotime($vonDate->format('Y-m-d'));
-	$maxBisDatum = strtotime($maxPeriodeBisDatum, $von);
-
-	if (strtotime($bis->format('Y-m-d')) > $maxBisDatum)
+	$intervall = $bis->diff($von);
+	if ($intervall->days >= $maxDauerZS)
 	{
 		$error=true;
-		$error_msg .= $p->t('zeitsperre/bisDatumGroesserMax',date('d.m.Y', $maxBisDatum)).' ';
+		$error_msg = $p->t('zeitsperre/bisDatumGroesserMax');
 	}
 
 	//von-datum pruefen TODO
@@ -1013,7 +1006,6 @@ echo "<td class='tdvertical'>";
 echo $content_form;
 echo '</td>';
 echo "<td class='tdvertical'><div id='resturlaub' style='visibility:hidden;'></div></td>";
-echo "<input type ='hidden' value='$diffTageMax' id=maxdiff>";
 echo '</tr><tr><td colspan=2>';
 echo $content_table;
 echo '</td>';
diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index a9a5f5a18..346af8801 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -294,7 +294,4 @@ define ('DEFAULT_ALLIN_DIENSTVERTRAG',[111]);
 //Echter Dienstvertrag
 define ('DEFAULT_ECHTER_DIENSTVERTRAG',[103,111]);
 
-//Max-Ende-Datum für Zeitsperren (Parameter 1: Intervall serverside, Parameter 2: Tage clientside)
-define('MAXTIME_FROM_ENDEDATUM', ['+2 years', 730]);
-
 ?>
diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index 8990bbd81..c4da2f6e3 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -47,6 +47,9 @@ define('CIS_PROFIL_STUDIENINFORMATION_ANZEIGEN',true);
 // Zeitaufzeichnung gesperrt_bis Datum YYYY-MM-DD
 define('CIS_ZEITAUFZEICHNUNG_GESPERRT_BIS','');
 
+// maximale Dauer einer Zeitsperre in Tagen
+define('CIS_ZEITSPERREN_MAX_DAUER', 730);
+
 // Anzeige des Links zur Noteneingabe in der LVA Uebersicht
 define('CIS_LVALISTE_NOTENEINGABE_ANZEIGEN',true);
 
diff --git a/config/vilesci.config-default.inc.php b/config/vilesci.config-default.inc.php
index 2c56ed6e3..fdd971be0 100644
--- a/config/vilesci.config-default.inc.php
+++ b/config/vilesci.config-default.inc.php
@@ -289,7 +289,4 @@ define ('DEFAULT_LEHRMODUS','regulaer');
 //Echter Dienstvertrag
 define ('DEFAULT_ECHTER_DIENSTVERTRAG',[103,110]);
 
-//Max-Ende-Datum für Zeitsperren (Parameter 1: Intervall serverside, Parameter 2: Tage clientside)
-define('MAXTIME_FROM_ENDEDATUM', ['+2 years', 730]);
-
 ?>
diff --git a/locale/de-AT/zeitsperre.php b/locale/de-AT/zeitsperre.php
index c3acd00d0..413cd5be5 100644
--- a/locale/de-AT/zeitsperre.php
+++ b/locale/de-AT/zeitsperre.php
@@ -26,7 +26,7 @@ $this->phrasen['zeitsperre/vonDatumMonat']='Von-Datum Monat';
 $this->phrasen['zeitsperre/bisDatumMonat']='Bis-Datum Monat';
 $this->phrasen['zeitsperre/istGroesserAlsBisDatum']='ist größer als das Bis-Datum';
 $this->phrasen['zeitsperre/vonDatum']='Von-Datum';
-$this->phrasen['zeitsperre/bisDatumGroesserMax']='Datumswert liegt zu weit in der Zukunft, nicht zulässig!';
+$this->phrasen['zeitsperre/bisDatumGroesserMax']='BisDatum liegt zu weit in der Zukunft, nicht zulässig!';
 
 $this->phrasen['zeitsperre/resturlaubstage']='Resturlaubstage';
 $this->phrasen['zeitsperre/aktuellerStand']='aktueller Stand';
diff --git a/locale/en-US/zeitsperre.php b/locale/en-US/zeitsperre.php
index 5f54250b8..31cdef6f8 100644
--- a/locale/en-US/zeitsperre.php
+++ b/locale/en-US/zeitsperre.php
@@ -26,7 +26,7 @@ $this->phrasen['zeitsperre/vonDatumMonat']='From-date month';
 $this->phrasen['zeitsperre/bisDatumMonat']='To-date month';
 $this->phrasen['zeitsperre/istGroesserAlsBisDatum']='is later than To-date';
 $this->phrasen['zeitsperre/vonDatum']='From-date';
-$this->phrasen['zeitsperre/bisDatumGroesserMax']='Date value is too far in the future, action not permitted';
+$this->phrasen['zeitsperre/bisDatumGroesserMax']='TO-Date value is too far in the future, action not permitted';
 
 $this->phrasen['zeitsperre/resturlaubstage']='Carry-over days';
 $this->phrasen['zeitsperre/aktuellerStand']='Available vacation';
diff --git a/vilesci/personen/urlaubsverwaltung.php b/vilesci/personen/urlaubsverwaltung.php
index 6aa901aab..20b2d293c 100644
--- a/vilesci/personen/urlaubsverwaltung.php
+++ b/vilesci/personen/urlaubsverwaltung.php
@@ -68,13 +68,12 @@ $mlAbgeschickt = '';
 $sprache = getSprache();
 $p = new phrasen($sprache);
 
-//MaxDatum für BisFeld berechnen: Default 2 Jahre, über Config veränderbar
-$maxPeriodeBisDatum = '+2 years';
+//Default-Wert für Max-Intervall in Tagen für Zeitsperre, über Config veränderbar
+$maxDauerZS = 730;
 
-if (defined('MAXTIME_FROM_ENDEDATUM') && MAXTIME_FROM_ENDEDATUM != '') {
-	$maxPeriodeBisDatum = MAXTIME_FROM_ENDEDATUM[0];
+if (defined('CIS_ZEITSPERREN_MAX_DAUER') && CIS_ZEITSPERREN_MAX_DAUER != '') {
+	$maxDauerZS = CIS_ZEITSPERREN_MAX_DAUER;
 }
-
 //prüfen, ob addon casetime aktiviert ist
 $addon_obj = new addon();
 $addoncasetime = $addon_obj->checkActiveAddon("casetime");
@@ -224,17 +223,15 @@ if(isset($_POST['save']))
 		$error=true;
 	}
 
-	//check if bis-Datum > MaxDatum
+	//Check if Bisdatum zu weit in der Zukunft
 	$von = new DateTime($vondatum);
 	$bis = new DateTime($bisdatum);
-	$vonTime = strtotime($von->format('Y-m-d'));
-	$maxBisDatum = strtotime($maxPeriodeBisDatum, $vonTime);
-	$maxBisDatumDate = new DateTime($maxPeriodeBisDatum);
 
-	if (strtotime($bis->format('Y-m-d')) > $maxBisDatum)
+	$intervall = $bis->diff($von);
+	if ($intervall->days > $maxDauerZS)
 	{
 		$error=true;
-		$errormsg = $p->t('zeitsperre/bisDatumGroesserMax',date('d.m.Y', $maxBisDatum)).' ';
+		$errormsg = $p->t('zeitsperre/bisDatumGroesserMax');
 	}
 
 	//Speichern der Daten

From 3ab8fd22f48ed35731d478921fb03e6fbca54b7e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 6 Oct 2023 20:22:05 +0200
Subject: [PATCH 060/149] minor layout changes

---
 application/views/lehre/Antrag/Leitung/List.php        |  1 +
 public/css/cis_bs5.css                                 | 10 ++++++++++
 .../js/components/Studierendenantrag/Leitung/Table.js  | 10 ++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/application/views/lehre/Antrag/Leitung/List.php b/application/views/lehre/Antrag/Leitung/List.php
index 3dffacf3f..9c0749dae 100644
--- a/application/views/lehre/Antrag/Leitung/List.php
+++ b/application/views/lehre/Antrag/Leitung/List.php
@@ -13,6 +13,7 @@ $sitesettings = array(
 	'primevue3' => true,
 	'phrases' => array(
 		'global',
+		'ui',
 		'studierendenantrag',
 		'lehre',
 		'person',
diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css
index 9ee7cd848..d4fc7960c 100644
--- a/public/css/cis_bs5.css
+++ b/public/css/cis_bs5.css
@@ -59,8 +59,18 @@ h6, .h6 {
 
 .fhc-container {
 	padding: 0 15px;
+	max-width: 100%;
 }
 
 .tabulator {
 	font-size: var(--bs-body-font-size);
 }
+
+.fhc-container .tabulator .tabulator-frozen {
+	background-color: #fff !important;
+}
+
+.fhc-container .tabulator .tabulator-header .tabulator-col,
+.fhc-container .tabulator-row .tabulator-cell {
+	border-right: 1px solid #dee2e6;
+}
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 8cbfdd9d7..2af674a0f 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -86,8 +86,8 @@ export default {
 		this.table = new Tabulator(this.$refs.table, {
 			placeholder:"Keine zu bearbeitenden Datensätze",
 			movableColumns: true,
-			height: '50vh',
-			layout: "fitDataStretch", // TODO(chris): wont work when changed
+			maxHeight: '50vh',
+			layout: "fitDataFill", // TODO(chris): wont work when changed
 			ajaxURL: this.ajaxUrl,
 			persistence: { // NOTE(chris): do not store column titles
 				sort: true, //persist column sorting
@@ -214,6 +214,10 @@ export default {
 				}
 			}, {
 				field: 'actions',
+				frozen: true,
+				title: this.p.t('ui', 'aktion'),
+				headerFilter: false,
+				headerSort: false,				
 				formatter: (cell, formatterParams, onRendered) => {
 					let container = document.createElement('div'),
 						data = cell.getData();
@@ -325,9 +329,11 @@ export default {
 					}
 
 					// TODO(chris): not yet perfect
+					/*
 					onRendered(() => {
 						cell.getColumn().setWidth(true);
 					});
+					*/
 
 					return container;
 				}

From c1a53a1be352c20a89ab123797e0180a4dfb155f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 9 Oct 2023 11:47:02 +0200
Subject: [PATCH 061/149] do not use phrases from FHC_JS_PHRASES_STORAGE_OBJECT
 at all

---
 public/js/mixins/Phrasen.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
index bf11f8435..b94bc5702 100644
--- a/public/js/mixins/Phrasen.js
+++ b/public/js/mixins/Phrasen.js
@@ -59,13 +59,18 @@ const phrasen = {
 			return '';
 		}
 		if (!categories[category]) {
-
-			if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined)
-				categories[category] = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
+			
+			var initialval = '';
+  			if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined) {
+  				var category = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
+				if(category[phrase] !== undefined ) {
+					initialval = category[phrase];
+				}
+			}
 			
 			if (!categories[category] || Object.keys(categories[category]).length === 0) {
 				categories[category] = undefined;
-				let val = Vue.ref('');
+				let val = Vue.ref(initialval);
 				loadLazy(category, val, phrase, params);
 				return val;
 			}

From 17d5cff1784663d617c5f6b206cf3b84001df77b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 9 Oct 2023 15:13:00 +0200
Subject: [PATCH 062/149] slightly better css

---
 public/css/cis_bs5.css | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css
index d4fc7960c..4bc5a24f4 100644
--- a/public/css/cis_bs5.css
+++ b/public/css/cis_bs5.css
@@ -66,11 +66,30 @@ h6, .h6 {
 	font-size: var(--bs-body-font-size);
 }
 
-.fhc-container .tabulator .tabulator-frozen {
-	background-color: #fff !important;
+.fhc-container .tabulator {
+	border-left: 1px solid #dee2e6;
+}
+.fhc-container .tabulator .tabulator-row {
+	border-bottom: none;
+}
+.fhc-container .tabulator .tabulator-row .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row .tabulator-cell {
+	border-bottom: 1px solid #dee2e6;
+}
+.fhc-container .tabulator .tabulator-row.tabulator-row-even {
+	background-color: transparent;
+}
+.fhc-container .tabulator .tabulator-headers .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-cell {
+	background-color: #fff;
+}
+.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-cell {
+	background-color: #f2f2f2;
 }
 
-.fhc-container .tabulator .tabulator-header .tabulator-col,
-.fhc-container .tabulator-row .tabulator-cell {
+.fhc-container .tabulator .tabulator-col,
+.fhc-container .tabulator .tabulator-cell {
 	border-right: 1px solid #dee2e6;
 }

From c5b246dc8e132937e08937adae4d98109c22c5ce Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 10 Oct 2023 13:08:43 +0200
Subject: [PATCH 063/149] CSS table row hovering

---
 public/css/cis_bs5.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css
index 4bc5a24f4..48a5bfb1b 100644
--- a/public/css/cis_bs5.css
+++ b/public/css/cis_bs5.css
@@ -88,6 +88,10 @@ h6, .h6 {
 .fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-cell {
 	background-color: #f2f2f2;
 }
+.fhc-container .tabulator .tabulator-row.tabulator-selectable:hover .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row.tabulator-selectable:hover .tabulator-cell {
+	background-color: #ececec;
+}
 
 .fhc-container .tabulator .tabulator-col,
 .fhc-container .tabulator .tabulator-cell {

From 0a25982fa20ff95782d0137c464be909f6274a71 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 10 Oct 2023 13:09:28 +0200
Subject: [PATCH 064/149] Do not allow frozen columns to be invisible

---
 public/js/components/Studierendenantrag/Leitung/Table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 2af674a0f..d28b2e4ab 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -344,7 +344,7 @@ export default {
 			let columnData = [];
 			for (let col of columns) {
 				let def = col.getDefinition();
-				if (def.title) {
+				if (def.title && !def.frozen) {
 					columnData.push({
 						title: def.title,
 						visible: col.isVisible(),

From 5010a1653a382cc6f6a5855c63002b4c63c65b66 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 10 Oct 2023 13:09:43 +0200
Subject: [PATCH 065/149] cleaner config

---
 application/config/studierendenantrag.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
index 159ead759..c5ebc0d80 100644
--- a/application/config/studierendenantrag.php
+++ b/application/config/studierendenantrag.php
@@ -110,11 +110,10 @@ $config['abmeldung_job_deadline_date_modifier'] = '+2 weeks';
 
 /**
  * System User - uid of a user that is allowed to set prestudentstatus
- * TODO(chris): DEBUG! CHANGE THIS!
  *
  * @var string
  */
-$config['antrag_job_systemuser'] = 'ma0168';
+$config['antrag_job_systemuser'] = '';
 
 
 /**

From b5ce0ba7ed255b025a19ae30d96802dfafa15311 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 10 Oct 2023 13:12:51 +0200
Subject: [PATCH 066/149] Remove unnecessary comment

---
 public/js/components/Studierendenantrag/Leitung/Table.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index d28b2e4ab..18c72f762 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -328,13 +328,6 @@ export default {
 						container.append(button);
 					}
 
-					// TODO(chris): not yet perfect
-					/*
-					onRendered(() => {
-						cell.getColumn().setWidth(true);
-					});
-					*/
-
 					return container;
 				}
 			}]

From 6137cf3347a90755b158c84c62660f1e5921600e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 10 Oct 2023 14:11:21 +0200
Subject: [PATCH 067/149] Remove unnecessary comment

---
 public/js/components/Studierendenantrag/Leitung/Table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 18c72f762..ea8dae107 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -87,7 +87,7 @@ export default {
 			placeholder:"Keine zu bearbeitenden Datensätze",
 			movableColumns: true,
 			maxHeight: '50vh',
-			layout: "fitDataFill", // TODO(chris): wont work when changed
+			layout: "fitDataFill",
 			ajaxURL: this.ajaxUrl,
 			persistence: { // NOTE(chris): do not store column titles
 				sort: true, //persist column sorting

From ebdd6a2040d03b9ece17ed0cf0b20b71ba9de506 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 10 Oct 2023 14:16:32 +0200
Subject: [PATCH 068/149] =?UTF-8?q?Bug:=20Wiederholer=20Reminder=20werden?=
 =?UTF-8?q?=20nicht=20versandt=20-=20Fehlerquelle=20Datumsbereich=20wenn?=
 =?UTF-8?q?=20Pr=C3=BCfungen=20mehr=20als=20ein=20Monat=20verteilt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/jobs/AntragJob.php    | 75 +++++++++------
 .../models/education/Pruefung_model.php       | 96 +++++++++++++++----
 2 files changed, 122 insertions(+), 49 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 6bd4e29d6..6f5747232 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -426,40 +426,56 @@ class AntragJob extends JOB_Controller
 		$modifier_request_2 = $this->config->item('wiederholung_job_request_2_date_modifier');
 		$modifier_deadline = $this->config->item('wiederholung_job_deadline_date_modifier');
 
-		if ($modifier_deadline)
-		{
+		$digi_start = $this->config->item('digitalization_start');
+		if ($digi_start) {
+			try {
+				$digi_start = new DateTime($digi_start);
+			} catch(Exception $e) {
+			}
+		}
+
+		if ($modifier_deadline) {
 			$dateDeadline = new DateTime();
 			$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
+			
+			if ($digi_start)
+				$dateDeadline = max($digi_start, $dateDeadline);
+		} else {
+			$dateDeadline = $digi_start ?: null;
 		}
-		else
-			$dateDeadline = null;
 
 		//first request
-		if ($modifier_request_1)
-			$this->sendReminder(
-				'Request1',
-				null,
-				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
-				$dateDeadline,
-				$modifier_request_1,
-				$modifier_deadline,
-				'Aufforderung: Bekanntgabe Wiederholung'
-			);
-		else
+		if ($modifier_request_1) {
+			$dateStichtag = new DateTime();
+			$dateStichtag->sub(DateInterval::createFromDateString($modifier_request_1));
+			if (!$dateDeadline || $dateStichtag > $dateDeadline)
+				$this->sendReminder(
+					'Request1',
+					null,
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+					$dateDeadline,
+					$dateStichtag,
+					$modifier_deadline,
+					'Aufforderung: Bekanntgabe Wiederholung'
+				);
+		} else
 			$this->logError('Config "wiederholung_job_request_1_date_modifier" nicht gesetzt');
 
 		//second request
-		if ($modifier_request_2)
-			$this->sendReminder(
-				'Request2',
-				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
-				Studierendenantragstatus_model::STATUS_REQUESTSENT_2,
-				$dateDeadline,
-				$modifier_request_2,
-				$modifier_deadline,
-				'Reminder Aufforderung: Bekanntgabe Wiederholung'
-			);
-		else
+		if ($modifier_request_2) {
+			$dateStichtag = new DateTime();
+			$dateStichtag->sub(DateInterval::createFromDateString($modifier_request_2));
+			if (!$dateDeadline || $dateStichtag > $dateDeadline)
+				$this->sendReminder(
+					'Request2',
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_2,
+					$dateDeadline,
+					$dateStichtag,
+					$modifier_deadline,
+					'Reminder Aufforderung: Bekanntgabe Wiederholung'
+				);
+		} else
 			$this->logError('Config "wiederholung_job_request_2_date_modifier" nicht gesetzt');
 
 		$this->logInfo('Ende Job sendAufforderungWiederholer');
@@ -479,14 +495,11 @@ class AntragJob extends JOB_Controller
 		return $result;
 	}
 
-	protected function sendReminder($name, $status_from, $status_to, $deadline, $date_modifier, $modifier_deadline, $subject)
+	protected function sendReminder($name, $status_from, $status_to, $deadline, $date_stichtag, $modifier_deadline, $subject)
 	{
 		$this->logInfo('Start Job sendAufforderungWiederholer ' . $name);
 
-		$dateStichtag = new DateTime();
-		$dateStichtag->sub(DateInterval::createFromDateString($date_modifier));
-
-		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed($status_from, $dateStichtag, $deadline);
+		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed($status_from, $date_stichtag, $deadline);
 
 		if(isError($result))
 		{
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
index 813a74179..83bf9b7f8 100644
--- a/application/models/education/Pruefung_model.php
+++ b/application/models/education/Pruefung_model.php
@@ -117,8 +117,74 @@ class Pruefung_model extends DB_Model
         return $this->db->get_compiled_select($this->dbTable);
     }
 
+	/**
+	 * @return stdClass
+	 */
+	public function loadWhereCommitteeExamsFailed()
+	{
+		$this->dbTable = 'lehre.tbl_pruefung p';
+
+		$this->addSelect('p.datum');
+
+		$this->addJoin('lehre.tbl_note n', 'note');
+
+		$this->db->where("n.positiv", false);
+		$this->db->where_in("p.pruefungstyp_kurzbz", ['kommPruef','zusKommPruef']);
+
+		return $this->load();
+	}
 
 
+	/**
+	 * @return void
+	 */
+	protected function withDetailsForStudierendenAntrag()
+	{
+		$this->load->config('studierendenantrag');
+
+		$sprache_index = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
+
+		$this->addSelect('pers.vorname');
+		$this->addSelect('pers.nachname');
+		$this->addSelect('pers.person_id');
+		$this->addSelect('s.matrikelnr');
+		$this->addSelect('g.bezeichnung');
+		$this->addSelect('g.studiengang_kz');
+		$this->addSelect('o.bezeichnung_mehrsprachig[(' . $sprache_index . ')] AS orgform', false);
+		$this->addSelect('ps.prestudent_id');
+		$this->addSelect('lv.bezeichnung as lvbezeichnung');
+		$this->addSelect('le.studiensemester_kurzbz');
+		$this->addSelect('a.typ');
+		$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
+
+		$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
+		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
+		$this->addJoin('public.tbl_student s', 'student_uid');
+		$this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
+		$this->addJoin('public.tbl_person pers', 'person_id');
+		$this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+		$this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
+		$this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz');
+		$this->addJoin('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ=' . $this->escape(Studierendenantrag_model::TYP_WIEDERHOLUNG), 'LEFT');
+
+		$this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist'));
+
+		$this->db->where("g.aktiv", true);
+
+		$statusgruende = $this->config->item('status_gruende_wiederholer');
+		if (is_array($statusgruende) && !isEmptyArray($statusgruende)) {
+			foreach ($statusgruende as $k => $v) {
+				$statusgruende[$k] = $this->db->escape($v);
+			}
+			$this->db->where('lv.studiengang_kz NOT IN(
+				SELECT ps1.studiengang_kz
+				FROM
+				public.tbl_prestudent ps1
+				JOIN public.tbl_prestudentstatus pss USING (prestudent_id)
+				WHERE pss.statusgrund_id in (' . implode(',', $statusgruende) . ')
+				AND ps.prestudent_id = ps1.prestudent_id)', null, false);
+		}
+	}
 
 	/**
 	 * @param integer		$prestudent_id student_uid
@@ -127,23 +193,23 @@ class Pruefung_model extends DB_Model
 	 */
 	public function loadWhereCommitteeExamFailedForPrestudent($prestudent_id)
 	{
+		$this->withDetailsForStudierendenAntrag();
 
-		$sql = $this->loadWhereThreeExamsFailed();
+		$this->db->where('ps.prestudent_id', $prestudent_id);
 
-        $statusgruende = $this->config->item('status_gruende_wiederholer');
-        if (!is_array($statusgruende))
-            $statusgruende = [];
-
-        return $this->execQuery('select * from ( ' . $sql . ') temp where count >= 3 AND prestudent_id = ?', [
-			Studierendenantrag_model::TYP_WIEDERHOLUNG,
-			$statusgruende,
-			$prestudent_id
-		]);
+		return $this->loadWhereCommitteeExamsFailed();
 	}
 
+	/**
+	 * @param string		$status
+	 * @param \DateTime		$maxDate
+	 * @param \DateTime		$minDate
+	 *
+	 * @return stdClass
+	 */
 	public function getAllPrestudentsWhereCommitteeExamFailed($status, $maxDate, $minDate)
 	{
-		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+		$this->withDetailsForStudierendenAntrag();
 
 		if ($maxDate)
 			$this->db->where("p.datum < ", $maxDate->format('c'));
@@ -170,12 +236,6 @@ class Pruefung_model extends DB_Model
 			$this->db->where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status);
 		}
 
-		$sql = $this->loadWhereThreeExamsFailed();
-
-		$statusgruende = $this->config->item('status_gruende_wiederholer');
-		if (!is_array($statusgruende))
-			$statusgruende = [];
-
-		return $this->execQuery('select * from ( ' . $sql . ') temp where count >= 3', [Studierendenantrag_model::TYP_WIEDERHOLUNG, $statusgruende]);
+		return $this->loadWhereCommitteeExamsFailed();
 	}
 }

From 9db6874dc49bb31e7ab7f6ee5e0532e153bf6a33 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 11 Oct 2023 13:17:32 +0200
Subject: [PATCH 069/149] CSS for tabulator

---
 application/views/templates/FHC-Header.php |  2 +-
 public/css/Tabulator5.css                  | 37 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 public/css/Tabulator5.css

diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index aa63541c5..9637405f1 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -77,7 +77,7 @@
 			}
 
 			// Tabulator 5 CSS
-			if ($tabulator5 === true) generateCSSsInclude('vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css');
+			if ($tabulator5 === true) generateCSSsInclude('public/css/Tabulator5.css');
 
 			// Tinymce 4 CSS
 			if ($tinymce4 === true) generateCSSsInclude('public/css/TinyMCE4.css');
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
new file mode 100644
index 000000000..c6c4f925e
--- /dev/null
+++ b/public/css/Tabulator5.css
@@ -0,0 +1,37 @@
+@import '../../vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css';
+
+/* Apply borders and background to Cell instead of the Row
+ * otherwise frozen columns won't look good (columns behind
+ * will be partial visible)
+ */
+.tabulator-row {
+	border-bottom: none;
+}
+.tabulator-row .tabulator-frozen,
+.tabulator-row .tabulator-cell {
+	border-bottom: 1px solid #dee2e6;
+}
+.tabulator-row.tabulator-row-even {
+	background-color: transparent;
+}
+.tabulator-headers .tabulator-frozen,
+.tabulator-row.tabulator-row-odd .tabulator-frozen,
+.tabulator-row.tabulator-row-odd .tabulator-cell {
+	background-color: #fff;
+}
+.tabulator-row.tabulator-row-even .tabulator-frozen,
+.tabulator-row.tabulator-row-even .tabulator-cell {
+	background-color: #f2f2f2;
+}
+.tabulator-row.tabulator-selectable:hover .tabulator-frozen,
+.tabulator-row.tabulator-selectable:hover .tabulator-cell {
+	background-color: #ececec;
+}
+.tabulator-row.tabulator-selected .tabulator-frozen,
+.tabulator-row.tabulator-selected .tabulator-cell {
+	background-color: #9abcea;
+}
+.tabulator-row.tabulator-selected:hover .tabulator-frozen,
+.tabulator-row.tabulator-selected:hover .tabulator-cell {
+	background-color: #769bcc;
+}

From 16fdb0de690b3ffe0dc379f3a30f0c006629928b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 11 Oct 2023 13:17:45 +0200
Subject: [PATCH 070/149] cleanup

---
 public/js/components/filter/Filter/Columns.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/public/js/components/filter/Filter/Columns.js b/public/js/components/filter/Filter/Columns.js
index 8c26df984..47d66d5f1 100644
--- a/public/js/components/filter/Filter/Columns.js
+++ b/public/js/components/filter/Filter/Columns.js
@@ -38,9 +38,6 @@ export default {
 		return {
 			selectedFields: []
 		};
-	},
-	computed: {
-		
 	},
 	watch: {
 		selected(n) {
@@ -68,7 +65,7 @@ export default {
 				<div
 					v-for="fieldToDisplay in fields"
 					class="btn"
-					:class="selected.indexOf(fieldToDisplay) != -1 ? 'btn-dark' : 'btn-outline-dark' "
+					:class="selectedFields.indexOf(fieldToDisplay) != -1 ? 'btn-dark' : 'btn-outline-dark' "
 					@click="toggle(fieldToDisplay)"
 				>
 					{{ names[fieldToDisplay] || fieldToDisplay }}

From c3b6a77dadc2b6d3bc627b3ca39e58c485152428 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 11 Oct 2023 13:18:33 +0200
Subject: [PATCH 071/149] switch visibility only for not frozen columns with
 title

---
 public/js/components/filter/Filter.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 2b6a4fe6d..fc922eab5 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -147,6 +147,14 @@ export const CoreFilterCmpt = {
 
 			return columns;
 		},
+		fieldIdsForVisibilty() {
+			if (!this.tableBuilt)
+				return [];
+			return this.tabulator.getColumns().filter(col => {
+				let def = col.getDefinition();
+				return !def.frozen && def.title;
+			}).map(col => col.getField());
+		},
 		fieldNames() {
 			if (!this.tableBuilt)
 				return {};
@@ -539,7 +547,7 @@ export const CoreFilterCmpt = {
 				:id="'collapseColumns' + idExtra"
 				class="card-body collapse"
 				:data-bs-parent="'#filterCollapsables' + idExtra"
-				:fields="fields"
+				:fields="fieldIdsForVisibilty"
 				:selected="selectedFields"
 				:names="fieldNames"
 				@hide="tabulator.hideColumn($event)"

From af89ec394220845b606a1bfda54610a02c784083 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 11 Oct 2023 14:43:43 +0200
Subject: [PATCH 072/149] Bugfix: Phrasen: local variable has overwritten
 function parameter

---
 public/js/mixins/Phrasen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
index b94bc5702..3af8a6c92 100644
--- a/public/js/mixins/Phrasen.js
+++ b/public/js/mixins/Phrasen.js
@@ -62,9 +62,9 @@ const phrasen = {
 			
 			var initialval = '';
   			if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined) {
-  				var category = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
+  				var tmp_category = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
 				if(category[phrase] !== undefined ) {
-					initialval = category[phrase];
+					initialval = tmp_category[phrase];
 				}
 			}
 			

From 95d3b6ac5bdd74cdc90de547f14423b5d663d99f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 11 Oct 2023 14:57:44 +0200
Subject: [PATCH 073/149] Bugfix: Phrasen: local variable has overwritten
 function parameter

---
 public/js/mixins/Phrasen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
index 3af8a6c92..6c27f87bb 100644
--- a/public/js/mixins/Phrasen.js
+++ b/public/js/mixins/Phrasen.js
@@ -63,7 +63,7 @@ const phrasen = {
 			var initialval = '';
   			if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined) {
   				var tmp_category = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
-				if(category[phrase] !== undefined ) {
+				if(tmp_category[phrase] !== undefined ) {
 					initialval = tmp_category[phrase];
 				}
 			}

From 9d31cdffe6f67d45de4d3edf57014ffa6082efa9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 11 Oct 2023 14:59:54 +0200
Subject: [PATCH 074/149] Bugfix: handle reload event of Table.js

---
 public/js/components/Studierendenantrag/Leitung.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
index 747ad7123..da883acbc 100644
--- a/public/js/components/Studierendenantrag/Leitung.js
+++ b/public/js/components/Studierendenantrag/Leitung.js
@@ -347,6 +347,7 @@ export default {
 			@action:objectionDeny="actionoObjectionDeny"
 			@action:objectionApprove="actionObjectionApprove"
 			@action:cancel="actionCancel"
+			@reload="reload"
 			>
 		</leitung-table>
 

From 56f26e6ebe8163ac15727b400e032a57f3c0d426 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 11 Oct 2023 15:39:14 +0200
Subject: [PATCH 075/149] Bugfix: FilterCmpt: reload function

---
 public/js/components/filter/Filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index fc922eab5..77e3d7a60 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -181,7 +181,7 @@ export const CoreFilterCmpt = {
 	methods: {
 		reloadTable() {
 			if (this.tableOnly)
-				this.tabulator.reload();
+				this.tabulator.setData();
 			else
 				this.getFilter();
 		},

From b5c0c14e2aeca527d737c8753d4c347508f0c9d6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 11 Oct 2023 19:20:40 +0200
Subject: [PATCH 076/149] fix typo

---
 system/phrasesupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d405692ba..4567365c2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -21427,7 +21427,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Die Abmeldung vom Studium kann hier durchführt werden.',
+				'text' => 'Die Abmeldung vom Studium kann hier durchgeführt werden.',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From d06819f25fc6db54edd72a613364c8daf3ee6409 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Oct 2023 16:07:20 +0200
Subject: [PATCH 077/149] comment out info_ studierendenantrag phrase

---
 system/phrasesupdate.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4567365c2..0a8407ad7 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18936,6 +18936,9 @@ array(
 			)
 		)
 	),
+/*
+	// es kann fuer jede Kombination Typ und Status eine Phrase der Form info_<Typ>_<Status 
+	// erstellt werden, die dann in der Studierendenansicht in einer infobox angezeigt werden
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -18956,6 +18959,7 @@ array(
 			)
 		)
 	),
+*/
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',

From 60ee3ec8f0367ac22b28e6ebff246a3968ce893f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 16 Oct 2023 10:26:23 +0200
Subject: [PATCH 078/149] =?UTF-8?q?UID=20Generierung=20bei=20Incoming=20um?=
 =?UTF-8?q?=20Nachname,=20Vorname=20erg=C3=A4nzt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vilesci/personen/import/interessentenimport.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/vilesci/personen/import/interessentenimport.php b/vilesci/personen/import/interessentenimport.php
index 3cdfefb06..d1830eaeb 100644
--- a/vilesci/personen/import/interessentenimport.php
+++ b/vilesci/personen/import/interessentenimport.php
@@ -806,7 +806,12 @@ if (isset($_POST['save']))
 		$stg_obj = new studiengang();
 		$stg_obj->load(ltrim($stg,'0'));
 
-		$uid = generateUID($stg_obj->kurzbz,$jahr, $stg_obj->typ, $matrikelnr);
+		$nachname_clean = mb_strtolower(convertProblemChars($person->nachname));
+		$vorname_clean = mb_strtolower(convertProblemChars($person->vorname));
+		$nachname_clean = str_replace(' ','_', $nachname_clean);
+		$vorname_clean = str_replace(' ','_', $vorname_clean);
+
+		$uid = generateUID($stg_obj->kurzbz,$jahr, $stg_obj->typ, $matrikelnr, $vorname_clean, $nachname_clean);
 
 		//Benutzerdatensatz anlegen
 		$benutzer = new benutzer();
@@ -815,10 +820,6 @@ if (isset($_POST['save']))
 		$benutzer->aktiv = true;
 		$benutzer->aktivierungscode = generateActivationKey();
 
-		$nachname_clean = mb_strtolower(convertProblemChars($person->nachname));
-		$vorname_clean = mb_strtolower(convertProblemChars($person->vorname));
-		$nachname_clean = str_replace(' ','_', $nachname_clean);
-		$vorname_clean = str_replace(' ','_', $vorname_clean);
 
 		if (!defined('GENERATE_ALIAS_STUDENT') || GENERATE_ALIAS_STUDENT === true)
 		{

From 22d3b08a06367a8b92b87eee3d745a4fb8a20865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 16 Oct 2023 11:08:34 +0200
Subject: [PATCH 079/149] Escaping von LVs mit Sonderzeichen

---
 rdf/lehrveranstaltungszeugnis_ktu.rdf.php | 132 +++++++++++-----------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/rdf/lehrveranstaltungszeugnis_ktu.rdf.php b/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
index e065925e7..9696978b3 100644
--- a/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
+++ b/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
@@ -52,7 +52,7 @@ function breaktext($text, $zeichen)
 	$arr = explode(' ',$text);
 	$ret = '';
 	$teilstring='';
-	
+
 	foreach($arr as $elem)
 	{
 		if(strlen($teilstring.$elem)>$zeichen)
@@ -60,7 +60,7 @@ function breaktext($text, $zeichen)
 			$ret.=' '.$teilstring.'\n';
 			$teilstring=$elem;
 		}
-		else 
+		else
 			$teilstring .=' '.$elem;
 	}
 	$ret.=$teilstring;
@@ -72,9 +72,9 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 
 	if(isset($_GET['uid']))
 		$uid = $_GET['uid'];
-	else 
+	else
 		$uid = null;
-	
+
 	$uid_arr = explode(";",$uid);
 
 	if ($uid_arr[0] == "")
@@ -82,61 +82,61 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		unset($uid_arr[0]);
 		$uid_arr = array_values($uid_arr);
 	}
-	
+
 	$note_arr = array();
 	$note = new note();
 	$note->getAll($offiziell = true);
 	foreach ($note->result as $n){
 		$note_arr[$n->note] = $n->anmerkung;
-		$note_bezeichnung_arr[$n->note] = $n->bezeichnung;	
-	
+		$note_bezeichnung_arr[$n->note] = $n->bezeichnung;
+
 	}
 	if(isset($_GET['ss']))
 		$studiensemester_kurzbz = $_GET['ss'];
-	else 
+	else
 		die('Studiensemester muss uebergeben werden');
 
 	if(isset($_GET['lvid']))
 		$lehrveranstaltung_id = $_GET['lvid'];
-	else 
+	else
 		$lehrveranstaltung_id = 0;
-	
+
 	//Daten holen
 
-	$lqry = "SELECT 
-				tbl_person.titelpre, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpost 
-			FROM 
-				public.tbl_benutzer JOIN public.tbl_person using (person_id) 
-			WHERE 
-				tbl_benutzer.uid = (SELECT 
-										tbl_lehreinheitmitarbeiter.mitarbeiter_uid 
-									FROM 
-										lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehrfunktion USING(lehrfunktion_kurzbz), 
-										lehre.tbl_lehreinheit JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id) 
-									WHERE 
+	$lqry = "SELECT
+				tbl_person.titelpre, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpost
+			FROM
+				public.tbl_benutzer JOIN public.tbl_person using (person_id)
+			WHERE
+				tbl_benutzer.uid = (SELECT
+										tbl_lehreinheitmitarbeiter.mitarbeiter_uid
+									FROM
+										lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehrfunktion USING(lehrfunktion_kurzbz),
+										lehre.tbl_lehreinheit JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+									WHERE
 										tbl_lehreinheitmitarbeiter.lehreinheit_id = tbl_lehreinheit.lehreinheit_id AND
 										tbl_lehrveranstaltung.lehrveranstaltung_id = ".$db->db_add_param($lehrveranstaltung_id)." AND
 										tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
 									ORDER BY tbl_lehrfunktion.standardfaktor desc limit 1)";
-	
+
 	$leiter_titel = '';
 	$leiter_vorname = '';
 	$leiter_nachname = '';
 	$leiter_titelpost = '';
-	
+
 	if($db->db_query($lqry))
 	{
 		if ($lrow = $db->db_fetch_object())
 		{
-			$leiter_titel = $lrow->titelpre;			
+			$leiter_titel = $lrow->titelpre;
 			$leiter_vorname = $lrow->vorname;
-			$leiter_nachname = $lrow->nachname;	
-			$leiter_titelpost = $lrow->titelpost;	
-		}		
+			$leiter_nachname = $lrow->nachname;
+			$leiter_titelpost = $lrow->titelpost;
+		}
 	}
-		
-	$qry = "SELECT wochen FROM public.tbl_semesterwochen 
-						WHERE (studiengang_kz, semester) in (SELECT studiengang_kz, semester 
+
+	$qry = "SELECT wochen FROM public.tbl_semesterwochen
+						WHERE (studiengang_kz, semester) in (SELECT studiengang_kz, semester
 						FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id=".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER).")";
 	$wochen = 15;
 	if($result_wochen = $db->db_query($qry))
@@ -146,7 +146,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			$wochen = $row_wochen->wochen;
 		}
 	}
-	
+
 	$lehrveranstaltung=new lehrveranstaltung();
 	$lehrveranstaltung->load($lehrveranstaltung_id);
 	$sws=$lehrveranstaltung->semesterstunden/$wochen;
@@ -157,7 +157,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 	$lehrform = new lehrform($lehrform_kurzbz);
 	$lehrform_bezeichnung = $lehrform->bezeichnung;
 	$organisationseinheit = new organisationseinheit($lehrveranstaltung->oe_kurzbz);
-	
+
 	$lehreinheit=new lehreinheit();
 	$lehreinheit->load_lehreinheiten($lehrveranstaltung_id, $studiensemester_kurzbz);
 	if(count($lehreinheit->lehreinheiten)>=1)
@@ -169,11 +169,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$lehrfach_id='';
 		die('keine Lehreinheiten gefunden!');
 	}
-	
+
 	$lv_lehrfach=new lehrveranstaltung();
 	$lv_lehrfach->load($lehrfach_id);
 	$lehrfach_bezeichnung=$lv_lehrfach->bezeichnung;
-	
+
 /*	$lvqry = "SELECT * from lehre.tbl_lehrveranstaltung where lehrveranstaltung_id = ".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
 	if($db->db_query($lvqry))
 	{
@@ -182,43 +182,43 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			$sws = $lvrow->semesterstunden/$wochen;
 			$ects = $lvrow->ects;
 			$lvbezeichnung = $lvrow->bezeichnung;
-			$lvstg = $lvrow->studiengang_kz;			
-		}		
+			$lvstg = $lvrow->studiengang_kz;
+		}
 	} */
-	
+
 	$lehrinhalte = '';
 	$infoqry = "SELECT * FROM campus.tbl_lvinfo WHERE sprache='German' AND lehrveranstaltung_id = ".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
 	if($db->db_query($infoqry))
 	{
 		if ($inforow = $db->db_fetch_object())
 		{
-			$lehrinhalte_arr = explode("<br>",$inforow->lehrinhalte);			
+			$lehrinhalte_arr = explode("<br>",$inforow->lehrinhalte);
 			for ($i = 0; $i < sizeof($lehrinhalte_arr); $i++)
 			{
-				$lehrinhalte .= $lehrinhalte_arr[$i].'\n';			
+				$lehrinhalte .= $lehrinhalte_arr[$i].'\n';
 			}
-		}		
-	}	
-	
+		}
+	}
+
 	$xml = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>";
 	$xml .= "<zertifikate>";
-	
+
 	$studiensemester = new studiensemester();
 	$studiensemester->load($studiensemester_kurzbz);
-			
+
 	for ($i = 0; $i < sizeof($uid_arr); $i++)
 	{
 		$anzahl_fussnoten=0;
 		$studiengang_typ='';
 		$xml_fussnote='';
-		
+
 		$query = "SELECT mitarbeiter_uid FROM lehre.tbl_lehreinheit as le
 			JOIN lehre.tbl_pruefung as p USING(lehreinheit_id)
 			JOIN lehre.tbl_lehrveranstaltung as lv USING(lehrveranstaltung_id)
 			WHERE p.student_uid = ".$db->db_add_param($uid_arr[$i])."
 			AND le.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz)."
 			AND lv.lehrveranstaltung_id = ".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
-		
+
 		$pruefer_uid='';
 		$pruefer_name='';
 		if($db->db_query($query))
@@ -231,7 +231,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		if($pruefer_uid!='')
 		{
 			$pruefer = new mitarbeiter($pruefer_uid);
-			$pruefer_name = trim($pruefer->titelpre.' '.$pruefer->vorname.' '.$pruefer->nachname.' '.$pruefer->titelpost);			
+			$pruefer_name = trim($pruefer->titelpre.' '.$pruefer->vorname.' '.$pruefer->nachname.' '.$pruefer->titelpost);
 		}
 
 		$query = "SELECT tbl_student.matrikelnr, tbl_student.studiengang_kz, tbl_studiengang.typ, tbl_studiengang.bezeichnung, tbl_person.vorname, tbl_person.nachname,tbl_person.gebdatum,tbl_person.titelpre, tbl_person.titelpost, tbl_person.geschlecht, tbl_person.matr_nr FROM tbl_person, tbl_student, tbl_studiengang, tbl_benutzer WHERE tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz and tbl_student.student_uid = tbl_benutzer.uid and tbl_benutzer.person_id = tbl_person.person_id and tbl_student.student_uid = '".$uid_arr[$i]."'";
@@ -251,7 +251,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			$stgl_ma = new mitarbeiter($stgleiter_uid);
 			$stgl .= trim($stgl_ma->titelpre.' '.$stgl_ma->vorname.' '.$stgl_ma->nachname.' '.$stgl_ma->titelpost);
 		}
-		
+
 		$student=new student();
 		$student->load($uid_arr[$i]);
 		$prestudent=new prestudent();
@@ -261,11 +261,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		{
 			if($status->studienplan_bezeichnung != '')
 			    $studienplan_bezeichnung=$status->studienplan_bezeichnung;
-			
+
 			if($status->studienplan_id != NULL)
 			    $studienplan_id = $status->studienplan_id;
 		}
-		
+
 		$xml .= "\n	<zertifikat>";
 		$xml .= "\n		<studiensemester>".$studiensemester_kurzbz."</studiensemester>";
 		$xml .= "\n		<vorname>".$row->vorname."</vorname>";
@@ -279,8 +279,8 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$xml .= "\n		<studiengangsleiter>".$stgl."</studiengangsleiter>";
 		$datum_aktuell = date('d.m.Y');
 		$xml .= "\n		<ort_datum>Wien, am ".$datum_aktuell."</ort_datum>";
-		
-		
+
+
 		$obj = new zeugnisnote();
 		$obj->load($lehrveranstaltung_id, $uid_arr[$i], $studiensemester_kurzbz);
 
@@ -298,10 +298,10 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			$uebernahmedatum = "";
 			$benotungsdatum = "";
 		}
-		
+
 		$stg = new studiengang();
 		$stg->load($lvstg);
-                
+
                 $xml .= "				<stg_studiengang_bezeichnung>".$stg_oe_obj->bezeichnung."</stg_studiengang_bezeichnung>";
 		$xml .= "				<lv_studiengang_bezeichnung>".$stg->bezeichnung."</lv_studiengang_bezeichnung>";
 		$xml .= "				<lv_studiengang_typ>".$stg->typ."</lv_studiengang_typ>";
@@ -318,20 +318,20 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$xml .= "				<lehrform_kurzbz>".$lehrform_kurzbz."</lehrform_kurzbz>";
 		$xml .= "				<lehrform_bezeichnung>".$lehrform_bezeichnung."</lehrform_bezeichnung>";
 		$xml .= "				<sws>".($sws==0?'':number_format(sprintf('%.1F',$sws),1))."</sws>";
-		
+
 		$xml .= "				<lvleiter>".$leiter_titel." ".$leiter_vorname." ".$leiter_nachname.($leiter_titelpost!=''?', '.$leiter_titelpost:'')."</lvleiter>";
 		$xml .= "				<lehrinhalte><![CDATA[".clearHtmlTags($lehrinhalte)."]]></lehrinhalte>";
 		$xml .= "				<kompatible_lvs>";
-		
+
 		$lehrveranstaltung->getLVkompatibel($lehrveranstaltung_id);
 		foreach($lehrveranstaltung->lehrveranstaltungen as $lv_kompatibel)
 		{
-		    $xml .= "<lv>".$lv_kompatibel->bezeichnung."</lv>";
+		    $xml .= "<lv><![CDATA[".$lv_kompatibel->bezeichnung."]]></lv>";
 		}
 
 		$xml .= "	</kompatible_lvs>";
-                
-		
+
+
 		$anrechnung = new anrechnung();
 		$anrechnung->getAnrechnungPrestudent($student->prestudent_id, null, $lehrveranstaltung_id);
 
@@ -343,7 +343,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		    $xml .= $anrechnung->result[0]->lehrveranstaltung_bez;
 		}
 		$xml .= "</studienverpflichtung>";
-                
+
                 if($lehrveranstaltung_id_kompatibel != "")
                 {
                     $lv = new lehrveranstaltung($lehrveranstaltung_id_kompatibel);
@@ -352,11 +352,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
                         $ects = $lv->ects;
                     }
                 }
-                
+
                 $xml .= "				<ects>".number_format($ects,1)."</ects>";
 
 		$lehrveranstaltung->loadLehrveranstaltungStudienplan($studienplan_id);
-		
+
 		$studienplan_lehrveranstaltung_id = "";
 		foreach($lehrveranstaltung->lehrveranstaltungen as $lv)
 		{
@@ -366,7 +366,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			break;
 		    }
 		}
-		
+
 		$studienplan = new studienplan();
 		if($studienplan_lehrveranstaltung_id != "")
 		{
@@ -384,11 +384,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		{
 		    $lehrveranstaltung->lehrveranstaltungen = array();
 		}
-		
+
 //		$return = $lehrveranstaltung->getLVFromStudienplanByLehrtyp($studienplan_id, "modul");
 
 		$xml .= "	<module>";
-		
+
 		//Variable wird zur korrekten Darstellung im Dokument benötigt
 		$count=0;
 		foreach($lehrveranstaltung->lehrveranstaltungen as $modul)
@@ -411,4 +411,4 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 	$xml .= "</zertifikate>";
 	echo $xml;
 }
-?>
\ No newline at end of file
+?>

From 6a008fc5dada64e4fac3d91507fcdd8b553940d3 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 17 Oct 2023 16:38:05 +0200
Subject: [PATCH 080/149] - filter hinzugefuegt

---
 include/prestudent.class.php   | 39 ++++++++++++++++++++++++++
 rdf/lehrverbandsgruppe.rdf.php | 51 ++++++++++++++++++++++++++++++++--
 rdf/student.rdf.php            |  2 +-
 3 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 557412413..06b974b1a 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -906,6 +906,45 @@ class prestudent extends person
 							AND tbl_reihungstest.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
 					)";
 				break;
+			case "bewerberrtangemeldetteilgenommen":
+				$qry.=" AND a.rolle='Bewerber'
+					AND EXISTS (
+						SELECT
+							1
+						FROM
+							public.tbl_rt_person
+							JOIN public.tbl_reihungstest ON (rt_id = reihungstest_id)
+						WHERE
+							person_id=a.person_id
+							AND studienplan_id IN (
+								SELECT studienplan_id FROM lehre.tbl_studienplan
+								JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+								WHERE tbl_studienordnung.studiengang_kz=a.studiengang_kz
+							)
+							AND tbl_reihungstest.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
+					)
+					AND reihungstestangetreten = true";
+				break;
+			case "bewerberrtangemeldetnichtteilgenommen":
+				$qry.=" AND a.rolle='Bewerber'
+					AND EXISTS (
+						SELECT
+							1
+						FROM
+							public.tbl_rt_person
+							JOIN public.tbl_reihungstest ON (rt_id = reihungstest_id)
+						WHERE
+							person_id=a.person_id
+							AND studienplan_id IN (
+								SELECT studienplan_id FROM lehre.tbl_studienplan
+								JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+								WHERE tbl_studienordnung.studiengang_kz=a.studiengang_kz
+							)
+							AND tbl_reihungstest.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
+					)
+					AND reihungstestangetreten = false
+					";
+				break;
 			case "zgv":
 				$stg_obj = new studiengang();
 				$stg_obj->load($studiengang_kz);
diff --git a/rdf/lehrverbandsgruppe.rdf.php b/rdf/lehrverbandsgruppe.rdf.php
index 19affa245..755444b6d 100644
--- a/rdf/lehrverbandsgruppe.rdf.php
+++ b/rdf/lehrverbandsgruppe.rdf.php
@@ -309,6 +309,24 @@ function draw_orgformsubmenu($stg_kz, $orgform)
 						<VERBAND:orgform><![CDATA['.$orgform.']]></VERBAND:orgform>
 					</RDF:Description>
 
+					<RDF:Description RDF:about="'.$rdf_url.$stg_kurzbz.'/'.$orgform.'/'.$stsem->studiensemester_kurzbz.'/bewerber/reihungstestangemeldet/teilgenommen" >
+						<VERBAND:name>Teilgenommen</VERBAND:name>
+						<VERBAND:stg><![CDATA['.$stg_kurzbz.']]></VERBAND:stg>
+						<VERBAND:stg_kz><![CDATA['.$stg_kz.']]></VERBAND:stg_kz>
+						<VERBAND:stsem><![CDATA['.$stsem->studiensemester_kurzbz.']]></VERBAND:stsem>
+						<VERBAND:typ>bewerberrtangemeldetteilgenommen</VERBAND:typ>
+						<VERBAND:orgform><![CDATA['.$orgform.']]></VERBAND:orgform>
+					</RDF:Description>
+					
+					<RDF:Description RDF:about="'.$rdf_url.$stg_kurzbz.'/'.$orgform.'/'.$stsem->studiensemester_kurzbz.'/bewerber/reihungstestangemeldet/nichtteilgenommen" >
+						<VERBAND:name>Nicht teilgenommen</VERBAND:name>
+						<VERBAND:stg><![CDATA['.$stg_kurzbz.']]></VERBAND:stg>
+						<VERBAND:stg_kz><![CDATA['.$stg_kz.']]></VERBAND:stg_kz>
+						<VERBAND:stsem><![CDATA['.$stsem->studiensemester_kurzbz.']]></VERBAND:stsem>
+						<VERBAND:typ>bewerberrtangemeldetnichtteilgenommen</VERBAND:typ>
+						<VERBAND:orgform><![CDATA['.$orgform.']]></VERBAND:orgform>
+					</RDF:Description>
+
 					<RDF:Description RDF:about="'.$rdf_url.$stg_kurzbz.'/'.$orgform.'/'.$stsem->studiensemester_kurzbz.'/aufgenommen" >
 						<VERBAND:name>Aufgenommen</VERBAND:name>
 						<VERBAND:stg><![CDATA['.$stg_kurzbz.']]></VERBAND:stg>
@@ -366,7 +384,14 @@ function draw_orgformsubmenu($stg_kz, $orgform)
 			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li>";
 			$orgform_sequence[$stg_kz].= "\n\t\t\t\t<RDF:Seq RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber\">\n";
 			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber/reihungstestnichtangemeldet\" />\n";
-			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet\" />\n";
+			
+			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li>";
+			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:Seq RDF:about=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet\">\n";
+			$orgform_sequence[$stg_kz].= "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet/reihungstestnichtangemeldet/teilgenommen\" />\n";
+			$orgform_sequence[$stg_kz].= "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet/reihungstestnichtangemeldet/nichtteilgenommen\" />\n";
+			$orgform_sequence[$stg_kz].= "\t\t\t\t</RDF:Seq>";
+			$orgform_sequence[$stg_kz].= "\n\t\t\t</RDF:li>\n";
+			
 			$orgform_sequence[$stg_kz].= "\t\t\t\t</RDF:Seq>";
 			$orgform_sequence[$stg_kz].= "\n\t\t\t</RDF:li>\n";
 			
@@ -663,6 +688,22 @@ while ($row=$dbo->db_fetch_object())
 				<VERBAND:stsem><![CDATA[<?php echo $stsem->studiensemester_kurzbz; ?>]]></VERBAND:stsem>
 				<VERBAND:typ><![CDATA[bewerberrtangemeldet]]></VERBAND:typ>
 			</RDF:Description>
+			
+			<RDF:Description RDF:about="<?php echo $rdf_url.$stg_kurzbz.'/'.$stsem->studiensemester_kurzbz.'/bewerber/reihungstestangemeldet/teilgenommen'; ?>" >
+				<VERBAND:name><![CDATA[Teilgenommen]]></VERBAND:name>
+				<VERBAND:stg><![CDATA[<?php echo $stg_kurzbz; ?>]]></VERBAND:stg>
+				<VERBAND:stg_kz><![CDATA[<?php echo $row->studiengang_kz; ?>]]></VERBAND:stg_kz>
+				<VERBAND:stsem><![CDATA[<?php echo $stsem->studiensemester_kurzbz; ?>]]></VERBAND:stsem>
+				<VERBAND:typ><![CDATA[bewerberrtangemeldetteilgenommen]]></VERBAND:typ>
+			</RDF:Description>
+			
+			<RDF:Description RDF:about="<?php echo $rdf_url.$stg_kurzbz.'/'.$stsem->studiensemester_kurzbz.'/bewerber/reihungstestangemeldet/nichtteilgenommen'; ?>" >
+				<VERBAND:name><![CDATA[Nicht teilgenommen]]></VERBAND:name>
+				<VERBAND:stg><![CDATA[<?php echo $stg_kurzbz; ?>]]></VERBAND:stg>
+				<VERBAND:stg_kz><![CDATA[<?php echo $row->studiengang_kz; ?>]]></VERBAND:stg_kz>
+				<VERBAND:stsem><![CDATA[<?php echo $stsem->studiensemester_kurzbz; ?>]]></VERBAND:stsem>
+				<VERBAND:typ><![CDATA[bewerberrtangemeldetnichtteilgenommen]]></VERBAND:typ>
+			</RDF:Description>
 
 			<RDF:Description RDF:about="<?php echo $rdf_url.$stg_kurzbz.'/'.$stsem->studiensemester_kurzbz.'/aufgenommen'; ?>" >
 				<VERBAND:name><![CDATA[Aufgenommen]]></VERBAND:name>
@@ -876,7 +917,13 @@ draw_orgformpart($stg_kz);
 					echo "\t\t\t<RDF:li>";
 					echo "\t\t\t\t<RDF:Seq RDF:about=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber\">\n";
 					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber/reihungstestnichtangemeldet\" />\n";
-					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet\" />\n";
+					echo "\t\t\t<RDF:li>";
+					echo "\t\t\t\t<RDF:Seq RDF:about=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet\">\n";
+					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet/teilgenommen\" />\n";
+					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet/nichtteilgenommen\" />\n";
+					echo "\t\t\t\t</RDF:Seq>";
+					echo "\n\t\t\t</RDF:li>\n";
+					
 					echo "\t\t\t\t</RDF:Seq>";
 					echo "\n\t\t\t</RDF:li>\n";
 
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 1625f161c..2352efe9b 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -736,7 +736,7 @@ if($xmlformat=='rdf')
 		}
 	}
 	elseif(in_array($typ, array('prestudent', 'interessenten', 'bewerber', 'aufgenommen',
-		'warteliste', 'absage', 'zgv', 'reihungstestangemeldet', 'reihungstestnichtangemeldet', 'absolvent',
+		'warteliste', 'absage', 'zgv', 'reihungstestangemeldet', 'reihungstestnichtangemeldet', 'bewerberrtangemeldetteilgenommen', 'bewerberrtangemeldetnichtteilgenommen','absolvent',
 		'diplomand', 'bewerbungnichtabgeschickt', 'bewerbungabgeschickt', 'statusbestaetigt', 'statusbestaetigtrtnichtangemeldet', 'statusbestaetigtrtangemeldet', 'bewerberrtangemeldet', 'bewerberrtnichtangemeldet')))
 	{
 		$prestd = new prestudent();

From 548a3e39b9df2fac0899d9cc8b8bca59e6242970 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 20 Oct 2023 15:50:48 +0200
Subject: [PATCH 081/149] change label

---
 locale/de-AT/fas.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/de-AT/fas.dtd b/locale/de-AT/fas.dtd
index 53008a4e6..3fd593833 100644
--- a/locale/de-AT/fas.dtd
+++ b/locale/de-AT/fas.dtd
@@ -212,7 +212,7 @@
 		<!ENTITY menu-dokumente-diplsupplement.accesskey	"S">
 
 		<!ENTITY menu-dokumente-antrag.key		"N">
-		<!ENTITY menu-dokumente-antrag.label	"Antrag">
+		<!ENTITY menu-dokumente-antrag.label	"Verwaltung des Studierendenstatus">
 		<!ENTITY menu-dokumente-antrag.accesskey	"N">
 
 		<!ENTITY menu-dokumente-antrag-abmeldung.key		"A">

From a1ee027ea4d2f6893e367a51fa618e85ac141290 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 23 Oct 2023 09:51:04 +0200
Subject: [PATCH 082/149] - phrasen

---
 system/phrasesupdate.php | 665 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 665 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0a8407ad7..2c18f3afd 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -4154,6 +4154,671 @@ When on hold, the date is only a reminder.',
 			)
 		)
 	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'rechnungsnummer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rechnungsnummer',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invoice Number',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'date',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rechnungsnummer',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invoice Number',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faelligam',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fällig am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Due on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'gesamtbetrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gesamtbetrag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Total amount',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'rechnungsempfaenger',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rechnungsempfänger',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invoice recipient',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'rechnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rechnungsempfänger',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invoice',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'studiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Semester',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'bezeichnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bezeichnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Title',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'datum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'zahlungsbestaetigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zahlungsbestätigung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Payment confirmation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'bewerbung',
+		'phrase' => 'erklaerungInvoices',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ablauf und Zahlungsbedingungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'rechnungserklaerung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wir möchten Sie darauf aufmerksam machen, dass bei der Überweisung *immer* die Rechnungsnummer als Zahlungsreferenz anzuführen ist.
+						Andernfalls erfolgt keine automatische Zahlungszuordnung und es kann zu einer Verzögerung der Darstellung des aktuellen Zahlungsstatus
+						der Rechnung im CIS kommen.
+						<br/>
+						<br/>
+						Im Falle dass der Betrag an ein falsches Konto überwiesen wurde, bitten wir Sie höflichst sich an Ihre Bank zu wenden.
+						<br/>
+						<br/>
+						Jede Rechnung gilt als "Bezahlt", wenn der Gesamtbetrag vollständig auf unser Konto eingelangt ist.
+						<br/>
+						<br/>',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'kontoinfotitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontoinformationen der FHTW',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'kontoinfobody',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sämtliche Zahlungen sind an die nachstehende Kontonummer zu leisten und die Rechnungsnummer muss als Zahlungsreferenz eingegeben werden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'kontoinfoausland',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Auslandsüberweisungen:
+											<br/>
+											Bei Auslandsüberweisungen sind die Spesenkosten von den
+											<br/>
+											Zahlenden zusätzlich zu den Rechnungsbeträgen zu zahlen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'rechnungtitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rechnungen & Zahlungsbestätigungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq0frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Warum ist die Einzahlung trotz Einzahlung noch offen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq0antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der häufigste Grund für diesen Fall ist, dass bei der Überweisung nicht die Rechnungsnummer als Zahlungsreferenz eingegeben wird.
+Wir bitten Sie höflichst in diesem Fall eine Mail an <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a> mit Zahlungsbestätigung zu senden.
+Die Transaktion und die Bearbeitung der Zahlung, kann bis zu sechs Werktage dauern.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq1frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ich habe keine Rechnung erhalten, was tun?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq1antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'In diesem Fall ist der Spam-Ordner zu kontrollieren. Falls die Rechnung nicht übermittelt wurde ersuchen wir um Information an <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a>.
+Die Rechnung wird Ihnen erneut zugesendet. <u><strong>Erst nach Erhalt der Rechnung ist der Betrag zu überweisen</strong></u>',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq2frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Refundierung des Studienbeitrags',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq2antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Studienbeitrag wird nicht rückerstattet, wenn…
+-Anfänger*innen, die ihren Studienplatz nach Semesterbeginn (1. September / 16. Februar) nicht in Anspruch nehmen
+-Studierende, die ihr Studium nach Semesterbeginn (1. September / 16. Februar) abbrechen.
+
+-Unterbrechung vor dem 15.10. bzw. 15.3.: Studienbeitrag wird rückerstattet
+-Unterbrechung nach dem 15.10. bzw. 15.3.: Studienbeitrag wird nicht rückerstattet
+-in den Folgesemestern der Unterbrechung sind keine Studienbeiträge zu zahlen; der ÖHBeitrag ist jedoch in jedem Semester der Unterbrechung zu zahlen',
+			'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq3frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie sind vom Studienbeitrag befreit und haben eine Rechnung für den Studienbeitrag bekommen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq3antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Treten Sie bitte in Kontakt mit Ihrer Studiengangsassistenz. Die offene Rechnung wird storniert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq4frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mir ist ein Fehler bei der Überweisung unterlaufen, was tun?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq4antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte den Fehler an <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a> melden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq5frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Eine Rechnung wurde zwei Mal überwiesen, was tun?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq5antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Falls eine Rechnung doppelt überwiesen wurde, bitten wir Sie dies an <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a> zu melden. Wir werden Ihnen eine Zahlung refundieren.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq6frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es stehen mehrere Positionen auf der Rechnung – soll für jede Position eine Überweisung durchgeführt werden?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq6antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nein, es ist immer der auf der Rechnung ausgewiesene Gesamtbetrag zu überweisen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq7frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wann kann der Betrag überwiesen werden?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq7antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wir möchten Sie darauf hinweisen, dass Überweisungen erst bei Erhalt der Rechnung durchzuführen sind. Bitte um Angabe der Rechnungsnummer als Zahlungsreferenz.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	
 	array(
 		'app' => 'core',
 		'category' => 'password',

From 01ca5831677f2ec95f8b48c84666a8166c1d095c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 23 Oct 2023 15:02:34 +0200
Subject: [PATCH 083/149] Vertragsstunden werden auf 2 Nachkommastellen
 gerundet anstatt auf 1

---
 .../views/lehre/lehrauftrag/acceptLehrauftragData.php  |  6 +++---
 .../views/lehre/lehrauftrag/approveLehrauftragData.php |  6 +++---
 .../views/lehre/lehrauftrag/orderLehrauftragData.php   | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
index 92c896ce7..26a05c30b 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
@@ -142,7 +142,7 @@ FROM
                         WHEN oe.organisationseinheittyp_kurzbz = \'Department\' THEN (\'DEP \' || oe.bezeichnung)
                         ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
                         END                                             AS "lv_oe_kurzbz",
-                    TRUNC(lema.semesterstunden, 1)                      AS "stunden",
+                    TRUNC(lema.semesterstunden, 2)                      AS "stunden",
                     TRUNC((lema.semesterstunden * lema.stundensatz), 2) AS "betrag",
                     vertrag_id,
                     vertragsstunden                                     AS "vertrag_stunden",
@@ -375,9 +375,9 @@ $filterWidgetArray = array(
         orgform_kurzbz: {visible: false, headerFilter:"input"},
         person_id: {visible: false, headerFilter:"input"},
         lv_oe_kurzbz: {visible: false, headerFilter:"input"},
-        stunden: {align:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:1},
+        stunden: {align:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:2},
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
-            bottomCalc:"sum", bottomCalcParams:{precision:1}
+            bottomCalc:"sum", bottomCalcParams:{precision:2}
 		},
         betrag: {align:"right", formatter: form_formatNulltoStringNumber,
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragData.php b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
index 0414ddbf6..4f0c61193 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
@@ -149,7 +149,7 @@ FROM
                     ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
                     END                                             AS "lv_oe_kurzbz",
                 (person.nachname || \' \' || person.vorname)        AS "lektor",
-                TRUNC(lema.semesterstunden, 1)                      AS "stunden",
+                TRUNC(lema.semesterstunden, 2)                      AS "stunden",
                 lema.stundensatz,
                 TRUNC((lema.semesterstunden * lema.stundensatz), 2) AS "betrag",
                 vertrag_id,
@@ -400,9 +400,9 @@ $filterWidgetArray = array(
         person_id: {visible: false, headerFilter:"input"},
         lv_oe_kurzbz: {visible: false, headerFilter:"input"},
         lektor: {headerFilter:"input", widthGrow: 2},
-        stunden: {align:"right",  formatter: form_formatNulltoStringNumber, formatterParams:{precision:1},
+        stunden: {align:"right",  formatter: form_formatNulltoStringNumber, formatterParams:{precision:2},
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
-            bottomCalc:"sum", bottomCalcParams:{precision:1}},
+            bottomCalc:"sum", bottomCalcParams:{precision:2}},
 		stundensatz: {visible: true, align:"right", formatter: form_formatNulltoStringNumber,
 			headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator},
         betrag: {align:"right", formatter: form_formatNulltoStringNumber,
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragData.php b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
index 5a2ad98bd..48afd72a6 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
@@ -179,7 +179,7 @@ FROM
                     ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
                     END                                             AS "lv_oe_kurzbz",
                 (person.nachname || \' \' || person.vorname)        AS "lektor",
-                TRUNC(lema.semesterstunden, 1)                      AS "stunden",
+                TRUNC(lema.semesterstunden, 2)                      AS "stunden",
                 lema.stundensatz,
                 TRUNC((lema.semesterstunden * lema.stundensatz), 2) AS "betrag",
                 vertrag_id,
@@ -219,7 +219,7 @@ FROM
             (SELECT
                  uid
              FROM
-                 public.tbl_benutzer JOIN public.tbl_mitarbeiter ma 
+                 public.tbl_benutzer JOIN public.tbl_mitarbeiter ma
                     ON tbl_benutzer.uid = ma.mitarbeiter_uid
              WHERE
                  person_id = tmp_projektbetreuung.person_id
@@ -414,7 +414,7 @@ $filterWidgetArray = array(
         row_index: {visible: false},
         personalnummer: {visible: false, headerFilter:"input"},
 		auftrag: {
-			headerFilter:"input", widthGrow: 2, 
+			headerFilter:"input", widthGrow: 2,
 			bottomCalc:"count", bottomCalcFormatter:function(cell){return "'. ucfirst($this->p->t('global', 'anzahl')). ': " + cell.getValue();}
 		},
 		stg_typ_kurzbz: {headerFilter:"input"},
@@ -432,9 +432,9 @@ $filterWidgetArray = array(
         person_id: {visible: false, headerFilter:"input"},
         lv_oe_kurzbz: {headerFilter:"input"},
         lektor: {headerFilter:"input", widthGrow: 2},
-        stunden: {align:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:1},
+        stunden: {align:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:2},
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
-            bottomCalc:"sum", bottomCalcParams:{precision:1}},
+            bottomCalc:"sum", bottomCalcParams:{precision:2}},
         stundensatz: {visible: true, align:"right", formatter: form_formatNulltoStringNumber,
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator},
         betrag: {align:"right", formatter: form_formatNulltoStringNumber,

From c9331771b3e8f31d94c90e2b6308e555599ebec5 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Mon, 23 Oct 2023 16:39:33 +0200
Subject: [PATCH 084/149] lock Prestudentstatus after Bismeldestichtag in FAS:
 possible to edit student with prestudentstatus check permission, all fields
 are greyed out when not editable, changed BIS-Meldestichtagsverwaltung menu
 point text

---
 application/config/navigation.php          |  2 +-
 content/student/studentrolledialog.xul.php | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/application/config/navigation.php b/application/config/navigation.php
index c61b6de4f..3680930d0 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -35,7 +35,7 @@ $config['navigation_header'] = array(
 				'bismeldestichtagsverwaltung' => array(
 					'link' => site_url('codex/Bismeldestichtag'),
 					'icon' => '',
-					'description' => 'Bismeldestichtagsverwaltung',
+					'description' => 'BIS-Meldestichtagsverwaltung',
 					'expand' => true,
 					'sort' => 30,
 					'requiredPermissions' => 'admin:w'
diff --git a/content/student/studentrolledialog.xul.php b/content/student/studentrolledialog.xul.php
index 7e2177a90..88a357b6a 100644
--- a/content/student/studentrolledialog.xul.php
+++ b/content/student/studentrolledialog.xul.php
@@ -66,6 +66,10 @@ else
 
 $vorname = '';
 $nachname = '';
+
+$user=get_uid();
+$db = new basis_db();
+
 if($prestudent_id!='')
 {
 	$prestudent = new prestudent();
@@ -75,11 +79,14 @@ if($prestudent_id!='')
 	$nachname = $prestudent->nachname;
 
 	// Prüfen, ob Studnetrolle vor dem aktuellen Meldestichtag ist. In diesem Fall darf die Rolle nicht mehr bearbeitet werden.
+	$rechte = new benutzerberechtigung();
+	$rechte->getBerechtigungen($user);
+
 	$bismeldestichtag = new bismeldestichtag();
-	$disabled = $bismeldestichtag->checkMeldestichtagErreicht($datum) ? ' disabled="true"' : '';
+	$disabled = $bismeldestichtag->checkMeldestichtagErreicht($datum) && !$rechte->isBerechtigt('student/keine_studstatuspruefung', null, 'suid')
+		? ' disabled="true"'
+		: '';
 }
-$db = new basis_db();
-$user=get_uid();
 ?>
 
 <window id="student-rolle-dialog" title="Status"
@@ -234,7 +241,7 @@ $user=get_uid();
 				</row>
 				<row>
 					<label value="Aufnahmestufe"/>
-					<menulist id="student-rolle-menulist-stufe" disabled="false">
+					<menulist id="student-rolle-menulist-stufe" <?php echo empty($disabled) ? 'disabled="false"' : $disabled ?>>
 						<menupopup>
 							<menuitem value="" label="-- keine Auswahl --"/>
 							<menuitem value="1" label="1"/>
@@ -247,7 +254,7 @@ $user=get_uid();
 					<label value="Grund"/>
 					<menulist id="student-rolle-menulist-statusgrund"
 					          datasources="rdf:null" flex="1"
-					          ref="http://www.technikum-wien.at/statusgrund" >
+					          ref="http://www.technikum-wien.at/statusgrund"<?php echo $disabled ?> >
 						<template>
 							<menupopup>
 								<menuitem value="rdf:http://www.technikum-wien.at/statusgrund/rdf#statusgrund_id"

From aead4f3380a0d8e91f418d31a6ccf384a7cf58d1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 24 Oct 2023 10:44:17 +0200
Subject: [PATCH 085/149] =?UTF-8?q?Assistenz=20als=20CC=20zu=20SammelmailS?=
 =?UTF-8?q?TGL=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/jobs/AntragJob.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 6f5747232..d435f1818 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -166,8 +166,12 @@ class AntragJob extends JOB_Controller
 
 			$data['table'] = $data['table_' . DEFAULT_LANGUAGE];
 
+			//Mail an Stgl und Assistenz
+			$to = $leitung['Details']->uid . '@' . DOMAIN;
+			$cc = $leitung['Details']->email;
+
 			// NOTE(chris): Sancho mail
-			if (sendSanchoMail("Sancho_Mail_Antrag_Stgl", $data, $leitung['Details']->uid . '@' . DOMAIN, 'Anträge - Aktion(en) erforderlich'))
+			if (sendSanchoMail("Sancho_Mail_Antrag_Stgl", $data, $to, 'Anträge - Aktion(en) erforderlich', DEFAULT_SANCHO_HEADER_IMG, DEFAULT_SANCHO_FOOTER_IMG, '', $cc))
 				$count++;
 		}
 

From 73cbaf77f171efabe415d202f5e1722afec8e738 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Oct 2023 14:16:13 +0200
Subject: [PATCH 086/149] CSV Options adjusted for German MS Office

---
 public/js/components/Studierendenantrag/Leitung/Table.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index ea8dae107..aa1bc3734 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -44,7 +44,10 @@ export default {
 			this.table.replaceData(this.ajaxUrl + (stg || ''));
 		},
 		download() {
-			this.table.download("csv", "data.csv");
+			this.table.download("csv", "data.csv", {
+				delimiter: ';',
+				bom: true
+			});
 		},
 		getHistory() {
 			if (this.lastHistoryClickedId === null)

From 684a741f2a86b2ffa56d70f299d0cb73a73e643a Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 31 Oct 2023 08:33:10 +0100
Subject: [PATCH 087/149] - bugfix

---
 application/models/crm/Rueckstellung_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/crm/Rueckstellung_model.php b/application/models/crm/Rueckstellung_model.php
index d2c39ffde..c84c625eb 100644
--- a/application/models/crm/Rueckstellung_model.php
+++ b/application/models/crm/Rueckstellung_model.php
@@ -20,7 +20,7 @@ class Rueckstellung_model extends DB_Model
 		$this->addLimit(1);
 		$this->addJoin('tbl_rueckstellung_status', 'status_kurzbz');
 		$this->addSelect('*,
-							array_to_json(bezeichnung_mehrsprachig::varchar[])->>'.$language_index . 'as bezeichnung');
+							array_to_json(bezeichnung_mehrsprachig::varchar[])->>'.$language_index . ' as bezeichnung');
 		$this->addOrder('datum_bis', 'DESC');
 		
 		$where['person_id'] = $person_id;

From ccace2f826533094f6475afb6f4c5dc867cadab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 31 Oct 2023 11:16:53 +0100
Subject: [PATCH 088/149] Fehler beim Laden der Lehrauftragsliste korrigiert
 mit Postgres15

---
 application/views/lehre/lehrauftrag/orderLehrauftragData.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragData.php b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
index 48afd72a6..85b663d4a 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
@@ -159,7 +159,7 @@ FROM
         (
             SELECT
                 /* lehrauftraege also planned with dummies, therefore personalnummer is needed */
-                ma.personalnummer,
+                ma.personalnummer::text,
                 lema.lehreinheit_id,
                 lv.lehrveranstaltung_id,
                 lv.bezeichnung                                      AS "lv_bezeichnung",
@@ -272,7 +272,7 @@ FROM
                     pa.lehreinheit_id,
                     lv.lehrveranstaltung_id,
                     lv.bezeichnung                                                                      AS "lv_bezeichnung",
-                    pa.projektarbeit_id                                                                 AS "projektarbeit_id",
+                    pa.projektarbeit_id::text                                                                 AS "projektarbeit_id",
                     le.studiensemester_kurzbz,
                     stg.studiengang_kz,
                     upper(stg.typ || stg.kurzbz)                                                        AS "stg_typ_kurzbz",

From fdb4eb5e7db41fcb602dc34086c5ff17f480fd26 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 31 Oct 2023 13:16:25 +0100
Subject: [PATCH 089/149] Link Stgl Sammelmail

---
 application/controllers/jobs/AntragJob.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index d435f1818..8d55faf42 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -165,6 +165,7 @@ class AntragJob extends JOB_Controller
 			}
 
 			$data['table'] = $data['table_' . DEFAULT_LANGUAGE];
+			$data['leitungLink'] = CIS_ROOT. 'index.ci.php/lehre/Studierendenantrag/leitung';
 
 			//Mail an Stgl und Assistenz
 			$to = $leitung['Details']->uid . '@' . DOMAIN;

From 8971f79a77f76f51a8b7d6104e41bb51c806c845 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 31 Oct 2023 13:23:56 +0100
Subject: [PATCH 090/149] Verwendung von APP_ROOT

---
 application/controllers/jobs/AntragJob.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 8d55faf42..3022cf549 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -165,7 +165,7 @@ class AntragJob extends JOB_Controller
 			}
 
 			$data['table'] = $data['table_' . DEFAULT_LANGUAGE];
-			$data['leitungLink'] = CIS_ROOT. 'index.ci.php/lehre/Studierendenantrag/leitung';
+			$data['leitungLink'] = APP_ROOT. 'index.ci.php/lehre/Studierendenantrag/leitung';
 
 			//Mail an Stgl und Assistenz
 			$to = $leitung['Details']->uid . '@' . DOMAIN;

From c12169557b057494b3ce3c871394ba259f4716f8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 2 Nov 2023 16:49:38 +0100
Subject: [PATCH 091/149] rename vuepic/vue-datepicker to vuejs/vuedatepicker

---
 application/views/lehre/Antrag/Create.php |  2 +-
 composer.json                             | 48 +++++++++++------------
 composer.lock                             | 38 +++++++++---------
 public/js/components/vueDatepicker.js.php |  4 +-
 4 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
index 87c9c3af6..643991191 100644
--- a/application/views/lehre/Antrag/Create.php
+++ b/application/views/lehre/Antrag/Create.php
@@ -11,7 +11,7 @@ $sitesettings = array(
 	'customJSModules' => array('public/js/apps/lehre/Antrag.js'),
 	'customCSSs' => array(
 		'public/css/Fhc.css',
-		'vendor/vuepic/vue-datepicker-css/main.css'
+		'vendor/vuejs/vuedatepicker_css/main.css'
 	),
 	'customJSs' => array(
 	)
diff --git a/composer.json b/composer.json
index 9ee2904ba..089e2a751 100644
--- a/composer.json
+++ b/composer.json
@@ -26,28 +26,6 @@
 		"wiki": "https://wiki.fhcomplete.info/doku.php"
 	},
 	"repositories": [
-		{
-			"type": "package",
-			"package": {
-				"name": "vuepic/vue-datepicker-js",
-				"version": "4.0.0",
-				"dist": {
-					"url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/vue-datepicker.iife.js",
-					"type": "file"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "vuepic/vue-datepicker-css",
-				"version": "4.0.0",
-				"dist": {
-					"url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/main.css",
-					"type": "file"
-				}
-			}
-		},
 		{
 			"type": "package",
 			"package": {
@@ -370,6 +348,28 @@
 				}
 			}
 		},
+                {
+                        "type": "package",
+                        "package": {
+                                "name": "vuejs/vuedatepicker_js",
+                                "version": "5.4.0",
+                                "dist": {
+                                        "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/vue-datepicker.iife.js",
+                                        "type": "file"
+                                }
+                        }
+                },
+                {
+                        "type": "package",
+                        "package": {
+                                "name": "vuejs/vuedatepicker_css",
+                                "version": "5.4.0",
+                                "dist": {
+                                        "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/main.css",
+                                        "type": "file"
+                                }
+                        }
+                },		
 		{
 			"type": "composer",
 			"url": "https://asset-packagist.org"
@@ -443,8 +443,8 @@
 
 		"vuejs/vuejs3": "3.2.33",
 		"vuejs/vuerouter4": "4.1.3",
-		"vuepic/vue-datepicker-js": "4.*",
-		"vuepic/vue-datepicker-css": "4.*"
+		"vuejs/vuedatepicker_js": "5.4.0",
+		"vuejs/vuedatepicker_css": "5.4.0"
 	},
 	"config": {
 		"bin-dir": "vendor/bin"
diff --git a/composer.lock b/composer.lock
index c88612d1b..aac387eb2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1105a07a83f98040eedbe34b23e11ee3",
+    "content-hash": "f6e67e501fdd9ac047cc680abeb3daa9",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -1848,6 +1848,24 @@
             },
             "time": "2020-02-11T05:59:23+00:00"
         },
+        {
+            "name": "vuejs/vuedatepicker_css",
+            "version": "5.4.0",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/main.css"
+            },
+            "type": "library"
+        },
+        {
+            "name": "vuejs/vuedatepicker_js",
+            "version": "5.4.0",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/vue-datepicker.iife.js"
+            },
+            "type": "library"
+        },
         {
             "name": "vuejs/vuejs3",
             "version": "3.2.33",
@@ -1865,24 +1883,6 @@
                 "url": "https://unpkg.com/vue-router@4.1.3/dist/vue-router.global.js"
             },
             "type": "library"
-        },
-        {
-            "name": "vuepic/vue-datepicker-css",
-            "version": "4.0.0",
-            "dist": {
-                "type": "file",
-                "url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/main.css"
-            },
-            "type": "library"
-        },
-        {
-            "name": "vuepic/vue-datepicker-js",
-            "version": "4.0.0",
-            "dist": {
-                "type": "file",
-                "url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/vue-datepicker.iife.js"
-            },
-            "type": "library"
         }
     ],
     "packages-dev": [
diff --git a/public/js/components/vueDatepicker.js.php b/public/js/components/vueDatepicker.js.php
index e0814ac53..ad9053248 100644
--- a/public/js/components/vueDatepicker.js.php
+++ b/public/js/components/vueDatepicker.js.php
@@ -1,9 +1,9 @@
 <?php
 
-if(file_exists("../../../vendor/vuepic/vue-datepicker-js/vue-datepicker.iife.js"))
+if(file_exists("../../../vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js"))
 {
 	header('Content-Type: application/javascript');
-	echo file_get_contents("../../../vendor/vuepic/vue-datepicker-js/vue-datepicker.iife.js");
+	echo file_get_contents("../../../vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js");
 	echo "export default VueDatePicker";
 }
 else

From 6e18d2ee2bf5b1429ed9ece906ed4dab536a89e2 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Fri, 3 Nov 2023 11:22:27 +0100
Subject: [PATCH 092/149] - rt verwaltung message an prestudent

---
 vilesci/stammdaten/reihungstestverwaltung.php | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php
index b7cc41348..038c1977d 100644
--- a/vilesci/stammdaten/reihungstestverwaltung.php
+++ b/vilesci/stammdaten/reihungstestverwaltung.php
@@ -1010,6 +1010,7 @@ if(isset($_GET['excel']))
 							headers: {0: { sorter: false}},
 							widgetOptions: {filter_cssFilter: [
 									"filter_clm_null",
+									"filter_clm_prestudent_id",
 									"filter_clm_person_id",
 									"filter_clm_null",
 									"filter_clm_vorname",
@@ -1061,6 +1062,7 @@ if(isset($_GET['excel']))
 					if (typeof(Storage) !== 'undefined')
 					{
 						var arr = ['clm_null',
+							'clm_prestudent_id',
 							'clm_person_id',
 							'clm_null',
 							'clm_vorname',
@@ -1257,8 +1259,8 @@ if(isset($_GET['excel']))
 				form.find("input[type=hidden]").remove();
 				$.each(elements, function(index, item)
 				{
-					var person_id = $(this).closest('tr').find('td.clm_person_id').text();
-					form.append("<input type='hidden' name='person_id[]' value='" + person_id + "'>");
+					var prestudent_id = $(this).closest('tr').find('td.clm_prestudent_id').text();
+					form.append("<input type='hidden' name='prestudent_id[]' value='" + prestudent_id + "'>");
 				});
 				form.submit();
 			}
@@ -2618,7 +2620,7 @@ if($reihungstest_id!='')
 	echo '<a class="buttongreen" href="'.$_SERVER['PHP_SELF'].'?reihungstest_id='.$reihungstest_id.'&excel=true">Excel Export</a>';
 	//echo '<a class="buttongreen" href="'.$_SERVER['PHP_SELF'].'?reihungstest_id='.$reihungstest_id.'&type=saveallrtpunkte">Punkte ins FAS &uuml;bertragen</a>';
 	echo '<a class="buttongreen" href="#" onclick="SendMail()" id="mailSendButton">Mail an alle BewerberInnen senden</a>';
-	echo '<form id="sendMsgForm" method="post" action="'. APP_ROOT .'index.ci.php/system/messages/Messages/writeTemplate" target="_blank" style="display:inline-block">
+	echo '<form id="sendMsgForm" method="post" action="'. APP_ROOT .'index.ci.php/system/messages/FASMessages/writeTemplate" target="_blank" style="display:inline-block">
 			<a class="buttongreen" href="javascript:void(0)" onclick="SendMessage()" id="msgSendButton">Message an alle BewerberInnen senden</a>
 			</form>';
 }
@@ -2645,7 +2647,7 @@ if($reihungstest_id!='')
 	$qry = "
 	SELECT DISTINCT rt_person_id,
 		rt_id,
-		'0' AS prestudent_id,
+		prestudent_id,
 		tbl_rt_person.person_id,
 		vorname,
 		nachname,
@@ -2763,7 +2765,7 @@ if($reihungstest_id!='')
 		echo '<br><span style="color: red"><b>Achtung!</b> Anzahl Arbeitsplätze überschritten</span>';
 	echo '</td></tr>';
 	echo '<tr><td>';
-	//echo '<div id="clm_prestudent_id" class="active" onclick="hideColumn(\'clm_prestudent_id\')">Prestudent ID</div>';
+	echo '<div id="clm_prestudent_id" class="active" onclick="hideColumn(\'clm_prestudent_id\')">Prestudent ID</div>';
 	echo '<div id="clm_person_id" class="active" onclick="hideColumn(\'clm_person_id\')">Person ID</div>';
 	echo '<div id="clm_vorname" class="active" onclick="hideColumn(\'clm_vorname\')">Vorname</div>';
 	echo '<div id="clm_geschlecht" class="active" onclick="hideColumn(\'clm_geschlecht\')">Geschlecht</div>';
@@ -2803,7 +2805,7 @@ if($reihungstest_id!='')
 						<a href="#" data-toggle="checkboxes" data-action="uncheck" id="uncheck_t'.$cnt.'"><img src="../../skin/images/checkbox_uncheck.png" name="toggle"></a>
 					</nobr>
 					</th>
-					<!--<th style="display: table-cell" class="clm_prestudent_id" title="PrestudentID">Prestudent ID</th>-->
+					<th style="display: table-cell" class="clm_prestudent_id" title="PrestudentID">Prestudent ID</th>
 					<th style="display: table-cell" class="clm_person_id" title="PersonID">Person ID</th>
 					<th>Nachname</th>
 					<th style="display: table-cell" class="clm_vorname">Vorname</th>
@@ -2922,7 +2924,7 @@ if($reihungstest_id!='')
 							echo '
 									<tr>
 										<td style="text-align: center"><input type="checkbox" class="chkbox" id="checkbox_'.$row->person_id.'" name="checkbox['.$row->person_id.']"></td>
-										<!--<td style="display: table-cell" class="clm_prestudent_id">'.$db->convert_html_chars($row->prestudent_id).'</td>-->
+										<td style="display: table-cell" class="clm_prestudent_id">'.$db->convert_html_chars($row->prestudent_id).'</td>
 										<td style="display: table-cell" class="clm_person_id">'.$db->convert_html_chars($row->person_id).'</td>
 										<td>'.$db->convert_html_chars($row->nachname).'</td>
 										<td style="display: table-cell" class="clm_vorname">'.$db->convert_html_chars($row->vorname).'</td>
@@ -2985,7 +2987,7 @@ if($reihungstest_id!='')
 									<a href="#" data-toggle="checkboxes" data-action="uncheck" id="uncheck_t'.$cnt.'"><img src="../../skin/images/checkbox_uncheck.png" name="toggle"></a>
 							</nobr>
 							</th>
-							<!--<th style="display: table-cell" class="clm_prestudent_id" title="PrestudentID">Prestudent ID</th>-->
+							<th style="display: table-cell" class="clm_prestudent_id" title="PrestudentID">Prestudent ID</th>
 							<th style="display: table-cell" class="clm_person_id" title="PersonID">Person ID</th>
 							<th>Nachname</th>
 							<th style="display: table-cell" class="clm_vorname">Vorname</th>
@@ -3104,7 +3106,7 @@ if($reihungstest_id!='')
 							echo '
 								<tr>
 									<td style="text-align: center"><input class="chkbox" type="checkbox" id="checkbox_'.$row->person_id.'" name="checkbox['.$row->person_id.']"></td>
-									<!--<td style="display: table-cell" class="clm_prestudent_id">'.$db->convert_html_chars($row->prestudent_id).'</td>-->
+									<td style="display: table-cell" class="clm_prestudent_id">'.$db->convert_html_chars($row->prestudent_id).'</td>
 									<td style="display: table-cell" class="clm_person_id">'.$db->convert_html_chars($row->person_id).'</td>
 									<td>'.$db->convert_html_chars($row->nachname).'</td>
 									<td style="display: table-cell" class="clm_vorname">'.$db->convert_html_chars($row->vorname).'</td>

From e0a2fba209d62487beb5ac7ef02325c7ea872489 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Fri, 3 Nov 2023 11:37:58 +0100
Subject: [PATCH 093/149] - erhoehte studiengebuehr hinzugefuegt & filter

---
 content/student/studentDBDML.php                  | 11 ++++++++---
 content/student/studentenoverlay.xul.php          |  1 +
 include/konto.class.php                           |  5 ++---
 rdf/student.rdf.php                               | 15 +++++++++++++++
 system/dbupdate_3.4.php                           |  1 +
 ..._studienbeitrag_fuer_drittsaatenangehoerig.php | 13 +++++++++++++
 6 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php

diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 2d5c9e0b8..010ac7af6 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -2502,10 +2502,15 @@ if(!$error)
 	{
 		$person_ids = explode(';',$_POST['person_ids']);
 		$exists = false;
-		if (defined('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK') && (in_array($_POST['buchungstyp_kurzbz'], unserialize(FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK))))
+		if (defined('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK'))
 		{
-			$konto = new konto();
-			$exists = $konto->checkDoppelteBuchung($person_ids, $_POST['studiensemester_kurzbz'], $_POST['buchungstyp_kurzbz']);
+			$buchungen = unserialize(FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK);
+			$buchung = $_POST['buchungstyp_kurzbz'];
+			if (isset($buchungen[$buchung]))
+			{
+				$konto = new konto();
+				$exists = $konto->checkDoppelteBuchung($person_ids, $_POST['studiensemester_kurzbz'], $buchungen[$buchung]);
+			}
 		}
 
 		if($exists)
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 0926a5007..79436c6ec 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -209,6 +209,7 @@ else
 									<menuitem id="student-toolbar-filter-dokumente" label="fehlende Dokumente" oncommand="InteressentDokumenteFilter()" disabled="false" tooltiptext="Liste aller Studenten mit Fehlenden Dokumenten"/>
 									<menuitem id="student-toolbar-filter-offenebuchungen" label="offene Buchungen" oncommand="StudentKontoFilterStudenten('konto')" disabled="false" tooltiptext="Liste aller Studenten mit offenen Buchungen"/>
 									<menuitem id="student-toolbar-filter-studiengebuehr" label="nicht gebuchte Studiengebuehr" oncommand="StudentKontoFilterStudenten('studiengebuehr')" disabled="false" tooltiptext="Liste aller Studenten die noch nicht mit Studienbebuehr belastet wurden" />
+									<menuitem id="student-toolbar-filter-erhoehte-studiengebuehr" label="erhoehte Studiengebuehr" oncommand="StudentKontoFilterStudenten('StudiengebuehrErhoeht')" disabled="false" tooltiptext="Liste aller Studenten die noch nicht mit Studienbebuehr belastet wurden" />
 									<menuitem id="student-toolbar-filter-zgvohnedatum" label="ZGV eingetragen ohne Datum" oncommand="StudentKontoFilterStudenten('zgvohnedatum')" disabled="false" tooltiptext="Liste aller Studenten die ZGV eingetragen haben bei denen aber kein ZGV Datum gesetzt ist" />
 									<menu label="nach Statusgrund">
 									    <menupopup id="student-filter-statusgrund-menu-popup">
diff --git a/include/konto.class.php b/include/konto.class.php
index 281ab77c7..51f79200b 100644
--- a/include/konto.class.php
+++ b/include/konto.class.php
@@ -965,17 +965,16 @@ class konto extends basis_db
 		}
 	}
 
-	public function checkDoppelteBuchung($person_ids, $stsem, $typ)
+	public function checkDoppelteBuchung($person_ids, $stsem, $typen)
 	{
 		$qry = "SELECT person.vorname, person.nachname
 				FROM public.tbl_konto konto
 					JOIN public.tbl_person person USING(person_id)
 				WHERE konto.person_id IN (".$this->implode4SQL(array_filter($person_ids)).")
 					AND studiensemester_kurzbz = ".$this->db_add_param($stsem)."
-					AND buchungstyp_kurzbz = ".$this->db_add_param($typ)."
+					AND buchungstyp_kurzbz IN (".$this->implode4SQL($typen) .")
 				GROUP BY person.vorname, person.nachname
 				ORDER BY person.nachname, person.vorname";
-
 		if ($result = $this->db_query($qry))
 		{
 			$persons = array();
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 1625f161c..b6de4394e 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -107,6 +107,21 @@ function checkfilter($row, $filter2, $buchungstyp = null)
 				if($row_filter->anzahl>0 || $prestudent->status_kurzbz=='Incoming')
 					return false;
 	}
+	elseif($filter2 == 'StudiengebuehrErhoeht')
+	{
+		// Alle Personen die eine erhöhte Studiengebuehrbelastung haben
+		$prestudent = new prestudent();
+		$prestudent->getLastStatus($row->prestudent_id);
+
+		$qry = "SELECT count(*) as anzahl FROM public.tbl_konto WHERE
+					studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND
+					person_id=".$db->db_add_param($row->person_id, FHC_INTEGER)." AND
+					buchungstyp_kurzbz='StudiengebuehrErhoeht'";
+		if($db->db_query($qry))
+			if($row_filter = $db->db_fetch_object())
+				if($row_filter->anzahl == 0)
+					return false;
+	}
 	elseif(strstr($filter2,'buchungstyp;'))
 	{
 		// Alle Personen die keine Belastung auf den uebergebenen Buchungstyp haben
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 458f178d4..fc743d5ca 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -45,6 +45,7 @@ require_once('dbupdate_3.4/30537_anmerkung_in_tbl_rolleberechtigung.php');
 require_once('dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruendung.php');
 require_once('dbupdate_3.4/29529_infocenter_anpassungen.php');
 require_once('dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php');
+require_once('dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php');
 
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
diff --git a/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php b/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php
new file mode 100644
index 000000000..aaeb2dfe7
--- /dev/null
+++ b/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php
@@ -0,0 +1,13 @@
+<?php
+// Added Buchungstyp "StudiengebuehrErhoeht"
+if ($result = @$db->db_query("SELECT 1 FROM public.tbl_buchungstyp WHERE buchungstyp_kurzbz = 'StudiengebuehrErhoeht';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO public.tbl_buchungstyp (buchungstyp_kurzbz, beschreibung, standardtext) VALUES ('StudiengebuehrErhoeht', 'Erhöhter Studienbeitrag', 'Erhöhter Studienbeitrag');";
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_buchungstyp '.$db->db_last_error().'</strong><br>';
+		else
+			echo ' public.tbl_buchungstyp: Added buchungstyp "StudiengebuehrErhoeht" <br>';
+	}
+}
\ No newline at end of file

From fad475fb640b5df1ac83ff87155345735d848fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 6 Nov 2023 09:00:28 +0100
Subject: [PATCH 094/149] =?UTF-8?q?Fixed=20Loading=20Lehrauftr=C3=A4ge=20w?=
 =?UTF-8?q?ith=20Postgresql=2015?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/lehre/lehrauftrag/acceptLehrauftragData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
index 26a05c30b..fcd9b953c 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
@@ -232,7 +232,7 @@ FROM
                 SELECT
                     pa.lehreinheit_id,
                     lv.lehrveranstaltung_id,
-                    pa.projektarbeit_id                                                                 AS "projektarbeit_id",
+                    pa.projektarbeit_id::text                                                                 AS "projektarbeit_id",
                     le.studiensemester_kurzbz,
                     stg.studiengang_kz,
                     upper(stg.typ || stg.kurzbz)                                                        AS "stg_typ_kurzbz",

From 05744f39217423c2200c139cf19b0c1f18f4893a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 8 Nov 2023 09:35:23 +0100
Subject: [PATCH 095/149] Bugfix

---
 application/controllers/jobs/AntragJob.php    |  7 ++--
 .../controllers/lehre/Studierendenantrag.php  | 37 +------------------
 application/libraries/AntragLib.php           | 30 +++++----------
 .../models/crm/Prestudentstatus_model.php     |  7 ++--
 .../models/education/Pruefung_model.php       | 11 ++++--
 .../education/Studierendenantrag_model.php    | 19 +++++++---
 .../models/organisation/Studiengang_model.php | 17 +--------
 7 files changed, 42 insertions(+), 86 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 3022cf549..1840aceef 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -96,7 +96,7 @@ class AntragJob extends JOB_Controller
 				}
 				$stgLeitungen[$leitung->uid]['stgs'][] = $antrag->studiengang_kz;
 
-				$result = $this->StudiengangModel->load($antrag->studiengang_kz);
+				$result = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
 				if (isError($result))
 				{
 					$this->logError(getError($result));
@@ -214,12 +214,11 @@ class AntragJob extends JOB_Controller
 		$count = 0;
 		foreach ($antraege as $antrag)
 		{
-			$this->StudiengangModel->addJoin('public.tbl_prestudent ps','studiengang_kz');
-			$res = $this->StudiengangModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
+			$res = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
 			$stg = '';
 			$orgform = '';
 			if (hasData($res)) {
-				$studiengang = current(getData($res));
+				$studiengang = current(getData($res));var_dump($studiengang);
 				$stg = $studiengang->bezeichnung;
 				$orgform = $studiengang->orgform_kurzbz;
 			}
diff --git a/application/controllers/lehre/Studierendenantrag.php b/application/controllers/lehre/Studierendenantrag.php
index fb0d17abb..d6d6b2c50 100644
--- a/application/controllers/lehre/Studierendenantrag.php
+++ b/application/controllers/lehre/Studierendenantrag.php
@@ -81,42 +81,9 @@ class Studierendenantrag extends FHC_Controller
 
 	public function leitung()
 	{
-		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe');
-		$stgsNeuanlage = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
+		$stgL = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe') ?: [];
 
-		$stgL = [];
-		if ($studiengaenge) {
-			$result = $this->StudiengangModel->loadWithOrgform($studiengaenge);
-			if (isError($result))
-				return show_error(getError($result));
-			$antraege = getData($result) ?: [];
-
-			foreach ($antraege as $antrag) {
-				if (!isset($stgL[$antrag->studiengang_kz])) {
-					$stgL[$antrag->studiengang_kz] = new stdClass();
-					$stgL[$antrag->studiengang_kz]->bezeichnung = $antrag->bezeichnung;
-					$stgL[$antrag->studiengang_kz]->orgform = $antrag->orgform;
-					$stgL[$antrag->studiengang_kz]->studiengang_kz = $antrag->studiengang_kz;
-				}
-			}
-		}
-
-		$stgA = [];
-		if ($stgsNeuanlage) {
-			$result = $this->StudiengangModel->loadWithOrgform($stgsNeuanlage);
-			if (isError($result))
-				return show_error(getError($result));
-			$antraege = getData($result) ?: [];
-
-			foreach ($antraege as $antrag) {
-				if (!isset($stgA[$antrag->studiengang_kz])) {
-					$stgA[$antrag->studiengang_kz] = new stdClass();
-					$stgA[$antrag->studiengang_kz]->bezeichnung = $antrag->bezeichnung;
-					$stgA[$antrag->studiengang_kz]->orgform = $antrag->orgform;
-					$stgA[$antrag->studiengang_kz]->studiengang_kz = $antrag->studiengang_kz;
-				}
-			}
-		}
+		$stgA = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: [];
 
 		$this->load->view('lehre/Antrag/Leitung/List', [
 			'stgA' => $stgA,
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 6cad6c2bf..dcc38acc7 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -156,7 +156,6 @@ class AntragLib
 				if (hasData($result)) {
 					$studiengang = current(getData($result));
 					$stg = $studiengang->bezeichnung;
-					$orgform = $studiengang->orgform_kurzbz;
 				}
 				if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG)
 				{
@@ -166,6 +165,7 @@ class AntragLib
 
 					else {
 						$prestudent_status = getData($resultPrestudentStatus)[0];
+						$orgform = $prestudent_status->orgform_kurzbz;
 
 						$vorlage ='Sancho_Mail_Antrag_A_Approve';
 						$subject = $this->_ci->p->t('studierendenantrag', 'mail_subject_A_Approve');
@@ -202,14 +202,14 @@ class AntragLib
 							$data['UID'] = $student->student_uid;
 						}
 
-						$data['Orgform'] = $orgform;
+						$data['Orgform'] = $prestudent_status->orgform;
 						$data['stg'] = $stg;
 
 						// NOTE(chris): Sancho mail
 						sendSanchoMail($vorlage, $data, $prestudent_status->email, $subject);
 					}
 				} else { // ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL)
-					$result = $this->_ci->PrestudentstatusModel->getLastStatus($antrag->prestudent_id, '', 'Student');
+					$result = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail($antrag->prestudent_id, '', 'Student');
 					if (isError($result))
 					{
 						$errors[] = getError($result);
@@ -221,6 +221,7 @@ class AntragLib
 						continue;
 					}
 					$prestudentstatus = getData($result)[0];
+					$orgform = $prestudentstatus->orgform_kurzbz;
 
 					$result = $this->_ci->PrestudentstatusModel->withGrund('preabbrecher')->update([
 						'prestudent_id' => $prestudentstatus->prestudent_id,
@@ -349,8 +350,7 @@ class AntragLib
 					$kontakt = current(getData($res));
 					$email = $kontakt->kontakt;
 
-					$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent ps','studiengang_kz');
-					$res = $this->_ci->StudiengangModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
+					$res = $this->_ci->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
 					$stg = '';
 					$orgform = '';
 					if (hasData($res)) {
@@ -555,7 +555,7 @@ class AntragLib
 							[
 								'name' => $mail['ass'],
 								'stg' => $data['studiengang']->bezeichnung,
-								'Orgform' => $data['studiengang']->orgform_kurzbz,
+								'Orgform' => $data['prestudent_status']->orgform_kurzbz,
 								'vorname' => $data['person']->vorname,
 								'nachname' => $data['person']->nachname,
 								'UID' => $data['UID'],
@@ -579,7 +579,7 @@ class AntragLib
 							[
 								'name' => $mail['stu'],
 								'stg' => $data['studiengang']->bezeichnung,
-								'Orgform' => $data['studiengang']->orgform_kurzbz,
+								'Orgform' => $data['prestudent_status']->orgform_kurzbz,
 								'vorname' => $data['person']->vorname,
 								'nachname' => $data['person']->nachname
 							],
@@ -673,7 +673,7 @@ class AntragLib
 								'nachname' => $nachname,
 								'grund' => $grund,
 								'stg' => $data['studiengang']->bezeichnung,
-								'Orgform' => $data['studiengang']->orgform_kurzbz,
+								'Orgform' => $data['prestudent_status']->orgform_kurzbz,
 								'prestudent_id' => $data['prestudent_status']->prestudent_id,
 								'abmeldungLink' => site_url('lehre/Studierendenantrag/abmeldung/' . $data['prestudent_status']->prestudent_id),
 								'abmeldungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Studierendenantrag/abmeldung/' . $data['prestudent_status']->prestudent_id
@@ -719,7 +719,6 @@ class AntragLib
 		else{
 			$result['studiengang'] = new stdClass();
 			$result['studiengang']->bezeichnung = "";
-			$result['studiengang']->orgform_kurzbz = "";
 		}
 
 		$res = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail($antrag->prestudent_id);
@@ -1540,18 +1539,9 @@ class AntragLib
 		if (!$result)
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_antrag', ['id' => $antrag_id]));
 
-		$result = current($result);
-		$studiengang_kz = $result->studiengang_kz;
-		$semester = $result->ausbildungssemester;
-
-		$result = $this->_ci->StudiengangModel->load($studiengang_kz);
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_antrag', ['id' => $antrag_id]));
-
 		$stg = current($result);
+		$studiengang_kz = $stg->studiengang_kz;
+		$semester = $stg->ausbildungssemester;
 
 		$result = $this->_ci->StudierendenantragModel->load($antrag_id);
 		if (isError($result))
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index d12ebd68d..08c081153 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -238,7 +238,7 @@ class Prestudentstatus_model extends DB_Model
 	{
 		$this->addSelect('tbl_prestudentstatus.*,
 						tbl_studienplan.bezeichnung AS studienplan_bezeichnung,
-						tbl_studienplan.orgform_kurzbz AS orgform,
+						tbl_orgform.orgform_kurzbz AS orgform,
 						tbl_studienplan.sprache,
 						tbl_orgform.bezeichnung_mehrsprachig AS bezeichnung_orgform,
 						tbl_status.bezeichnung_mehrsprachig,
@@ -250,7 +250,7 @@ class Prestudentstatus_model extends DB_Model
 		$this->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
 		$this->addJoin('public.tbl_status', 'tbl_status.status_kurzbz = tbl_prestudentstatus.status_kurzbz');
 		$this->addJoin('public.tbl_status_grund', 'statusgrund_id', 'LEFT');
-		$this->addJoin('bis.tbl_orgform', 'tbl_studienplan.orgform_kurzbz = tbl_orgform.orgform_kurzbz', 'LEFT');
+		$this->addJoin('bis.tbl_orgform', 'COALESCE(tbl_studienplan.orgform_kurzbz, ' . $this->dbTable . '.orgform_kurzbz, tbl_studiengang.orgform_kurzbz) = tbl_orgform.orgform_kurzbz', 'LEFT');
 		$this->db->where('tbl_status.status_kurzbz = tbl_prestudentstatus.status_kurzbz');
 
 		$where = array('prestudent_id' => $prestudent_id);
@@ -295,7 +295,8 @@ class Prestudentstatus_model extends DB_Model
 		$this->addJoin('public.tbl_studiensemester ss', 'studiensemester_kurzbz');
 		$this->addJoin('public.tbl_person pers', 'person_id');
 		$this->addJoin('public.tbl_studiengang g', 'p.studiengang_kz=g.studiengang_kz');
-		$this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, ' . $this->dbTable . '.orgform_kurzbz, g.orgform_kurzbz)=o.orgform_kurzbz');
 
 		$this->addOrder($this->dbTable . '.datum', 'DESC');
 		$this->addOrder($this->dbTable . '.insertamum', 'DESC');
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
index 83bf9b7f8..644b346ed 100644
--- a/application/models/education/Pruefung_model.php
+++ b/application/models/education/Pruefung_model.php
@@ -39,6 +39,7 @@ class Pruefung_model extends DB_Model
 
 
     /**
+     * NOTE(chris): not used
      * @return string
      */
     protected function loadWhereThreeExamsFailed()
@@ -86,8 +87,10 @@ class Pruefung_model extends DB_Model
         $this->addJoin('public.tbl_person pers', 'person_id');
         $this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
         $this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
-        $this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz');
-        $this->db->join('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ = ?', 'LEFT', false);
+        $this->addJoin('public.tbl_prestudentstatus pss', 'pss.prestudent_id=ps.prestudent_id AND pss.studiensemester_kurzbz=le.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(ps.prestudent_id, le.studiensemester_kurzbz)', 'LEFT');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, g.orgform_kurzbz)=o.orgform_kurzbz');
+		$this->db->join('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ = ?', 'LEFT', false);
 
         $this->db->where("n.positiv", false);
         /*		$this->db->where_in("p.pruefungstyp_kurzbz1", ['kommPruef','zusKommPruef']);*/
@@ -164,7 +167,9 @@ class Pruefung_model extends DB_Model
 		$this->addJoin('public.tbl_person pers', 'person_id');
 		$this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
 		$this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
-		$this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz');
+		$this->addJoin('public.tbl_prestudentstatus pss', 'pss.prestudent_id=ps.prestudent_id AND pss.studiensemester_kurzbz=le.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(ps.prestudent_id, le.studiensemester_kurzbz)', 'LEFT');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, g.orgform_kurzbz)=o.orgform_kurzbz');
 		$this->addJoin('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ=' . $this->escape(Studierendenantrag_model::TYP_WIEDERHOLUNG), 'LEFT');
 
 		$this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist'));
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index e1b386f2e..91af9c1f4 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -37,11 +37,11 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect('studienjahr_kurzbz');
 		$this->addSelect('vorname');
 		$this->addSelect('nachname');
-		$this->addSelect('prestudent_id');
+		$this->addSelect('p.prestudent_id');
 		$this->addSelect('p.studiengang_kz');
 		$this->addSelect('semester');
 		$this->addSelect($this->dbTable . '.grund');
-		$this->addSelect('datum');
+		$this->addSelect($this->dbTable . '.datum');
 		$this->addSelect('datum_wiedereinstieg');
 		$this->addSelect($this->dbTable . '.typ');
 		$this->addSelect('st.studierendenantrag_statustyp_kurzbz as status');
@@ -52,8 +52,10 @@ class Studierendenantrag_model extends DB_Model
 		$this->addJoin('public.tbl_student', 'prestudent_id');
 		$this->addJoin('public.tbl_person', 'person_id');
 		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
-		$this->addJoin('public.tbl_studiensemester', 'studiensemester_kurzbz');
-		$this->addJoin('bis.tbl_orgform', 'orgform_kurzbz');
+		$this->addJoin('public.tbl_studiensemester ss', 'studiensemester_kurzbz');
+		$this->addJoin('public.tbl_prestudentstatus ps', 'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=ss.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ss.studiensemester_kurzbz)');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		$this->addJoin('bis.tbl_orgform of', 'of.orgform_kurzbz=COALESCE(plan.orgform_kurzbz, ps.orgform_kurzbz, stg.orgform_kurzbz)');
 		$this->addJoin(
 			'campus.tbl_studierendenantrag_status as s',
 			'campus.get_status_id_studierendenantrag('. $this->dbTable .'.studierendenantrag_id) = studierendenantrag_status_id'
@@ -120,14 +122,17 @@ class Studierendenantrag_model extends DB_Model
 	public function getStgAndSem($antrag_id)
 	{
 		$this->addSelect('p.studiengang_kz');
+		$this->addSelect('stg.bezeichnung');
 		$this->addSelect('s.ausbildungssemester');
-		$this->addSelect('s.orgform_kurzbz');
+		$this->addSelect('COALESCE(plan.orgform_kurzbz, s.orgform_kurzbz, stg.orgform_kurzbz) AS orgform_kurzbz');
 
 		$this->addJoin(
 			'public.tbl_prestudentstatus s',
 			$this->dbTable . '.prestudent_id=s.prestudent_id AND ' . $this->dbTable . '.studiensemester_kurzbz=s.studiensemester_kurzbz'
 		);
 		$this->addJoin('public.tbl_prestudent p', $this->dbTable . '.prestudent_id=p.prestudent_id');
+		$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
 
 		$this->addOrder('s.datum', 'DESC');
 		$this->addOrder('s.insertamum', 'DESC');
@@ -192,7 +197,9 @@ class Studierendenantrag_model extends DB_Model
 
 		$this->addJoin('public.tbl_prestudent p', 'prestudent_id', 'RIGHT');
 		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
-		$this->addJoin('bis.tbl_orgform', 'orgform_kurzbz');
+		$this->addJoin('public.tbl_prestudentstatus ps', 'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=' . $this->dbTable . '.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ' . $this->dbTable . '.studiensemester_kurzbz)');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		$this->addJoin('bis.tbl_orgform of', 'of.orgform_kurzbz=COALESCE(plan.orgform_kurzbz, ps.orgform_kurzbz, stg.orgform_kurzbz)');
 		$this->addJoin(
 			'campus.tbl_studierendenantrag_statustyp st',
 			'campus.get_status_studierendenantrag(studierendenantrag_id)=st.studierendenantrag_statustyp_kurzbz',
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index ea8e59ebd..d232e14d6 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -525,20 +525,6 @@ class Studiengang_model extends DB_Model
 		return $this->execQuery($query, $params);
 	}
 
-	public function loadWithOrgform($studiengang_kzs)
-	{
-		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
-
-		$this->addSelect($this->dbTable . '.*');
-		$this->addSelect('o.bezeichnung_mehrsprachig[(' . $sql . ')] AS orgform');
-		
-		$this->addJoin('bis.tbl_orgform o', 'orgform_kurzbz');
-
-		$this->db->where_in($this->dbTable . '.studiengang_kz', $studiengang_kzs);
-
-		return $this->load();
-	}
-
 	/**
 	 * @param array		$studiengang_kzs
 	 * @param array		$not_antrag_typ		(optional) If the prestudent has an antrag with one of the specified types it will be excluded from the result
@@ -571,7 +557,8 @@ class Studiengang_model extends DB_Model
 				AND ps.ausbildungssemester=get_absem_prestudent(p.prestudent_id, NULL)
 				AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, NULL)'
 		);
-		$this->addJoin('bis.tbl_orgform o', $this->dbTable . '.orgform_kurzbz=o.orgform_kurzbz');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id');
+		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, ps.orgform_kurzbz, ' . $this->dbTable . '.orgform_kurzbz)=o.orgform_kurzbz');
 		$this->addJoin('public.tbl_person pers', 'person_id');
 		$this->addJoin('public.tbl_student stud', 'p.prestudent_id=stud.prestudent_id', 'LEFT');
 

From 85f178fcf323d64bd6470a58f99abbab447ca4b8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 9 Nov 2023 13:26:54 +0100
Subject: [PATCH 096/149] remove var_dump

---
 application/controllers/jobs/AntragJob.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 1840aceef..cbd34a561 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -218,7 +218,7 @@ class AntragJob extends JOB_Controller
 			$stg = '';
 			$orgform = '';
 			if (hasData($res)) {
-				$studiengang = current(getData($res));var_dump($studiengang);
+				$studiengang = current(getData($res));
 				$stg = $studiengang->bezeichnung;
 				$orgform = $studiengang->orgform_kurzbz;
 			}

From 46855c9547b033573dd37a7709c2111c8fa86244 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 9 Nov 2023 13:37:56 +0100
Subject: [PATCH 097/149] =?UTF-8?q?Blacklist=20f=C3=BCr=20Noten?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/config/studierendenantrag.php       | 8 ++++++++
 application/models/education/Pruefung_model.php | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
index c5ebc0d80..3f28e5d50 100644
--- a/application/config/studierendenantrag.php
+++ b/application/config/studierendenantrag.php
@@ -159,3 +159,11 @@ $config['stgkz_blacklist_unterbrechung'] = [];
  * @var array           An array of tbl_studiengang.studiengang_kz's
  */
 $config['stgkz_blacklist_wiederholung'] = [];
+
+/**
+ * Blacklisted noten for negative committee exams
+ * noten with this ids won't be seen as negative
+ *
+ * @var array           An array of noten ids
+ */
+$config['note_blacklist_wiederholung'] = [];
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
index 644b346ed..ef7cfc967 100644
--- a/application/models/education/Pruefung_model.php
+++ b/application/models/education/Pruefung_model.php
@@ -125,6 +125,8 @@ class Pruefung_model extends DB_Model
 	 */
 	public function loadWhereCommitteeExamsFailed()
 	{
+		$this->load->config('studierendenantrag');
+
 		$this->dbTable = 'lehre.tbl_pruefung p';
 
 		$this->addSelect('p.datum');
@@ -132,6 +134,9 @@ class Pruefung_model extends DB_Model
 		$this->addJoin('lehre.tbl_note n', 'note');
 
 		$this->db->where("n.positiv", false);
+		$note_blacklist = $this->config->item('note_blacklist_wiederholung');
+		if ($note_blacklist)
+			$this->db->where_not_in("n.note", $note_blacklist);
 		$this->db->where_in("p.pruefungstyp_kurzbz", ['kommPruef','zusKommPruef']);
 
 		return $this->load();

From 479d1a900fc100122ed093d2199dad6e91a4185b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 9 Nov 2023 14:19:36 +0100
Subject: [PATCH 098/149] Orgform PDFs

---
 rdf/AntragAbmeldung.xml.php     | 16 +++++++++-------
 rdf/AntragAbmeldungStgl.xml.php | 16 +++++++++-------
 rdf/AntragUnterbrechung.xml.php | 16 +++++++++-------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/rdf/AntragAbmeldung.xml.php b/rdf/AntragAbmeldung.xml.php
index dc59b57a0..0de936e0a 100644
--- a/rdf/AntragAbmeldung.xml.php
+++ b/rdf/AntragAbmeldung.xml.php
@@ -14,7 +14,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$id = $_GET['id'];
 
 		$where = " WHERE studierendenantrag_id = " . $db->db_add_param($id) . "
-					AND campus.tbl_studierendenantrag.typ = 'Abmeldung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) = 'Genehmigt';";
+					AND a.typ = 'Abmeldung' AND campus.get_status_studierendenantrag(a.studierendenantrag_id) = 'Genehmigt';";
 		$not_found_error = 'Studierendenantrag not found'. $id;
 	} elseif(isset($_GET['uid']) && isset($_GET['prestudent_id'])) {
 		$uid = $_GET['uid'];
@@ -25,8 +25,8 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$prestudent_id = explode(';', $prestudent_id);
 		$prestudent_id  = (array_filter($prestudent_id, 'strlen'));
 
-		$where = " WHERE  campus.tbl_studierendenantrag.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
-					AND campus.tbl_studierendenantrag.typ = 'Abmeldung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) = 'Genehmigt';";
+		$where = " WHERE  a.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
+					AND a.typ = 'Abmeldung' AND campus.get_status_studierendenantrag(a.studierendenantrag_id) = 'Genehmigt';";
 		$not_found_error = 'Studierendenantrag not found for: ' . implode(',', $uid);
 	} else
 		die('<error>wrong parameters</error>');
@@ -36,15 +36,17 @@ else
 
 
 $query = "
-	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, studiensemester_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund
+	SELECT stg.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(a.prestudent_id, NULL) AS semester, a.grund
 	FROM
-	campus.tbl_studierendenantrag
+	campus.tbl_studierendenantrag a
 	JOIN public.tbl_student USING (prestudent_id)
 	JOIN public.tbl_benutzer ON tbl_student.student_uid=uid
 	JOIN public.tbl_person USING (person_id)
-	JOIN public.tbl_studiengang USING (studiengang_kz)
+	JOIN public.tbl_studiengang stg USING (studiengang_kz)
 	JOIN public.tbl_studiensemester USING (studiensemester_kurzbz)
-	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = tbl_studiengang.orgform_kurzbz)" . $where;
+	LEFT JOIN public.tbl_prestudentstatus pss ON (pss.prestudent_id = a.prestudent_id AND pss.studiensemester_kurzbz=a.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(a.prestudent_id, a.studiensemester_kurzbz))
+	LEFT JOIN lehre.tbl_studienplan plan USING (studienplan_id)
+	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, stg.orgform_kurzbz))" . $where;
 
 
 if (!$db->db_query($query) || !$db->db_num_rows())
diff --git a/rdf/AntragAbmeldungStgl.xml.php b/rdf/AntragAbmeldungStgl.xml.php
index 55d940457..cccd677b0 100644
--- a/rdf/AntragAbmeldungStgl.xml.php
+++ b/rdf/AntragAbmeldungStgl.xml.php
@@ -14,7 +14,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$id = $_GET['id'];
 
 		$where = " WHERE studierendenantrag_id = " . $db->db_add_param($id) . "
-					AND campus.tbl_studierendenantrag.typ = 'AbmeldungStgl' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) IN ('Genehmigt', 'Beeinsprucht', 'EinspruchAbgelehnt');";
+					AND a.typ = 'AbmeldungStgl' AND campus.get_status_studierendenantrag(a.studierendenantrag_id) IN ('Genehmigt', 'Beeinsprucht', 'EinspruchAbgelehnt');";
 		$not_found_error = 'Studierendenantrag not found'. $id;
 	} elseif(isset($_GET['uid']) && isset($_GET['prestudent_id'])) {
 		$uid = $_GET['uid'];
@@ -25,8 +25,8 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$prestudent_id = explode(';', $prestudent_id);
 		$prestudent_id  = (array_filter($prestudent_id, 'strlen'));
 
-		$where = " WHERE  campus.tbl_studierendenantrag.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
-					AND campus.tbl_studierendenantrag.typ = 'AbmeldungStgl' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) IN ('Genehmigt', 'Beeinsprucht', 'EinspruchAbgelehnt');";
+		$where = " WHERE  a.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
+					AND a.typ = 'AbmeldungStgl' AND campus.get_status_studierendenantrag(a.studierendenantrag_id) IN ('Genehmigt', 'Beeinsprucht', 'EinspruchAbgelehnt');";
 		$not_found_error = 'Studierendenantrag not found for: ' . implode(',', $uid);
 	} else
 		die('<error>wrong parameters</error>');
@@ -36,15 +36,17 @@ else
 
 
 $query = "
-	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, studiensemester_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund
+	SELECT stg.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(a.prestudent_id, NULL) AS semester, a.grund
 	FROM
-	campus.tbl_studierendenantrag
+	campus.tbl_studierendenantrag a
 	JOIN public.tbl_student USING (prestudent_id)
 	JOIN public.tbl_benutzer ON tbl_student.student_uid=uid
 	JOIN public.tbl_person USING (person_id)
-	JOIN public.tbl_studiengang USING (studiengang_kz)
+	JOIN public.tbl_studiengang stg USING (studiengang_kz)
 	JOIN public.tbl_studiensemester USING (studiensemester_kurzbz)
-	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = tbl_studiengang.orgform_kurzbz)" . $where;
+	LEFT JOIN public.tbl_prestudentstatus pss ON (pss.prestudent_id = a.prestudent_id AND pss.studiensemester_kurzbz=a.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(a.prestudent_id, a.studiensemester_kurzbz))
+	LEFT JOIN lehre.tbl_studienplan plan USING (studienplan_id)
+	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, stg.orgform_kurzbz))" . $where;
 
 
 if (!$db->db_query($query) || !$db->db_num_rows())
diff --git a/rdf/AntragUnterbrechung.xml.php b/rdf/AntragUnterbrechung.xml.php
index 6945f66ef..70a056b8a 100644
--- a/rdf/AntragUnterbrechung.xml.php
+++ b/rdf/AntragUnterbrechung.xml.php
@@ -15,7 +15,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$id = $_GET['id'];
 
 		$where = " WHERE studierendenantrag_id = " . $db->db_add_param($id) . "
-					AND campus.tbl_studierendenantrag.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) IN ('Genehmigt', 'EmailVersandt');";
+					AND a.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(a.studierendenantrag_id) IN ('Genehmigt', 'EmailVersandt');";
 		$not_found_error = 'Studierendenantrag not found'. $id;
 	} elseif(isset($_GET['uid']) && isset($_GET['prestudent_id'])) {
 		$uid = $_GET['uid'];
@@ -26,8 +26,8 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$prestudent_id = explode(';', $prestudent_id);
 		$prestudent_id  = (array_filter($prestudent_id, 'strlen'));
 
-		$where = " WHERE  campus.tbl_studierendenantrag.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
-					AND campus.tbl_studierendenantrag.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) IN ('Genehmigt', 'EmailVersandt');";
+		$where = " WHERE  a.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
+					AND a.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(a.studierendenantrag_id) IN ('Genehmigt', 'EmailVersandt');";
 		$not_found_error = 'Studierendenantrag not found for: ' . implode(',', $uid);
 	} else
 		die('<error>wrong parameters</error>');
@@ -37,15 +37,17 @@ else
 
 
 $query = "
-	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund, datum_wiedereinstieg, datum
+	SELECT stg.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(a.prestudent_id, NULL) AS semester, a.grund, datum_wiedereinstieg, a.datum
 	FROM
-	campus.tbl_studierendenantrag
+	campus.tbl_studierendenantrag a
 	JOIN public.tbl_student USING (prestudent_id)
 	JOIN public.tbl_benutzer ON tbl_student.student_uid=uid
 	JOIN public.tbl_person USING (person_id)
-	JOIN public.tbl_studiengang USING (studiengang_kz)
+	JOIN public.tbl_studiengang stg USING (studiengang_kz)
 	JOIN public.tbl_studiensemester USING (studiensemester_kurzbz)
-	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = tbl_studiengang.orgform_kurzbz)" . $where;
+	LEFT JOIN public.tbl_prestudentstatus pss ON (pss.prestudent_id = a.prestudent_id AND pss.studiensemester_kurzbz=a.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(a.prestudent_id, a.studiensemester_kurzbz))
+	LEFT JOIN lehre.tbl_studienplan plan USING (studienplan_id)
+	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, stg.orgform_kurzbz))" . $where;
 
 
 if (!$db->db_query($query) || !$db->db_num_rows())

From e56ccffe8d62e35f33630c4687a2b9fe71974c33 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 10 Nov 2023 14:30:41 +0100
Subject: [PATCH 099/149] Bugfixes: Studstatus

---
 application/models/education/Studierendenantrag_model.php | 2 +-
 application/views/lehre/Antrag/Student/List.php           | 4 ++--
 public/js/components/Studierendenantrag/Leitung.js        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 91af9c1f4..4931896cd 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -197,7 +197,7 @@ class Studierendenantrag_model extends DB_Model
 
 		$this->addJoin('public.tbl_prestudent p', 'prestudent_id', 'RIGHT');
 		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
-		$this->addJoin('public.tbl_prestudentstatus ps', 'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=' . $this->dbTable . '.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ' . $this->dbTable . '.studiensemester_kurzbz)');
+		$this->addJoin('public.tbl_prestudentstatus ps', 'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=' . $this->dbTable . '.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ' . $this->dbTable . '.studiensemester_kurzbz)', 'LEFT');
 		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
 		$this->addJoin('bis.tbl_orgform of', 'of.orgform_kurzbz=COALESCE(plan.orgform_kurzbz, ps.orgform_kurzbz, stg.orgform_kurzbz)');
 		$this->addJoin(
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index add2e8c7d..0bc4c401a 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -110,8 +110,8 @@ $this->load->view(
 										<a class="ms-2" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xml=Antrag' . $antrag->typ . '.xml.php&xsl=Antrag' . $antrag->typ . '&id=' . $antrag->studierendenantrag_id . '&uid=' . getAuthUID()); ?>"><i class="fa-solid fa-download" title="<?= $this->p->t('studierendenantrag', 'btn_download_antrag'); ?>"></i></a>
 									<?php } ?>
 									<?php if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG && $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED) { ?>
-										<a class="ms-2" href="#modalgrund<?= $antrag->studierendenantrag_id; ?>" data-bs-toggle="modal"><?= $this->p->t('studierendenantrag', 'btn_show_lvs'); ?></a>
-										<lv-popup id="modalgrund<?= $antrag->studierendenantrag_id; ?>" antrag-id = "<?= $antrag->studierendenantrag_id; ?>">
+										<a class="ms-2" href="#modallv<?= $antrag->studierendenantrag_id; ?>" data-bs-toggle="modal"><?= $this->p->t('studierendenantrag', 'btn_show_lvs'); ?></a>
+										<lv-popup id="modallv<?= $antrag->studierendenantrag_id; ?>" antrag-id = "<?= $antrag->studierendenantrag_id; ?>">
 											<?= $this->p->t('studierendenantrag', 'my_lvs'); ?>
 										</lv-popup>
 									<?php } ?>
diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
index da883acbc..611d01b7a 100644
--- a/public/js/components/Studierendenantrag/Leitung.js
+++ b/public/js/components/Studierendenantrag/Leitung.js
@@ -31,12 +31,12 @@ export default {
 		stgkzL() {
 			if (!this.stgL)
 				return [];
-			return this.stgL.map(stg => stg.studiengang_kz);
+			return this.stgL.map(stg => parseInt(stg));
 		},
 		stgkzA() {
 			if (!this.stgA)
 				return [];
-			return this.stgA.map(stg => stg.studiengang_kz);
+			return this.stgA.map(stg => parseInt(stg));
 		}
 	},
 	methods: {

From cb009529af00f8cacdff7f8370ce6029e6a5c2b7 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 10 Nov 2023 14:46:18 +0100
Subject: [PATCH 100/149] =?UTF-8?q?Mixin=20auf=20Plugin=20=C3=A4ndern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/apps/lehre/Antrag.js                |   5 +-
 public/js/apps/lehre/Antrag/Leitung.js        |   6 +-
 public/js/apps/lehre/Antrag/Lvzuweisung.js    |   5 +-
 public/js/apps/lehre/Antrag/Student.js        |   5 +-
 public/js/components/Bootstrap/Modal.js       |   3 +
 .../components/Studierendenantrag/Antrag.js   |   8 +-
 .../Studierendenantrag/Form/Abmeldung.js      |  50 ++++-----
 .../Studierendenantrag/Form/AbmeldungStgl.js  |  54 +++++-----
 .../Studierendenantrag/Form/Unterbrechung.js  |  52 +++++----
 .../Studierendenantrag/Form/Wiederholung.js   |  32 +++---
 .../components/Studierendenantrag/Leitung.js  |  12 +--
 .../Studierendenantrag/Leitung/Actions.js     |  16 ++-
 .../Studierendenantrag/Leitung/Actions/New.js |  16 ++-
 .../Studierendenantrag/Leitung/GrundPopup.js  |  11 +-
 .../Studierendenantrag/Leitung/Header.js      |   7 +-
 .../Studierendenantrag/Leitung/LvPopup.js     |  24 ++---
 .../Studierendenantrag/Leitung/Table.js       |  72 +++++++------
 .../Studierendenantrag/Lvzuweisung.js         |  30 +++---
 public/js/plugin/Phrasen.js                   | 102 ++++++++++++++++++
 19 files changed, 299 insertions(+), 211 deletions(-)
 create mode 100644 public/js/plugin/Phrasen.js

diff --git a/public/js/apps/lehre/Antrag.js b/public/js/apps/lehre/Antrag.js
index bcb7b37a7..24f071597 100644
--- a/public/js/apps/lehre/Antrag.js
+++ b/public/js/apps/lehre/Antrag.js
@@ -2,6 +2,7 @@ import StudierendenantragAntrag from "../../components/Studierendenantrag/Antrag
 import StudierendenantragStatus from "../../components/Studierendenantrag/Status.js";
 import StudierendenantragInfoblock from "../../components/Studierendenantrag/Infoblock.js";
 import VueDatePicker from "../../components/vueDatepicker.js.php";
+import Phrasen from '../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
 	components: {
@@ -18,4 +19,6 @@ const app = Vue.createApp({
 		};
 	}
 });
-app.mount('#wrapper');
+app
+	.use(Phrasen)
+	.mount('#wrapper');
diff --git a/public/js/apps/lehre/Antrag/Leitung.js b/public/js/apps/lehre/Antrag/Leitung.js
index 25e4afaa0..637ca3f61 100644
--- a/public/js/apps/lehre/Antrag/Leitung.js
+++ b/public/js/apps/lehre/Antrag/Leitung.js
@@ -1,8 +1,12 @@
 import StudierendenantragLeitung from '../../../components/Studierendenantrag/Leitung.js';
+import Phrasen from '../../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
 	components: {
 		StudierendenantragLeitung
 	}
 });
-app.use(primevue.config.default,{zIndex: {overlay: 9999}}).mount('#wrapper');
+app
+	.use(Phrasen)
+	.use(primevue.config.default,{zIndex: {overlay: 9999}})
+	.mount('#wrapper');
diff --git a/public/js/apps/lehre/Antrag/Lvzuweisung.js b/public/js/apps/lehre/Antrag/Lvzuweisung.js
index 836d1168e..78abec5cf 100644
--- a/public/js/apps/lehre/Antrag/Lvzuweisung.js
+++ b/public/js/apps/lehre/Antrag/Lvzuweisung.js
@@ -1,4 +1,5 @@
 import LvZuweisung from '../../../components/Studierendenantrag/Lvzuweisung.js';
+import Phrasen from '../../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
 	components: {
@@ -10,4 +11,6 @@ const app = Vue.createApp({
 		}
 	}
 });
-app.mount('#wrapper');
+app
+	.use(Phrasen)
+	.mount('#wrapper');
diff --git a/public/js/apps/lehre/Antrag/Student.js b/public/js/apps/lehre/Antrag/Student.js
index f06143149..80cea89e9 100644
--- a/public/js/apps/lehre/Antrag/Student.js
+++ b/public/js/apps/lehre/Antrag/Student.js
@@ -1,8 +1,11 @@
 import LvPopup from '../../../components/Studierendenantrag/Leitung/LvPopup.js';
+import Phrasen from '../../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
 	components: {
 		LvPopup
 	}
 });
-app.mount('#wrapper');
+app
+	.use(Phrasen)
+	.mount('#wrapper');
diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 90cec2d50..453cc0b48 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -1,3 +1,5 @@
+import Phrasen from '../../plugin/Phrasen.js';
+
 export default {
 	data: () => ({
 		modal: null
@@ -86,6 +88,7 @@ export default {
 				}
 			});
 			const wrapper = document.createElement("div");
+			instance.use(Phrasen); // TODO(chris): find a more dynamic way
 			instance.mount(wrapper);
 			document.body.appendChild(wrapper);
 		});
diff --git a/public/js/components/Studierendenantrag/Antrag.js b/public/js/components/Studierendenantrag/Antrag.js
index d5989b521..197fe2206 100644
--- a/public/js/components/Studierendenantrag/Antrag.js
+++ b/public/js/components/Studierendenantrag/Antrag.js
@@ -2,7 +2,6 @@ import StudierendenantragAbmeldung from './Form/Abmeldung.js';
 import StudierendenantragAbmeldungStgl from './Form/AbmeldungStgl.js';
 import StudierendenantragUnterbrechung from './Form/Unterbrechung.js';
 import StudierendenantragWiederholung from './Form/Wiederholung.js';
-import Phrasen from '../../mixins/Phrasen.js';
 
 export default {
 	components: {
@@ -11,9 +10,6 @@ export default {
 		StudierendenantragUnterbrechung,
 		StudierendenantragWiederholung
 	},
-	mixins: [
-		Phrasen
-	],
 	emits: [
 		'update:infoArray',
 		'update:statusMsg',
@@ -37,13 +33,13 @@ export default {
 			return 'Studierendenantrag' + this.antragType;
 		},
 		infoText() {
-			return this.p.t('studierendenantrag/info_' + this.antragType + '_' + this.status);
+			return this.$p.t('studierendenantrag/info_' + this.antragType + '_' + this.status);
 		}
 	},
 	template: `
 	<div class="studierendenantrag-antrag card">
 		<div class="card-header">
-		    {{p.t('studierendenantrag', 'title_' + antragType)}}
+		    {{$p.t('studierendenantrag', 'title_' + antragType)}}
 		</div>
 		<div v-if="infoText && infoText.substr(0, 9) != '<< PHRASE'" class="alert alert-primary m-3" role="alert" v-html="infoText">
 		</div>
diff --git a/public/js/components/Studierendenantrag/Form/Abmeldung.js b/public/js/components/Studierendenantrag/Form/Abmeldung.js
index ba6a054ad..5f5d5ecb6 100644
--- a/public/js/components/Studierendenantrag/Form/Abmeldung.js
+++ b/public/js/components/Studierendenantrag/Form/Abmeldung.js
@@ -1,5 +1,4 @@
 import {CoreFetchCmpt} from '../../Fetch.js';
-import Phrasen from '../../../mixins/Phrasen.js';
 
 var _uuid = 0;
 
@@ -7,9 +6,6 @@ export default {
 	components: {
 		CoreFetchCmpt
 	},
-	mixins: [
-		Phrasen
-	],
 	emits: [
 		'setInfos',
 		'setStatus'
@@ -56,7 +52,7 @@ export default {
 					this.data = result.data.retval;
 					if (this.data.status) {
 						this.$emit("setStatus", {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
 							severity: this.statusSeverity
 						});
 					}
@@ -67,7 +63,7 @@ export default {
 		createAntrag() {
 			bootstrap.Modal.getOrCreateInstance(this.$refs.modal).hide();
 			this.$emit('setStatus', {
-				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+				msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')}),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -93,7 +89,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')}),
 							severity: 'danger'
 						});
 					}
@@ -104,13 +100,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_open')}),
+								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_open')}),
 								severity:'success'
 							});
 					}
@@ -120,7 +116,7 @@ export default {
 		},
 		cancelAntrag() {
 			this.$emit('setStatus', {
-				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelling')}),
+				msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelling')}),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -144,7 +140,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')}),
 							severity:'danger'
 						});
 					}
@@ -156,13 +152,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelled')}),
+								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelled')}),
 								severity: 'danger'
 							});
 					}
@@ -183,37 +179,37 @@ export default {
 					</div>
 					<table class="table">
 						<tr>
-							<th>{{p.t('lehre', 'studiengang')}}</th>
+							<th>{{$p.t('lehre', 'studiengang')}}</th>
 							<td align="right">{{data.bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'organisationsform')}}</th>
+							<th>{{$p.t('lehre', 'organisationsform')}}</th>
 							<td align="right">{{data.orgform_bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
+							<th>{{$p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
 							<td align="right">{{data.name}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('person', 'personenkennzeichen')}}</th>
+							<th>{{$p.t('person', 'personenkennzeichen')}}</th>
 							<td align="right">{{data.matrikelnr}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'studienjahr')}}</th>
+							<th>{{$p.t('lehre', 'studienjahr')}}</th>
 							<td align="right">{{data.studienjahr_kurzbz}}</td>
 						</tr>						
 						<tr>
-							<th>{{p.t('lehre', 'studiensemester')}}</th>
+							<th>{{$p.t('lehre', 'studiensemester')}}</th>
 							<td align="right">{{data.studiensemester_kurzbz}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'semester')}}</th>
+							<th>{{$p.t('lehre', 'semester')}}</th>
 							<td align="right">{{data.semester}}</td>
 						</tr>
 					</table>
 				</div>
 				<div v-if="data.grund" class="mb-3">
-					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
+					<h5>{{$p.t('studierendenantrag', 'antrag_grund')}}:</h5>
 					<pre>{{data.grund}}</pre>
 				</div>
 				<div v-else class="col-sm-6 mb-3">
@@ -239,7 +235,7 @@ export default {
 						@click="cancelAntrag"
 						:disabled="saving"
 						>
-						{{p.t('studierendenantrag', 'btn_cancel')}}
+						{{$p.t('studierendenantrag', 'btn_cancel')}}
 					</button>
 					<button
 						v-else-if="!data.studierendenantrag_id"
@@ -249,7 +245,7 @@ export default {
 						:data-bs-target="'#studierendenantrag-form-abmeldung-' + uuid + '-modal'"
 						:disabled="saving"
 						>
-						{{p.t('studierendenantrag', 'btn_create_Abmeldung')}}
+						{{$p.t('studierendenantrag', 'btn_create_Abmeldung')}}
 					</button>
 
 					<div
@@ -266,18 +262,18 @@ export default {
 										class="modal-title"
 										:id="'studierendenantrag-form-abmeldung-' + uuid + '-modal-label'"
 										>
-										{{p.t('studierendenantrag', 'title_Abmeldung')}}
+										{{$p.t('studierendenantrag', 'title_Abmeldung')}}
 									</h5>
-									<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="p.t('ui', 'schliessen')"></button>
+									<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$p.t('ui', 'schliessen')"></button>
 								</div>
-								<div class="modal-body" v-html="p.t('studierendenantrag', 'warning_Abmeldung')">
+								<div class="modal-body" v-html="$p.t('studierendenantrag', 'warning_Abmeldung')">
 								</div>
 								<div class="modal-footer">
 									<button
 										type="button"
 										class="btn btn-primary"
 										@click="createAntrag">
-										{{p.t('studierendenantrag', 'btn_create_Abmeldung')}}
+										{{$p.t('studierendenantrag', 'btn_create_Abmeldung')}}
 									</button>
 								</div>
 							</div>
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 3524bcd1f..540abed9d 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -1,5 +1,4 @@
 import {CoreFetchCmpt} from '../../Fetch.js';
-import Phrasen from '../../../mixins/Phrasen.js';
 
 var _uuid = 0;
 
@@ -7,9 +6,6 @@ export default {
 	components: {
 		CoreFetchCmpt
 	},
-	mixins: [
-		Phrasen
-	],
 	emits: [
 		'setInfos',
 		'setStatus'
@@ -56,7 +52,7 @@ export default {
 					this.data = result.data.retval;
 					if (this.data.status) {
 						this.$emit("setStatus", {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
 							severity: this.statusSeverity
 						});
 					}
@@ -67,7 +63,7 @@ export default {
 		createAntrag() {
 			bootstrap.Modal.getOrCreateInstance(this.$refs.modal).hide();
 			this.$emit('setStatus', {
-				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+				msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')}),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -93,7 +89,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')}),
 							severity: 'danger'
 						});
 					}
@@ -104,13 +100,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_open')}),
+								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_open')}),
 								severity:'success'
 							});
 					}
@@ -123,7 +119,7 @@ export default {
 
 			if(event.target.value)
 			{
-				let templateT= this.p.t('studierendenantrag', event.target.value);
+				let templateT= this.$p.t('studierendenantrag', event.target.value);
 				templateText.value = templateT;
 			}
 			else
@@ -140,38 +136,38 @@ export default {
 				<div class="col-12">
 					<table class="table">
 						<tr>
-							<th>{{p.t('lehre', 'studiengang')}}</th>
+							<th>{{$p.t('lehre', 'studiengang')}}</th>
 							<td align="right">{{data.bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'organisationsform')}}</th>
+							<th>{{$p.t('lehre', 'organisationsform')}}</th>
 							<td align="right">{{data.orgform_bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
+							<th>{{$p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
 							<td align="right">{{data.name}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('person', 'personenkennzeichen')}}</th>
+							<th>{{$p.t('person', 'personenkennzeichen')}}</th>
 							<td align="right">{{data.matrikelnr}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'studienjahr')}}</th>
+							<th>{{$p.t('lehre', 'studienjahr')}}</th>
 							<td align="right">{{data.studienjahr_kurzbz}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'studiensemester')}}</th>
+							<th>{{$p.t('lehre', 'studiensemester')}}</th>
 							<td align="right">{{data.studiensemester_kurzbz}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'semester')}}</th>
+							<th>{{$p.t('lehre', 'semester')}}</th>
 							<td align="right">{{data.semester}}</td>
 						</tr>
 					</table>
 				</div>
 
 				<div v-if="data.grund" class="mb-3">
-					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
+					<h5>{{$p.t('studierendenantrag', 'antrag_grund')}}:</h5>
 				
 					<pre class="text-prewrap">{{data.grund}}</pre>
 				</div>      
@@ -181,17 +177,17 @@ export default {
 						<select name="grundAv" @change="appendDropDownText
 							($event)">
 							<option value="" > --- bitte auswählen, sofern zutreffend ---- </option>
-							<option value="textLong_NichtantrittStudium">{{p.t('studierendenantrag', 'dropdown_NichtantrittStudium')}}
+							<option value="textLong_NichtantrittStudium">{{$p.t('studierendenantrag', 'dropdown_NichtantrittStudium')}}
 							</option>
-							<option value="textLong_ungenuegendeLeistung">{{p.t('studierendenantrag', 'dropdown_ungenuegendeLeistung')}}
+							<option value="textLong_ungenuegendeLeistung">{{$p.t('studierendenantrag', 'dropdown_ungenuegendeLeistung')}}
 							</option>
-							<option value="textLong_studentNichtAnwesend">{{p.t('studierendenantrag', 'dropdown_nichtAnwesend')}}
+							<option value="textLong_studentNichtAnwesend">{{$p.t('studierendenantrag', 'dropdown_nichtAnwesend')}}
 							</option>
-							<option value="textLong_PruefunstermineNichtEingehalten">{{p.t('studierendenantrag', 'dropdown_PruefunstermineNichtEingehalten')}}
+							<option value="textLong_PruefunstermineNichtEingehalten">{{$p.t('studierendenantrag', 'dropdown_PruefunstermineNichtEingehalten')}}
 							</option>
-							<option value="textLong_studentNichtGezahlt">{{p.t('studierendenantrag', 'dropdown_nichtGezahlt')}}
+							<option value="textLong_studentNichtGezahlt">{{$p.t('studierendenantrag', 'dropdown_nichtGezahlt')}}
 							</option>
-							<option value="textLong_plageat">{{p.t('studierendenantrag', 'dropdown_plageat')}}
+							<option value="textLong_plageat">{{$p.t('studierendenantrag', 'dropdown_plageat')}}
 							</option>					
 						</select>	
 					</div>			
@@ -218,7 +214,7 @@ export default {
 						:data-bs-target="'#studierendenantrag-form-abmeldung-' + uuid + '-modal'"
 						:disabled="saving"
 						>
-						{{p.t('studierendenantrag', 'btn_create_Abmeldung')}}
+						{{$p.t('studierendenantrag', 'btn_create_Abmeldung')}}
 					</button>
 					<div
 						ref="modal"
@@ -234,18 +230,18 @@ export default {
 										class="modal-title"
 										:id="'studierendenantrag-form-abmeldung-' + uuid + '-modal-label'"
 										>
-										{{p.t('studierendenantrag', 'title_Abmeldung')}}
+										{{$p.t('studierendenantrag', 'title_Abmeldung')}}
 									</h5>
-									<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="p.t('ui', 'schliessen')"></button>
+									<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$p.t('ui', 'schliessen')"></button>
 								</div>
-								<div class="modal-body" v-html="p.t('studierendenantrag', 'warning_AbmeldungStgl')">
+								<div class="modal-body" v-html="$p.t('studierendenantrag', 'warning_AbmeldungStgl')">
 								</div>
 								<div class="modal-footer">
 									<button
 										type="button"
 										class="btn btn-primary"
 										@click="createAntrag">
-										{{p.t('studierendenantrag', 'btn_create_Abmeldung')}}
+										{{$p.t('studierendenantrag', 'btn_create_Abmeldung')}}
 									</button>
 								</div>
 							</div>
diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
index 2459dec17..f4fea0629 100644
--- a/public/js/components/Studierendenantrag/Form/Unterbrechung.js
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -1,6 +1,5 @@
 import {CoreFetchCmpt} from '../../Fetch.js';
 import VueDatepicker from '../../vueDatepicker.js.php';
-import Phrasen from '../../../mixins/Phrasen.js';
 
 var _uuid = 0;
 
@@ -9,9 +8,6 @@ export default {
 		CoreFetchCmpt,
 		VueDatepicker
 	},
-	mixins: [
-		Phrasen
-	],
 	emits: [
 		'setInfos',
 		'setStatus'
@@ -79,7 +75,7 @@ export default {
 					this.data = result.data.retval;
 					if (this.data.status) {
 						this.$emit("setStatus", {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
 							severity: this.statusSeverity
 						});
 					}
@@ -89,7 +85,7 @@ export default {
 		},
 		createAntrag() {
 			this.$emit('setStatus', {
-				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+				msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')}),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -126,7 +122,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')}),
 							severity: 'danger'
 						});
 					}
@@ -137,13 +133,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_created')}),
+								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_created')}),
 								severity: 'info'
 							});
 					}
@@ -153,7 +149,7 @@ export default {
 		},
 		cancelAntrag() {
 			this.$emit('setStatus', {
-				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelling')}),
+				msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelling')}),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -177,7 +173,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')}),
 							severity: 'danger'
 						});
 					}
@@ -189,13 +185,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelled')}),
+								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelled')}),
 								severity: 'danger'
 							});
 					}
@@ -216,28 +212,28 @@ export default {
 					</div>
 					<table class="table">
 						<tr>
-							<th>{{p.t('lehre', 'studiengang')}}</th>
+							<th>{{$p.t('lehre', 'studiengang')}}</th>
 							<td align="right">{{data.bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'organisationsform')}}</th>
+							<th>{{$p.t('lehre', 'organisationsform')}}</th>
 							<td align="right">{{data.orgform_bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
+							<th>{{$p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
 							<td align="right">{{data.name}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('person', 'personenkennzeichen')}}</th>
+							<th>{{$p.t('person', 'personenkennzeichen')}}</th>
 							<td align="right">{{data.matrikelnr}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'studienjahr')}}</th>
+							<th>{{$p.t('lehre', 'studienjahr')}}</th>
 							<td align="right" v-if="data.studierendenantrag_id">{{data.studienjahr_kurzbz}}</td>
 							<td align="right" v-else>{{stsem === null ? '' : data.studiensemester[stsem].studienjahr_kurzbz}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'semester')}}</th>
+							<th>{{$p.t('lehre', 'semester')}}</th>
 							<td align="right" v-if="data.studierendenantrag_id">{{data.semester}}</td>
 							<td align="right" v-else>{{stsem === null ? '' : data.studiensemester[stsem].semester}}</td>
 						</tr>
@@ -246,7 +242,7 @@ export default {
 
 				<div class="col-sm-6 mb-3">
 					<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-stsem'" class="form-label">
-						{{p.t('lehre', 'studiensemester')}}
+						{{$p.t('lehre', 'studiensemester')}}
 					</label>
 					<div v-if="data.studierendenantrag_id">
 						{{data.studiensemester_kurzbz}}
@@ -271,7 +267,7 @@ export default {
 				</div>
 				<div class="col-sm-6 mb-3">
 					<label class="form-label">
-						{{p.t('studierendenantrag', 'antrag_datum_wiedereinstieg')}}
+						{{$p.t('studierendenantrag', 'antrag_datum_wiedereinstieg')}}
 					</label>
 
 					<div v-if="data.studierendenantrag_id">
@@ -279,7 +275,7 @@ export default {
 					</div>
 					<div v-else-if="stsem === null">
 						<select class="form-select" disabled>
-							<option selected>{{p.t('ui/select_studiensemester')}}</option>
+							<option selected>{{$p.t('ui/select_studiensemester')}}</option>
 						</select>
 					</div>
 					<div v-else>
@@ -295,7 +291,7 @@ export default {
 					</div>
 				</div>
 				<div v-if="data.studierendenantrag_id" class="mb-3">
-					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
+					<h5>{{$p.t('studierendenantrag', 'antrag_grund')}}:</h5>
 					<pre>{{data.grund}}</pre>
 				</div>
 				<div v-else class="col-sm-6 mb-3">
@@ -316,14 +312,14 @@ export default {
 				<div class="col-12 mb-3">
 
 					<div v-if="data.studierendenantrag_id">
-						<a v-if="data.dms_id" target="_blank" :href="siteUrl + '/lehre/Antrag/Attachment/Show/' + data.dms_id"> {{p.t('studierendenantrag', 'antrag_dateianhaenge')}} </a>
-						<span v-else>{{p.t('studierendenantrag', 'no_attachments')}}</span>
+						<a v-if="data.dms_id" target="_blank" :href="siteUrl + '/lehre/Antrag/Attachment/Show/' + data.dms_id"> {{$p.t('studierendenantrag', 'antrag_dateianhaenge')}} </a>
+						<span v-else>{{$p.t('studierendenantrag', 'no_attachments')}}</span>
 					</div>
 					<div v-else>
 						<label
 							:for="'studierendenantrag-form-abmeldung-' + uuid + '-attachment'"
 							class="form-label">
-							{{p.t('studierendenantrag', 'antrag_dateianhaenge')}}
+							{{$p.t('studierendenantrag', 'antrag_dateianhaenge')}}
 						</label>
 						<input
 							class="form-control"
@@ -341,7 +337,7 @@ export default {
 						@click="createAntrag"
 						:disabled="saving"
 						>
-						{{p.t('studierendenantrag', 'btn_create_Unterbrechung')}}
+						{{$p.t('studierendenantrag', 'btn_create_Unterbrechung')}}
 					</button>
 					<button
 						v-else-if="data.status == 'Erstellt'"
@@ -350,7 +346,7 @@ export default {
 						@click="cancelAntrag"
 						:disabled="saving"
 						>
-						{{p.t('studierendenantrag', 'btn_cancel')}}
+						{{$p.t('studierendenantrag', 'btn_cancel')}}
 					</button>
 				</div>
 			</div>
diff --git a/public/js/components/Studierendenantrag/Form/Wiederholung.js b/public/js/components/Studierendenantrag/Form/Wiederholung.js
index 336441dda..bc7dfc616 100644
--- a/public/js/components/Studierendenantrag/Form/Wiederholung.js
+++ b/public/js/components/Studierendenantrag/Form/Wiederholung.js
@@ -1,6 +1,5 @@
 import {CoreFetchCmpt} from '../../Fetch.js';
 import VueDatepicker from '../../vueDatepicker.js.php';
-import Phrasen from '../../../mixins/Phrasen.js';
 
 var _uuid = 0;
 
@@ -9,9 +8,6 @@ export default {
 		CoreFetchCmpt,
 		VueDatepicker
 	},
-	mixins: [
-		Phrasen
-	],
 	emits: [
 		'setInfos',
 		'setStatus',
@@ -67,11 +63,11 @@ export default {
 					this.data = result.data.retval;
 					if (!this.data.status || this.data.status == 'ErsteAufforderungVersandt' || this.data.status == 'ZweiteAufforderungVersandt') {
 						this.data.status = 'Offen';
-						this.data.statustyp = this.p.t('studierendenantrag', 'status_open');
+						this.data.statustyp = this.$p.t('studierendenantrag', 'status_open');
 					}
 					this.$emit('update:status', this.data.status);
 					this.$emit("setStatus", {
-						msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+						msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
 						severity: this.statusSeverity
 					});
 					return result;
@@ -89,7 +85,7 @@ export default {
 			let nextState = repeat ? 'Erstellt' : 'Verzichtet';
 
 			this.$emit('setStatus', {
-				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+				msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')}),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -116,7 +112,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')}),
 							severity: 'danger'
 						});
 					}
@@ -129,7 +125,7 @@ export default {
 							this.data.status = nextState;
 						this.$emit('update:status', this.data.status);
 						this.$emit("setStatus", {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
 							severity: this.statusSeverity
 						});
 					}
@@ -143,7 +139,7 @@ export default {
 	},
 	mounted() {
 		this.infos = [...Array(5).keys()].map(n => ({
-			body: this.p.t_ref('studierendenantrag', 'infotext_Wiederholung_' + n)
+			body: this.$p.t_ref('studierendenantrag', 'infotext_Wiederholung_' + n)
 		}));
 		this.$emit('setInfos', this.infos);
 	},
@@ -156,27 +152,27 @@ export default {
 					</div>
 					<table class="table">
 						<tr>
-							<th>{{p.t('lehre', 'studiengang')}}</th>
+							<th>{{$p.t('lehre', 'studiengang')}}</th>
 							<td align="right">{{data.bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'organisationsform')}}</th>
+							<th>{{$p.t('lehre', 'organisationsform')}}</th>
 							<td align="right">{{data.orgform_bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
+							<th>{{$p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
 							<td align="right">{{data.name}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('person', 'personenkennzeichen')}}</th>
+							<th>{{$p.t('person', 'personenkennzeichen')}}</th>
 							<td align="right">{{data.matrikelnr}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('studierendenantrag', 'antrag_Wiederholung_pruefung')}}</th>
+							<th>{{$p.t('studierendenantrag', 'antrag_Wiederholung_pruefung')}}</th>
 							<td align="right">{{data.lvbezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('studierendenantrag', 'antrag_Wiederholung_pruefung_date')}}</th>
+							<th>{{$p.t('studierendenantrag', 'antrag_Wiederholung_pruefung_date')}}</th>
 							<td align="right">{{datumPruefungFormatted}}</td>
 						</tr>
 					</table>
@@ -190,7 +186,7 @@ export default {
 						@click="createAntrag"
 						:disabled="saving"
 					>
-						{{p.t('studierendenantrag/antrag_Wiederholung_button_yes')}}
+						{{$p.t('studierendenantrag/antrag_Wiederholung_button_yes')}}
 					</button>
 <!--					<button
 						v-if="!data.studierendenantrag_id || data.status == 'Offen'"
@@ -199,7 +195,7 @@ export default {
 						@click="cancelAntrag"
 						:disabled="saving"
 					>
-						{{p.t('studierendenantrag/antrag_Wiederholung_button_no')}}
+						{{$p.t('studierendenantrag/antrag_Wiederholung_button_no')}}
 					</button>-->
 				</div>
 			</div>
diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
index da883acbc..95828e6cb 100644
--- a/public/js/components/Studierendenantrag/Leitung.js
+++ b/public/js/components/Studierendenantrag/Leitung.js
@@ -5,7 +5,6 @@ import GrundPopup from './Leitung/GrundPopup.js';
 import LvPopup from './Leitung/LvPopup.js';
 import BsAlert from '../Bootstrap/Alert.js';
 import FhcLoader from '../Loader.js';
-import Phrasen from '../../mixins/Phrasen.js';
 
 export default {
 	components: {
@@ -14,7 +13,6 @@ export default {
 		LeitungActions,
 		FhcLoader
 	},
-	mixins: [Phrasen],
 	props: {
 		stgL: Array,
 		stgA: Array
@@ -31,12 +29,12 @@ export default {
 		stgkzL() {
 			if (!this.stgL)
 				return [];
-			return this.stgL.map(stg => stg.studiengang_kz);
+			return this.stgL.map(stg => parseInt(stg));
 		},
 		stgkzA() {
 			if (!this.stgA)
 				return [];
-			return this.stgA.map(stg => stg.studiengang_kz);
+			return this.stgA.map(stg => parseInt(stg));
 		}
 	},
 	methods: {
@@ -79,7 +77,7 @@ export default {
 				{
 					let countAntrage = 0;
 					LvPopup
-						.popup(this.p.t('studierendenantrag','title_show_lvs', currentAntrag), {
+						.popup(this.$p.t('studierendenantrag','title_show_lvs', currentAntrag), {
 							antragId: currentAntrag.studierendenantrag_id,
 							footer: true,
 							dialogClass: 'modal-lg',
@@ -128,7 +126,7 @@ export default {
 			var currentAntrag = antraege.pop();
 			if (currentAntrag) {
 				GrundPopup
-					.popup(this.p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), {
+					.popup(this.$p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), {
 						countRemaining: antraege.length
 					})
 					.then(result => {
@@ -211,7 +209,7 @@ export default {
 			var currentAntrag = antraege.pop();
 			if (currentAntrag) {
 				GrundPopup
-					.popup(this.p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), {
+					.popup(this.$p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), {
 						countRemaining : antraege.length,
 						optional: true
 					})
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions.js b/public/js/components/Studierendenantrag/Leitung/Actions.js
index 71ada5c20..2720a7df5 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions.js
@@ -1,13 +1,11 @@
 import ActionsNew from './Actions/New.js';
 import ActionsColumns from './Actions/Columns.js';
-import Phrasen from '../../../mixins/Phrasen.js';
 
 export default {
 	components: {
 		ActionsNew,
 		ActionsColumns
 	},
-	mixins: [Phrasen],
 	props: {
 		selectedData: Array,
 		columns: Array,
@@ -67,17 +65,17 @@ export default {
 	<div class="studierendenantrag-leitung-actions fhc-table-actions d-flex flex-wrap justify-content-between mb-2">
 		<div class="d-flex align-items-center gap-2">
 			<actions-new @reload="$emit('reload')"></actions-new>
-			<button type="button" class="btn btn-outline-secondary" @click="$emit('reload')" :title="p.t('table','reload')">
+			<button type="button" class="btn btn-outline-secondary" @click="$emit('reload')" :title="$p.t('table','reload')">
 				<i class="fa-solid fa-rotate-right"></i>
 			</button>
-			<span>{{p.t('table', 'with_selected', {count: selectedData.length})}}</span>
-			<button v-if="stgL.length" :disabled="!selectedCanBeApproved" type="button" class="btn btn-outline-secondary" @click="$emit('action:approve')">{{p.t('studierendenantrag', 'btn_approve')}}</button>
-			<button v-if="stgL.length" :disabled="!selectedCanBeRejected" type="button" class="btn btn-outline-secondary" @click="$emit('action:reject')">{{p.t('studierendenantrag', 'btn_reject')}}</button>
-			<button v-if="stgA.length" :disabled="!selectedCanBeReopened" type="button" class="btn btn-outline-secondary" @click="$emit('action:reopen')">{{p.t('studierendenantrag', 'btn_reopen')}}</button>
+			<span>{{$p.t('table', 'with_selected', {count: selectedData.length})}}</span>
+			<button v-if="stgL.length" :disabled="!selectedCanBeApproved" type="button" class="btn btn-outline-secondary" @click="$emit('action:approve')">{{$p.t('studierendenantrag', 'btn_approve')}}</button>
+			<button v-if="stgL.length" :disabled="!selectedCanBeRejected" type="button" class="btn btn-outline-secondary" @click="$emit('action:reject')">{{$p.t('studierendenantrag', 'btn_reject')}}</button>
+			<button v-if="stgA.length" :disabled="!selectedCanBeReopened" type="button" class="btn btn-outline-secondary" @click="$emit('action:reopen')">{{$p.t('studierendenantrag', 'btn_reopen')}}</button>
 		</div>
 		<div>
-			<button type="button" class="btn btn-link" data-bs-toggle="collapse" href="#columns" :title="p.t('table','spaltenEinAusblenden')"><i class="fa fa-table-columns"></i></button>
-			<button type="button" class="btn btn-link" @click="$emit('download')" :title="p.t('table','download')"><i class="fa fa-download"></i></button>
+			<button type="button" class="btn btn-link" data-bs-toggle="collapse" href="#columns" :title="$p.t('table','spaltenEinAusblenden')"><i class="fa fa-table-columns"></i></button>
+			<button type="button" class="btn btn-link" @click="$emit('download')" :title="$p.t('table','download')"><i class="fa fa-download"></i></button>
 		</div>
 		<div class="col-12">
 			<actions-columns id="columns" class="collapse" :columns="columns"></actions-columns>
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
index ad3009bdb..8952c4e78 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions/New.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
@@ -1,15 +1,11 @@
 import BsAlert from '../../../Bootstrap/Alert.js';
 import BsModal from '../../../Bootstrap/Modal.js';
-import Phrasen from '../../../../mixins/Phrasen.js';
 
 export default {
 	components: {
 		BsModal,
 		AutoComplete: primevue.autocomplete
 	},
-	mixins: [
-		Phrasen
-	],
 	emits: [
 		'reload'
 	],
@@ -33,7 +29,7 @@ export default {
 				class: 'position-absolute top-0 start-0 w-100 h-100'
 			}), {
 				dialogClass: 'modal-fullscreen'
-			}, this.p.t('studierendenantrag', 'antrag_header')).then(() => {
+			}, this.$p.t('studierendenantrag', 'antrag_header')).then(() => {
 				this.$emit('reload');
 				this.student = '';
 			});
@@ -67,17 +63,17 @@ export default {
 	<div class="studierendenantrag-leitung-actions-new" v-if="data">
 		<button type="button" class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#newAntragModal">
 			<i class="fa fa-plus"></i>
-			{{p.t('studierendenantrag','btn_new')}}
+			{{$p.t('studierendenantrag','btn_new')}}
 		</button>
 		<div ref="modal" class="modal fade" id="newAntragModal" tabindex="-1" aria-labelledby="newAntragModalLabel" aria-hidden="true">
 			<div class="modal-dialog">
 				<div class="modal-content">
 					<div class="modal-header">
-						<h5 class="modal-title" id="newAntragModalLabel">{{p.t('studierendenantrag','title_new_Abmeldung')}}</h5>
-						<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="p.t('ui','schliessen')"></button>
+						<h5 class="modal-title" id="newAntragModalLabel">{{$p.t('studierendenantrag','title_new_Abmeldung')}}</h5>
+						<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$p.t('ui','schliessen')"></button>
 					</div>
 					<div class="modal-body">
-						<label for="newAntragModalAutoComplete">{{p.t('person','studentIn')}}</label>
+						<label for="newAntragModalAutoComplete">{{$p.t('person','studentIn')}}</label>
 						<div>
 							<auto-complete
 								class="w-100"
@@ -102,7 +98,7 @@ export default {
 							class="btn btn-primary"
 							:disabled="!this.student"
 							@click.prevent="openForm">
-							{{p.t('studierendenantrag','btn_create')}}
+							{{$p.t('studierendenantrag','btn_create')}}
 						</button>
 					</div>
 				</div>
diff --git a/public/js/components/Studierendenantrag/Leitung/GrundPopup.js b/public/js/components/Studierendenantrag/Leitung/GrundPopup.js
index 3a7b40f2d..bdea298ec 100644
--- a/public/js/components/Studierendenantrag/Leitung/GrundPopup.js
+++ b/public/js/components/Studierendenantrag/Leitung/GrundPopup.js
@@ -1,11 +1,8 @@
-
 import BsAlert from '../../Bootstrap/Alert.js';
-import Phrasen from '../../../mixins/Phrasen.js';
 
 export default {
 	mixins: [
 		BsAlert,
-		Phrasen
 	],
 	props: {
 		placeholder: String,
@@ -46,17 +43,17 @@ export default {
 			<div>
 				<textarea ref="input" class="form-control" :class="{'is-invalid' : isInvalid}" v-model="value"></textarea>
 				<div v-if="isInvalid" class="invalid-feedback">
-					{{p.t('kvp','new.error.required')}}
+					{{$p.t('kvp','new.error.required')}}
 				</div>
 			</div>
 		</template>
 		<template v-slot:footer>
 			<div v-if="countRemaining > 0" class="form-check flex-grow-1">
 				<input ref="check" type="checkbox" class="form-check-input" id="cbid" v-model="check">
-				<label class="form-check-label" for="cbid">{{p.t('studierendenantrag','fuer_alle_uebernehmen')}}</label>
+				<label class="form-check-label" for="cbid">{{$p.t('studierendenantrag','fuer_alle_uebernehmen')}}</label>
 			</div>
-			<button type="button" class="btn btn-primary" @click="submit">{{p.t('ui','ok')}}</button>
-			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{p.t('ui','cancel')}}</button>
+			<button type="button" class="btn btn-primary" @click="submit">{{$p.t('ui','ok')}}</button>
+			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui','cancel')}}</button>
 		</template>
 	</bs-modal>`
 }
diff --git a/public/js/components/Studierendenantrag/Leitung/Header.js b/public/js/components/Studierendenantrag/Leitung/Header.js
index 388a93b7d..12bfcbe82 100644
--- a/public/js/components/Studierendenantrag/Leitung/Header.js
+++ b/public/js/components/Studierendenantrag/Leitung/Header.js
@@ -1,7 +1,4 @@
-import Phrasen from '../../../mixins/Phrasen.js';
-
 export default {
-	mixins: [Phrasen],
 	props: {
 		stgs: Array
 	},
@@ -10,10 +7,10 @@ export default {
 	],
 	template: `
 	<div class="studierendenantrag-leitung-header fhc-table-header d-flex align-items-center mb-2 gap-2">
-		<h3 class="h5 col m-0">{{p.t('studierendenantrag', 'studierendenantraege')}}</h3>
+		<h3 class="h5 col m-0">{{$p.t('studierendenantrag', 'studierendenantraege')}}</h3>
 		<div v-if="stgs.length > 1" class="col-auto">
 			<select ref="stg_select" class="form-select" @input="$emit('input', $event)">
-				<option value="">{{p.t('global', 'alle')}}</option>
+				<option value="">{{$p.t('global', 'alle')}}</option>
 				<option v-for="stg in stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">
 					{{stg.bezeichnung}} ({{stg.orgform}})
 				</option>
diff --git a/public/js/components/Studierendenantrag/Leitung/LvPopup.js b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
index db13a1bb7..99455237e 100644
--- a/public/js/components/Studierendenantrag/Leitung/LvPopup.js
+++ b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
@@ -1,14 +1,12 @@
 import BsAlert from '../../Bootstrap/Alert.js';
 import {CoreFetchCmpt} from "../../Fetch.js";
-import Phrasen from '../../../mixins/Phrasen.js';
 
 export default {
 	components: {
 		CoreFetchCmpt
 	},
 	mixins: [
-		BsAlert,
-		Phrasen
+		BsAlert
 	],
 	props: {
 		footer: Boolean,
@@ -79,29 +77,29 @@ export default {
 				@data-fetched="setlvs">
 				<template #default>
 					<div v-if="lvzugelassenLength == 0">
-						{{p.t('studierendenantrag','error_no_lvs')}}
+						{{$p.t('studierendenantrag','error_no_lvs')}}
 					</div>
 					<table v-else class="table caption-top" v-for="(lv_arr, sem) in lvzugelassen" :key="sem">
 						<caption>
 							<span class="d-flex justify-content-between">
-								<span>{{ p.t('studierendenantrag',['title_lv_nicht_zugelassen', 'title_lv_wiederholen'][sem.substr(0,1)-1]) }}</span>
+								<span>{{ $p.t('studierendenantrag',['title_lv_nicht_zugelassen', 'title_lv_wiederholen'][sem.substr(0,1)-1]) }}</span>
 								<span>{{sem.substr(1)}}</span>
 							</span>
 						</caption>
 						<thead v-if="lv_arr !== null">
 							<tr>
-								<th scope="col">{{p.t('ui','bezeichnung')}}</th>
-								<th scope="col">{{p.t('lehre','lehrform')}}</th>
+								<th scope="col">{{$p.t('ui','bezeichnung')}}</th>
+								<th scope="col">{{$p.t('lehre','lehrform')}}</th>
 								<th scope="col">ECTS</th>
-								<th scope="col">{{p.t('lehre','note')}}</th>
+								<th scope="col">{{$p.t('lehre','note')}}</th>
 								<th scope="col">
-									{{p.t('global','anmerkung')}}
+									{{$p.t('global','anmerkung')}}
 								</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-if="lv_arr === null" class="table-warning">
-								<td colspan="5">{{p.t('studierendenantrag/error_stg_last_semester')}}</td>
+								<td colspan="5">{{$p.t('studierendenantrag/error_stg_last_semester')}}</td>
 							</tr>
 							<template v-else>
 								<tr v-for="lv in lv_arr">
@@ -140,10 +138,10 @@ export default {
 		<template v-if="footer" v-slot:footer>
 			<div v-if="countRemaining > 0" class="form-check flex-grow-1">
 				<input ref="check" type="checkbox" class="form-check-input" id="cbid" v-model="check">
-				<label class="form-check-label" for="cbid">{{p.t('studierendenantrag','fuer_x_uebernehmen', {count: countRemaining})}}</label>
+				<label class="form-check-label" for="cbid">{{$p.t('studierendenantrag','fuer_x_uebernehmen', {count: countRemaining})}}</label>
 			</div>
-			<button type="button" class="btn btn-primary" @click="submit(true)">{{p.t('studierendenantrag','btn_approve')}}</button>
-			<button v-if="countRemaining > 0" type="button" class="btn btn-secondary" @click="submit(false)">{{p.t('ui','skip')}}</button>
+			<button type="button" class="btn btn-primary" @click="submit(true)">{{$p.t('studierendenantrag','btn_approve')}}</button>
+			<button v-if="countRemaining > 0" type="button" class="btn btn-secondary" @click="submit(false)">{{$p.t('ui','skip')}}</button>
 		</template>
 	</bs-modal>`
 }
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index aa1bc3734..d398824b1 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -1,7 +1,6 @@
 import BsModal from '../../Bootstrap/Modal.js';
 import {CoreFetchCmpt} from '../../Fetch.js';
 import LvPopup from './LvPopup.js';
-import Phrasen from '../../../mixins/Phrasen.js';
 import { dateFilter } from '../../../tabulator/filters/Dates.js';
 
 export default {
@@ -10,7 +9,6 @@ export default {
 		CoreFetchCmpt,
 		LvPopup
 	},
-	mixins: [Phrasen],
 	props: {
 		selectedData: Array,
 		columnData: Array,
@@ -114,7 +112,7 @@ export default {
 				title: '#'
 			}, {
 				field: 'bezeichnung',
-				title: this.p.t('lehre', 'studiengang'),
+				title: this.$p.t_node('lehre', 'studiengang'),
 				headerFilter: 'list',
 				headerFilterParams: {
 					valuesLookup: true,
@@ -123,7 +121,7 @@ export default {
 				}
 			}, {
 				field: 'orgform',
-				title: this.p.t('lehre', 'organisationsform'),
+				title: this.$p.t_node('lehre', 'organisationsform'),
 				headerFilter: 'list',
 				headerFilterParams: {
 					valuesLookup: true,
@@ -132,7 +130,7 @@ export default {
 				}
 			}, {
 				field: 'typ',
-				title: this.p.t('studierendenantrag', 'antrag_typ'),
+				title: this.$p.t_node('studierendenantrag', 'antrag_typ'),
 				headerFilter: 'list',
 				headerFilterParams: {
 					valuesLookup: true,
@@ -140,11 +138,11 @@ export default {
 					autocomplete: true,
 				},
 				formatter: (cell, formatterParams, onRendered) => {
-					return this.p.t('studierendenantrag','antrag_typ_' + cell.getValue());
+					return this.$p.t('studierendenantrag','antrag_typ_' + cell.getValue());
 				}
 			}, {
 				field: 'statustyp',
-				title: this.p.t('studierendenantrag', 'antrag_status'),
+				title: this.$p.t_node('studierendenantrag', 'antrag_status'),
 				headerFilter: 'list',
 				headerFilterParams: {
 					valuesLookup: true,
@@ -166,38 +164,38 @@ export default {
 				}
 			}, {
 				field: 'matrikelnr',
-				title: this.p.t('person', 'personenkennzeichen'),
+				title: this.$p.t_node('person', 'personenkennzeichen'),
 				headerFilter: 'input'
 			}, {
 				field: 'prestudent_id',
-				title: this.p.t('lehre', 'prestudent'),
+				title: this.$p.t_node('lehre', 'prestudent'),
 				headerFilter: 'input'
 			}, {
 				field: 'name',
-				title: this.p.t('global', 'name'),
+				title: this.$p.t_node('global', 'name'),
 				mutator: (value, data) => (data.vorname + ' ' + data.nachname).replace(/^\s*(.*)\s*$/, '$1'),
 				headerFilter: 'input'
 			}, {
 				field: 'datum',
-				title: this.p.t('global', 'datum'),
+				title: this.$p.t_node('global', 'datum'),
 				formatter: dateFormatter,
 				headerFilterFunc: 'dates',
 				headerFilter: dateFilter
 			}, {
 				field: 'datum_wiedereinstieg',
-				title: this.p.t('studierendenantrag', 'antrag_datum_wiedereinstieg'),
+				title: this.$p.t_node('studierendenantrag', 'antrag_datum_wiedereinstieg'),
 				formatter: dateFormatter,
 				headerFilterFunc: 'dates',
 				headerFilter: dateFilter
 			}, {
 				field: 'grund',
-				title: this.p.t('studierendenantrag', 'antrag_grund'),
+				title: this.$p.t_node('studierendenantrag', 'antrag_grund'),
 				formatter: (cell, formatterParams, onRendered) => {
 					let link = document.createElement('a'),
 						val = cell.getValue();
 					link.href = "#modal-grund";
 					link.setAttribute('data-bs-toggle', 'modal');
-					link.innerHTML = this.p.t('studierendenantrag', 'antrag_grund');
+					link.innerHTML = this.$p.t('studierendenantrag', 'antrag_grund');
 					link.addEventListener('click', () => {
 						this.$refs.modalGrundPre.innerHTML = val;
 					});
@@ -206,19 +204,25 @@ export default {
 				}
 			}, {
 				field: 'dms_id',
-				title: this.p.t('studierendenantrag', 'antrag_dateianhaenge'),
+				title: this.$p.t_node('studierendenantrag', 'antrag_dateianhaenge'),
 				formatter: (cell, formatterParams, onRendered) => {
 					let val = cell.getValue();
 					if (!val)
 						return '';
-					return '<a href="' + FHC_JS_DATA_STORAGE_OBJECT.app_root +
+					let link = document.createElement('a');
+					link.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
 						FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-						'/lehre/Antrag/Attachment/show/' + val + '" target="_blank"><i class="fa fa-paperclip" aria-hidden="true"></i> ' + this.p.t('studierendenantrag', 'antrag_anhang') + '</a>';
+						'/lehre/Antrag/Attachment/show/' +
+						val;
+					link.setAttribute('target', '_blank');
+					link.innerHTML = '<i class="fa fa-paperclip" aria-hidden="true"></i>';
+					link.append(this.$p.t_node('studierendenantrag/antrag_anhang'));
+					return link;
 				}
 			}, {
 				field: 'actions',
 				frozen: true,
-				title: this.p.t('ui', 'aktion'),
+				title: this.$p.t_node('ui', 'aktion'),
 				headerFilter: false,
 				headerSort: false,				
 				formatter: (cell, formatterParams, onRendered) => {
@@ -230,7 +234,9 @@ export default {
 					if ((data.typ == 'Abmeldung' || data.typ == 'AbmeldungStgl' || data.typ == 'Unterbrechung') && (data.status == 'Genehmigt' || data.status == 'Beeinsprucht' || data.status == 'EinspruchAbgelehnt' || data.status == 'EmailVersandt')) {
 						// NOTE(chris): Download PDF
 						let button = document.createElement('a');
-						button.innerHTML = '<i class="fa-solid fa-download" title="' + this.p.t('studierendenantrag', 'btn_download_antrag') + '"></i>';
+						// NOTE(chris): phrasen in attribues don't work if they are not preloaded
+						// it work in this case because the category has already been loaded before
+						button.innerHTML = '<i class="fa-solid fa-download" title="' + this.$p.t('studierendenantrag', 'btn_download_antrag') + '"></i>';
 						button.className = "btn btn-outline-secondary";
 						button.target = "_blank";
 						button.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
@@ -240,7 +246,7 @@ export default {
 					if (data.typ == 'AbmeldungStgl' && data.status == 'Genehmigt') {
 						// NOTE(chris): Object
 						let button = document.createElement('button');
-						button.innerHTML = this.p.t('studierendenantrag', 'btn_object');
+						button.append(this.$p.t_node('studierendenantrag', 'btn_object'));
 						button.className = "btn btn-outline-secondary";
 						button.addEventListener('click', () => this.$emit('action:object', [cell.getData()]));
 						container.append(button);
@@ -249,14 +255,14 @@ export default {
 					if (data.typ == 'AbmeldungStgl' && data.status == 'Beeinsprucht') {
 						// NOTE(chris): Deny Objection
 						let button = document.createElement('button');
-						button.innerHTML = this.p.t('studierendenantrag', 'btn_objection_deny');
+						button.append(this.$p.t_node('studierendenantrag', 'btn_objection_deny'));
 						button.className = "btn btn-outline-secondary";
 						button.addEventListener('click', () => this.$emit('action:objectionDeny', [cell.getData()]));
 						container.append(button);
 
 						// NOTE(chris): Approve Objection
 						button = document.createElement('button');
-						button.innerHTML = this.p.t('studierendenantrag', 'btn_objection_approve');
+						button.append(this.$p.t_node('studierendenantrag', 'btn_objection_approve'));
 						button.className = "btn btn-outline-secondary";
 						button.addEventListener('click', () => this.$emit('action:objectionApprove', [cell.getData()]));
 						container.append(button);
@@ -266,7 +272,7 @@ export default {
 						// NOTE(chris): Reopen
 						if (data.typ == 'Wiederholung' && data.status == 'Verzichtet') {
 							let button = document.createElement('button');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_reopen');
+							button.append(this.$p.t_node('studierendenantrag', 'btn_reopen'));
 							button.className = "btn btn-outline-secondary";
 							button.addEventListener('click', () => this.$emit('action:reopen', [cell.getData()]));
 							container.append(button);
@@ -274,7 +280,7 @@ export default {
 						// NOTE(chris): Lv Zuweisen
 						if (data.typ == 'Wiederholung' && (data.status == 'Erstellt' || data.status == 'Lvszugewiesen')) {
 							let button = document.createElement('a');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_lvzuweisen');
+							button.append(this.$p.t_node('studierendenantrag', 'btn_lvzuweisen'));
 							button.className = "btn btn-outline-secondary";
 							button.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
 								FHC_JS_DATA_STORAGE_OBJECT.ci_router +
@@ -287,7 +293,7 @@ export default {
 									class: 'position-absolute top-0 start-0 w-100 h-100'
 								}), {
 									dialogClass: 'modal-fullscreen'
-								}, this.p.t('studierendenantrag', 'title_lvzuweisen', cell.getData())).then(() => {
+								}, this.$p.t('studierendenantrag', 'title_lvzuweisen', cell.getData())).then(() => {
 									this.$emit('reload');
 								});
 							};
@@ -296,7 +302,7 @@ export default {
 						// NOTE(chris): Cancel
 						if (data.typ == 'AbmeldungStgl' && (data.status == 'Erstellt' || data.status == 'Genehmigt' )) {
 							let button = document.createElement('button');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_cancel');
+							button.append(this.$p.t_node('studierendenantrag', 'btn_cancel'));
 							button.className = "btn btn-outline-secondary";
 							button.addEventListener('click',() => this.$emit('action:cancel', [cell.getData()]));
 							container.append(button);
@@ -307,7 +313,7 @@ export default {
 						// NOTE(chris): Approve
 						if ((data.typ == 'Wiederholung' && data.status == 'Lvszugewiesen') || (data.typ != 'Wiederholung' && data.status == 'Erstellt')) {
 							let button = document.createElement('button');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_approve');
+							button.append(this.$p.t_node('studierendenantrag', 'btn_approve'));
 							button.className = "btn btn-outline-secondary";
 							button.addEventListener('click', () => this.$emit('action:approve', [cell.getData()]));
 							container.append(button);
@@ -315,7 +321,7 @@ export default {
 						// NOTE(chris): Reject (Unterbrechung braucht grund)
 						if (data.status == 'Erstellt' && data.typ == 'Unterbrechung') {
 							let button = document.createElement('button');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_reject');
+							button.append(this.$p.t_node('studierendenantrag', 'btn_reject'));
 							button.className = "btn btn-outline-secondary";
 							button.addEventListener('click', () => this.$emit('action:reject', [cell.getData()]));
 							container.append(button);
@@ -325,7 +331,7 @@ export default {
 					// NOTE(chris): Show LVs
 					if (data.typ == 'Wiederholung' && (data.status == 'Lvszugewiesen' || data.status == 'Genehmigt')) {
 						let button = document.createElement('button');
-						button.innerHTML = this.p.t('studierendenantrag', 'btn_show_lvs');
+						button.append(this.$p.t_node('studierendenantrag', 'btn_show_lvs'));
 						button.className = "btn btn-outline-secondary";
 						button.addEventListener('click', () => this.showLVs(cell.getData()));
 						container.append(button);
@@ -358,11 +364,11 @@ export default {
 	<div class="studierendenantrag-leitung-table">
 		<div ref="table"></div>
 		<bs-modal ref="modalGrund" id="modal-grund" class="fade">
-			<template #title>{{p.t('studierendenantrag', 'antrag_grund')}}</template>
+			<template #title>{{$p.t('studierendenantrag', 'antrag_grund')}}</template>
 			<pre ref="modalGrundPre"></pre>
 		</bs-modal>
 		<bs-modal ref="history" class="fade">
-			<template #title>{{p.t('studierendenantrag', 'title_history', {id: lastHistoryClickedId})}}</template>
+			<template #title>{{$p.t('studierendenantrag', 'title_history', {id: lastHistoryClickedId})}}</template>
 			<core-fetch-cmpt ref="historyLoader" :api-function="getHistory">
 				<table v-if="historyData.length" class="table">
 					<tr v-for="status in historyData" :key="status.studierendenantrag_status_id">
@@ -371,7 +377,7 @@ export default {
 						<td>{{status.typ}}</td>
 						<td>
 							<a v-if="status.grund" href="#modal-grund" data-bs-toggle="modal" @click="showHistoryGrund(status.grund)">
-								{{p.t('studierendenantrag', 'antrag_grund')}}
+								{{$p.t('studierendenantrag', 'antrag_grund')}}
 							</a>
 						</td>
 					</tr>
@@ -379,7 +385,7 @@ export default {
 			</core-fetch-cmpt>
 		</bs-modal>
 		<lv-popup ref="lvList" class="fade" :antrag-id="lvsData ? lvsData.studierendenantrag_id : null">
-			{{p.t('studierendenantrag', 'title_show_lvs', lvsData ? lvsData : {name: ''}) }}
+			{{$p.t('studierendenantrag', 'title_show_lvs', lvsData ? lvsData : {name: ''}) }}
 		</lv-popup>
 	</div>
 	`
diff --git a/public/js/components/Studierendenantrag/Lvzuweisung.js b/public/js/components/Studierendenantrag/Lvzuweisung.js
index 376e266d3..34576ed4c 100644
--- a/public/js/components/Studierendenantrag/Lvzuweisung.js
+++ b/public/js/components/Studierendenantrag/Lvzuweisung.js
@@ -1,11 +1,9 @@
 import StudierendenantragStatus from './Status.js';
-import Phrasen from '../../mixins/Phrasen.js';
 
 export default {
 	components: {
 		StudierendenantragStatus
 	},
-	mixins: [Phrasen],
 	props: {
 		antragId: Number,
 		initialStatusCode: String,
@@ -110,7 +108,7 @@ export default {
 					for (var k in result.data.retval) {
 						if (result.data.retval[k] === null) {
 							const alert = document.createElement('div');
-							alert.innerHTML = this.p.t('studierendenantrag', 'error_stg_last_semester');
+							alert.innerHTML = this.$p.t('studierendenantrag', 'error_stg_last_semester');
 							alert.className = 'alert alert-warning';
 							alert.role = 'alert';
 							this.$refs["lvtable" + k.substr(0,1)].append(alert);
@@ -134,18 +132,19 @@ export default {
 						res[k] = Object.values(lvs).filter(lv => !lv.studienplan_lehrveranstaltung_id_parent);
 						let current = res[k];
 						let index = k.substr(0,1);
-						var table = new Tabulator(this.$refs["lvtable" + k.substr(0,1)], {
+
+						const options = {
 							data: current,
 							dataTree: true,
 							dataTreeStartExpanded: true, //start with an expanded tree
 							dataTreeChildIndent: 15,
 							layout: "fitDataStretch",
 							columns: [
-								{title: this.p.t('ui','bezeichnung'), field: "bezeichnung"},
-								{title: this.p.t('lehre','lehrform'), field: "lehrform_kurzbz"},
+								{title: this.$p.t_node('ui', 'bezeichnung'), field: "bezeichnung"},
+								{title: this.$p.t_node('lehre','lehrform'), field: "lehrform_kurzbz"},
 								{title: "ECTS", field: "ects"},
-								{title: this.p.t('lehre','note'), field: "note", formatter:(cell, formatterParams, onRendered)=>cell.getValue() || "---"},
-								{title: (index==1) ? this.p.t('studierendenantrag','lv_nicht_zulassen') : this.p.t('studierendenantrag','lv_wiederholen'), field: "antrag_zugelassen", formatter: (cell, formatterParams, onRendered) => {
+								{title: this.$p.t_node('lehre','note'), field: "note", formatter:(cell, formatterParams, onRendered)=>cell.getValue() || "---"},
+								{title: (index==1) ? this.$p.t_node('studierendenantrag','lv_nicht_zulassen') : this.$p.t_node('studierendenantrag','lv_wiederholen'), field: "antrag_zugelassen", formatter: (cell, formatterParams, onRendered) => {
 									let data = cell.getData();
 									if(data._children || !data.zeugnis)
 										return "";
@@ -169,7 +168,7 @@ export default {
 									return div;
 								}},
 								{
-									title: this.p.t('global','anmerkung'),
+									title: this.$p.t_node('global','anmerkung'),
 									field: "antrag_anmerkung",
 									headerSort:false,
 									titleFormatter:(cell, formatterParams, onRendered)=>{
@@ -179,10 +178,10 @@ export default {
 										});
 
 										link.href ="#";
-										link.title = this.p.t('studierendenantrag','anmerkung_tooltip');
+										link.title = this.$p.t('studierendenantrag','anmerkung_tooltip');
 										new bootstrap.Tooltip(link);
 										let tooltip = document.createElement('span');
-										tooltip.innerHTML = this.p.t('global','anmerkung') + " ";
+										tooltip.innerHTML = this.$p.t('global','anmerkung') + " ";
 										tooltip.append(link);
 
 										let icon =  document.createElement('i');
@@ -217,7 +216,8 @@ export default {
 									}
 								}
 							]
-						});
+						};
+						var table = new Tabulator(this.$refs["lvtable" + k.substr(0,1)], options);
 					}
 					this.lvs = result.data.retval;
 				}
@@ -229,20 +229,20 @@ export default {
 		<div ref="alertbox"></div>
 
 		<span class="d-flex justify-content-between h4">
-			<span>{{p.t('studierendenantrag', 'title_lv_nicht_zugelassen')}}</span>
+			<span>{{$p.t('studierendenantrag', 'title_lv_nicht_zugelassen')}}</span>
 			<span>{{lvs1sem}}</span>
 		</span>
 		<div ref="lvtable1" class="mb-3">
 		</div>
 
 		<span class="d-flex justify-content-between h4">
-			<span>{{p.t('studierendenantrag', 'title_lv_wiederholen')}}</span>
+			<span>{{$p.t('studierendenantrag', 'title_lv_wiederholen')}}</span>
 			<span>{{lvs2sem}}</span>
 		</span>
 		<div ref="lvtable2">
 		</div>
 
-		<button type="button" @click="save" :disabled="isloading || disabled"  class="btn btn-primary my-3">{{p.t('studierendenantrag', 'btn_save_lvs')}}</button>
+		<button type="button" @click="save" :disabled="isloading || disabled"  class="btn btn-primary my-3">{{$p.t('studierendenantrag', 'btn_save_lvs')}}</button>
 	</div>
 	<div class="col-sm-2">
 		<studierendenantrag-status :msg="statusMsg" :severity="statusSeverity"></studierendenantrag-status>
diff --git a/public/js/plugin/Phrasen.js b/public/js/plugin/Phrasen.js
new file mode 100644
index 000000000..9c710db2b
--- /dev/null
+++ b/public/js/plugin/Phrasen.js
@@ -0,0 +1,102 @@
+const categories = {};
+const loadingModules = {};
+
+function extractCategory(obj, category) {
+	return obj.filter(e => e.category == category).reduce((res, elem) => {
+		if (!res[elem.phrase])
+			res[elem.phrase] = elem.text;
+		return res;
+	}, {});
+}
+function reloadRefs(category) {
+	while (loadingModules[category].length) {
+		var v = loadingModules[category].pop();
+		if (v[0].nodeType && v[0].nodeType == Node.TEXT_NODE) {
+			v[0].textContent = getValueForLoadedPhrase(category, v[1], v[2]);
+		} else if (Vue.isRef(v[0])) {
+			v[0].value = getValueForLoadedPhrase(category, v[1], v[2]);
+			Vue.triggerRef(v[0]);
+			/*Vue.unref(v);*/
+		}
+	}
+}
+function loadLazy(category, val, phrase, params) {
+	// NOTE(chris): load module if it's not loaded yet
+	if (loadingModules[category]) {
+		loadingModules[category].push([val, phrase, params]);
+		if (categories[category]) // NOTE(chris): this is for safety in case the loading finished the moment before the val was pushed into the array
+			reloadRefs(category);
+		return;
+	}
+	loadingModules[category] = [[val, phrase, params]];
+
+	axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Phrasen/loadModule/' + category).then(res => {
+		if (res.data.retval)
+			categories[category] = extractCategory(res.data.retval, category);
+		else
+			categories[category] = {};
+
+		reloadRefs(category);
+	}).catch(err => console.error(err));
+}
+function getValueForLoadedPhrase(category, phrase, params) {
+	let result = categories[category][phrase];
+	if (!result)
+		return '<< PHRASE ' + phrase + '>>';
+	if (params)
+		result = result.replace(/\{([^}]*)\}/g, (match, p1) => params[p1] === undefined ? match : params[p1]);
+	return result;
+}
+
+
+const phrasen = {
+	t_ref(category, phrase, params) {
+		if (params === undefined && (
+			(Array.isArray(category) && category.length == 2) ||
+			(category.split && category.split('/').length == 2))
+			) {
+			params = phrase;
+			[category, phrase] = category.split ? category.split('/') : category;
+		}
+		if (phrase === undefined) {
+			console.error('invalid input', category, phrase, params);
+			return Vue.ref('');
+		}
+		if (!categories[category]) {
+			let val = Vue.ref('');
+			loadLazy(category, val, phrase, params);
+			return val;
+		}
+		var result = getValueForLoadedPhrase(category, phrase, params);
+		return Vue.ref(result);
+	},
+	t_node(category, phrase, params) {
+		const node = document.createTextNode('');
+		if (params === undefined && (
+			(Array.isArray(category) && category.length == 2) ||
+			(category.split && category.split('/').length == 2))
+			) {
+			params = phrase;
+			[category, phrase] = category.split ? category.split('/') : category;
+		}
+		if (phrase === undefined) {
+			console.error('invalid input', category, phrase, params);
+			return node;
+		}
+		if (!categories[category]) {
+			loadLazy(category, node, phrase, params);
+		} else {
+			node.textContent = getValueForLoadedPhrase(category, phrase, params);
+		}
+		return node;
+	},
+	t(category, phrase, params) {
+		return Vue.unref(this.t_ref(category, phrase, params));
+	}
+};
+
+export default {
+	install(app, options) {
+		app.config.globalProperties.$p = phrasen;
+	}
+}

From 18f36c9d23b2b962aba236cbd1fe28f8a6a305ea Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 10 Nov 2023 15:16:40 +0100
Subject: [PATCH 101/149] update tabulator5 to version 5.5.2 to get better
 behaviour of frozen right column

---
 composer.json | 6 +++---
 composer.lock | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 089e2a751..7d1627420 100644
--- a/composer.json
+++ b/composer.json
@@ -230,9 +230,9 @@
 			"type": "package",
 			"package": {
 				"name": "olifolkerd/tabulator5",
-				"version": "5.2.1",
+				"version": "5.5.2",
 				"dist": {
-					"url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.2.1.zip",
+					"url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.5.2.zip",
 					"type": "zip"
 				}
 			}
@@ -426,7 +426,7 @@
 		"npm-asset/primeicons": "5.0.0",
 
 		"olifolkerd/tabulator4": "4.9.*",
-		"olifolkerd/tabulator5": "5.2.*",
+		"olifolkerd/tabulator5": "5.5.*",
 
 		"phpseclib/phpseclib": "2.0.*",
 
diff --git a/composer.lock b/composer.lock
index aac387eb2..5660e87e9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f6e67e501fdd9ac047cc680abeb3daa9",
+    "content-hash": "b6e875dbd1ec2554abbf9f7513806469",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -1511,10 +1511,10 @@
         },
         {
             "name": "olifolkerd/tabulator5",
-            "version": "5.2.1",
+            "version": "5.5.2",
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.2.1.zip"
+                "url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.5.2.zip"
             },
             "type": "library"
         },

From 89c546f74ff21c8760bce2bceb9bd90ea891f2e5 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 10 Nov 2023 15:29:50 +0100
Subject: [PATCH 102/149] fix resize-handle in right column header

---
 public/css/Tabulator5.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
index c6c4f925e..48124335f 100644
--- a/public/css/Tabulator5.css
+++ b/public/css/Tabulator5.css
@@ -35,3 +35,6 @@
 .tabulator-row.tabulator-selected:hover .tabulator-cell {
 	background-color: #769bcc;
 }
+.tabulator .tabulator-col-resize-handle:last-of-type {
+	z-index: 999999;
+}

From 5b2bfb9340c430875a213b18e011328bf43b4c0d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 13 Nov 2023 09:52:04 +0100
Subject: [PATCH 103/149] Code optimizing

---
 public/js/plugin/Phrasen.js | 60 +++++++++++++++----------------------
 1 file changed, 24 insertions(+), 36 deletions(-)

diff --git a/public/js/plugin/Phrasen.js b/public/js/plugin/Phrasen.js
index 9c710db2b..2ca7c7c44 100644
--- a/public/js/plugin/Phrasen.js
+++ b/public/js/plugin/Phrasen.js
@@ -48,47 +48,35 @@ function getValueForLoadedPhrase(category, phrase, params) {
 	return result;
 }
 
+function t_intern(val, category, phrase, params) {
+	if (params === undefined && (
+		(Array.isArray(category) && category.length == 2) ||
+		(category.split && category.split('/').length == 2))
+		) {
+		params = phrase;
+		[category, phrase] = category.split ? category.split('/') : category;
+	}
+	if (phrase === undefined) {
+		console.error('invalid input', category, phrase, params);
+		return '';
+	}
+	if (categories[category])
+		return getValueForLoadedPhrase(category, phrase, params);
+	
+	loadLazy(category, val, phrase, params);
+	return '';
+}
 
 const phrasen = {
 	t_ref(category, phrase, params) {
-		if (params === undefined && (
-			(Array.isArray(category) && category.length == 2) ||
-			(category.split && category.split('/').length == 2))
-			) {
-			params = phrase;
-			[category, phrase] = category.split ? category.split('/') : category;
-		}
-		if (phrase === undefined) {
-			console.error('invalid input', category, phrase, params);
-			return Vue.ref('');
-		}
-		if (!categories[category]) {
-			let val = Vue.ref('');
-			loadLazy(category, val, phrase, params);
-			return val;
-		}
-		var result = getValueForLoadedPhrase(category, phrase, params);
-		return Vue.ref(result);
+		let val = Vue.ref('');
+		val.value = t_intern(val, category, phrase, params);
+		return val;
 	},
 	t_node(category, phrase, params) {
-		const node = document.createTextNode('');
-		if (params === undefined && (
-			(Array.isArray(category) && category.length == 2) ||
-			(category.split && category.split('/').length == 2))
-			) {
-			params = phrase;
-			[category, phrase] = category.split ? category.split('/') : category;
-		}
-		if (phrase === undefined) {
-			console.error('invalid input', category, phrase, params);
-			return node;
-		}
-		if (!categories[category]) {
-			loadLazy(category, node, phrase, params);
-		} else {
-			node.textContent = getValueForLoadedPhrase(category, phrase, params);
-		}
-		return node;
+		let val = document.createTextNode('');
+		val.textContent = t_intern(val, category, phrase, params);
+		return val;
 	},
 	t(category, phrase, params) {
 		return Vue.unref(this.t_ref(category, phrase, params));

From f9cf1a5b32fb93d4e918d2658845e88cfba9a703 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 14 Nov 2023 22:55:29 +0100
Subject: [PATCH 104/149] change perstistenceID to force new settings in
 browser localstorage

---
 public/js/components/Studierendenantrag/Leitung/Table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index aa1bc3734..7c7286d62 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -100,7 +100,7 @@ export default {
 				page: true, //persist page
 				columns: ["width", "visible"], //persist columns
 			},
-			persistenceID: 'studierendenantrag_leitung',
+			persistenceID: 'studierendenantrag_leitung_2023-11-14',
 			columns: [{
 				formatter: 'rowSelection',
 				titleFormatter: 'rowSelection',

From a82df1058d0d16971dd601d3d3448b5b06461da7 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 16 Nov 2023 15:23:40 +0100
Subject: [PATCH 105/149] Phrasen Plugin: async loadCategory function & use
 Vue.computed()

---
 application/views/lehre/Antrag/Create.php     |  6 +-
 public/js/apps/lehre/Antrag.js                |  6 +-
 .../Studierendenantrag/Form/Abmeldung.js      | 18 ++--
 .../Studierendenantrag/Form/AbmeldungStgl.js  | 10 +-
 .../Studierendenantrag/Form/Unterbrechung.js  | 18 ++--
 .../Studierendenantrag/Form/Wiederholung.js   | 10 +-
 .../Leitung/Actions/Columns.js                |  3 -
 .../Studierendenantrag/Leitung/Table.js       | 47 ++++-----
 public/js/plugin/Phrasen.js                   | 95 +++++++------------
 9 files changed, 95 insertions(+), 118 deletions(-)

diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
index 643991191..2c9d0d382 100644
--- a/application/views/lehre/Antrag/Create.php
+++ b/application/views/lehre/Antrag/Create.php
@@ -35,13 +35,13 @@ $this->load->view(
 				antrag-type="<?= $antrag_type; ?>"
 				studierendenantrag-id="<?= $studierendenantrag_id; ?>"
 				v-model:info-array="infoArray"
-				v-model:status-msg="statusMsg"
-				v-model:status-severity="statusSeverity"
+				v-model:status-msg="status.msg"
+				v-model:status-severity="status.severity"
 				>
 			</studierendenantrag-antrag>
 		</div>
 		<div class="col-sm-4 mb-3">
-			<studierendenantrag-status :msg="statusMsg" :severity="statusSeverity"></studierendenantrag-status>
+			<studierendenantrag-status :msg="status.msg" :severity="status.severity"></studierendenantrag-status>
 			<studierendenantrag-infoblock :infos="infoArray"></studierendenantrag-infoblock>
 		</div>
 	</div>
diff --git a/public/js/apps/lehre/Antrag.js b/public/js/apps/lehre/Antrag.js
index 24f071597..00a5877b3 100644
--- a/public/js/apps/lehre/Antrag.js
+++ b/public/js/apps/lehre/Antrag.js
@@ -13,8 +13,10 @@ const app = Vue.createApp({
 	},
 	data() {
 		return {
-			statusMsg: "",
-			statusSeverity: "",
+			status: {
+				msg: '',
+				severity: ''
+			},
 			infoArray: []
 		};
 	}
diff --git a/public/js/components/Studierendenantrag/Form/Abmeldung.js b/public/js/components/Studierendenantrag/Form/Abmeldung.js
index 5f5d5ecb6..513b8b542 100644
--- a/public/js/components/Studierendenantrag/Form/Abmeldung.js
+++ b/public/js/components/Studierendenantrag/Form/Abmeldung.js
@@ -52,7 +52,7 @@ export default {
 					this.data = result.data.retval;
 					if (this.data.status) {
 						this.$emit("setStatus", {
-							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 							severity: this.statusSeverity
 						});
 					}
@@ -63,7 +63,7 @@ export default {
 		createAntrag() {
 			bootstrap.Modal.getOrCreateInstance(this.$refs.modal).hide();
 			this.$emit('setStatus', {
-				msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')}),
+				msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -89,7 +89,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
 							severity: 'danger'
 						});
 					}
@@ -100,13 +100,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_open')}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_open')})),
 								severity:'success'
 							});
 					}
@@ -116,7 +116,7 @@ export default {
 		},
 		cancelAntrag() {
 			this.$emit('setStatus', {
-				msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelling')}),
+				msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelling')})),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -140,7 +140,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
 							severity:'danger'
 						});
 					}
@@ -152,13 +152,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelled')}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelled')})),
 								severity: 'danger'
 							});
 					}
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 540abed9d..2bc24e5c7 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -52,7 +52,7 @@ export default {
 					this.data = result.data.retval;
 					if (this.data.status) {
 						this.$emit("setStatus", {
-							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 							severity: this.statusSeverity
 						});
 					}
@@ -63,7 +63,7 @@ export default {
 		createAntrag() {
 			bootstrap.Modal.getOrCreateInstance(this.$refs.modal).hide();
 			this.$emit('setStatus', {
-				msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')}),
+				msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -89,7 +89,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
 							severity: 'danger'
 						});
 					}
@@ -100,13 +100,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_open')}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_open')})),
 								severity:'success'
 							});
 					}
diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
index f4fea0629..49e50fd71 100644
--- a/public/js/components/Studierendenantrag/Form/Unterbrechung.js
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -75,7 +75,7 @@ export default {
 					this.data = result.data.retval;
 					if (this.data.status) {
 						this.$emit("setStatus", {
-							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 							severity: this.statusSeverity
 						});
 					}
@@ -85,7 +85,7 @@ export default {
 		},
 		createAntrag() {
 			this.$emit('setStatus', {
-				msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')}),
+				msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -122,7 +122,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
 							severity: 'danger'
 						});
 					}
@@ -133,13 +133,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_created')}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_created')})),
 								severity: 'info'
 							});
 					}
@@ -149,7 +149,7 @@ export default {
 		},
 		cancelAntrag() {
 			this.$emit('setStatus', {
-				msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelling')}),
+				msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelling')})),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -173,7 +173,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
 							severity: 'danger'
 						});
 					}
@@ -185,13 +185,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelled')}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelled')})),
 								severity: 'danger'
 							});
 					}
diff --git a/public/js/components/Studierendenantrag/Form/Wiederholung.js b/public/js/components/Studierendenantrag/Form/Wiederholung.js
index bc7dfc616..c2aea93f2 100644
--- a/public/js/components/Studierendenantrag/Form/Wiederholung.js
+++ b/public/js/components/Studierendenantrag/Form/Wiederholung.js
@@ -67,7 +67,7 @@ export default {
 					}
 					this.$emit('update:status', this.data.status);
 					this.$emit("setStatus", {
-						msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+						msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 						severity: this.statusSeverity
 					});
 					return result;
@@ -85,7 +85,7 @@ export default {
 			let nextState = repeat ? 'Erstellt' : 'Verzichtet';
 
 			this.$emit('setStatus', {
-				msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')}),
+				msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -112,7 +112,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
 							severity: 'danger'
 						});
 					}
@@ -125,7 +125,7 @@ export default {
 							this.data.status = nextState;
 						this.$emit('update:status', this.data.status);
 						this.$emit("setStatus", {
-							msg: this.$p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 							severity: this.statusSeverity
 						});
 					}
@@ -139,7 +139,7 @@ export default {
 	},
 	mounted() {
 		this.infos = [...Array(5).keys()].map(n => ({
-			body: this.$p.t_ref('studierendenantrag', 'infotext_Wiederholung_' + n)
+			body: Vue.computed(() => this.$p.t('studierendenantrag', 'infotext_Wiederholung_' + n))
 		}));
 		this.$emit('setInfos', this.infos);
 	},
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js b/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
index 7128761d7..55a7bd1cc 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
@@ -6,9 +6,6 @@ export default {
 		toggleColumn(col) {
 			col.visible = !col.visible;
 			col.original.toggle()
-		},
-		show() {
-
 		}
 	},
 	template: `
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index d398824b1..1e566222e 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -74,7 +74,8 @@ export default {
 			this.$refs.lvList.show();
 		}
 	},
-	mounted() {
+	async mounted() {
+		await this.$p.loadCategory(['lehre', 'studierendenantrag', 'person', 'global', 'ui']);
 		function dateFormatter(cell)
 		{
 			let val = cell.getValue();
@@ -112,7 +113,7 @@ export default {
 				title: '#'
 			}, {
 				field: 'bezeichnung',
-				title: this.$p.t_node('lehre', 'studiengang'),
+				title: this.$p.t('lehre', 'studiengang'),
 				headerFilter: 'list',
 				headerFilterParams: {
 					valuesLookup: true,
@@ -121,7 +122,7 @@ export default {
 				}
 			}, {
 				field: 'orgform',
-				title: this.$p.t_node('lehre', 'organisationsform'),
+				title: this.$p.t('lehre', 'organisationsform'),
 				headerFilter: 'list',
 				headerFilterParams: {
 					valuesLookup: true,
@@ -130,7 +131,7 @@ export default {
 				}
 			}, {
 				field: 'typ',
-				title: this.$p.t_node('studierendenantrag', 'antrag_typ'),
+				title: this.$p.t('studierendenantrag', 'antrag_typ'),
 				headerFilter: 'list',
 				headerFilterParams: {
 					valuesLookup: true,
@@ -142,7 +143,7 @@ export default {
 				}
 			}, {
 				field: 'statustyp',
-				title: this.$p.t_node('studierendenantrag', 'antrag_status'),
+				title: this.$p.t('studierendenantrag', 'antrag_status'),
 				headerFilter: 'list',
 				headerFilterParams: {
 					valuesLookup: true,
@@ -164,32 +165,32 @@ export default {
 				}
 			}, {
 				field: 'matrikelnr',
-				title: this.$p.t_node('person', 'personenkennzeichen'),
+				title: this.$p.t('person', 'personenkennzeichen'),
 				headerFilter: 'input'
 			}, {
 				field: 'prestudent_id',
-				title: this.$p.t_node('lehre', 'prestudent'),
+				title: this.$p.t('lehre', 'prestudent'),
 				headerFilter: 'input'
 			}, {
 				field: 'name',
-				title: this.$p.t_node('global', 'name'),
+				title: this.$p.t('global', 'name'),
 				mutator: (value, data) => (data.vorname + ' ' + data.nachname).replace(/^\s*(.*)\s*$/, '$1'),
 				headerFilter: 'input'
 			}, {
 				field: 'datum',
-				title: this.$p.t_node('global', 'datum'),
+				title: this.$p.t('global', 'datum'),
 				formatter: dateFormatter,
 				headerFilterFunc: 'dates',
 				headerFilter: dateFilter
 			}, {
 				field: 'datum_wiedereinstieg',
-				title: this.$p.t_node('studierendenantrag', 'antrag_datum_wiedereinstieg'),
+				title: this.$p.t('studierendenantrag', 'antrag_datum_wiedereinstieg'),
 				formatter: dateFormatter,
 				headerFilterFunc: 'dates',
 				headerFilter: dateFilter
 			}, {
 				field: 'grund',
-				title: this.$p.t_node('studierendenantrag', 'antrag_grund'),
+				title: this.$p.t('studierendenantrag', 'antrag_grund'),
 				formatter: (cell, formatterParams, onRendered) => {
 					let link = document.createElement('a'),
 						val = cell.getValue();
@@ -204,7 +205,7 @@ export default {
 				}
 			}, {
 				field: 'dms_id',
-				title: this.$p.t_node('studierendenantrag', 'antrag_dateianhaenge'),
+				title: this.$p.t('studierendenantrag', 'antrag_dateianhaenge'),
 				formatter: (cell, formatterParams, onRendered) => {
 					let val = cell.getValue();
 					if (!val)
@@ -216,13 +217,13 @@ export default {
 						val;
 					link.setAttribute('target', '_blank');
 					link.innerHTML = '<i class="fa fa-paperclip" aria-hidden="true"></i>';
-					link.append(this.$p.t_node('studierendenantrag/antrag_anhang'));
+					link.append(this.$p.t('studierendenantrag/antrag_anhang'));
 					return link;
 				}
 			}, {
 				field: 'actions',
 				frozen: true,
-				title: this.$p.t_node('ui', 'aktion'),
+				title: this.$p.t('ui', 'aktion'),
 				headerFilter: false,
 				headerSort: false,				
 				formatter: (cell, formatterParams, onRendered) => {
@@ -246,7 +247,7 @@ export default {
 					if (data.typ == 'AbmeldungStgl' && data.status == 'Genehmigt') {
 						// NOTE(chris): Object
 						let button = document.createElement('button');
-						button.append(this.$p.t_node('studierendenantrag', 'btn_object'));
+						button.append(this.$p.t('studierendenantrag', 'btn_object'));
 						button.className = "btn btn-outline-secondary";
 						button.addEventListener('click', () => this.$emit('action:object', [cell.getData()]));
 						container.append(button);
@@ -255,14 +256,14 @@ export default {
 					if (data.typ == 'AbmeldungStgl' && data.status == 'Beeinsprucht') {
 						// NOTE(chris): Deny Objection
 						let button = document.createElement('button');
-						button.append(this.$p.t_node('studierendenantrag', 'btn_objection_deny'));
+						button.append(this.$p.t('studierendenantrag', 'btn_objection_deny'));
 						button.className = "btn btn-outline-secondary";
 						button.addEventListener('click', () => this.$emit('action:objectionDeny', [cell.getData()]));
 						container.append(button);
 
 						// NOTE(chris): Approve Objection
 						button = document.createElement('button');
-						button.append(this.$p.t_node('studierendenantrag', 'btn_objection_approve'));
+						button.append(this.$p.t('studierendenantrag', 'btn_objection_approve'));
 						button.className = "btn btn-outline-secondary";
 						button.addEventListener('click', () => this.$emit('action:objectionApprove', [cell.getData()]));
 						container.append(button);
@@ -272,7 +273,7 @@ export default {
 						// NOTE(chris): Reopen
 						if (data.typ == 'Wiederholung' && data.status == 'Verzichtet') {
 							let button = document.createElement('button');
-							button.append(this.$p.t_node('studierendenantrag', 'btn_reopen'));
+							button.append(this.$p.t('studierendenantrag', 'btn_reopen'));
 							button.className = "btn btn-outline-secondary";
 							button.addEventListener('click', () => this.$emit('action:reopen', [cell.getData()]));
 							container.append(button);
@@ -280,7 +281,7 @@ export default {
 						// NOTE(chris): Lv Zuweisen
 						if (data.typ == 'Wiederholung' && (data.status == 'Erstellt' || data.status == 'Lvszugewiesen')) {
 							let button = document.createElement('a');
-							button.append(this.$p.t_node('studierendenantrag', 'btn_lvzuweisen'));
+							button.append(this.$p.t('studierendenantrag', 'btn_lvzuweisen'));
 							button.className = "btn btn-outline-secondary";
 							button.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
 								FHC_JS_DATA_STORAGE_OBJECT.ci_router +
@@ -302,7 +303,7 @@ export default {
 						// NOTE(chris): Cancel
 						if (data.typ == 'AbmeldungStgl' && (data.status == 'Erstellt' || data.status == 'Genehmigt' )) {
 							let button = document.createElement('button');
-							button.append(this.$p.t_node('studierendenantrag', 'btn_cancel'));
+							button.append(this.$p.t('studierendenantrag', 'btn_cancel'));
 							button.className = "btn btn-outline-secondary";
 							button.addEventListener('click',() => this.$emit('action:cancel', [cell.getData()]));
 							container.append(button);
@@ -313,7 +314,7 @@ export default {
 						// NOTE(chris): Approve
 						if ((data.typ == 'Wiederholung' && data.status == 'Lvszugewiesen') || (data.typ != 'Wiederholung' && data.status == 'Erstellt')) {
 							let button = document.createElement('button');
-							button.append(this.$p.t_node('studierendenantrag', 'btn_approve'));
+							button.append(this.$p.t('studierendenantrag', 'btn_approve'));
 							button.className = "btn btn-outline-secondary";
 							button.addEventListener('click', () => this.$emit('action:approve', [cell.getData()]));
 							container.append(button);
@@ -321,7 +322,7 @@ export default {
 						// NOTE(chris): Reject (Unterbrechung braucht grund)
 						if (data.status == 'Erstellt' && data.typ == 'Unterbrechung') {
 							let button = document.createElement('button');
-							button.append(this.$p.t_node('studierendenantrag', 'btn_reject'));
+							button.append(this.$p.t('studierendenantrag', 'btn_reject'));
 							button.className = "btn btn-outline-secondary";
 							button.addEventListener('click', () => this.$emit('action:reject', [cell.getData()]));
 							container.append(button);
@@ -331,7 +332,7 @@ export default {
 					// NOTE(chris): Show LVs
 					if (data.typ == 'Wiederholung' && (data.status == 'Lvszugewiesen' || data.status == 'Genehmigt')) {
 						let button = document.createElement('button');
-						button.append(this.$p.t_node('studierendenantrag', 'btn_show_lvs'));
+						button.append(this.$p.t('studierendenantrag', 'btn_show_lvs'));
 						button.className = "btn btn-outline-secondary";
 						button.addEventListener('click', () => this.showLVs(cell.getData()));
 						container.append(button);
diff --git a/public/js/plugin/Phrasen.js b/public/js/plugin/Phrasen.js
index 2ca7c7c44..162dc2179 100644
--- a/public/js/plugin/Phrasen.js
+++ b/public/js/plugin/Phrasen.js
@@ -1,4 +1,4 @@
-const categories = {};
+const categories = Vue.reactive({});
 const loadingModules = {};
 
 function extractCategory(obj, category) {
@@ -8,37 +8,6 @@ function extractCategory(obj, category) {
 		return res;
 	}, {});
 }
-function reloadRefs(category) {
-	while (loadingModules[category].length) {
-		var v = loadingModules[category].pop();
-		if (v[0].nodeType && v[0].nodeType == Node.TEXT_NODE) {
-			v[0].textContent = getValueForLoadedPhrase(category, v[1], v[2]);
-		} else if (Vue.isRef(v[0])) {
-			v[0].value = getValueForLoadedPhrase(category, v[1], v[2]);
-			Vue.triggerRef(v[0]);
-			/*Vue.unref(v);*/
-		}
-	}
-}
-function loadLazy(category, val, phrase, params) {
-	// NOTE(chris): load module if it's not loaded yet
-	if (loadingModules[category]) {
-		loadingModules[category].push([val, phrase, params]);
-		if (categories[category]) // NOTE(chris): this is for safety in case the loading finished the moment before the val was pushed into the array
-			reloadRefs(category);
-		return;
-	}
-	loadingModules[category] = [[val, phrase, params]];
-
-	axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Phrasen/loadModule/' + category).then(res => {
-		if (res.data.retval)
-			categories[category] = extractCategory(res.data.retval, category);
-		else
-			categories[category] = {};
-
-		reloadRefs(category);
-	}).catch(err => console.error(err));
-}
 function getValueForLoadedPhrase(category, phrase, params) {
 	let result = categories[category][phrase];
 	if (!result)
@@ -48,38 +17,46 @@ function getValueForLoadedPhrase(category, phrase, params) {
 	return result;
 }
 
-function t_intern(val, category, phrase, params) {
-	if (params === undefined && (
-		(Array.isArray(category) && category.length == 2) ||
-		(category.split && category.split('/').length == 2))
-		) {
-		params = phrase;
-		[category, phrase] = category.split ? category.split('/') : category;
-	}
-	if (phrase === undefined) {
-		console.error('invalid input', category, phrase, params);
-		return '';
-	}
-	if (categories[category])
-		return getValueForLoadedPhrase(category, phrase, params);
-	
-	loadLazy(category, val, phrase, params);
-	return '';
-}
 
 const phrasen = {
-	t_ref(category, phrase, params) {
-		let val = Vue.ref('');
-		val.value = t_intern(val, category, phrase, params);
-		return val;
+	loadCategory(category) {
+		if (Array.isArray(category))
+			return Promise.all(category.map(cat => this.loadCategory(cat)));
+		if (!loadingModules[category])
+			loadingModules[category] = axios
+				.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Phrasen/loadModule/' + category)
+				.then(res => {
+					if (res.data.retval)
+						categories[category] = extractCategory(res.data.retval, category);
+					else
+						categories[category] = {};
+				});
+		return loadingModules[category];
 	},
-	t_node(category, phrase, params) {
-		let val = document.createTextNode('');
-		val.textContent = t_intern(val, category, phrase, params);
-		return val;
+	t_ref(category, phrase, params) {
+		console.warn('depricated');
+		return Vue.computed(() => this.t(category, phrase, params));
 	},
 	t(category, phrase, params) {
-		return Vue.unref(this.t_ref(category, phrase, params));
+		if (params === undefined && (
+			(Array.isArray(category) && category.length == 2) ||
+			(category.split && category.split('/').length == 2))
+			) {
+			params = phrase;
+			[category, phrase] = category.split ? category.split('/') : category;
+		}
+		if (phrase === undefined) {
+			console.error('invalid input', category, phrase, params);
+			return '';
+		}
+		let val = Vue.computed(() => {
+			if (!categories[category])
+				return '';
+			return getValueForLoadedPhrase(category, phrase, params);
+		});
+		if (!categories[category])
+			this.loadCategory(category);
+		return val.value;
 	}
 };
 

From 2158e7a28dac0fa411ec0c76da1bb6f8176e9164 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 20 Nov 2023 11:55:05 +0100
Subject: [PATCH 106/149] - wording - standardwert - absage infocenter

---
 application/views/system/infocenter/zgvpruefungen.php          | 3 +--
 content/student/studentenoverlay.xul.php                       | 2 +-
 ...714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index 1d26b9d55..b021379a8 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -447,7 +447,6 @@
 								<div class="form-inline">
 									<div class="input-group" id="absgstatusgrselect_<?php echo $zgvpruefung->prestudent_id ?>">
 										<select name="absgstatusgrund"
-												<?php echo $disabledStg ?>
 												<?php echo $disabledPer ?>
 												class="d-inline float-right"
 												required>
@@ -460,7 +459,7 @@
 										</select>
 										<span class="input-group-btn">
 											<button type="button"
-													class="btn btn-default absageBtn" <?php echo $disabledStg . ' ' . $disabledPer?> id="absagebtn_<?php echo $zgvpruefung->prestudent_id ?>">
+													class="btn btn-default absageBtn" <?php echo $disabledPer?> id="absagebtn_<?php echo $zgvpruefung->prestudent_id ?>">
 												<?php echo  $this->p->t('ui', 'absagen') ?>
 											</button>
 										</span>
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 79436c6ec..de7b6da55 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -209,7 +209,7 @@ else
 									<menuitem id="student-toolbar-filter-dokumente" label="fehlende Dokumente" oncommand="InteressentDokumenteFilter()" disabled="false" tooltiptext="Liste aller Studenten mit Fehlenden Dokumenten"/>
 									<menuitem id="student-toolbar-filter-offenebuchungen" label="offene Buchungen" oncommand="StudentKontoFilterStudenten('konto')" disabled="false" tooltiptext="Liste aller Studenten mit offenen Buchungen"/>
 									<menuitem id="student-toolbar-filter-studiengebuehr" label="nicht gebuchte Studiengebuehr" oncommand="StudentKontoFilterStudenten('studiengebuehr')" disabled="false" tooltiptext="Liste aller Studenten die noch nicht mit Studienbebuehr belastet wurden" />
-									<menuitem id="student-toolbar-filter-erhoehte-studiengebuehr" label="erhoehte Studiengebuehr" oncommand="StudentKontoFilterStudenten('StudiengebuehrErhoeht')" disabled="false" tooltiptext="Liste aller Studenten die noch nicht mit Studienbebuehr belastet wurden" />
+									<menuitem id="student-toolbar-filter-erhoehte-studiengebuehr" label="erhöhten Studienbeitrag" oncommand="StudentKontoFilterStudenten('StudiengebuehrErhoeht')" disabled="false" tooltiptext="Liste aller Studenten die noch nicht mit Studienbebuehr belastet wurden" />
 									<menuitem id="student-toolbar-filter-zgvohnedatum" label="ZGV eingetragen ohne Datum" oncommand="StudentKontoFilterStudenten('zgvohnedatum')" disabled="false" tooltiptext="Liste aller Studenten die ZGV eingetragen haben bei denen aber kein ZGV Datum gesetzt ist" />
 									<menu label="nach Statusgrund">
 									    <menupopup id="student-filter-statusgrund-menu-popup">
diff --git a/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php b/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php
index aaeb2dfe7..d2c0c07b8 100644
--- a/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php
+++ b/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php
@@ -4,7 +4,7 @@ if ($result = @$db->db_query("SELECT 1 FROM public.tbl_buchungstyp WHERE buchung
 {
 	if ($db->db_num_rows($result) == 0)
 	{
-		$qry = "INSERT INTO public.tbl_buchungstyp (buchungstyp_kurzbz, beschreibung, standardtext) VALUES ('StudiengebuehrErhoeht', 'Erhöhter Studienbeitrag', 'Erhöhter Studienbeitrag');";
+		$qry = "INSERT INTO public.tbl_buchungstyp (buchungstyp_kurzbz, beschreibung, standardtext, standardbetrag) VALUES ('StudiengebuehrErhoeht', 'Erhöhter Studienbeitrag', 'Erhöhter Studienbeitrag', '-3000');";
 		if (!$db->db_query($qry))
 			echo '<strong>public.tbl_buchungstyp '.$db->db_last_error().'</strong><br>';
 		else

From cc779f3d273b777a5620807f8475d231c6b70e62 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 21 Nov 2023 08:48:34 +0100
Subject: [PATCH 107/149] finish

---
 .../Studierendenantrag/Lvzuweisung.js         | 230 +++++++++---------
 1 file changed, 117 insertions(+), 113 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Lvzuweisung.js b/public/js/components/Studierendenantrag/Lvzuweisung.js
index 34576ed4c..6b482dc38 100644
--- a/public/js/components/Studierendenantrag/Lvzuweisung.js
+++ b/public/js/components/Studierendenantrag/Lvzuweisung.js
@@ -105,121 +105,125 @@ export default {
 				else
 				{
 					let res = {};
-					for (var k in result.data.retval) {
-						if (result.data.retval[k] === null) {
-							const alert = document.createElement('div');
-							alert.innerHTML = this.$p.t('studierendenantrag', 'error_stg_last_semester');
-							alert.className = 'alert alert-warning';
-							alert.role = 'alert';
-							this.$refs["lvtable" + k.substr(0,1)].append(alert);
-							continue;
-						}
-						let lvs = result.data.retval[k].reduce((obj,lv) => {
-							obj[lv.studienplan_lehrveranstaltung_id] = lv;
-							return obj;
-						}, {});
-						for (var lv of Object.values(lvs)) {
-							if (!lv.studienplan_lehrveranstaltung_id_parent)
-								continue;
-							if (!lvs[lv.studienplan_lehrveranstaltung_id_parent])
-								console.error('parent not available');
-							else {
-								if (!lvs[lv.studienplan_lehrveranstaltung_id_parent]._children)
-									lvs[lv.studienplan_lehrveranstaltung_id_parent]._children = [];
-								lvs[lv.studienplan_lehrveranstaltung_id_parent]._children.push(lv);
-							}
-						}
-						res[k] = Object.values(lvs).filter(lv => !lv.studienplan_lehrveranstaltung_id_parent);
-						let current = res[k];
-						let index = k.substr(0,1);
-
-						const options = {
-							data: current,
-							dataTree: true,
-							dataTreeStartExpanded: true, //start with an expanded tree
-							dataTreeChildIndent: 15,
-							layout: "fitDataStretch",
-							columns: [
-								{title: this.$p.t_node('ui', 'bezeichnung'), field: "bezeichnung"},
-								{title: this.$p.t_node('lehre','lehrform'), field: "lehrform_kurzbz"},
-								{title: "ECTS", field: "ects"},
-								{title: this.$p.t_node('lehre','note'), field: "note", formatter:(cell, formatterParams, onRendered)=>cell.getValue() || "---"},
-								{title: (index==1) ? this.$p.t_node('studierendenantrag','lv_nicht_zulassen') : this.$p.t_node('studierendenantrag','lv_wiederholen'), field: "antrag_zugelassen", formatter: (cell, formatterParams, onRendered) => {
-									let data = cell.getData();
-									if(data._children || !data.zeugnis)
-										return "";
-									let input = document.createElement('input');
-									input.className = "form-check-input";
-									input.type = "checkbox";
-									input.role = "switch";
-									input.checked = cell.getValue();
-									input.addEventListener('input', () => {
-										lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen = input.checked;
-										cell.getRow().reformat();
-									});
-									if (this.disabled) {
-										input.disabled = true;
-									}
-
-									let div =  document.createElement('div');
-									div.className = 'form-check form-switch';
-									div.append(input);
-
-									return div;
-								}},
-								{
-									title: this.$p.t_node('global','anmerkung'),
-									field: "antrag_anmerkung",
-									headerSort:false,
-									titleFormatter:(cell, formatterParams, onRendered)=>{
-										let link =  document.createElement('a');
-										link.addEventListener('click', (e) => {
-											e.preventDefault();
-										});
-
-										link.href ="#";
-										link.title = this.$p.t('studierendenantrag','anmerkung_tooltip');
-										new bootstrap.Tooltip(link);
-										let tooltip = document.createElement('span');
-										tooltip.innerHTML = this.$p.t('global','anmerkung') + " ";
-										tooltip.append(link);
-
-										let icon =  document.createElement('i');
-										link.append(icon);
-										icon.className = "fa fa-info-circle";
-										icon.setAttribute("aria-hidden", "true");
-										icon.style.minWidth = '1em';
-
-										return tooltip;
-
-									},
-									formatter: (cell, formatterParams, onRendered) => {
-										if (this.disabled) {
-											return cell.getValue() || "";
-										}
-										var data = cell.getData();
-										if (lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen)
-										{
-											let input = document.createElement('input');
-											input.className = "form-control";
-											input.type = "text";
-											input.value = cell.getValue() || "";
-											input.addEventListener('input', () => {
-												lvs[data.studienplan_lehrveranstaltung_id].antrag_anmerkung = input.value;
-											});
-											return input;
-										}
-										else
-										{
-											return "";
-										}
+					this.$p
+						.loadCategory(['ui', 'lehre', 'studierendenantrag', 'global'])
+						.then(() => {
+							for (var k in result.data.retval) {
+								if (result.data.retval[k] === null) {
+									const alert = document.createElement('div');
+									alert.innerHTML = this.$p.t('studierendenantrag', 'error_stg_last_semester');
+									alert.className = 'alert alert-warning';
+									alert.role = 'alert';
+									this.$refs["lvtable" + k.substr(0,1)].append(alert);
+									continue;
+								}
+								let lvs = result.data.retval[k].reduce((obj,lv) => {
+									obj[lv.studienplan_lehrveranstaltung_id] = lv;
+									return obj;
+								}, {});
+								for (var lv of Object.values(lvs)) {
+									if (!lv.studienplan_lehrveranstaltung_id_parent)
+										continue;
+									if (!lvs[lv.studienplan_lehrveranstaltung_id_parent])
+										console.error('parent not available');
+									else {
+										if (!lvs[lv.studienplan_lehrveranstaltung_id_parent]._children)
+											lvs[lv.studienplan_lehrveranstaltung_id_parent]._children = [];
+										lvs[lv.studienplan_lehrveranstaltung_id_parent]._children.push(lv);
 									}
 								}
-							]
-						};
-						var table = new Tabulator(this.$refs["lvtable" + k.substr(0,1)], options);
-					}
-					this.lvs = result.data.retval;
+								res[k] = Object.values(lvs).filter(lv => !lv.studienplan_lehrveranstaltung_id_parent);
+								let current = res[k];
+								let index = k.substr(0,1);
+
+								const options = {
+									data: current,
+									dataTree: true,
+									dataTreeStartExpanded: true, //start with an expanded tree
+									dataTreeChildIndent: 15,
+									layout: "fitDataStretch",
+									columns: [
+										{title: this.$p.t('ui', 'bezeichnung'), field: "bezeichnung"},
+										{title: this.$p.t('lehre','lehrform'), field: "lehrform_kurzbz"},
+										{title: "ECTS", field: "ects"},
+										{title: this.$p.t('lehre','note'), field: "note", formatter:(cell, formatterParams, onRendered)=>cell.getValue() || "---"},
+										{title: (index==1) ? this.$p.t('studierendenantrag','lv_nicht_zulassen') : this.$p.t('studierendenantrag','lv_wiederholen'), field: "antrag_zugelassen", formatter: (cell, formatterParams, onRendered) => {
+											let data = cell.getData();
+											if(data._children || !data.zeugnis)
+												return "";
+											let input = document.createElement('input');
+											input.className = "form-check-input";
+											input.type = "checkbox";
+											input.role = "switch";
+											input.checked = cell.getValue();
+											input.addEventListener('input', () => {
+												lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen = input.checked;
+												cell.getRow().reformat();
+											});
+											if (this.disabled) {
+												input.disabled = true;
+											}
+
+											let div =  document.createElement('div');
+											div.className = 'form-check form-switch';
+											div.append(input);
+
+											return div;
+										}},
+										{
+											title: this.$p.t('global','anmerkung'),
+											field: "antrag_anmerkung",
+											headerSort:false,
+											titleFormatter:(cell, formatterParams, onRendered)=>{
+												let link =  document.createElement('a');
+												link.addEventListener('click', (e) => {
+													e.preventDefault();
+												});
+
+												link.href ="#";
+												link.title = this.$p.t('studierendenantrag','anmerkung_tooltip');
+												new bootstrap.Tooltip(link);
+												let tooltip = document.createElement('span');
+												tooltip.innerHTML = this.$p.t('global','anmerkung') + " ";
+												tooltip.append(link);
+
+												let icon =  document.createElement('i');
+												link.append(icon);
+												icon.className = "fa fa-info-circle";
+												icon.setAttribute("aria-hidden", "true");
+												icon.style.minWidth = '1em';
+
+												return tooltip;
+
+											},
+											formatter: (cell, formatterParams, onRendered) => {
+												if (this.disabled) {
+													return cell.getValue() || "";
+												}
+												var data = cell.getData();
+												if (lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen)
+												{
+													let input = document.createElement('input');
+													input.className = "form-control";
+													input.type = "text";
+													input.value = cell.getValue() || "";
+													input.addEventListener('input', () => {
+														lvs[data.studienplan_lehrveranstaltung_id].antrag_anmerkung = input.value;
+													});
+													return input;
+												}
+												else
+												{
+													return "";
+												}
+											}
+										}
+									]
+								};
+								var table = new Tabulator(this.$refs["lvtable" + k.substr(0,1)], options);
+							}
+							this.lvs = result.data.retval;
+						});
 				}
 			}
 		);

From 73e8761728ba1b698c5e7a18b94357c866033a51 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 21 Nov 2023 10:46:23 +0100
Subject: [PATCH 108/149] Bugfix: Lvzuweisung - DB Errors in production

---
 public/js/components/Studierendenantrag/Lvzuweisung.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Studierendenantrag/Lvzuweisung.js b/public/js/components/Studierendenantrag/Lvzuweisung.js
index 376e266d3..e43832cbc 100644
--- a/public/js/components/Studierendenantrag/Lvzuweisung.js
+++ b/public/js/components/Studierendenantrag/Lvzuweisung.js
@@ -64,7 +64,7 @@ export default {
 						this.statusCode = response.data.retval[0].studierendenantrag_statustyp_kurzbz;
 						this.statusMsg = response.data.retval[0].typ;
 					} else {
-						this.addAlert(response.data.retval, 'alert-danger');
+						this.addAlert(response.data.retval.message || response.data.retval, 'alert-danger');
 						this.statusCode = 0;
 						this.statusMsg = 'Error';
 					}

From ad8a18ed7d670f1d902d2810ee0d098bfae67117 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 22 Nov 2023 13:08:47 +0100
Subject: [PATCH 109/149] change lvzuweisungurl to use VILESCI_ROOT if defined
 for Sancho_Mail_Antrag_W_New

---
 application/libraries/AntragLib.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index dcc38acc7..f3eb4d152 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -854,14 +854,18 @@ class AntragLib
 			$prestudent_status = current($res);
 			$email = $prestudent_status->email;
 			// NOTE(chris): Sancho mail
+			$lvzuweisungLink = site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id);
+			if( defined('VILESCI_ROOT') )
+			{
+				$lvzuweisungLink = VILESCI_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id;
+			}
 			sendSanchoMail(
 				'Sancho_Mail_Antrag_W_New',
 				[
 					'antrag_id' => $antrag_id,
 					'stg' => $prestudent_status->stg_bezeichnung,
 					'Orgform' => $prestudent_status->orgform,
-					'lvzuweisungLink' => site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id),
-					'lvzuweisungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id
+					'lvzuweisungLink' => $lvzuweisungLink 
 				],
 				$email,
 				$this->_ci->p->t('studierendenantrag', 'mail_subject_W_New')

From ca2256bb32c8d15af1f75df9144c3974b9a93574 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 22 Nov 2023 14:57:06 +0100
Subject: [PATCH 110/149] Fix: Better handling of uninitialized variables

---
 .../Studierendenantrag/Form/AbmeldungStgl.js  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 3524bcd1f..64c9cc575 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -30,7 +30,7 @@ export default {
 	},
 	computed: {
 		statusSeverity() {
-			switch (this.data.status)
+			switch (this.data?.status)
 			{
 				case 'Erstellt': return 'info';
 				case 'Genehmigt': return 'success';
@@ -141,39 +141,39 @@ export default {
 					<table class="table">
 						<tr>
 							<th>{{p.t('lehre', 'studiengang')}}</th>
-							<td align="right">{{data.bezeichnung}}</td>
+							<td align="right">{{data?.bezeichnung}}</td>
 						</tr>
 						<tr>
 							<th>{{p.t('lehre', 'organisationsform')}}</th>
-							<td align="right">{{data.orgform_bezeichnung}}</td>
+							<td align="right">{{data?.orgform_bezeichnung}}</td>
 						</tr>
 						<tr>
 							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
-							<td align="right">{{data.name}}</td>
+							<td align="right">{{data?.name}}</td>
 						</tr>
 						<tr>
 							<th>{{p.t('person', 'personenkennzeichen')}}</th>
-							<td align="right">{{data.matrikelnr}}</td>
+							<td align="right">{{data?.matrikelnr}}</td>
 						</tr>
 						<tr>
 							<th>{{p.t('lehre', 'studienjahr')}}</th>
-							<td align="right">{{data.studienjahr_kurzbz}}</td>
+							<td align="right">{{data?.studienjahr_kurzbz}}</td>
 						</tr>
 						<tr>
 							<th>{{p.t('lehre', 'studiensemester')}}</th>
-							<td align="right">{{data.studiensemester_kurzbz}}</td>
+							<td align="right">{{data?.studiensemester_kurzbz}}</td>
 						</tr>
 						<tr>
 							<th>{{p.t('lehre', 'semester')}}</th>
-							<td align="right">{{data.semester}}</td>
+							<td align="right">{{data?.semester}}</td>
 						</tr>
 					</table>
 				</div>
 
-				<div v-if="data.grund" class="mb-3">
+				<div v-if="data?.grund" class="mb-3">
 					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
 				
-					<pre class="text-prewrap">{{data.grund}}</pre>
+					<pre class="text-prewrap">{{data?.grund}}</pre>
 				</div>      
 				<div v-else class="col-sm-6 mb-3">
 					<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-grund'" class="form-label">Grund:</label>
@@ -211,7 +211,7 @@ export default {
 				
 				<div class="col-12 text-end">
 					<button
-						v-if="!data.studierendenantrag_id"
+						v-if="!data?.studierendenantrag_id"
 						type="button"
 						class="btn btn-primary"
 						data-bs-toggle="modal"

From 8142982ac726147862cd40850e0ca2a48306720f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 22 Nov 2023 14:57:24 +0100
Subject: [PATCH 111/149] s&d

---
 application/controllers/jobs/AntragJob.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index cbd34a561..6d4617a73 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -349,6 +349,7 @@ class AntragJob extends JOB_Controller
 		$this->StudierendenantragModel->addSelect('prestudent_id');
 		$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
 		$this->StudierendenantragModel->addSelect('s.insertamum');
+		$this->StudierendenantragModel->addSelect('s.insertvon');
 
 		$this->StudierendenantragModel->db->where_in('public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)', $this->config->item('antrag_prestudentstatus_whitelist'));
 
@@ -372,7 +373,7 @@ class AntragJob extends JOB_Controller
 				$result = $this->prestudentlib->setAbbrecher(
                     $antrag->prestudent_id,
                     $antrag->studiensemester_kurzbz,
-                    $insertvon,
+                    $antrag->insertvon ?: $insertvon,
                     'abbrecherStgl',
                     $antrag->insertamum
                 );
@@ -413,7 +414,7 @@ class AntragJob extends JOB_Controller
 					}
 				}
 			}
-			$this->logInfo($count . " Students set to Abbrecher");
+			$this->logInfo($count . "/" . count($antraege) . " Students set to Abbrecher");
 		}
 		$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
 	}

From d0bebeaa4aa46a648311e6824cdb29033346d572 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 23 Nov 2023 09:16:56 +0100
Subject: [PATCH 112/149] neue Phrase MissingZGV, entfernen new lines

---
 .../Studierendenantrag/Form/AbmeldungStgl.js  |  4 +-
 system/phrasesupdate.php                      | 64 +++++++++++++++----
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 64c9cc575..a9214893a 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -192,7 +192,9 @@ export default {
 							<option value="textLong_studentNichtGezahlt">{{p.t('studierendenantrag', 'dropdown_nichtGezahlt')}}
 							</option>
 							<option value="textLong_plageat">{{p.t('studierendenantrag', 'dropdown_plageat')}}
-							</option>					
+							</option>
+							<option value="textLong_MissingZgv">{{p.t('studierendenantrag', 'dropdown_MissingZgv')}}
+							</option>						
 						</select>	
 					</div>			
 					<textarea
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0a8407ad7..cd3f98181 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -21491,13 +21491,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nNichterfüllung finanzieller Verpflichtungen trotz Mahnung (Studienbeitrag)',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Nichterfüllung finanzieller Verpflichtungen trotz Mahnung (Studienbeitrag)',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nFailure to meet financial obligations despite a reminder (tuition fees)',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): Failure to meet financial obligations despite a reminder (tuition fees)',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -21511,13 +21511,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nmehrmalig unentschuldigtes Verletzen der Anwesenheitspflicht',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): mehrmalig unentschuldigtes Verletzen der Anwesenheitspflicht',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nmultiple unexcused breaches of attendance requirements',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): multiple unexcused breaches of attendance requirements',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -21531,13 +21531,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nwiederholtes Nichteinhalten von Prüfungsterminen bzw Abgabeterminen für Seminararbeiten bzw. Projektarbeiten',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): wiederholtes Nichteinhalten von Prüfungsterminen bzw Abgabeterminen für Seminararbeiten bzw. Projektarbeiten',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nrepeated non-compliance with examination dates or deadlines for seminar papers or project work',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): repeated non-compliance with examination dates or deadlines for seminar papers or project work',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -21551,13 +21551,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nPlagiieren im Rahmen wissenschaftlicher Arbeiten bzw. unerlaubte Verwendung KI generierter Hilfsmittel bzw. Quellen',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Plagiieren im Rahmen wissenschaftlicher Arbeiten bzw. unerlaubte Verwendung KI generierter Hilfsmittel bzw. Quellen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nPlagiarism in the context of scientific work or unauthorized use of AI-generated tools or sources',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): Plagiarism in the context of scientific work or unauthorized use of AI-generated tools or sources',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -21571,13 +21571,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nnicht genügende Leistung im Sinne der Prüfungsordnung',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): nicht genügende Leistung im Sinne der Prüfungsordnung',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): \ninsufficient performance in terms of the examination regulations',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): insufficient performance in terms of the examination regulations',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -21591,13 +21591,33 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nNichtantritt des Studiums zu Beginn des Studienjahres (=Unbegründetes Nichterscheinen zur ersten Studienveranstaltung)',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Nichtantritt des Studiums zu Beginn des Studienjahres (=Unbegründetes Nichterscheinen zur ersten Studienveranstaltung)',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nFailure to start the course at the beginning of the academic year (= unjustified non-attendance to the first course event)',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): Failure to start the course at the beginning of the academic year (= unjustified non-attendance to the first course event)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_MissingZgv',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Zugangsvoraussetzung BA (bzw. MA) nicht erfüllt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): Entry requirements BA (resp. MA) not fulfilled)',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -21723,6 +21743,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_MissingZgv',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugangsvoraussetzung BA (bzw. MA) nicht erfüllt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Entry requirements BA (resp. MA) not fulfilled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',

From 2d25e0822789920230efc5705942ad5d1da8f887 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 23 Nov 2023 09:45:29 +0100
Subject: [PATCH 113/149] Longtext ZGV ohne Hinweis auf Ausbildungsvertrag

---
 system/phrasesupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cd3f98181..8352abd0f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -21611,7 +21611,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Zugangsvoraussetzung BA (bzw. MA) nicht erfüllt',
+				'text' => 'Zugangsvoraussetzung BA (bzw. MA) nicht erfüllt',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From 4932f2120429c13312b31e246d143be91d135057 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 23 Nov 2023 15:37:01 +0100
Subject: [PATCH 114/149] s&d

---
 application/controllers/jobs/AntragJob.php | 5 +++--
 application/libraries/PrestudentLib.php    | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 6d4617a73..0571bd9dd 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -373,9 +373,10 @@ class AntragJob extends JOB_Controller
 				$result = $this->prestudentlib->setAbbrecher(
                     $antrag->prestudent_id,
                     $antrag->studiensemester_kurzbz,
-                    $antrag->insertvon ?: $insertvon,
+                    'AntragJob',
                     'abbrecherStgl',
-                    $antrag->insertamum
+                    $antrag->insertamum,
+                    $antrag->insertvon ?: $insertvon
                 );
 				if (isError($result))
 					$this->logError(getError($result));
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 279b6ed2a..989e14585 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -35,10 +35,12 @@ class PrestudentLib
 		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
 
-	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null)
+	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null, $bestaetigtvon = null)
 	{
 		if (!$insertvon)
 			$insertvon = getAuthUID();
+		if (!$bestaetigtvon)
+			$bestaetigtvon = $insertvon;
 
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
 		if (isError($result))
@@ -79,7 +81,7 @@ class PrestudentLib
 			'insertamum' => date('c'),
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => $insertvon,
+			'bestaetigtvon' => $bestaetigtvon,
 			'bestaetigtam' => $bestaetigtam
 		]);
 

From c93a4d2fb53aaee02ab051b95977f60e4b6c35f2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 23 Nov 2023 15:51:35 +0100
Subject: [PATCH 115/149] Studstatus: Wiederholer Reminder 1 wird vermutlich
 mit einem Tag delay versandt

---
 application/models/education/Pruefung_model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
index ef7cfc967..e1d668293 100644
--- a/application/models/education/Pruefung_model.php
+++ b/application/models/education/Pruefung_model.php
@@ -222,9 +222,9 @@ class Pruefung_model extends DB_Model
 		$this->withDetailsForStudierendenAntrag();
 
 		if ($maxDate)
-			$this->db->where("p.datum < ", $maxDate->format('c'));
+			$this->db->where("p.datum <= ", $maxDate->format('Y-m-d'));
 		if ($minDate)
-			$this->db->where("p.datum > ", $minDate->format('c'));
+			$this->db->where("p.datum > ", $minDate->format('Y-m-d'));
 
 		$this->db->where("b.aktiv", true);
 

From 66cbe5199aa4de7d378570387f8bc5aed63f8b3a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 23 Nov 2023 16:17:05 +0100
Subject: [PATCH 116/149] correct phrasestext

---
 system/phrasesupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8352abd0f..971b9dab1 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -21617,7 +21617,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): Entry requirements BA (resp. MA) not fulfilled)',
+				'text' => 'Entry requirements BA (resp. MA) not fulfilled)',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 28e533fb3cf1c542e5b6a61840ec73abb4e72db1 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 23 Nov 2023 17:53:43 +0100
Subject: [PATCH 117/149] replace pre with textarea to fix reason being
 overlapped by scroll bar

---
 public/js/components/Studierendenantrag/Leitung/Table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 7c7286d62..55b2065e5 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -359,7 +359,7 @@ export default {
 		<div ref="table"></div>
 		<bs-modal ref="modalGrund" id="modal-grund" class="fade">
 			<template #title>{{p.t('studierendenantrag', 'antrag_grund')}}</template>
-			<pre ref="modalGrundPre"></pre>
+			<textarea ref="modalGrundPre" style="width: 100%; height: 250px;" readonly></textarea>
 		</bs-modal>
 		<bs-modal ref="history" class="fade">
 			<template #title>{{p.t('studierendenantrag', 'title_history', {id: lastHistoryClickedId})}}</template>

From a6f18ae424ec2a82f35e13d9427c796011718b4b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 27 Nov 2023 12:21:25 +0100
Subject: [PATCH 118/149] Bugfix: parameter missing

---
 application/controllers/jobs/AntragJob.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 0571bd9dd..2e72041ff 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -376,6 +376,7 @@ class AntragJob extends JOB_Controller
                     'AntragJob',
                     'abbrecherStgl',
                     $antrag->insertamum,
+                    null,
                     $antrag->insertvon ?: $insertvon
                 );
 				if (isError($result))

From 6b2d7281439aa1d1c09dc18c93a810227296ab3a Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 28 Nov 2023 08:57:30 +0100
Subject: [PATCH 119/149] =?UTF-8?q?-=20text=C3=A4nderung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/student/studentenoverlay.xul.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index de7b6da55..cdaa2e69b 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -208,8 +208,8 @@ else
 								<menupopup id="student-filter-menu-popup" >
 									<menuitem id="student-toolbar-filter-dokumente" label="fehlende Dokumente" oncommand="InteressentDokumenteFilter()" disabled="false" tooltiptext="Liste aller Studenten mit Fehlenden Dokumenten"/>
 									<menuitem id="student-toolbar-filter-offenebuchungen" label="offene Buchungen" oncommand="StudentKontoFilterStudenten('konto')" disabled="false" tooltiptext="Liste aller Studenten mit offenen Buchungen"/>
-									<menuitem id="student-toolbar-filter-studiengebuehr" label="nicht gebuchte Studiengebuehr" oncommand="StudentKontoFilterStudenten('studiengebuehr')" disabled="false" tooltiptext="Liste aller Studenten die noch nicht mit Studienbebuehr belastet wurden" />
-									<menuitem id="student-toolbar-filter-erhoehte-studiengebuehr" label="erhöhten Studienbeitrag" oncommand="StudentKontoFilterStudenten('StudiengebuehrErhoeht')" disabled="false" tooltiptext="Liste aller Studenten die noch nicht mit Studienbebuehr belastet wurden" />
+									<menuitem id="student-toolbar-filter-studiengebuehr" label="nicht gebuchte Studiengebuehr" oncommand="StudentKontoFilterStudenten('studiengebuehr')" disabled="false" tooltiptext="Liste aller Studenten die noch nicht mit der Studiengebühr belastet wurden" />
+									<menuitem id="student-toolbar-filter-erhoehte-studiengebuehr" label="erhöhten Studienbeitrag" oncommand="StudentKontoFilterStudenten('StudiengebuehrErhoeht')" disabled="false" tooltiptext="Liste aller Studenten denen der erhöhte Studienbeitrag eingebucht wurde" />
 									<menuitem id="student-toolbar-filter-zgvohnedatum" label="ZGV eingetragen ohne Datum" oncommand="StudentKontoFilterStudenten('zgvohnedatum')" disabled="false" tooltiptext="Liste aller Studenten die ZGV eingetragen haben bei denen aber kein ZGV Datum gesetzt ist" />
 									<menu label="nach Statusgrund">
 									    <menupopup id="student-filter-statusgrund-menu-popup">

From bbd41f17ccc2390697198fa9104b981d88a02244 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 28 Nov 2023 12:53:44 +0100
Subject: [PATCH 120/149] use textarea instead of pre

---
 application/views/lehre/Antrag/Student/List.php               | 2 +-
 public/js/components/Studierendenantrag/Form/Unterbrechung.js | 2 +-
 public/js/components/Studierendenantrag/Leitung/Table.js      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index 0bc4c401a..4ca99f951 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -82,7 +82,7 @@ $this->load->view(
 													<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 												</div>
 												<div class="modal-body">
-													<pre><?= $antrag->grund; ?></pre>
+													<textarea class="form-control" style="width: 100%; height: 250px;" readonly><?= $antrag->grund; ?></textarea>
 												</div>
 											</div>
 										</div>
diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
index 49e50fd71..a0e84af63 100644
--- a/public/js/components/Studierendenantrag/Form/Unterbrechung.js
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -292,7 +292,7 @@ export default {
 				</div>
 				<div v-if="data.studierendenantrag_id" class="mb-3">
 					<h5>{{$p.t('studierendenantrag', 'antrag_grund')}}:</h5>
-					<pre>{{data.grund}}</pre>
+					<textarea class="form-control" rows="5" readonly>{{data.grund}}</textarea>
 				</div>
 				<div v-else class="col-sm-6 mb-3">
 					<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-grund'" class="form-label">Grund:</label>
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 30719c2f0..7bdf5d4a3 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -366,7 +366,7 @@ export default {
 		<div ref="table"></div>
 		<bs-modal ref="modalGrund" id="modal-grund" class="fade">
 			<template #title>{{$p.t('studierendenantrag', 'antrag_grund')}}</template>
-			<textarea ref="modalGrundPre" style="width: 100%; height: 250px;" readonly></textarea>
+			<textarea class="form-control" ref="modalGrundPre" style="width: 100%; height: 250px;" readonly></textarea>
 		</bs-modal>
 		<bs-modal ref="history" class="fade">
 			<template #title>{{$p.t('studierendenantrag', 'title_history', {id: lastHistoryClickedId})}}</template>

From 1310dea4a5dee2ac30891c067c3c5854f28e2a8b Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 28 Nov 2023 18:55:14 +0100
Subject: [PATCH 121/149] Changed Tabulators new-Button to btn-primary color

---
 .../lehre/anrechnung/RequestAnrechnung.php    | 17 +++++++++-------
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/application/controllers/lehre/anrechnung/RequestAnrechnung.php b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
index 1922bacda..3cba756cf 100644
--- a/application/controllers/lehre/anrechnung/RequestAnrechnung.php
+++ b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
@@ -152,10 +152,10 @@ class requestAnrechnung extends Auth_Controller
 			return $this->outputJsonError($this->p->t('anrechnung', 'antragBereitsGestellt'));
 		}
 		
-		// Exit if application is not for actual studysemester
-		if (!self::_applicationIsForActualSS($studiensemester_kurzbz))
+		// Exit if application is a past ( < actual ) studysemester
+		if (self::_applicationIsPastSS($studiensemester_kurzbz))
 		{
-			return $this->outputJsonError($this->p->t('anrechnung', 'antragNurImAktSS'));
+			return $this->outputJsonError($this->p->t('anrechnung', 'antragNichtFuerVerganganeSS'));
 		}
 		
 		// Upload document
@@ -312,18 +312,21 @@ class requestAnrechnung extends Auth_Controller
 	}
 
 	/**
-	 * Check if applications' study semester is actual study semester.
+	 * Check if applications' study semester is < actual study semester.
 	 *
 	 * @param $studiensemester_kurzbz
 	 * @return bool
 	 */
-	private function _applicationIsForActualSS($studiensemester_kurzbz)
+	private function _applicationIsPastSS($studiensemester_kurzbz)
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 		$result = $this->StudiensemesterModel->getNearest();
-		$actual_ss = getData($result)[0]->studiensemester_kurzbz;
+		$actual_ss = getData($result)[0];
 
-		return $studiensemester_kurzbz == $actual_ss;
+		$result = $this->StudiensemesterModel->load($studiensemester_kurzbz);
+		$anrechnung_ss = getData($result)[0];
+
+		return $anrechnung_ss->ende < $actual_ss->start;
 	}
 
 	private function _LVhasBlockingGrades($studiensemester_kurzbz, $lehrveranstaltung_id)
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 971b9dab1..069c9a471 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -13637,6 +13637,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'antragNichtFuerVerganganeSS',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Der Antrag kann nicht für vergangene Semester gestellt werden",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "You can not apply for the past study semester",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',

From 734ab452646faa5c0dd2f4063dde86fa098d3b64 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Wed, 29 Nov 2023 01:06:42 +0100
Subject: [PATCH 122/149] UHSTAT form: added SVNR text

---
 application/views/codex/uhstat1.php |  3 +++
 system/phrasesupdate.php            | 22 +++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
index a09f9c70a..78a30b3e5 100644
--- a/application/views/codex/uhstat1.php
+++ b/application/views/codex/uhstat1.php
@@ -47,6 +47,9 @@ $saved = isset($saved) && $saved === true;
 		<p>
 			<?php echo $this->p->t('uhstat', 'uhstat1AnmeldungEinleitungstext') ?>
 		</p>
+		<p>
+			<?php echo $this->p->t('uhstat', 'uhstat1EinleitungSvnrtext') ?>
+		</p>
 		<br>
 		<?php if ($editPermission): ?>
 			<?php if (isset($successMessage) && !isEmptyString($successMessage)): ?>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 971b9dab1..ebed4d343 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18516,6 +18516,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'uhstat1EinleitungSvnrtext',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Laut Bildungsdokumentationsgesetz sind wir verpflichtet die Sozialversicherungsnummer zu erheben bzw. zu registrieren. Falls Sie über keine Sozialversicherungsnummer verfügen, fordert die FH Technikum Wien in Ihrem Namen ein Ersatzkenneichen an.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'According to the General Social Insurance Act, we are obliged to collect and register your national insurance number. If you do not have a national insurance number, UAS Technikum Wien will request a social insurance substitute code on your behalf.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'uhstat',
@@ -18937,7 +18957,7 @@ array(
 		)
 	),
 /*
-	// es kann fuer jede Kombination Typ und Status eine Phrase der Form info_<Typ>_<Status 
+	// es kann fuer jede Kombination Typ und Status eine Phrase der Form info_<Typ>_<Status
 	// erstellt werden, die dann in der Studierendenansicht in einer infobox angezeigt werden
 	array(
 		'app' => 'core',

From ea14fa1a4bb3d573011635c909b386571fc87b7f Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 29 Nov 2023 13:05:49 +0100
Subject: [PATCH 123/149] - infocenter kaution spalte angepasst - infocenter
 abgewiesen nachricht spalte angepasst

---
 .../infocenter/infocenterAbgewiesenData.php   | 20 ++++++++++++++++---
 .../system/infocenter/infocenterData.php      |  7 +++++--
 .../infocenter/infocenterFreigegebenData.php  |  7 +++++--
 .../infocenterReihungstestAbsolviertData.php  |  6 +++++-
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/application/views/system/infocenter/infocenterAbgewiesenData.php b/application/views/system/infocenter/infocenterAbgewiesenData.php
index 2307ea87e..da816b2c7 100644
--- a/application/views/system/infocenter/infocenterAbgewiesenData.php
+++ b/application/views/system/infocenter/infocenterAbgewiesenData.php
@@ -31,21 +31,35 @@ $query = '
 					ORDER BY l.log_id DESC
 					LIMIT 1
 				)
-				AND '. $LOGDATA_VON .' = (
+				AND ('. $LOGDATA_VON .' = (
 					SELECT l.insertvon
 					FROM system.tbl_log l
 					WHERE l.person_id = p.person_id
 					ORDER BY l.log_id DESC
 					LIMIT 1
 				)
+				OR
+					(
+						(
+						SELECT l.insertvon
+						FROM system.tbl_log l
+						WHERE l.person_id = p.person_id
+						ORDER BY l.log_id DESC
+						LIMIT 1
+						) IS NULL
+					)
+				)
 				AND l.zeitpunkt >= pss.insertamum
 			  ORDER BY l.log_id DESC
 				 LIMIT 1
 			) AS "Nachricht",
 			(
-				SELECT SUM(konto.betrag)
+				SELECT
+					CASE
+						WHEN COUNT(CASE WHEN konto.betrag != 0 THEN 1 END) = 0 THEN null
+						ELSE SUM(konto.betrag)
+					END AS "Kaution"
 				FROM public.tbl_konto konto
-				LEFT JOIN tbl_konto skonto ON (skonto.buchungsnr_verweis = konto.buchungsnr)
 				WHERE konto.person_id = p.person_id
 					AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
 					AND konto.buchungstyp_kurzbz = '. $STUDIENGEBUEHR_ANZAHLUNG .'
diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index bb5b84479..61dc5a575 100644
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -292,9 +292,12 @@
 			rueck.datum_bis AS "HoldDate",
 			rueck.bezeichnung AS "Rueckstellgrund",
 			(
-				SELECT SUM(konto.betrag)
+				SELECT
+					CASE
+						WHEN COUNT(CASE WHEN konto.betrag != 0 THEN 1 END) = 0 THEN null
+						ELSE SUM(konto.betrag)
+					END AS "Kaution"
 				FROM public.tbl_konto konto
-				LEFT JOIN tbl_konto skonto ON (skonto.buchungsnr_verweis = konto.buchungsnr)
 				WHERE konto.person_id = p.person_id
 					AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
 					AND konto.buchungstyp_kurzbz = '. $STUDIENGEBUEHR_ANZAHLUNG .'
diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php
index 32315c145..8003b42e0 100644
--- a/application/views/system/infocenter/infocenterFreigegebenData.php
+++ b/application/views/system/infocenter/infocenterFreigegebenData.php
@@ -267,9 +267,12 @@ $query = '
 				LIMIT 1
 			) AS "AktenId",
 			(
-				SELECT SUM(konto.betrag)
+				SELECT
+					CASE
+						WHEN COUNT(CASE WHEN konto.betrag != 0 THEN 1 END) = 0 THEN null
+						ELSE SUM(konto.betrag)
+					END AS "Kaution"
 				FROM public.tbl_konto konto
-				LEFT JOIN tbl_konto skonto ON (skonto.buchungsnr_verweis = konto.buchungsnr)
 				WHERE konto.person_id = p.person_id
 					AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
 					AND konto.buchungstyp_kurzbz = '. $STUDIENGEBUEHR_ANZAHLUNG .'
diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
index e6b6d2495..7f9ee1288 100644
--- a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
+++ b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
@@ -198,7 +198,11 @@ $query = '
 				LIMIT 1 
 			) AS "InfoCenterMitarbeiter",
 			(
-				SELECT SUM(konto.betrag)
+				SELECT
+					CASE
+						WHEN COUNT(CASE WHEN konto.betrag != 0 THEN 1 END) = 0 THEN null
+						ELSE SUM(konto.betrag)
+					END AS "Kaution"
 				FROM public.tbl_konto konto
 				WHERE konto.person_id = p.person_id
 					AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'

From a3963248dda37db5bd1c3c361af357d9c5c84b9d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 29 Nov 2023 14:37:35 +0100
Subject: [PATCH 124/149] s&d

---
 application/libraries/AntragLib.php      | 37 ++++++++++++++----------
 application/models/crm/Student_model.php |  2 +-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index f3eb4d152..ff4d5dc63 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -123,6 +123,8 @@ class AntragLib
 	 */
 	public function approveAbmeldung($studierendenantrag_ids, $insertvon)
 	{
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
+
 		$errors = [];
 		foreach ($studierendenantrag_ids as $studierendenantrag_id) {
 			$result = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
@@ -251,10 +253,9 @@ class AntragLib
 						$vorname = '';
 						$nachname = $name;
 					}
-					$res = $this->_ci->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
+					$res = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
 					if (hasData($res)) {
-						$kontakt = current(getData($res));
-						$email = $kontakt->kontakt;
+						$email = $this->_ci->StudentModel->getEmailFH(current(getData($res))->student_uid);
 						$vorlage = $antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG ? 'Student' : 'Stgl';
 
 						// NOTE(chris): Sancho mail
@@ -335,6 +336,8 @@ class AntragLib
 			$res = $this->_ci->PrestudentModel->load($antrag->prestudent_id);
 
 			if (hasData($res)) {
+				$this->_ci->load->model('crm/Student_model', 'StudentModel');
+
 				$prestudent = current(getData($res));
 				$res = $this->_ci->PersonModel->load($prestudent->person_id);
 				if (hasData($res)) {
@@ -345,10 +348,10 @@ class AntragLib
 				} else {
 					$name = $this->_ci->p->t('person', 'studentIn');
 				}
-				$res = $this->_ci->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
+
+				$res = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
 				if (hasData($res)) {
-					$kontakt = current(getData($res));
-					$email = $kontakt->kontakt;
+					$email = $this->_ci->StudentModel->getEmailFH(current(getData($res))->student_uid);
 
 					$res = $this->_ci->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
 					$stg = '';
@@ -432,6 +435,7 @@ class AntragLib
 	public function approveUnterbrechung($studierendenantrag_ids, $insertvon)
 	{
 		$this->_ci->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
 
 		$errors = [];
 
@@ -609,6 +613,7 @@ class AntragLib
 	public function rejectUnterbrechung($studierendenantrag_ids, $insertvon, $grund)
 	{
 		$this->_ci->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
 
 		$errors = [];
 
@@ -755,7 +760,7 @@ class AntragLib
 					}
 				}
 
-				$res = $this->_ci->KontaktModel->getZustellKontakt($person_id, ['email']);
+				$res = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
 				if (isError($res)) {
 					$errors['email'] = getError($res);
 				} else {
@@ -764,7 +769,7 @@ class AntragLib
 					if (!$res) {
 						$errors['email'] = $this->_ci->p->t('studierendenantrag', 'error_no_email', ['person_id' => $person_id]);
 					} else {
-						$result['email'] = current($res)->kontakt;
+						$result['email'] = $this->_ci->StudentModel->getEmailFH(current($res)->student_uid);
 					}
 				}
 			}
@@ -1517,6 +1522,8 @@ class AntragLib
 
 	public function approveWiederholung($antrag_id, $insertvon)
 	{
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
+
 		$result = $this->_ci->StudierendenantragstatusModel->insert([
 			'studierendenantrag_id' => $antrag_id,
 			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
@@ -1571,10 +1578,10 @@ class AntragLib
 			$mitarbeiter = getData($result);
 		}
 
-		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id'=> $antrag->prestudent_id]);
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id'=> $prestudent_id]);
 		if (hasData($result)) {
-			$student = current(getData($result));
-			$student_uid = $student->student_uid;
+			$studentObj = current(getData($result));
+			$student_uid = $studentObj->student_uid;
 		}
 		else
 			$student_uid = '';
@@ -1596,10 +1603,8 @@ class AntragLib
 		))
 			return error($this->_ci->p->t('studierendenantrag', 'error_mail_to', ['email' => $email]));
 
-		$result = $this->_ci->KontaktModel->getZustellKontakt($person->person_id, ['email']);
-		if (hasData($result)) {
-			$kontakt = current(getData($result));
-			$email = $kontakt->kontakt;
+		if ($student_uid) {
+			$email = $this->_ci->StudentModel->getEmailFH($student_uid);
 
 			$sem_not_allowed = $sem_to_repeat = '';
 			$list_not_allowed = $list_to_repeat = $this->_ci->p->t('studierendenantrag', 'mail_part_error_no_lvs');
@@ -1609,7 +1614,7 @@ class AntragLib
 				$lvs = getData($result);
 				foreach ($lvs as $sem => $lv_list) {
 					$lvs_filtered = array_filter($lv_list, function ($el) {
-						return $el->antrag_zugelassen;
+						return property_exists($el, 'antrag_zugelassen') && $el->antrag_zugelassen;
 					});
 					if (substr($sem, 0, 1) == '1') {
 						$sem_not_allowed = substr($sem, 1);
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index e27fa68dc..4b0a70b1a 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -84,7 +84,7 @@ class Student_model extends DB_Model
 	}
 
 	/**
-	 * Get the FH-Email for a student (not the private kontakt emailt)
+	 * Get the FH-Email for a student (not the private kontakt email)
 	 * @param $student_uid
 	 * @return string
 	 */

From 483b6171c76727e1d027ee353ee346059ff0fc12 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Dec 2023 09:39:46 +0100
Subject: [PATCH 125/149] add space between firstname and surname

---
 rdf/AntragAbmeldung.xml.php     | 2 +-
 rdf/AntragAbmeldungStgl.xml.php | 2 +-
 rdf/AntragUnterbrechung.xml.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rdf/AntragAbmeldung.xml.php b/rdf/AntragAbmeldung.xml.php
index 0de936e0a..515b1809a 100644
--- a/rdf/AntragAbmeldung.xml.php
+++ b/rdf/AntragAbmeldung.xml.php
@@ -57,7 +57,7 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
 	<antrag>
-        <name><![CDATA[<?= trim($row->vorname . $row->nachname); ?>]]></name>
+        <name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
         <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
         <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
         <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
diff --git a/rdf/AntragAbmeldungStgl.xml.php b/rdf/AntragAbmeldungStgl.xml.php
index cccd677b0..4511be232 100644
--- a/rdf/AntragAbmeldungStgl.xml.php
+++ b/rdf/AntragAbmeldungStgl.xml.php
@@ -57,7 +57,7 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
         <antrag>
-            <name><![CDATA[<?= trim($row->vorname . $row->nachname); ?>]]></name>
+            <name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
             <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
             <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
             <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
diff --git a/rdf/AntragUnterbrechung.xml.php b/rdf/AntragUnterbrechung.xml.php
index 70a056b8a..ff3e68afa 100644
--- a/rdf/AntragUnterbrechung.xml.php
+++ b/rdf/AntragUnterbrechung.xml.php
@@ -58,7 +58,7 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
 	<antrag>
-        <name><![CDATA[<?= trim($row->vorname . $row->nachname); ?>]]></name>
+        <name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
         <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
         <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
         <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>

From 98de634393113e9eef06416b75fbc1e77da900dd Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 5 Dec 2023 09:27:20 +0100
Subject: [PATCH 126/149] s&d

---
 application/libraries/AntragLib.php           | 35 ++++++++++++++-----
 .../education/Studierendenantrag_model.php    |  1 +
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index ff4d5dc63..e3cc5bf14 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -967,6 +967,7 @@ class AntragLib
 		$studiengang_kz = $result->studiengang_kz;
 		$orgform_kurzbz = $result->orgform_kurzbz;
 		$ausbildungssemester = $result->ausbildungssemester;
+		$sprache = $result->sprache;
 
 		// NOTE(chris): check permission
 		$allowedStgs = $this->_ci->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: [];
@@ -1012,7 +1013,8 @@ class AntragLib
 			$semA,
 			$ausbildungssemester + 1,
 			$antrag->prestudent_id,
-			$antrag->studiensemester_kurzbz
+			$antrag->studiensemester_kurzbz,
+			$sprache
 		);
 		if (isError($result))
 			return $result;
@@ -1035,7 +1037,8 @@ class AntragLib
 			$semB,
 			$ausbildungssemester,
 			$antrag->prestudent_id,
-			$antrag->studiensemester_kurzbz
+			$antrag->studiensemester_kurzbz,
+			$sprache
 		);
 		if (isError($result))
 			return $result;
@@ -1062,7 +1065,8 @@ class AntragLib
 		$studiensemester_kurzbz,
 		$ausbildungssemester,
 		$prestudent_id,
-		$note_stsem
+		$note_stsem,
+		$sprache
 	) {
 		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
 
@@ -1091,12 +1095,25 @@ class AntragLib
 				'semester' => $ausbildungssemester
 			]));
 		}
-		if (count($result) > 1)
-			return error($this->_ci->p->t('studierendenantrag', 'error_multiple_studienplan', [
-				'studiengang_kz' => $studiengang_kz,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'semester' => $ausbildungssemester
-			]));
+		if (count($result) > 1) {
+			$langmap = array_unique(array_map(function ($a) {
+				return $a->sprache;
+			}, $result));
+			if ($sprache
+				&& count($langmap) == count($result)
+				&& in_array($sprache, $langmap)
+			) {
+				$result = array_filter($result, function ($a) use ($sprache) {
+					return $a->sprache == $sprache;
+				});
+			} else {
+				return error($this->_ci->p->t('studierendenantrag', 'error_multiple_studienplan', [
+					'studiengang_kz' => $studiengang_kz,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz,
+					'semester' => $ausbildungssemester
+				]));
+			}
+		}
 		$studienplan = current($result);
 
 		return $this->_ci->StudienplanModel->getStudienplanLehrveranstaltungForPrestudent(
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 4931896cd..2ad942870 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -124,6 +124,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect('p.studiengang_kz');
 		$this->addSelect('stg.bezeichnung');
 		$this->addSelect('s.ausbildungssemester');
+		$this->addSelect('plan.sprache');
 		$this->addSelect('COALESCE(plan.orgform_kurzbz, s.orgform_kurzbz, stg.orgform_kurzbz) AS orgform_kurzbz');
 
 		$this->addJoin(

From 3e9dcf2911aaae2b735ff04a187f8e766e918da2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 6 Dec 2023 09:46:34 +0100
Subject: [PATCH 127/149] =?UTF-8?q?task-35010:=20Abmeldung=20d.=20StG=20Pr?=
 =?UTF-8?q?e-Abbrecher=20Statusgrund=20nach=20zur=C3=BCckgezogen=20wieder?=
 =?UTF-8?q?=20r=C3=BCckg=C3=A4ngig=20machen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/libraries/AntragLib.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index e3cc5bf14..cb7431952 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -62,6 +62,24 @@ class AntragLib
 			'insertvon' => $insertvon
 		]);
 
+		// NOTE(chris): remove "preabbrecher" statusgrund for Stgl-Abmeldungen if set
+		$res = $this->_ci->StudierendenantragModel->load($antrag_id);
+		if (hasData($res) && current(getData($res))->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL) {
+			$this->_ci->PrestudentstatusModel->addSelect('tbl_status_grund.statusgrund_kurzbz');
+			$res = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail(current(getData($res))->prestudent_id, '', 'Student');
+			if (hasData($res) && current(getData($res))->statusgrund_kurzbz == 'preabbrecher') {
+				$prestudentstatus = current(getData($res));
+				$this->_ci->PrestudentstatusModel->update([
+					'prestudent_id' => $prestudentstatus->prestudent_id,
+					'status_kurzbz'=>$prestudentstatus->status_kurzbz,
+					'studiensemester_kurzbz'=>$prestudentstatus->studiensemester_kurzbz,
+					'ausbildungssemester'=>$prestudentstatus->ausbildungssemester
+				], [
+					'statusgrund_id' => null
+				]);
+			}
+		}
+
 		return $result;
 	}
 

From b6b21d54fc2261b4b6d51d4b22e97a2f00209ad8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 6 Dec 2023 14:26:59 +0100
Subject: [PATCH 128/149] =?UTF-8?q?Pre-Abbrecher=20Statusgrund=20nach=20zu?=
 =?UTF-8?q?r=C3=BCckgezogen=20wieder=20r=C3=BCckg=C3=A4ngig=20machen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/libraries/AntragLib.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index ff4d5dc63..6b5462b31 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -62,6 +62,24 @@ class AntragLib
 			'insertvon' => $insertvon
 		]);
 
+		// NOTE(chris): remove "preabbrecher" statusgrund for Stgl-Abmeldungen if set
+		$res = $this->_ci->StudierendenantragModel->load($antrag_id);
+		if (hasData($res) && current(getData($res))->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL) {
+			$this->_ci->PrestudentstatusModel->addSelect('tbl_status_grund.statusgrund_kurzbz');
+			$res = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail(current(getData($res))->prestudent_id, '', 'Student');
+			if (hasData($res) && current(getData($res))->statusgrund_kurzbz == 'preabbrecher') {
+				$prestudentstatus = current(getData($res));
+				$this->_ci->PrestudentstatusModel->update([
+					'prestudent_id' => $prestudentstatus->prestudent_id,
+					'status_kurzbz'=>$prestudentstatus->status_kurzbz,
+					'studiensemester_kurzbz'=>$prestudentstatus->studiensemester_kurzbz,
+					'ausbildungssemester'=>$prestudentstatus->ausbildungssemester
+				], [
+					'statusgrund_id' => null
+				]);
+			}
+		}
+
 		return $result;
 	}
 

From b15adf7b2335cb94067b231853fae4c8c51621a5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 6 Dec 2023 14:32:29 +0100
Subject: [PATCH 129/149] =?UTF-8?q?Revert=20"task-35010:=20Abmeldung=20d.?=
 =?UTF-8?q?=20StG=20Pre-Abbrecher=20Statusgrund=20nach=20zur=C3=BCckgezoge?=
 =?UTF-8?q?n=20wieder=20r=C3=BCckg=C3=A4ngig=20machen"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3e9dcf2911aaae2b735ff04a187f8e766e918da2.
---
 application/libraries/AntragLib.php | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index cb7431952..e3cc5bf14 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -62,24 +62,6 @@ class AntragLib
 			'insertvon' => $insertvon
 		]);
 
-		// NOTE(chris): remove "preabbrecher" statusgrund for Stgl-Abmeldungen if set
-		$res = $this->_ci->StudierendenantragModel->load($antrag_id);
-		if (hasData($res) && current(getData($res))->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL) {
-			$this->_ci->PrestudentstatusModel->addSelect('tbl_status_grund.statusgrund_kurzbz');
-			$res = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail(current(getData($res))->prestudent_id, '', 'Student');
-			if (hasData($res) && current(getData($res))->statusgrund_kurzbz == 'preabbrecher') {
-				$prestudentstatus = current(getData($res));
-				$this->_ci->PrestudentstatusModel->update([
-					'prestudent_id' => $prestudentstatus->prestudent_id,
-					'status_kurzbz'=>$prestudentstatus->status_kurzbz,
-					'studiensemester_kurzbz'=>$prestudentstatus->studiensemester_kurzbz,
-					'ausbildungssemester'=>$prestudentstatus->ausbildungssemester
-				], [
-					'statusgrund_id' => null
-				]);
-			}
-		}
-
 		return $result;
 	}
 

From b6585dc186cf0805c5ba7afae4fefee3dd769d5e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Dec 2023 16:05:52 +0100
Subject: [PATCH 130/149] add margin-right to prevent scrollbar from overlaying
 table

---
 cis/private/tools/zeitaufzeichnung.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/cis/private/tools/zeitaufzeichnung.php b/cis/private/tools/zeitaufzeichnung.php
index 0eb86bdb1..7937857ef 100644
--- a/cis/private/tools/zeitaufzeichnung.php
+++ b/cis/private/tools/zeitaufzeichnung.php
@@ -229,6 +229,21 @@ $( document ).ready(function()
 </script>
 ';
 
+echo <<<EOSBJS
+<script>
+	$(document).ready(function() {
+        const scrollDiv = document.createElement('div');
+        scrollDiv.style.cssText = 'width: 99px; height: 99px; overflow: scroll; position: absolute; top: -9999px;';
+        document.body.appendChild(scrollDiv);
+        const scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth;
+        document.body.removeChild(scrollDiv);
+		var marginright = Math.max((20 - scrollbarWidth), 0);
+        document.body.style.setProperty('width', 'calc(100% - ' + marginright + 'px)');
+    });
+</script>
+
+EOSBJS;
+
 echo '
         <script type="text/javascript">
 		$(document).ready(function()
@@ -1621,7 +1636,7 @@ if ($projekt->getProjekteMitarbeiter($user, true))
 			        <td '.$style.' align="right"><b>'.$tagessaldo.$erstr.'</b><br>'.date('H:i', ($pausesumme-3600)).'</td>
 			        <td '.$style.' colspan="3" align="right">';
 					if ($tag > $sperrdatum)
-					echo '<a href="?von_datum='.$datum->formatDatum($tag,'d.m.Y').'&bis_datum='.$datum->formatDatum($tag,'d.m.Y').'" class="item">&lt;-</a>';
+					echo '<a href="?von_datum='.$datum->formatDatum($tag,'d.m.Y').'&bis_datum='.$datum->formatDatum($tag,'d.m.Y').'" class="item">&larr;</a>';
 
 					echo '</td></tr>';
 

From 9fa7e6e56c07ec0af08b131221ec480b33133a0a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Dec 2023 17:12:38 +0100
Subject: [PATCH 131/149] modify label of Studiengaenge in Dropdown and Table

---
 application/models/education/Studierendenantrag_model.php | 2 +-
 public/js/components/Studierendenantrag/Leitung/Header.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 4931896cd..a11df6981 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -30,7 +30,7 @@ class Studierendenantrag_model extends DB_Model
 	{
 		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
 
-		$this->addSelect('stg.bezeichnung');
+		$this->addSelect('UPPER(stg.typ) || UPPER(stg.kurzbz) || \' \' || stg.bezeichnung AS bezeichnung');
 		$this->addSelect('bezeichnung_mehrsprachig[(' . $sql . ')] AS orgform', false);
 		$this->addSelect('s.studierendenantrag_id');
 		$this->addSelect('matrikelnr');
diff --git a/public/js/components/Studierendenantrag/Leitung/Header.js b/public/js/components/Studierendenantrag/Leitung/Header.js
index 12bfcbe82..3d6287afa 100644
--- a/public/js/components/Studierendenantrag/Leitung/Header.js
+++ b/public/js/components/Studierendenantrag/Leitung/Header.js
@@ -12,7 +12,7 @@ export default {
 			<select ref="stg_select" class="form-select" @input="$emit('input', $event)">
 				<option value="">{{$p.t('global', 'alle')}}</option>
 				<option v-for="stg in stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">
-					{{stg.bezeichnung}} ({{stg.orgform}})
+					{{stg.bezeichnung}}
 				</option>
 			</select>
 		</div>

From 14c24005fe5760d34b419c9bf9dcc73624324dff Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 12 Dec 2023 11:02:12 +0100
Subject: [PATCH 132/149] Wiederholung wenn Studierende das letze Semester
 wiederholen

---
 application/libraries/AntragLib.php           | 103 ++++++++++++++++--
 ...dierendenantraglehrveranstaltung_model.php |  32 +++++-
 .../models/organisation/Studienplan_model.php |  28 ++++-
 .../Studierendenantrag/Leitung/LvPopup.js     |  14 ++-
 .../Studierendenantrag/Lvzuweisung.js         |  57 +++++-----
 system/phrasesupdate.php                      |  40 +++++++
 6 files changed, 221 insertions(+), 53 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 6b5462b31..f4659dc91 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1029,12 +1029,12 @@ class AntragLib
 			$orgform_kurzbz,
 			$semA,
 			$ausbildungssemester + 1,
-			$antrag->prestudent_id,
-			$antrag->studiensemester_kurzbz
+			$antrag->prestudent_id
 		);
 		if (isError($result))
 			return $result;
 		$lvsA = $result->retval; // NOTE(chris): don't use getData() because we want to differenciate [] and null
+		$repeat_last = false;
 		if ($lvsA) {
 			foreach($lvsA as $lv)
 			{
@@ -1045,6 +1045,79 @@ class AntragLib
 					$lv->antrag_anmerkung = $lvszugewiesen[$lv->lehrveranstaltung_id]->anmerkung;
 				}
 			}
+		} elseif ($lvsA === null) {
+			// NOTE(chris): We are repeating the last semester
+			$repeat_last = true;
+
+			$result = $this->_ci->PrestudentstatusModel->getStatusByFilter($antrag->prestudent_id, 'Student', $ausbildungssemester - 1);
+			if (isError($result))
+				return $result;
+
+			$stdsems = getData($result) ?: [];
+			$stdsem = null;
+
+			$result = $this->_ci->StudiensemesterModel->load($antrag->studiensemester_kurzbz);
+			if (isError($result))
+				return $result;
+			if (!hasData($result))
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_stdsem', ['studiensemester_kurzbz' => $antrag->studiensemester_kurzbz]));
+			$asem = current(getData($result));
+
+			foreach ($stdsems as $sem) {
+				$result = $this->_ci->StudiensemesterModel->load($sem->studiensemester_kurzbz);
+				if (isError($result))
+					return $result;
+				if (hasData($result)) {
+					if (current(getData($result))->start < $asem->start) {
+						$stdsem = $sem->studiensemester_kurzbz;
+						break;
+					}
+				}
+			}
+
+			// NOTE(chris): if we don't find a status in the previous semester there is something wrong
+			if (!$stdsem)
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_status_in_prev_sem'));
+
+			$result = $this->getLvsByStgStsemAndSem(
+				$studiengang_kz,
+				$orgform_kurzbz,
+				$semA,
+				$ausbildungssemester - 1,
+				$antrag->prestudent_id
+			);
+			if (isError($result))
+				return $result;
+			
+			$lvsA = getData($result) ?: [];
+			
+			$result = $this->getLvsByStgStsemAndSem(
+				$studiengang_kz,
+				$orgform_kurzbz,
+				$stdsem,
+				$ausbildungssemester - 1,
+				$antrag->prestudent_id
+			);
+			if (isError($result))
+				return $result;
+
+			$lvsAtest = getData($result) ?: [];
+
+			if (count(array_intersect(array_map(function ($a) {
+				return $a->lehrveranstaltung_id;
+			}, $lvsA), array_map(function ($a) {
+				return $a->lehrveranstaltung_id;
+			}, $lvsAtest)))) {
+				foreach ($lvsA as $lv) {
+					if (isset($lvszugewiesen[$lv->lehrveranstaltung_id]) && ($lvszugewiesen[$lv->lehrveranstaltung_id]->note == 0)) {
+						$lv->antrag_anmerkung = $lvszugewiesen[$lv->lehrveranstaltung_id]->anmerkung;
+						$lv->antrag_zugelassen = true;
+					}
+
+				}
+			} else {
+				$lvsA = null;
+			}
 		}
 
 		$result = $this->getLvsByStgStsemAndSem(
@@ -1052,8 +1125,7 @@ class AntragLib
 			$orgform_kurzbz,
 			$semB,
 			$ausbildungssemester,
-			$antrag->prestudent_id,
-			$antrag->studiensemester_kurzbz
+			$antrag->prestudent_id
 		);
 		if (isError($result))
 			return $result;
@@ -1068,10 +1140,14 @@ class AntragLib
 			// TODO(manu): eventuelle Änderungen taggen
 		}
 
-		return success([
+		$result = [
 			'1' . $semA => $lvsA,
 			'2' . $semB => $lvsB ?: []
-		]);
+		];
+		if ($repeat_last)
+			$result['repeat_last'] = true;
+
+		return success($result);
 	}
 
 	public function getLvsByStgStsemAndSem(
@@ -1079,8 +1155,7 @@ class AntragLib
 		$orgform_kurzbz,
 		$studiensemester_kurzbz,
 		$ausbildungssemester,
-		$prestudent_id,
-		$note_stsem
+		$prestudent_id
 	) {
 		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
 
@@ -1120,8 +1195,7 @@ class AntragLib
 		return $this->_ci->StudienplanModel->getStudienplanLehrveranstaltungForPrestudent(
 			$studienplan->studienplan_id,
 			$ausbildungssemester,
-			$prestudent_id,
-			$note_stsem
+			$prestudent_id
 		);
 	}
 
@@ -1623,6 +1697,7 @@ class AntragLib
 
 		if ($student_uid) {
 			$email = $this->_ci->StudentModel->getEmailFH($student_uid);
+			$vorlage = 'Sancho_Mail_Antrag_W_Student';
 
 			$sem_not_allowed = $sem_to_repeat = '';
 			$list_not_allowed = $list_to_repeat = $this->_ci->p->t('studierendenantrag', 'mail_part_error_no_lvs');
@@ -1630,6 +1705,12 @@ class AntragLib
 			$result = $this->getLvsForAntrag($antrag_id);
 			if (hasData($result)) {
 				$lvs = getData($result);
+				$repeat_last = false;
+				if (isset($lvs['repeat_last'])) {
+					$repeat_last = true;
+					unset($lvs['repeat_last']);
+					$vorlage .= '_Last';
+				}
 				foreach ($lvs as $sem => $lv_list) {
 					$lvs_filtered = array_filter($lv_list, function ($el) {
 						return property_exists($el, 'antrag_zugelassen') && $el->antrag_zugelassen;
@@ -1652,7 +1733,7 @@ class AntragLib
 			
 			// NOTE(chris): Sancho mail
 			sendSanchoMail(
-				'Sancho_Mail_Antrag_W_Student',
+				$vorlage,
 				[
 					'antrag_id' => $antrag_id,
 					'stg' => $stg->bezeichnung,
diff --git a/application/models/education/Studierendenantraglehrveranstaltung_model.php b/application/models/education/Studierendenantraglehrveranstaltung_model.php
index 47a07ecfe..4318c773e 100644
--- a/application/models/education/Studierendenantraglehrveranstaltung_model.php
+++ b/application/models/education/Studierendenantraglehrveranstaltung_model.php
@@ -65,20 +65,40 @@ class Studierendenantraglehrveranstaltung_model extends DB_Model
 			'stat.studierendenantrag_status_id = campus.get_status_id_studierendenantrag(a.studierendenantrag_id)'
 		);
 		$this->addJoin('public.tbl_student s', 'prestudent_id');
-		$this->addJoin(
-			'lehre.tbl_zeugnisnote z',
-			'z.lehrveranstaltung_id=lv.lehrveranstaltung_id AND z.student_uid=s.student_uid AND z.studiensemester_kurzbz=a.studiensemester_kurzbz',
-			'LEFT'
-		);
+
+		// NOTE(chris): last offizell note
+		$this->addJoin('(
+			SELECT z.* 
+			FROM lehre.tbl_zeugnisnote z
+			LEFT JOIN public.tbl_studiensemester zs 
+				USING(studiensemester_kurzbz)
+			JOIN (
+				SELECT zi.lehrveranstaltung_id, zi.student_uid, MAX(zis.start) AS start 
+				FROM lehre.tbl_zeugnisnote zi
+				LEFT JOIN lehre.tbl_note zin
+					USING(note)
+				LEFT JOIN public.tbl_studiensemester zis
+					USING(studiensemester_kurzbz)
+				WHERE zin.aktiv AND zin.offiziell
+				GROUP BY zi.lehrveranstaltung_id, zi.student_uid
+			) zx
+				ON (
+					z.lehrveranstaltung_id=zx.lehrveranstaltung_id
+					AND z.student_uid=zx.student_uid
+					AND zs.start = zx.start
+				)) z', 'z.lehrveranstaltung_id=lv.lehrveranstaltung_id AND z.student_uid=s.student_uid', 'LEFT');
 		$this->addJoin('lehre.tbl_note zn', 'z.note = zn.note', 'LEFT');
 
+		$this->load->config('studierendenantrag');
+		$note_intern_angerechntet = $this->config->item('wiederholung_note_angerechnet');
+
 		return $this->loadWhere([
 			'ps.prestudent_id' => $prestudent_id,
 			'a.typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 			'stat.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
 			'n.note <> ' => 0,
 			$this->dbTable . '.studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'(n.note<>19 OR (z.note IS NOT NULL AND zn.positiv))' => null
+			'(n.note<>' . $this->db->escape($note_intern_angerechntet) . ' OR (z.note IS NOT NULL AND zn.positiv))' => null
 		]);
 	}
 }
diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
index 66ec06ba8..8422f4607 100644
--- a/application/models/organisation/Studienplan_model.php
+++ b/application/models/organisation/Studienplan_model.php
@@ -60,7 +60,7 @@ class Studienplan_model extends DB_Model
 		));
 	}
 
-	public function getStudienplanLehrveranstaltungForPrestudent($studienplan_id, $semester, $prestudent_id, $note_stsem)
+	public function getStudienplanLehrveranstaltungForPrestudent($studienplan_id, $semester, $prestudent_id)
 	{
 		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
 		$sql = 'SELECT student_uid FROM public.tbl_student WHERE prestudent_id=' . $this->escape($prestudent_id);
@@ -75,11 +75,27 @@ class Studienplan_model extends DB_Model
 
 		$this->addJoin('lehre.tbl_studienplan_lehrveranstaltung', 'studienplan_id');
 		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
-		$this->addJoin(
-			'lehre.tbl_zeugnisnote zn',
-			'zn.lehrveranstaltung_id=lv.lehrveranstaltung_id AND zn.student_uid=(' . $sql . ') AND zn.studiensemester_kurzbz=' . $this->escape($note_stsem),
-			'LEFT'
-		);
+		// NOTE(chris): last offizell note
+		$this->addJoin('(
+			SELECT z.* 
+			FROM lehre.tbl_zeugnisnote z
+			LEFT JOIN public.tbl_studiensemester zs 
+				USING(studiensemester_kurzbz)
+			JOIN (
+				SELECT zi.lehrveranstaltung_id, zi.student_uid, MAX(zis.start) AS start 
+				FROM lehre.tbl_zeugnisnote zi
+				LEFT JOIN lehre.tbl_note zin
+					USING(note)
+				LEFT JOIN public.tbl_studiensemester zis
+					USING(studiensemester_kurzbz)
+				WHERE zin.aktiv AND zin.offiziell
+				GROUP BY zi.lehrveranstaltung_id, zi.student_uid
+			) zx
+				ON (
+					z.lehrveranstaltung_id=zx.lehrveranstaltung_id
+					AND z.student_uid=zx.student_uid
+					AND zs.start = zx.start
+				)) zn', 'zn.lehrveranstaltung_id=lv.lehrveranstaltung_id AND zn.student_uid=( ' . $sql . ')', 'LEFT');
 		$this->addJoin('lehre.tbl_note n', 'n.note=zn.note', 'LEFT');
 
 		$this->addOrder('lehre.tbl_studienplan_lehrveranstaltung.sort');
diff --git a/public/js/components/Studierendenantrag/Leitung/LvPopup.js b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
index 99455237e..700a2330b 100644
--- a/public/js/components/Studierendenantrag/Leitung/LvPopup.js
+++ b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
@@ -16,6 +16,7 @@ export default {
 	data(){
 		return {
 			lvs: null,
+			repeat_last: false,
 			refresh: true,
 			result: false,
 			check: false
@@ -35,13 +36,16 @@ export default {
 	},
 	methods: {
 		setlvs(param) {
-			if(param.error)
-			{
+			if(param.error) {
 				this.$refs.fetchCompt.error = true;
 				this.$refs.fetchCompt.errorMessage = param.retval;
-			}
-			else
+			} else {
+				this.repeat_last = !!param.retval.repeat_last;
+				if (this.repeat_last) {
+					delete param.retval.repeat_last;
+				}
 				this.lvs = param.retval;
+			}
 		},
 		loadlvs() {
 			if (!this.antragId)
@@ -82,7 +86,7 @@ export default {
 					<table v-else class="table caption-top" v-for="(lv_arr, sem) in lvzugelassen" :key="sem">
 						<caption>
 							<span class="d-flex justify-content-between">
-								<span>{{ $p.t('studierendenantrag',['title_lv_nicht_zugelassen', 'title_lv_wiederholen'][sem.substr(0,1)-1]) }}</span>
+								<span>{{ $p.t('studierendenantrag',['title_lv_nicht_zugelassen', 'title_lv_wiederholen'][repeat_last ? 1 : sem.substr(0,1)-1]) }}</span>
 								<span>{{sem.substr(1)}}</span>
 							</span>
 						</caption>
diff --git a/public/js/components/Studierendenantrag/Lvzuweisung.js b/public/js/components/Studierendenantrag/Lvzuweisung.js
index 42f390ac3..5ef1e9030 100644
--- a/public/js/components/Studierendenantrag/Lvzuweisung.js
+++ b/public/js/components/Studierendenantrag/Lvzuweisung.js
@@ -41,10 +41,11 @@ export default {
 	methods: {
 		save() {
 			this.isloading = true;
-			const forbiddenLvs = this.lvs1.filter(lv => lv.antrag_zugelassen && !lv._children).map(lv => ({
+			const forbiddenLvs = this.lvs1.filter(lv => (lv.antrag_zugelassen || this.lvs.repeat_last)
+			 && !lv._children).map(lv => ({
 				studierendenantrag_id: this.antragId,
 				lehrveranstaltung_id: lv.lehrveranstaltung_id,
-				zugelassen: 0,
+				zugelassen: this.lvs.repeat_last ? (lv.antrag_zugelassen ? 1 : 2) : 0,
 				anmerkung: lv.antrag_anmerkung || "",
 				studiensemester_kurzbz: this.lvs1sem
 			}));
@@ -109,6 +110,8 @@ export default {
 						.loadCategory(['ui', 'lehre', 'studierendenantrag', 'global'])
 						.then(() => {
 							for (var k in result.data.retval) {
+								if (k === 'repeat_last')
+									continue;
 								if (result.data.retval[k] === null) {
 									const alert = document.createElement('div');
 									alert.innerHTML = this.$p.t('studierendenantrag', 'error_stg_last_semester');
@@ -147,29 +150,33 @@ export default {
 										{title: this.$p.t('lehre','lehrform'), field: "lehrform_kurzbz"},
 										{title: "ECTS", field: "ects"},
 										{title: this.$p.t('lehre','note'), field: "note", formatter:(cell, formatterParams, onRendered)=>cell.getValue() || "---"},
-										{title: (index==1) ? this.$p.t('studierendenantrag','lv_nicht_zulassen') : this.$p.t('studierendenantrag','lv_wiederholen'), field: "antrag_zugelassen", formatter: (cell, formatterParams, onRendered) => {
-											let data = cell.getData();
-											if(data._children || !data.zeugnis)
-												return "";
-											let input = document.createElement('input');
-											input.className = "form-check-input";
-											input.type = "checkbox";
-											input.role = "switch";
-											input.checked = cell.getValue();
-											input.addEventListener('input', () => {
-												lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen = input.checked;
-												cell.getRow().reformat();
-											});
-											if (this.disabled) {
-												input.disabled = true;
+										{
+											title: index == 1 && !result.data.retval.repeat_last ? this.$p.t('studierendenantrag','lv_nicht_zulassen') : this.$p.t('studierendenantrag','lv_wiederholen'),
+											field: "antrag_zugelassen",
+											formatter: (cell, formatterParams, onRendered) => {
+												let data = cell.getData();
+												if(data._children || !data.zeugnis)
+													return "";
+												let input = document.createElement('input');
+												input.className = "form-check-input";
+												input.type = "checkbox";
+												input.role = "switch";
+												input.checked = cell.getValue();
+												input.addEventListener('input', () => {
+													lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen = input.checked;
+													cell.getRow().reformat();
+												});
+												if (this.disabled) {
+													input.disabled = true;
+												}
+
+												let div =  document.createElement('div');
+												div.className = 'form-check form-switch';
+												div.append(input);
+
+												return div;
 											}
-
-											let div =  document.createElement('div');
-											div.className = 'form-check form-switch';
-											div.append(input);
-
-											return div;
-										}},
+										},
 										{
 											title: this.$p.t('global','anmerkung'),
 											field: "antrag_anmerkung",
@@ -233,7 +240,7 @@ export default {
 		<div ref="alertbox"></div>
 
 		<span class="d-flex justify-content-between h4">
-			<span>{{$p.t('studierendenantrag', 'title_lv_nicht_zugelassen')}}</span>
+			<span>{{lvs.repeat_last ? $p.t('studierendenantrag', 'title_lv_wiederholen') : $p.t('studierendenantrag', 'title_lv_nicht_zugelassen')}}</span>
 			<span>{{lvs1sem}}</span>
 		</span>
 		<div ref="lvtable1" class="mb-3">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 971b9dab1..1627c991f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20683,6 +20683,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_stdsem',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Studiensemester {studiensemester_kurzbz} existiert nicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Semester {studiensemester_kurzbz} does not exist',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_status_in_prev_sem',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Status im letzten Semester gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No status found in previous semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',

From 5c3f5b26d3e9e1d0b2b92d017abc452dbc62ce7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 12 Dec 2023 13:25:10 +0100
Subject: [PATCH 133/149] =?UTF-8?q?Composer=20Lock=20aktualisiert=20und=20?=
 =?UTF-8?q?neuen=20Config=20Eintrag=20f=C3=BCr=20Zahlungstypen=20hinzugef?=
 =?UTF-8?q?=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.lock                         | 101 ++++++++++++++------------
 config/vilesci.config-default.inc.php |   8 +-
 2 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/composer.lock b/composer.lock
index 5660e87e9..d83e749b0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b6e875dbd1ec2554abbf9f7513806469",
+    "content-hash": "728ac4542ac39ac1efbcea15134a81f9",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -614,16 +614,16 @@
         },
         {
             "name": "components/jquery",
-            "version": "3.6.0",
+            "version": "v3.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/components/jquery.git",
-                "reference": "6cf38ee1fd04b6adf8e7dda161283aa35be818c3"
+                "reference": "8edc7785239bb8c2ad2b83302b856a1d61de60e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/components/jquery/zipball/6cf38ee1fd04b6adf8e7dda161283aa35be818c3",
-                "reference": "6cf38ee1fd04b6adf8e7dda161283aa35be818c3",
+                "url": "https://api.github.com/repos/components/jquery/zipball/8edc7785239bb8c2ad2b83302b856a1d61de60e7",
+                "reference": "8edc7785239bb8c2ad2b83302b856a1d61de60e7",
                 "shasum": ""
             },
             "type": "component",
@@ -659,7 +659,7 @@
                 "source": "https://github.com/jquery/jquery",
                 "wiki": "http://docs.jquery.com/"
             },
-            "time": "2021-03-20T19:13:42+00:00"
+            "time": "2023-09-22T01:43:46+00:00"
         },
         {
             "name": "components/jqueryui",
@@ -1520,16 +1520,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.44",
+            "version": "2.0.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "149f608243f8133c61926aae26ce67d2b22b37e5"
+                "reference": "28d8f438a0064c9de80857e3270d071495544640"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/149f608243f8133c61926aae26ce67d2b22b37e5",
-                "reference": "149f608243f8133c61926aae26ce67d2b22b37e5",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/28d8f438a0064c9de80857e3270d071495544640",
+                "reference": "28d8f438a0064c9de80857e3270d071495544640",
                 "shasum": ""
             },
             "require": {
@@ -1610,7 +1610,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.44"
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.45"
             },
             "funding": [
                 {
@@ -1626,7 +1626,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-13T08:41:47+00:00"
+            "time": "2023-09-15T20:55:47+00:00"
         },
         {
             "name": "rmariuzzo/jquery-checkboxes",
@@ -1734,15 +1734,6 @@
             },
             "type": "library"
         },
-        {
-            "name": "tinymce/tinymce4",
-            "version": "4.9.11",
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/tinymce/tinymce-dist/archive/refs/tags/4.9.11.zip"
-            },
-            "type": "library"
-        },
         {
             "name": "tinymce/tinymce5",
             "version": "5.10.3",
@@ -2025,16 +2016,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.16.0",
+            "version": "v4.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "19526a33fb561ef417e822e85f08a00db4059c17"
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17",
-                "reference": "19526a33fb561ef417e822e85f08a00db4059c17",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
                 "shasum": ""
             },
             "require": {
@@ -2075,34 +2066,34 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
             },
-            "time": "2023-06-25T14:52:30+00:00"
+            "time": "2023-12-10T21:03:43+00:00"
         },
         {
             "name": "pdepend/pdepend",
-            "version": "2.14.0",
+            "version": "2.16.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1"
+                "reference": "66ceb05eaa8bf358574143c974b04463911bc700"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1121d4b04af06e33e9659bac3a6741b91cab1de1",
-                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/66ceb05eaa8bf358574143c974b04463911bc700",
+                "reference": "66ceb05eaa8bf358574143c974b04463911bc700",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.7",
-                "symfony/config": "^2.3.0|^3|^4|^5|^6.0",
-                "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0",
-                "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0"
+                "symfony/config": "^2.3.0|^3|^4|^5|^6.0|^7.0",
+                "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0|^7.0",
+                "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0|^7.0",
+                "symfony/polyfill-mbstring": "^1.19"
             },
             "require-dev": {
                 "easy-doc/easy-doc": "0.0.0|^1.2.3",
                 "gregwar/rst": "^1.0",
-                "phpunit/phpunit": "^4.8.36|^5.7.27",
                 "squizlabs/php_codesniffer": "^2.0.0"
             },
             "bin": [
@@ -2132,7 +2123,7 @@
             ],
             "support": {
                 "issues": "https://github.com/pdepend/pdepend/issues",
-                "source": "https://github.com/pdepend/pdepend/tree/2.14.0"
+                "source": "https://github.com/pdepend/pdepend/tree/2.16.1"
             },
             "funding": [
                 {
@@ -2140,26 +2131,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-26T13:15:18+00:00"
+            "time": "2023-12-10T18:38:19+00:00"
         },
         {
             "name": "phpmd/phpmd",
-            "version": "2.13.0",
+            "version": "2.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "dad0228156856b3ad959992f9748514fa943f3e3"
+                "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/dad0228156856b3ad959992f9748514fa943f3e3",
-                "reference": "dad0228156856b3ad959992f9748514fa943f3e3",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/74a1f56e33afad4128b886e334093e98e1b5e7c0",
+                "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0",
                 "shasum": ""
             },
             "require": {
                 "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
                 "ext-xml": "*",
-                "pdepend/pdepend": "^2.12.1",
+                "pdepend/pdepend": "^2.16.1",
                 "php": ">=5.3.9"
             },
             "require-dev": {
@@ -2168,8 +2159,7 @@
                 "ext-simplexml": "*",
                 "gregwar/rst": "^1.0",
                 "mikey179/vfsstream": "^1.6.8",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27",
-                "squizlabs/php_codesniffer": "^2.0"
+                "squizlabs/php_codesniffer": "^2.9.2 || ^3.7.2"
             },
             "bin": [
                 "src/bin/phpmd"
@@ -2206,6 +2196,7 @@
             "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
             "homepage": "https://phpmd.org/",
             "keywords": [
+                "dev",
                 "mess detection",
                 "mess detector",
                 "pdepend",
@@ -2215,7 +2206,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/phpmd",
                 "issues": "https://github.com/phpmd/phpmd/issues",
-                "source": "https://github.com/phpmd/phpmd/tree/2.13.0"
+                "source": "https://github.com/phpmd/phpmd/tree/2.15.0"
             },
             "funding": [
                 {
@@ -2223,7 +2214,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-09-10T08:44:15+00:00"
+            "time": "2023-12-11T08:22:20+00:00"
         },
         {
             "name": "phpmetrics/phpmetrics",
@@ -2600,12 +2591,12 @@
             "version": "3.6.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
                 "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
                 "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
                 "shasum": ""
             },
@@ -2649,6 +2640,20 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
             "time": "2021-12-12T21:44:58+00:00"
         },
         {
diff --git a/config/vilesci.config-default.inc.php b/config/vilesci.config-default.inc.php
index fdd971be0..ddcf8d563 100644
--- a/config/vilesci.config-default.inc.php
+++ b/config/vilesci.config-default.inc.php
@@ -276,7 +276,13 @@ define('DOCSBOX_WAITING_SLEEP_TIME', 1);
 // Bei folgenden Buchungstypen wird ein Anlegen geprüft ob bereits ein Eintrag für diesen Typ vorhanden ist im selben
 // Semester und ggf ein Hinweis ausgegeben
 define('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK', serialize(
-        array('StudiengebuehrAnzahlung', 'Studiengebuehr', 'StudiengebuehrRestzahlung', 'OEH')
+	array(
+			'Studiengebuehr' => array('StudiengebuehrErhoeht', 'Studiengebuehr', 'StudiengebuehrAnzahlung', 'StudiengebuehrRestzahlung'),
+			'StudiengebuehrErhoeht' => array('StudiengebuehrErhoeht', 'Studiengebuehr', 'StudiengebuehrAnzahlung', 'StudiengebuehrRestzahlung'),
+			'StudiengebuehrAnzahlung' => array('StudiengebuehrErhoeht', 'Studiengebuehr', 'StudiengebuehrAnzahlung'),
+			'StudiengebuehrRestzahlung' => array('StudiengebuehrErhoeht', 'Studiengebuehr', 'StudiengebuehrRestzahlung'),
+			'OEH' => array('OEH')
+	))
 ));
 
 // Spezialnoten die am Zeunigs und Diplomasupplement ignoriert werden

From e6985642023b0a2a39c993fec0abbd93a34ace96 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 14 Dec 2023 11:28:19 +0100
Subject: [PATCH 134/149] StudStatus: Toggle "nur aktive anzeigen"

---
 .../controllers/components/Antrag/Leitung.php | 28 +++++++--
 .../components/Studierendenantrag/Leitung.js  |  4 +-
 .../Studierendenantrag/Leitung/Header.js      | 60 ++++++++++++++++---
 .../Studierendenantrag/Leitung/Table.js       |  9 ++-
 4 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
index f6b184351..e46c0bc50 100644
--- a/application/controllers/components/Antrag/Leitung.php
+++ b/application/controllers/components/Antrag/Leitung.php
@@ -75,12 +75,18 @@ class Leitung extends FHC_Controller
 		$this->outputJsonSuccess($stgs);
 	}
 
-	public function getAntraege($studiengang = null)
+	public function getAntraege($studiengang = null, $extra = null)
 	{
+		if ($studiengang && $studiengang == 'todo') {
+			$studiengang = $extra;
+			$extra = true;
+		} else {
+			$extra = false;
+		}
 
-		if($studiengang)
+		if ($studiengang) {
 			$studiengaenge = [$studiengang];
-		else {
+		} else {
 			$studiengaenge =$this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe');
 			if(!is_array($studiengaenge))
 				$studiengaenge = [];
@@ -96,7 +102,21 @@ class Leitung extends FHC_Controller
 
 		$antraege = [];
 		if ($studiengaenge) {
-			$result = $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
+			if ($extra) {
+				$this->StudierendenantragModel->db->group_start();
+				$this->StudierendenantragModel->db->where_not_in('s.studierendenantrag_statustyp_kurzbz', [
+					Studierendenantragstatus_model::STATUS_CANCELLED,
+					Studierendenantragstatus_model::STATUS_APPROVED,
+					Studierendenantragstatus_model::STATUS_REJECTED,
+					Studierendenantragstatus_model::STATUS_OBJECTION_DENIED
+				]);
+				$this->StudierendenantragModel->db->or_group_start();
+				$this->StudierendenantragModel->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);
+				$this->StudierendenantragModel->db->where('tbl_studierendenantrag.typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
+				$this->StudierendenantragModel->db->group_end();
+				$this->StudierendenantragModel->db->group_end();
+			}
+			$result = $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge, null, null, true);
 			if (isError($result)) {
 				$this->output->set_status_header(500);
 				return $this->outputJson('Internal Server Error');
diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
index 95828e6cb..ab29ea770 100644
--- a/public/js/components/Studierendenantrag/Leitung.js
+++ b/public/js/components/Studierendenantrag/Leitung.js
@@ -49,8 +49,8 @@ export default {
 				console.error(error);
 			});
 		},
-		changeFilter(evt) {
-			this.filter = evt.target.value || undefined;
+		changeFilter(filter) {
+			this.filter = filter || undefined;
 			this.reload();
 		},
 		reload() {
diff --git a/public/js/components/Studierendenantrag/Leitung/Header.js b/public/js/components/Studierendenantrag/Leitung/Header.js
index 12bfcbe82..54950856b 100644
--- a/public/js/components/Studierendenantrag/Leitung/Header.js
+++ b/public/js/components/Studierendenantrag/Leitung/Header.js
@@ -1,3 +1,5 @@
+const LOCAL_STORAGE_ID = 'studierendenantrag_leitung_2023-11-14_header_filter';
+
 export default {
 	props: {
 		stgs: Array
@@ -5,16 +7,60 @@ export default {
 	emits: [
 		'input'
 	],
+	data() {
+		return {
+			todo_value: '',
+			stg_value: ''
+		}
+	},
+	computed: {
+		value() {
+			const a = [];
+			if (this.todo_value)
+				a.push(this.todo_value);
+			if (this.stg_value)
+				a.push(this.stg_value);
+
+			return a.join('/');
+		}
+	},
+	watch: {
+		value(n) {
+			window.localStorage.setItem(LOCAL_STORAGE_ID, n);
+			this.$emit('input', n);
+		}
+	},
+	created() {
+		const values = window.localStorage.getItem(LOCAL_STORAGE_ID).split('/');
+		if (values.length) {
+			if (values.length == 1) {
+				if (values[0] == 'todo')
+					values.push('');
+				else
+					values.unshift('');
+			}
+			this.stg_value = values.pop();
+			this.todo_value = values.pop();
+		}
+	},
 	template: `
 	<div class="studierendenantrag-leitung-header fhc-table-header d-flex align-items-center mb-2 gap-2">
 		<h3 class="h5 col m-0">{{$p.t('studierendenantrag', 'studierendenantraege')}}</h3>
-		<div v-if="stgs.length > 1" class="col-auto">
-			<select ref="stg_select" class="form-select" @input="$emit('input', $event)">
-				<option value="">{{$p.t('global', 'alle')}}</option>
-				<option v-for="stg in stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">
-					{{stg.bezeichnung}} ({{stg.orgform}})
-				</option>
-			</select>
+		<div class="col-auto row row-cols-lg-auto g-3 align-items-center">
+			<div class="col-12">
+				<select class="form-select" v-model="todo_value">
+					<option value="">{{$p.t('global', 'alle')}}</option>
+					<option value="todo">{{$p.t('global', 'aktiv')}}</option>
+				</select>
+			</div>
+			<div class="col-12">
+				<select v-if="stgs.length > 1" class="form-select" v-model="stg_value">
+					<option value="">{{$p.t('global', 'alle')}}</option>
+					<option v-for="stg in stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">
+						{{stg.bezeichnung}} ({{stg.orgform}})
+					</option>
+				</select>
+			</div>
 		</div>
 	</div>
 	`
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 7bdf5d4a3..7676115c9 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -80,7 +80,7 @@ export default {
 		{
 			let val = cell.getValue();
 			if (!val)
-				return '';
+				return '&nbsp;';
 			let date = new Date(val);
 			return date.toLocaleDateString();
 		}
@@ -201,7 +201,7 @@ export default {
 						this.$refs.modalGrundPre.innerHTML = val;
 					});
 
-					return val ? link : '';
+					return val ? link : '&nbsp;';
 				}
 			}, {
 				field: 'dms_id',
@@ -209,7 +209,7 @@ export default {
 				formatter: (cell, formatterParams, onRendered) => {
 					let val = cell.getValue();
 					if (!val)
-						return '';
+						return '&nbsp;';
 					let link = document.createElement('a');
 					link.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
 						FHC_JS_DATA_STORAGE_OBJECT.ci_router +
@@ -338,6 +338,9 @@ export default {
 						container.append(button);
 					}
 
+					if (container.innerHTML == '')
+						container.innerHTML = '&nbsp;';
+
 					return container;
 				}
 			}]

From 55fbf40374debaa65178bf3da827852f75c2c448 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 18 Dec 2023 09:20:01 +0100
Subject: [PATCH 135/149] - abgabetool text anpassungen - nutzungsbedingungen -
 delay config hinzugefuegt - required inputs hinzugefuegt

---
 cis/private/lehre/abgabe_student.php         |  1 -
 cis/private/lehre/abgabe_student_details.php | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cis/private/lehre/abgabe_student.php b/cis/private/lehre/abgabe_student.php
index 9b3cec6f6..2512d9831 100644
--- a/cis/private/lehre/abgabe_student.php
+++ b/cis/private/lehre/abgabe_student.php
@@ -124,7 +124,6 @@ $sql_query = "SELECT (SELECT nachname FROM public.tbl_person  WHERE person_id=tb
 		AND tbl_projektarbeit.student_uid=".$db->db_add_param($uid)."
 		ORDER BY studiensemester_kurzbz desc, tbl_lehrveranstaltung.kurzbz";
 
-//AND tbl_projektarbeit.student_uid='$getuid' 'ie07m102';
 if(!$erg=$db->db_query($sql_query))
 {
 	$errormsg=$p->t('global/fehlerBeimLesenAusDatenbank');
diff --git a/cis/private/lehre/abgabe_student_details.php b/cis/private/lehre/abgabe_student_details.php
index 9171a978c..860eb7579 100644
--- a/cis/private/lehre/abgabe_student_details.php
+++ b/cis/private/lehre/abgabe_student_details.php
@@ -395,15 +395,15 @@ if($command=="update" && $error!=true)
 							    }
 							    $htmlstr .= "</td></tr>\n";
 								$htmlstr .= '<tr><td><b>'.$p->t('abgabetool/deutscheSchlagwoerter').':*</b></td>
-											<td><input  type="text" name="schlagwoerter" value="'.$db->convert_html_chars($schlagwoerter).'" size="60" maxlength="150"></td></tr>'."\n";
+											<td><input  type="text" name="schlagwoerter" value="'.$db->convert_html_chars($schlagwoerter).'" size="60" maxlength="150" required></td></tr>'."\n";
 								$htmlstr .= '<tr><td><b>'.$p->t('abgabetool/englischeSchlagwoerter').':*</b></td>
-											<td><input type="text" name="schlagwoerter_en" value="'.$db->convert_html_chars($schlagwoerter_en).'" size="60" maxlength="150"></td></tr>'."\n";
+											<td><input type="text" name="schlagwoerter_en" value="'.$db->convert_html_chars($schlagwoerter_en).'" size="60" maxlength="150" required></td></tr>'."\n";
 								$htmlstr .= '<tr><td valign="top"><b>'.$p->t('abgabetool/abstract').' </b>'.$p->t('abgabetool/maxZeichen').':*</td>
-											<td><textarea name="abstract" cols="46"  rows="7">'.$db->convert_html_chars($abstract).'</textarea></td></tr>'."\n";
+											<td><textarea name="abstract" cols="46"  rows="7" required>'.$db->convert_html_chars($abstract).'</textarea></td></tr>'."\n";
 								$htmlstr .= '<tr><td valign="top"><b>'.$p->t('abgabetool/abstractEng').'</b>'.$p->t('abgabetool/maxZeichen').':*</td>
-											<td><textarea name="abstract_en" cols="46"  rows="7">'.$db->convert_html_chars($abstract_en).'</textarea></td></tr>'."\n";
+											<td><textarea name="abstract_en" cols="46"  rows="7" required>'.$db->convert_html_chars($abstract_en).'</textarea></td></tr>'."\n";
 								$htmlstr .= '<tr><td><b>'.$p->t('abgabetool/seitenanzahl').':*</b></td>
-											<td><input  type="text" name="seitenanzahl" value="'.$db->convert_html_chars($seitenanzahl).'" size="5" maxlength="4"></td></tr>'."\n";
+											<td><input  type="text" name="seitenanzahl" value="'.$db->convert_html_chars($seitenanzahl).'" size="5" maxlength="4" required></td></tr>'."\n";
 								$htmlstr .="<tr><td>&nbsp;</td></tr>\n";
 
 								// If there are info about the signed document

From f4194c251a476db0e88bdeac851e2989b7b0b04b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 18 Dec 2023 14:27:32 +0100
Subject: [PATCH 136/149] loadActiveForStudiengaenge eigene Funktion

---
 .../controllers/components/Antrag/Leitung.php  | 18 +++---------------
 .../education/Studierendenantrag_model.php     | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
index e46c0bc50..4c99fcca1 100644
--- a/application/controllers/components/Antrag/Leitung.php
+++ b/application/controllers/components/Antrag/Leitung.php
@@ -102,21 +102,9 @@ class Leitung extends FHC_Controller
 
 		$antraege = [];
 		if ($studiengaenge) {
-			if ($extra) {
-				$this->StudierendenantragModel->db->group_start();
-				$this->StudierendenantragModel->db->where_not_in('s.studierendenantrag_statustyp_kurzbz', [
-					Studierendenantragstatus_model::STATUS_CANCELLED,
-					Studierendenantragstatus_model::STATUS_APPROVED,
-					Studierendenantragstatus_model::STATUS_REJECTED,
-					Studierendenantragstatus_model::STATUS_OBJECTION_DENIED
-				]);
-				$this->StudierendenantragModel->db->or_group_start();
-				$this->StudierendenantragModel->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);
-				$this->StudierendenantragModel->db->where('tbl_studierendenantrag.typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
-				$this->StudierendenantragModel->db->group_end();
-				$this->StudierendenantragModel->db->group_end();
-			}
-			$result = $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge, null, null, true);
+			$result = $extra
+				? $this->StudierendenantragModel->loadActiveForStudiengaenge($studiengaenge)
+				: $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
 			if (isError($result)) {
 				$this->output->set_status_header(500);
 				return $this->outputJson('Internal Server Error');
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 60e53365c..da9d53aba 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -73,6 +73,23 @@ class Studierendenantrag_model extends DB_Model
 		return $this->loadWhere($where);
 	}
 
+	public function loadActiveForStudiengaenge($studiengaenge) {
+		$this->db->group_start();
+		$this->db->where_not_in('s.studierendenantrag_statustyp_kurzbz', [
+			Studierendenantragstatus_model::STATUS_CANCELLED,
+			Studierendenantragstatus_model::STATUS_APPROVED,
+			Studierendenantragstatus_model::STATUS_REJECTED,
+			Studierendenantragstatus_model::STATUS_OBJECTION_DENIED
+		]);
+		$this->db->or_group_start();
+		$this->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);
+		$this->db->where('tbl_studierendenantrag.typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
+		$this->db->group_end();
+		$this->db->group_end();
+
+		return $this->loadForStudiengaenge($studiengaenge);
+	}
+
 	public function isInStudiengang($studierendenantrag_id, $studiengaenge)
 	{
 		$this->addJoin('public.tbl_prestudent', 'prestudent_id');

From a02e79a33a98736f7c0e0ef86c0b48c4e8a3f9e3 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Dec 2023 18:14:08 +0100
Subject: [PATCH 137/149] fix sancho mail template kurzbz too long

---
 application/libraries/AntragLib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 46d21df05..96c1a90d8 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1728,7 +1728,7 @@ class AntragLib
 				if (isset($lvs['repeat_last'])) {
 					$repeat_last = true;
 					unset($lvs['repeat_last']);
-					$vorlage .= '_Last';
+					$vorlage .= '_Lst';
 				}
 				foreach ($lvs as $sem => $lv_list) {
 					$lvs_filtered = array_filter($lv_list, function ($el) {

From 6c0fa3fed35d5822140d6c5c2bb3587da741b8dd Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 20 Dec 2023 09:14:58 +0100
Subject: [PATCH 138/149] Leitungsansicht: Aktiv Default & korrekter Filter
 beim Neuladen der Seite

---
 public/js/components/Studierendenantrag/Leitung.js    |  4 +++-
 .../components/Studierendenantrag/Leitung/Header.js   | 11 +++++++++--
 .../js/components/Studierendenantrag/Leitung/Table.js |  5 +++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
index ab29ea770..0db2cc2c0 100644
--- a/public/js/components/Studierendenantrag/Leitung.js
+++ b/public/js/components/Studierendenantrag/Leitung.js
@@ -54,7 +54,8 @@ export default {
 			this.reload();
 		},
 		reload() {
-			this.$refs.table.reload(this.filter);
+			if (this.$refs.table)
+				this.$refs.table.reload(this.filter);
 			this.loadFilter();
 		},
 		download() {
@@ -336,6 +337,7 @@ export default {
 			ref="table"
 			:stg-a="stgkzA"
 			:stg-l="stgkzL"
+			:filter="filter"
 			v-model:columnData="columns"
 			v-model:selectedData="selectedData"
 			@action:approve="actionApprove"
diff --git a/public/js/components/Studierendenantrag/Leitung/Header.js b/public/js/components/Studierendenantrag/Leitung/Header.js
index 017148689..eae130de5 100644
--- a/public/js/components/Studierendenantrag/Leitung/Header.js
+++ b/public/js/components/Studierendenantrag/Leitung/Header.js
@@ -31,7 +31,14 @@ export default {
 		}
 	},
 	created() {
-		const values = window.localStorage.getItem(LOCAL_STORAGE_ID).split('/');
+		var values = 'todo';
+		const savedPath = window.localStorage.getItem(LOCAL_STORAGE_ID);
+		if (savedPath !== null) {
+			values = savedPath;
+		}
+
+		values = values.split('/');
+
 		if (values.length) {
 			if (values.length == 1) {
 				if (values[0] == 'todo')
@@ -49,8 +56,8 @@ export default {
 		<div class="col-auto row row-cols-lg-auto g-3 align-items-center">
 			<div class="col-12">
 				<select class="form-select" v-model="todo_value">
-					<option value="">{{$p.t('global', 'alle')}}</option>
 					<option value="todo">{{$p.t('global', 'aktiv')}}</option>
+					<option value="">{{$p.t('global', 'alle')}}</option>
 				</select>
 			</div>
 			<div class="col-12">
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 7676115c9..c4d794326 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -13,7 +13,8 @@ export default {
 		selectedData: Array,
 		columnData: Array,
 		stgL: Array,
-		stgA: Array
+		stgA: Array,
+		filter: String
 	},
 	emits: [
 		'update:columnData',
@@ -90,7 +91,7 @@ export default {
 			movableColumns: true,
 			maxHeight: '50vh',
 			layout: "fitDataFill",
-			ajaxURL: this.ajaxUrl,
+			ajaxURL: this.ajaxUrl + (this.filter || ''),
 			persistence: { // NOTE(chris): do not store column titles
 				sort: true, //persist column sorting
 				filter: true, //persist filters

From ba7f60b16eec2918fbfbeb8059a5f7fbba2781c4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 20 Dec 2023 09:18:44 +0100
Subject: [PATCH 139/149] Filter Beschriftung

---
 .../Studierendenantrag/Leitung/Header.js      |  4 +-
 system/phrasesupdate.php                      | 40 +++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Leitung/Header.js b/public/js/components/Studierendenantrag/Leitung/Header.js
index eae130de5..addb3ff72 100644
--- a/public/js/components/Studierendenantrag/Leitung/Header.js
+++ b/public/js/components/Studierendenantrag/Leitung/Header.js
@@ -56,8 +56,8 @@ export default {
 		<div class="col-auto row row-cols-lg-auto g-3 align-items-center">
 			<div class="col-12">
 				<select class="form-select" v-model="todo_value">
-					<option value="todo">{{$p.t('global', 'aktiv')}}</option>
-					<option value="">{{$p.t('global', 'alle')}}</option>
+					<option value="todo">{{$p.t('studierendenantrag', 'filter_todo')}}</option>
+					<option value="">{{$p.t('studierendenantrag', 'filter_all')}}</option>
 				</select>
 			</div>
 			<div class="col-12">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 84279888d..14882b38d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -19885,6 +19885,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'filter_all',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'alle anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'show all',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'filter_todo',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'nur offene anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'only show open',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',

From ca55b63e01758d0f7a407c5e859b1429c3ddd97f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 20 Dec 2023 09:30:44 +0100
Subject: [PATCH 140/149] =?UTF-8?q?Load=20Language=20before=20Antr=C3=A4ge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/education/Studierendenantrag_model.php      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index da9d53aba..3d688eb82 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -26,9 +26,10 @@ class Studierendenantrag_model extends DB_Model
 		return $this->loadForStudiengaenge($studiengaenge, $typ, $this->StudierendenantragstatusModel::STATUS_CREATED);
 	}
 
-	public function loadForStudiengaenge($studiengaenge, $typ = null, $status = null)
+	public function loadForStudiengaenge($studiengaenge, $typ = null, $status = null, $sql = null)
 	{
-		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
+		if ($sql == null)
+			$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
 
 		$this->addSelect('UPPER(stg.typ) || UPPER(stg.kurzbz) || \' \' || stg.bezeichnung AS bezeichnung');
 		$this->addSelect('bezeichnung_mehrsprachig[(' . $sql . ')] AS orgform', false);
@@ -74,6 +75,9 @@ class Studierendenantrag_model extends DB_Model
 	}
 
 	public function loadActiveForStudiengaenge($studiengaenge) {
+		// NOTE(chris): get language before changing things in the global db object because getUserLanguage() might use it and it should not have been tampered with
+		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
+
 		$this->db->group_start();
 		$this->db->where_not_in('s.studierendenantrag_statustyp_kurzbz', [
 			Studierendenantragstatus_model::STATUS_CANCELLED,
@@ -87,7 +91,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->db->group_end();
 		$this->db->group_end();
 
-		return $this->loadForStudiengaenge($studiengaenge);
+		return $this->loadForStudiengaenge($studiengaenge, null, null, $sql);
 	}
 
 	public function isInStudiengang($studierendenantrag_id, $studiengaenge)

From 3f88bba9bb9a812a1503b37f1a31e84ab4915e82 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 20 Dec 2023 12:06:45 +0100
Subject: [PATCH 141/149] =?UTF-8?q?Negative=20Pr=C3=BCfungen=20sortiert=20?=
 =?UTF-8?q?und=20bei=20bestehenden=20Antr=C3=A4gen=20nach=20Antragsdatum?=
 =?UTF-8?q?=20und=20Stdsem=20gefiltert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/components/Antrag/Wiederholung.php    |  3 +--
 application/libraries/AntragLib.php                   |  6 ++++--
 application/models/education/Pruefung_model.php       | 11 ++++++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/application/controllers/components/Antrag/Wiederholung.php b/application/controllers/components/Antrag/Wiederholung.php
index 515771224..418d05f45 100644
--- a/application/controllers/components/Antrag/Wiederholung.php
+++ b/application/controllers/components/Antrag/Wiederholung.php
@@ -76,10 +76,9 @@ class Wiederholung extends FHC_Controller
 			if (isError($result)) {
 				return $this->outputJsonError(getError($result));
 			}
-
 			$data = getData($result);
 
-			$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id);
+			$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id, $data->datum, $data->studiensemester_kurzbz);
 			// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
 			$pruefungsdata = current(getData($result));
 
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 96c1a90d8..335bfab27 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1499,6 +1499,8 @@ class AntragLib
 		$resultDetails->grund = $resultAntrag->grund;
 		$resultDetails->studierendenantrag_id = $resultAntrag->studierendenantrag_id;
 		$resultDetails->typ = $resultAntrag->typ;
+		$resultDetails->datum = $resultAntrag->datum;
+		$resultDetails->studiensemester_kurzbz = $resultAntrag->studiensemester_kurzbz;
 
 		return success($resultDetails);
 	}
@@ -1600,9 +1602,9 @@ class AntragLib
 		);
 	}
 
-	public function getFailedExamForPrestudent($prestudent_id)
+	public function getFailedExamForPrestudent($prestudent_id, $max_date = null, $studiensemester_kurzbz = null)
 	{
-		return $this->_ci->PruefungModel->loadWhereCommitteeExamFailedForPrestudent($prestudent_id);
+		return $this->_ci->PruefungModel->loadWhereCommitteeExamFailedForPrestudent($prestudent_id, $max_date, $studiensemester_kurzbz);
 	}
 
 	public function saveLvs($lvArray)
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
index e1d668293..50109d2f1 100644
--- a/application/models/education/Pruefung_model.php
+++ b/application/models/education/Pruefung_model.php
@@ -139,6 +139,8 @@ class Pruefung_model extends DB_Model
 			$this->db->where_not_in("n.note", $note_blacklist);
 		$this->db->where_in("p.pruefungstyp_kurzbz", ['kommPruef','zusKommPruef']);
 
+		$this->addOrder('p.datum', 'DESC');
+
 		return $this->load();
 	}
 
@@ -201,12 +203,19 @@ class Pruefung_model extends DB_Model
 	 *
 	 * @return stdClass
 	 */
-	public function loadWhereCommitteeExamFailedForPrestudent($prestudent_id)
+	public function loadWhereCommitteeExamFailedForPrestudent($prestudent_id, $max_date = null, $studiensemester_kurzbz = null)
 	{
 		$this->withDetailsForStudierendenAntrag();
 
 		$this->db->where('ps.prestudent_id', $prestudent_id);
 
+		if ($max_date !== null) {
+			$this->db->where('p.datum <', $max_date);
+		}
+		if ($studiensemester_kurzbz !== null) {
+			$this->db->where('le.studiensemester_kurzbz', $studiensemester_kurzbz);
+		}
+
 		return $this->loadWhereCommitteeExamsFailed();
 	}
 

From 20f9f52eefebec1a2b69010e88f2d2f3a2b8450a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 20 Dec 2023 14:11:49 +0100
Subject: [PATCH 142/149] Doppelten Composer Eintrag entfernt

---
 composer.json | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/composer.json b/composer.json
index e2932fea5..65ab5cb6a 100644
--- a/composer.json
+++ b/composer.json
@@ -337,28 +337,6 @@
 				}
 			}
 		},
-                {
-                        "type": "package",
-                        "package": {
-                                "name": "vuejs/vuedatepicker_js",
-                                "version": "5.4.0",
-                                "dist": {
-                                        "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/vue-datepicker.iife.js",
-                                        "type": "file"
-                                }
-                        }
-                },
-                {
-                        "type": "package",
-                        "package": {
-                                "name": "vuejs/vuedatepicker_css",
-                                "version": "5.4.0",
-                                "dist": {
-                                        "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/main.css",
-                                        "type": "file"
-                                }
-                        }
-                },		
 		{
 			"type": "package",
 			"package": {

From 29d7a97ee81ed746a38158f3cf8b440037ab9250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 20 Dec 2023 14:26:30 +0100
Subject: [PATCH 143/149] Wording korrigiert

---
 system/phrasesupdate.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ba04725a4..33d14ba04 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -4488,7 +4488,7 @@ When on hold, the date is only a reminder.',
 			)
 		)
 	),
-	
+
 	array(
 		'app' => 'infocenter',
 		'category' => 'infocenter',
@@ -4818,7 +4818,7 @@ Die Rechnung wird Ihnen erneut zugesendet. <u><strong>Erst nach Erhalt der Rechn
 			)
 		)
 	),
-	
+
 	array(
 		'app' => 'core',
 		'category' => 'password',
@@ -22515,7 +22515,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Bismeldestichtage verwalten',
+				'text' => 'BIS-Meldestichtage verwalten',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From 151012fedf74a5ea6739bcd3a77f072be74de0c7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 22 Dec 2023 11:08:56 +0100
Subject: [PATCH 144/149] AntragJob: nur Personen die eine Aufforderung oder
 einen Reminder zur Wiederholung erhalten haben und die Frist abgelaufen ist
 zum Abbrecher machen

---
 application/controllers/jobs/AntragJob.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 2e72041ff..2730ee802 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -286,7 +286,6 @@ class AntragJob extends JOB_Controller
 
 		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed(
 			[
-				null,
 				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
 				Studierendenantragstatus_model::STATUS_REQUESTSENT_2
 			],

From f03d218872dfc8f3fdf68d1e3d13d92fe8923205 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 22 Dec 2023 14:49:40 +0100
Subject: [PATCH 145/149] s&d

---
 public/js/components/Studierendenantrag/Leitung/Table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index c4d794326..da9ddf456 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -40,7 +40,7 @@ export default {
 	},
 	methods: {
 		reload(stg) {
-			this.table.replaceData(this.ajaxUrl + (stg || ''));
+			this.table.setData(this.ajaxUrl + (stg || ''));
 		},
 		download() {
 			this.table.download("csv", "data.csv", {

From aa5868826ff949fdfbd57c5c0b03ef6c314f6ffe Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 27 Dec 2023 10:26:42 +0100
Subject: [PATCH 146/149] getAntraege

---
 .../27351_digitalisierung_formulare.php       | 64 +++++++++++++++++--
 1 file changed, 60 insertions(+), 4 deletions(-)

diff --git a/system/dbupdate_3.4/27351_digitalisierung_formulare.php b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
index 1f8dd4b4b..4bf52dc3a 100644
--- a/system/dbupdate_3.4/27351_digitalisierung_formulare.php
+++ b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
@@ -170,9 +170,12 @@ if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berecht
 	}
 }
 
-if (!$result = @$db->db_query("SELECT campus.get_status_studierendenantrag(0)")) {
+if (!$result = @$db->db_query("SELECT campus.get_status_studierendenantrag(0)"))
+{
 	$qry = 'CREATE FUNCTION campus.get_status_studierendenantrag(integer) RETURNS character varying
     LANGUAGE plpgsql
+    STABLE
+    RETURNS NULL ON NULL INPUT
     AS $_$
         DECLARE i_studierendenantrag_id ALIAS FOR $1;
         DECLARE rec RECORD;
@@ -194,10 +197,25 @@ if (!$result = @$db->db_query("SELECT campus.get_status_studierendenantrag(0)"))
 	else
 		echo '<br>campus.get_status_studierendenantrag(integer): function created';
 }
+elseif ($result = @$db->db_query("SELECT 1 FROM pg_proc WHERE proname='get_status_studierendenantrag' AND provolatile='s'"))
+{
+	if ($db->db_num_rows($result) == 0) {
+		$qry = 'ALTER FUNCTION campus.get_status_studierendenantrag(integer) STABLE;';
+		$qry .= 'ALTER FUNCTION campus.get_status_studierendenantrag(integer) RETURNS NULL ON NULL INPUT;';
 
-if (!$result = @$db->db_query("SELECT campus.get_status_id_studierendenantrag(0)")) {
+		if(!$db->db_query($qry))
+			echo '<strong>campus.get_status_studierendenantrag(integer): '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>campus.get_status_studierendenantrag(integer): function updated';
+	}
+}
+
+if (!$result = @$db->db_query("SELECT campus.get_status_id_studierendenantrag(0)"))
+{
 	$qry = 'CREATE FUNCTION campus.get_status_id_studierendenantrag(integer) RETURNS integer
     LANGUAGE plpgsql
+    STABLE
+    RETURNS NULL ON NULL INPUT
     AS $_$
         DECLARE i_studierendenantrag_id ALIAS FOR $1;
         DECLARE rec RECORD;
@@ -219,10 +237,24 @@ if (!$result = @$db->db_query("SELECT campus.get_status_id_studierendenantrag(0)
 	else
 		echo '<br>campus.get_status_id_studierendenantrag(integer): function created';
 }
+elseif ($result = @$db->db_query("SELECT 1 FROM pg_proc WHERE proname='get_status_id_studierendenantrag' AND provolatile='s'"))
+{
+	if ($db->db_num_rows($result) == 0) {
+		$qry = 'ALTER FUNCTION campus.get_status_id_studierendenantrag(integer) STABLE;';
+		$qry .= 'ALTER FUNCTION campus.get_status_id_studierendenantrag(integer) RETURNS NULL ON NULL INPUT;';
 
-if (!$result = @$db->db_query("SELECT public.get_absem_prestudent(0, null)")) {
+		if(!$db->db_query($qry))
+			echo '<strong>campus.get_status_id_studierendenantrag(integer): '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>campus.get_status_id_studierendenantrag(integer): function updated';
+	}
+}
+
+if (!$result = @$db->db_query("SELECT public.get_absem_prestudent(0, null)"))
+{
 	$qry = 'CREATE FUNCTION public.get_absem_prestudent(integer, character varying) RETURNS integer
     LANGUAGE plpgsql
+    STABLE
     AS $_$
         DECLARE i_prestudent_id ALIAS FOR $1;
         DECLARE cv_studiensemester_kurzbz ALIAS FOR $2;
@@ -253,9 +285,22 @@ if (!$result = @$db->db_query("SELECT public.get_absem_prestudent(0, null)")) {
 	else
 		echo '<br>public.get_absem_prestudent(integer, character varying): function created';
 }
-if (!$result = @$db->db_query("SELECT public.get_stdsem_prestudent(0, null)")) {
+elseif ($result = @$db->db_query("SELECT 1 FROM pg_proc WHERE proname='get_absem_prestudent' AND provolatile='s'"))
+{
+	if ($db->db_num_rows($result) == 0) {
+		$qry = 'ALTER FUNCTION public.get_absem_prestudent(integer, character varying) STABLE;';
+
+		if(!$db->db_query($qry))
+			echo '<strong>public.get_absem_prestudent(integer, character varying): '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>public.get_absem_prestudent(integer, character varying): function updated';
+	}
+}
+if (!$result = @$db->db_query("SELECT public.get_stdsem_prestudent(0, null)"))
+{
 	$qry = 'CREATE FUNCTION public.get_stdsem_prestudent(integer, character varying) RETURNS character varying
     LANGUAGE plpgsql
+    STABLE
     AS $_$
         DECLARE i_prestudent_id ALIAS FOR $1;
         DECLARE cv_studiensemester_kurzbz ALIAS FOR $2;
@@ -286,6 +331,17 @@ if (!$result = @$db->db_query("SELECT public.get_stdsem_prestudent(0, null)")) {
 	else
 		echo '<br>public.get_stdsem_prestudent(integer, character varying): function created';
 }
+elseif ($result = @$db->db_query("SELECT 1 FROM pg_proc WHERE proname='get_stdsem_prestudent' AND provolatile='s'"))
+{
+	if ($db->db_num_rows($result) == 0) {
+		$qry = 'ALTER FUNCTION public.get_stdsem_prestudent(integer, character varying) STABLE;';
+
+		if(!$db->db_query($qry))
+			echo '<strong>public.get_stdsem_prestudent(integer, character varying): '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>public.get_stdsem_prestudent(integer, character varying): function updated';
+	}
+}
 
 if($result = @$db->db_query("SELECT 1 FROM public.tbl_status_grund WHERE statusgrund_kurzbz = 'abbrecherStgl';"))
 {

From 43813b3ef01ef13fd8f61b8b768b59a3db56e82e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 27 Dec 2023 10:51:57 +0100
Subject: [PATCH 147/149] getActiveStgs

---
 .../controllers/components/Antrag/Leitung.php | 46 +++----------------
 .../education/Studierendenantrag_model.php    | 19 +++++++-
 .../components/Studierendenantrag/Leitung.js  |  2 +-
 3 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
index 4c99fcca1..8d333d5b8 100644
--- a/application/controllers/components/Antrag/Leitung.php
+++ b/application/controllers/components/Antrag/Leitung.php
@@ -33,46 +33,14 @@ class Leitung extends FHC_Controller
 
 	public function getActiveStgs()
 	{
-		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe');
-		$stgsNeuanlage = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
-
-		$stgs = [];
-
-		if ($studiengaenge) {
-			$result = $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
-
-			if (isError($result))
-				return $this->outputJson($result);
-			$antraege = getData($result) ?: [];
-
-			foreach ($antraege as $antrag) {
-				if (!isset($stgs[$antrag->studiengang_kz])) {
-					$stgs[$antrag->studiengang_kz] = new stdClass();
-					$stgs[$antrag->studiengang_kz]->bezeichnung = $antrag->bezeichnung;
-					$stgs[$antrag->studiengang_kz]->orgform = $antrag->orgform;
-					$stgs[$antrag->studiengang_kz]->studiengang_kz = $antrag->studiengang_kz;
-				}
-			}
+		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe') ?: [];
+		$studiengaenge = array_merge($studiengaenge, $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: []);
+		
+		$result = $this->StudierendenantragModel->loadStgsWithAntraege($studiengaenge);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
-
-		if ($stgsNeuanlage) {
-			$result = $this->StudierendenantragModel->loadForStudiengaenge($stgsNeuanlage);
-
-			if (isError($result))
-				return $this->outputJson($result);
-			$antraege = getData($result) ?: [];
-
-			foreach ($antraege as $antrag) {
-				if (!isset($stgs[$antrag->studiengang_kz])) {
-					$stgs[$antrag->studiengang_kz] = new stdClass();
-					$stgs[$antrag->studiengang_kz]->bezeichnung = $antrag->bezeichnung;
-					$stgs[$antrag->studiengang_kz]->orgform = $antrag->orgform;
-					$stgs[$antrag->studiengang_kz]->studiengang_kz = $antrag->studiengang_kz;
-				}
-			}
-		}
-
-		$this->outputJsonSuccess($stgs);
+		$this->outputJson($result);
 	}
 
 	public function getAntraege($studiengang = null, $extra = null)
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 3d688eb82..0eda91886 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -74,7 +74,8 @@ class Studierendenantrag_model extends DB_Model
 		return $this->loadWhere($where);
 	}
 
-	public function loadActiveForStudiengaenge($studiengaenge) {
+	public function loadActiveForStudiengaenge($studiengaenge)
+	{
 		// NOTE(chris): get language before changing things in the global db object because getUserLanguage() might use it and it should not have been tampered with
 		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
 
@@ -94,6 +95,22 @@ class Studierendenantrag_model extends DB_Model
 		return $this->loadForStudiengaenge($studiengaenge, null, null, $sql);
 	}
 
+	public function loadStgsWithAntraege($studiengaenge)
+	{
+		$this->addDistinct();
+		$this->addSelect('UPPER(stg.typ) || UPPER(stg.kurzbz) || \' \' || stg.bezeichnung AS bezeichnung');
+		$this->addSelect('p.studiengang_kz');
+
+		$this->addJoin('public.tbl_prestudent p', 'prestudent_id');
+		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
+
+		$this->addOrder('UPPER(stg.typ) || UPPER(stg.kurzbz) || \' \' || stg.bezeichnung');
+
+		$this->db->where_in('p.studiengang_kz', $studiengaenge);
+
+		return $this->load();
+	}
+
 	public function isInStudiengang($studierendenantrag_id, $studiengaenge)
 	{
 		$this->addJoin('public.tbl_prestudent', 'prestudent_id');
diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
index 0db2cc2c0..a56e23725 100644
--- a/public/js/components/Studierendenantrag/Leitung.js
+++ b/public/js/components/Studierendenantrag/Leitung.js
@@ -44,7 +44,7 @@ export default {
 				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
 				'/components/Antrag/Leitung/getActiveStgs'
 			).then(result => {
-				this.stgs = Object.values(result.data.retval).sort((a,b) => a.bezeichnung == b.bezeichnung ? (a.orgform == b.orgform ? 0 : (a.orgform > b.orgform ? 1 : -1)) : (a.bezeichnung > b.bezeichnung ? 1 : -1));
+				this.stgs = result.data.retval;
 			}).catch(error => {
 				console.error(error);
 			});

From 5b6227171144a31c0e2b32b002efd237df264410 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 2 Jan 2024 09:36:28 +0100
Subject: [PATCH 148/149] s&d

---
 application/controllers/jobs/AntragJob.php    | 93 +++++++++++--------
 .../education/Studierendenantrag_model.php    |  3 +-
 .../Studierendenantragstatus_model.php        |  1 +
 .../27351_digitalisierung_formulare.php       | 18 +++-
 4 files changed, 73 insertions(+), 42 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 2730ee802..131cfdced 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -345,6 +345,7 @@ class AntragJob extends JOB_Controller
 		$dateDeadline = new DateTime();
 		$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
 
+		$this->StudierendenantragModel->addSelect('tbl_studierendenantrag.studierendenantrag_id');
 		$this->StudierendenantragModel->addSelect('prestudent_id');
 		$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
 		$this->StudierendenantragModel->addSelect('s.insertamum');
@@ -369,50 +370,62 @@ class AntragJob extends JOB_Controller
 
 			foreach ($antraege as $antrag)
 			{
-				$result = $this->prestudentlib->setAbbrecher(
-                    $antrag->prestudent_id,
-                    $antrag->studiensemester_kurzbz,
-                    'AntragJob',
-                    'abbrecherStgl',
-                    $antrag->insertamum,
-                    null,
-                    $antrag->insertvon ?: $insertvon
-                );
+				$result = $this->StudierendenantragstatusModel->insert([
+					'studierendenantrag_id' => $antrag->studierendenantrag_id,
+					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_DEREGISTERED,
+					'insertvon' => 'AntragJob'
+				]);
 				if (isError($result))
 					$this->logError(getError($result));
-				else
-				{
-					$count++;
-					$result = $this->PrestudentModel->load($antrag->prestudent_id);
-					if(!hasData($result)) {
-						$this->logWarning('No Prestudent found');
-						continue;
-					}
-					$prestudent = current(getData($result));
-					$result = $this->StudiengangModel->load($prestudent->studiengang_kz);
-					if(!hasData($result)) {
-						$this->logWarning('No Studiengang found');
-						continue;
-					}
-					$studiengang = current(getData($result));
-					$result = $this->PersonModel->loadPrestudent($antrag->prestudent_id);
-					if(!hasData($result))
-					{
-						$this->logWarning('No Person found');
-						continue;
-					}
-					$person = current(getData($result));
-					$email = $studiengang->email;
-					$dataMail = array(
-						'prestudent' => $antrag->prestudent_id,
-						'studiensemester' => $antrag->studiensemester_kurzbz,
-						'name' => trim($person->vorname . ' '. $person->nachname),
-					);
+				else {
+					$deregisterStatus = getData($result);
 
-					if(!sendSanchoMail('Sancho_Mail_Antrag_A_Assist', $dataMail, $email, 'Einspruchsfrist abgelaufen'))
-					{
-						$this->logWarning("Failed to send Notification to " . $email);
+					$result = $this->prestudentlib->setAbbrecher(
+	                    $antrag->prestudent_id,
+	                    $antrag->studiensemester_kurzbz,
+	                    'AntragJob',
+	                    'abbrecherStgl',
+	                    $antrag->insertamum,
+	                    null,
+	                    $antrag->insertvon ?: $insertvon
+	                );
+					if (isError($result)) {
+						$this->StudierendenantragstatusModel->delete($deregisterStatus);
+						$this->logError(getError($result));
+					} else {
+						$count++;
+						$result = $this->PrestudentModel->load($antrag->prestudent_id);
+						if(!hasData($result)) {
+							$this->logWarning('No Prestudent found');
+							continue;
+						}
+						$prestudent = current(getData($result));
+						$result = $this->StudiengangModel->load($prestudent->studiengang_kz);
+						if(!hasData($result)) {
+							$this->logWarning('No Studiengang found');
+							continue;
+						}
+						$studiengang = current(getData($result));
+						$result = $this->PersonModel->loadPrestudent($antrag->prestudent_id);
+						if(!hasData($result))
+						{
+							$this->logWarning('No Person found');
+							continue;
+						}
+						$person = current(getData($result));
+						$email = $studiengang->email;
+						$dataMail = array(
+							'prestudent' => $antrag->prestudent_id,
+							'studiensemester' => $antrag->studiensemester_kurzbz,
+							'name' => trim($person->vorname . ' '. $person->nachname),
+						);
+
+						if(!sendSanchoMail('Sancho_Mail_Antrag_A_Assist', $dataMail, $email, 'Einspruchsfrist abgelaufen'))
+						{
+							$this->logWarning("Failed to send Notification to " . $email);
+						}
 					}
+
 				}
 			}
 			$this->logInfo($count . "/" . count($antraege) . " Students set to Abbrecher");
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 3d688eb82..4a226fea9 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -83,7 +83,8 @@ class Studierendenantrag_model extends DB_Model
 			Studierendenantragstatus_model::STATUS_CANCELLED,
 			Studierendenantragstatus_model::STATUS_APPROVED,
 			Studierendenantragstatus_model::STATUS_REJECTED,
-			Studierendenantragstatus_model::STATUS_OBJECTION_DENIED
+			Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
+			Studierendenantragstatus_model::STATUS_DEREGISTERED
 		]);
 		$this->db->or_group_start();
 		$this->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);
diff --git a/application/models/education/Studierendenantragstatus_model.php b/application/models/education/Studierendenantragstatus_model.php
index b4bf3938b..c134cc4ee 100644
--- a/application/models/education/Studierendenantragstatus_model.php
+++ b/application/models/education/Studierendenantragstatus_model.php
@@ -14,6 +14,7 @@ class Studierendenantragstatus_model extends DB_Model
 	const STATUS_REQUESTSENT_2 = 'ZweiteAufforderungVersandt';
 	const STATUS_OBJECTED = 'Beeinsprucht';
 	const STATUS_OBJECTION_DENIED = 'EinspruchAbgelehnt';
+	const STATUS_DEREGISTERED = 'Abgemeldet';
 
 	/**
 	 * Constructor
diff --git a/system/dbupdate_3.4/27351_digitalisierung_formulare.php b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
index 1f8dd4b4b..75e634569 100644
--- a/system/dbupdate_3.4/27351_digitalisierung_formulare.php
+++ b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
@@ -37,7 +37,8 @@ if($result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_statust
 			('ErsteAufforderungVersandt', '{\"1.Aufforderung Versandt\",\"1st Request Sent\"}'),
 			('ZweiteAufforderungVersandt', '{\"2.Aufforderung Versandt\",\"2nd Request Sent\"}'),
 			('Beeinsprucht', '{\"Beeinsprucht\",\"Objected\"}'),
-			('EinspruchAbgelehnt', '{\"Einspruch abgelehnt\",\"Objection denied\"}');
+			('EinspruchAbgelehnt', '{\"Einspruch abgelehnt\",\"Objection denied\"}'),
+			('Abgemeldet', '{\"Abgemeldet\",\"Deregistered\"}');
 			";
 		if (!$db->db_query($qry))
 			echo '<strong>campus.tbl_studierendenantrag_statustyp (insert): '.$db->db_last_error().'</strong><br>';
@@ -45,6 +46,21 @@ if($result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_statust
 			echo '<br>campus.tbl_studierendenantrag_statustyp: table prefilled';
 	}
 }
+if($result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_statustyp WHERE studierendenantrag_statustyp_kurzbz = 'Abgemeldet' "))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO campus.tbl_studierendenantrag_statustyp
+			(studierendenantrag_statustyp_kurzbz, bezeichnung)
+			VALUES
+			('Abgemeldet', '{\"Abgemeldet\",\"Deregistered\"}');
+			";
+		if (!$db->db_query($qry))
+			echo '<strong>campus.tbl_studierendenantrag_statustyp (insert): '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>campus.tbl_studierendenantrag_statustyp: "Abgemeldet" added';
+	}
+}
 
 if(!$result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag LIMIT 1"))
 {

From 64279bace203f7d2a33326ff6400219d46546cfa Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 9 Jan 2024 09:40:56 +0100
Subject: [PATCH 149/149] change function type from volatile to stable for
 public.get_rolle_prestudent

---
 .../dbupdate_3.4/27351_digitalisierung_formulare.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/system/dbupdate_3.4/27351_digitalisierung_formulare.php b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
index bf274ecba..d05b69604 100644
--- a/system/dbupdate_3.4/27351_digitalisierung_formulare.php
+++ b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
@@ -359,6 +359,18 @@ elseif ($result = @$db->db_query("SELECT 1 FROM pg_proc WHERE proname='get_stdse
 	}
 }
 
+if ($result = @$db->db_query("SELECT 1 FROM pg_proc WHERE proname='get_rolle_prestudent' AND provolatile='s'"))
+{
+	if ($db->db_num_rows($result) == 0) {
+		$qry = 'ALTER FUNCTION public.get_rolle_prestudent(integer, character varying) STABLE;';
+
+		if(!$db->db_query($qry))
+			echo '<strong>public.get_rolle_prestudent(integer, character varying): '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>public.get_rolle_prestudent(integer, character varying): function updated';
+	}
+}
+
 if($result = @$db->db_query("SELECT 1 FROM public.tbl_status_grund WHERE statusgrund_kurzbz = 'abbrecherStgl';"))
 {
 	if($db->db_num_rows($result) == 0)