phpspreadsheet 1.7 for smaller & well formatted exports

spout 2.7 install for large excel exports
Merge branch 'feature-70376/Lohnguide'
2026-06-26 00:19:28 +00:00 · 2026-06-18 15:43:23 +02:00 · 2026-05-20 13:26:29 +02:00 · 2026-05-13 11:53:14 +02:00 · 2026-05-13 11:42:25 +02:00 · 2026-05-13 11:16:18 +02:00
7 changed files with 100 additions and 91 deletions
@@ -263,59 +263,6 @@ class ProfilLib{
 			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
 			return $element;
 		}, $mailverteiler_res);
-
-		$this->ci->load->model("crm/Student_model", "StudentModel");
-		$this->ci->StudentModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_student.student_uid");
-		$this->ci->StudentModel->addJoin("tbl_person", "tbl_benutzer.person_id = tbl_person.person_id");
-		$this->ci->StudentModel->addJoin("tbl_studiengang", "tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz");
-		$this->ci->StudentModel->addSelect("matr_nr, semester, verband, gruppe, kurzbzlang");
-
-		$studentResult = $this->ci->StudentModel->loadWhere(["student_uid" => $uid]);
-		if (isError($studentResult)) {
-			return error(getData($studentResult));
-		}
-
-		$studentResultData = getData($studentResult);
-		$studentData = null;
-		if (is_array($studentResultData) && count($studentResultData)) {
-			$studentData = $studentResultData[0];
-		}
-
-		if ($studentData && $studentData->matr_nr) {
-			$this->ci->load->library("phrasesLib", ["profil"], "phrases");
-			$standardCourseVerteiler = trim($studentData->kurzbzlang) . "_STD";
-			$mailverteiler_res[] = [
-				"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $standardCourseVerteiler,
-				"gruppe_kurzbz" => $standardCourseVerteiler,
-				"mailto" => "mailto:" . strtolower($standardCourseVerteiler) . "@" . DOMAIN,
-			];
-
-			$semesterVerteiler = trim($studentData->kurzbzlang) . trim($studentData->semester);
-			$mailverteiler_res[] = [
-				"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $semesterVerteiler,
-				"gruppe_kurzbz" => $semesterVerteiler,
-				"mailto" => "mailto:" . strtolower($semesterVerteiler) . "@" . DOMAIN,
-			];
-
-			if ($studentData->verband && strlen(trim($studentData->verband))) {
-				$verbandVerteiler = $semesterVerteiler . trim($studentData->verband);
-				$mailverteiler_res[] = [
-					"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $verbandVerteiler,
-					"gruppe_kurzbz" => $verbandVerteiler,
-					"mailto" => "mailto:" . strtolower($verbandVerteiler) . "@" . DOMAIN,
-				];
-
-				if ($studentData->gruppe && strlen(trim($studentData->gruppe))) {
-					$gruppeVerteiler = $verbandVerteiler . trim($studentData->gruppe);
-					$mailverteiler_res[] = [
-						"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $gruppeVerteiler,
-						"gruppe_kurzbz" => $gruppeVerteiler,
-						"mailto" => "mailto:" . strtolower($gruppeVerteiler) . "@" . DOMAIN,
-					];
-				}
-			}
-		}
-
 		return $mailverteiler_res;
 	}

@@ -40,7 +40,9 @@ abstract class AbstractBestandteil implements IValidation
 		
 		if( is_bool($new_value) && ($old_value !== $new_value) ) {
 			$this->modifiedcolumns[$columnname] = $columnname;
-		} else if($old_value != $new_value) {		
+		} else if(is_null($old_value) xor is_null($new_value)) {
+			$this->modifiedcolumns[$columnname] = $columnname;
+		} else if($old_value != $new_value) {
 			$this->modifiedcolumns[$columnname] = $columnname;
 		}
 	}
@@ -137,19 +137,25 @@ EOTXT;
 		return parent::__toString() . $txt;
 	}

-	/* public function validate()
+	public function validate()
 	{
-		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
-				array(
-					'options' => array(
-						'min_range' => 1,
-						'max_range' => 50
-					)
-				)
-			)) ) {
-			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
+		$value = $this->vordienstzeit;
+
+		if ($value === null || $value === '') {
+			$result = null;   // allow null value 
+		} else {
+			$result = filter_var($value, FILTER_VALIDATE_INT, [
+				'options' => [
+					'min_range' => 0,
+					'max_range' => 100
+				]
+			]);
+
+			if ($result === false) {				
+				$this->validationerrors[] = 'Vordienstjahre muss eine ganze Zahl (0 bis 100) enthalten oder leer sein.';
+			}
 		}
 		
 		return parent::validate();
-	} */
+	} 
 }
@@ -505,7 +505,9 @@
 		"vuejs/vuedatepicker_js": "7.2.0",
 		"vuejs/vuedatepicker_css": "7.2.0",
 		"vuejs/vuedatepicker_js11": "11.0.1",
-		"vuejs/vuedatepicker_css11": "11.0.1"
+		"vuejs/vuedatepicker_css11": "11.0.1",
+		"box/spout": "^2.7",
+		"phpoffice/phpspreadsheet": "~1.7.0"

 	},
 	"config": {
@@ -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": "f4f0af4586f46f97d8b6092c1ac0fb3a",
+    "content-hash": "c5b0e5eb7392192a92418412ab1f2ed2",
    "packages": [
        {
            "name": "afarkas/html5shiv",
@@ -77,6 +77,79 @@
            },
            "type": "library"
        },
+        {
+            "name": "box/spout",
+            "version": "v2.7.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/box/spout.git",
+                "reference": "3681a3421a868ab9a65da156c554f756541f452b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/box/spout/zipball/3681a3421a868ab9a65da156c554f756541f452b",
+                "reference": "3681a3421a868ab9a65da156c554f756541f452b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-xmlreader": "*",
+                "ext-zip": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.0"
+            },
+            "suggest": {
+                "ext-iconv": "To handle non UTF-8 CSV files (if \"php-intl\" is not already installed or is too limited)",
+                "ext-intl": "To handle non UTF-8 CSV files (if \"iconv\" is not already installed)"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Box\\Spout\\": "src/Spout"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Adrien Loison",
+                    "email": "adrien@box.com"
+                }
+            ],
+            "description": "PHP Library to read and write spreadsheet files (CSV, XLSX and ODS), in a fast and scalable way",
+            "homepage": "https://www.github.com/box/spout",
+            "keywords": [
+                "OOXML",
+                "csv",
+                "excel",
+                "memory",
+                "odf",
+                "ods",
+                "office",
+                "open",
+                "php",
+                "read",
+                "scale",
+                "spreadsheet",
+                "stream",
+                "write",
+                "xlsx"
+            ],
+            "support": {
+                "issues": "https://github.com/box/spout/issues",
+                "source": "https://github.com/box/spout/tree/v2.7.3"
+            },
+            "abandoned": true,
+            "time": "2017-09-25T19:44:35+00:00"
+        },
        {
            "name": "brutusin/json-forms",
            "version": "1.4.0",
@@ -264,8 +264,8 @@ CREATE TABLE IF NOT EXISTS hr.tbl_vertragsbestandteil_lohnguide (
    stellenbezeichnung varchar(255),
    fachrichtung_kurzbz character varying(32) NOT NULL,
    modellstelle_kurzbz character varying(32) NOT NULL,
-    kommentar_person varchar(255),
-    kommentar_modellstelle varchar(255),
+    kommentar_person text,
+    kommentar_modellstelle text,
    CONSTRAINT tbl_vertragsbestandteil_lohnguide_pk PRIMARY KEY (vertragsbestandteil_id),
 	CONSTRAINT tbl_vertragsbestandteil_fk FOREIGN KEY (vertragsbestandteil_id) REFERENCES hr.tbl_vertragsbestandteil (vertragsbestandteil_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
 	CONSTRAINT tbl_vertragsbestandteil_lohnguide_fachrichtung_fk FOREIGN KEY (fachrichtung_kurzbz) REFERENCES hr.tbl_lohnguide_fachrichtung (fachrichtung_kurzbz) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
@@ -29562,8 +29562,7 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	),
-	array(
+	),	array(
 		'app' => 'core',
 		'category' => 'profil',
 		'phrase' => 'sem_short',
@@ -29583,26 +29582,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'profil',
-		'phrase' => 'alleStudentenVon',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Alle StudentInnen aus',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'All students from',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	//Profil Phrasen ende
 	// LvPlan Phrasen start
 	array(
Author	SHA1	Message	Date
Johann Hoffmann	2fe7db7882	phpspreadsheet 1.7 for smaller & well formatted exports	2026-06-18 15:43:23 +02:00
Johann Hoffmann	8f2d268e3e	spout 2.7 install for large excel exports	2026-05-20 13:26:29 +02:00
Harald Bamberger	cb7a0f7669	Merge branch 'feature-70376/Lohnguide'	2026-05-13 11:53:14 +02:00
Harald Bamberger	68d97a5e97	handle case where old value or new value and not both are null explicitly in markDirty Method	2026-05-13 11:42:25 +02:00
Harald Bamberger	d27071528f	revert change to comparision in markDirty Method	2026-05-13 11:16:18 +02:00
Harald Bamberger	17772c3738	Merge branch 'master' into feature-70376/Lohnguide	2026-05-13 11:15:07 +02:00
Werner Masik	7f13c128f1	allow null value for vordienstzeit; changed comparison in markDirty to !== (because of 0 vs. null issue)	2026-05-04 20:35:51 +02:00
Werner Masik	58a921b500	changed lohnguide kommentar data type to text	2026-04-30 09:47:12 +02:00