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 01/66] - 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 02/66] - 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 03/66] 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 04/66] - 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 05/66] 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 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 06/66] 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 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 07/66] 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 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 08/66] 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 09/66] 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 10/66] 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 11/66] 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 12/66] 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 13/66] 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 14/66] 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 15/66] 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 16/66] 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 17/66] 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 18/66] 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 19/66] 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 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 20/66] 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 21/66] 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 22/66] 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 23/66] 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 24/66] 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 25/66] 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 26/66] 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 27/66] - 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 28/66] - 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 29/66] - 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 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 30/66] - 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 31/66] 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 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 32/66] - 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 33/66] - 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 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 34/66] - 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 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 35/66] - 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 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 36/66] - 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 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 37/66] 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 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 38/66] - 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 39/66] - 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 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 40/66] - 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 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 41/66] =?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 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 42/66] 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 43/66] 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 44/66] - 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 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 45/66] 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 46/66] =?UTF-8?q?task-35010:=20Abmeldung=20d.=20StG=20Pre-?=
 =?UTF-8?q?Abbrecher=20Statusgrund=20nach=20zur=C3=BCckgezogen=20wieder=20?=
 =?UTF-8?q?r=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 47/66] =?UTF-8?q?Pre-Abbrecher=20Statusgrund=20nach=20zur?=
 =?UTF-8?q?=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 48/66] =?UTF-8?q?Revert=20"task-35010:=20Abmeldung=20d.=20?=
 =?UTF-8?q?StG=20Pre-Abbrecher=20Statusgrund=20nach=20zur=C3=BCckgezogen?=
 =?UTF-8?q?=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 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 49/66] 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 50/66] =?UTF-8?q?Composer=20Lock=20aktualisiert=20und=20ne?=
 =?UTF-8?q?uen=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 51/66] 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 52/66] - 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 53/66] 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 54/66] 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 55/66] 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 56/66] 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 57/66] =?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 58/66] =?UTF-8?q?Negative=20Pr=C3=BCfungen=20sortiert=20un?=
 =?UTF-8?q?d=20bei=20bestehenden=20Antr=C3=A4gen=20nach=20Antragsdatum=20u?=
 =?UTF-8?q?nd=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 59/66] 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 60/66] 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 61/66] 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 62/66] 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 63/66] 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 64/66] 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 65/66] 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 66/66] 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)