Merge branch 'master' into feature-40315/Diagramme_generieren

# Conflicts:
#	cis/testtool/menu.php
#	system/dbupdate_3.4.php

application/controllers/Cis/Compat.php

@@ -0,0 +1,44 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Compat extends Auth_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+
+	public function __construct()
+	{
+		parent::__construct([
+			'ci' => ['basis/cis:r'],
+			'legacy' => ['basis/cis:r'],
+			
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+
+	/**
+	 * @access public
+	 * @return void 
+	 */
+	public function ci()
+	{
+		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
+	}
+
+	/**
+	 * @access public
+	 * @return void
+	 */
+	public function legacy()
+	{
+		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
+	}
+
+}

application/controllers/api/frontend/v1/CisMenu.php

@@ -67,8 +67,11 @@ class CisMenu extends FHCAPI_Controller
 
 	private function generateUrlForMenuItem($menuItem)
 	{
-		$menuItem->url = $this->menuItemUrlHelper($menuItem);
-		unset($menuItem->content);
+		if(!isset($menuItem->url))
+		{
+			$menuItem->url = $this->menuItemUrlHelper($menuItem);
+			unset($menuItem->content);
+		}
 
 		if ($menuItem->childs && count($menuItem->childs)) {
 			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
@@ -83,7 +86,7 @@ class CisMenu extends FHCAPI_Controller
 			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
 		}
 
-		if (!$menuItem->content || !mb_strlen($menuItem->content)) {
+		if (!isset($menuItem->content) || !$menuItem->content || !mb_strlen($menuItem->content)) {
 			return '';
 		}
 

application/controllers/jobs/Modulgrafik.php

@@ -0,0 +1,196 @@
+<?php
+/* Copyright (C) 2024 fhcomplete.net
+ *
+ * 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.
+ *
+ */
+
+if (!defined("BASEPATH")) exit("No direct script access allowed");
+
+class Modulgrafik extends JOB_Controller
+{
+	const DEFAULT_XOFFSET = 40;
+	const DEFAULT_YOFFSET = 30;
+	const DEFAULT_WIDTH	  = 160;
+	const DEFAULT_SEMESTER_LABEL_WIDTH = 80;
+	const DEFAULT_ECTS_WIDTH = 40;
+	const DEFAULT_HEIGHT  = 50;
+	const DEFAULT_SPACING = 40;
+	const DEFAULT_FONTSIZE = 8;
+
+	protected $curx;
+	protected $cury;
+
+	public function __construct()
+	{
+		parent::__construct();
+		
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+		$this->load->model('CL/Drawio_model', 'DrawioModel');
+		
+		$this->load->library('DocsboxLib', null, 'DocsboxLib');
+	}
+
+	public function drawModulGrafik($studienplan_id)
+	{
+		$sql = <<<EOSQL
+		SELECT 
+			sl.studienplan_lehrveranstaltung_id, 
+			sl.lehrveranstaltung_id, 
+			sl.studienplan_lehrveranstaltung_id_parent, 
+			COALESCE(sl.studienplan_lehrveranstaltung_id_parent, sl.studienplan_lehrveranstaltung_id) AS lvgrp, 
+			sl.semester, 
+			lv.bezeichnung, 
+			lv.ects, 
+			lv.lehrtyp_kurzbz 
+		FROM 
+			lehre.tbl_studienplan_lehrveranstaltung sl 
+		JOIN 
+			lehre.tbl_lehrveranstaltung lv USING(lehrveranstaltung_id) 
+		WHERE 
+			sl.studienplan_id = {$studienplan_id} 
+			AND 
+			ects > '0.00' 
+		ORDER BY 
+			sl.semester ASC, 
+			lvgrp ASC, 
+			lv.lehrtyp_kurzbz DESC
+EOSQL;
+		
+		$result = $this->StudienplanModel->execReadOnlyQuery($sql);
+		$lvs = getData($result);
+
+		$errors = array();
+		$assoclvs = array();
+		$semester = array();
+		if($lvs)
+		{
+			ob_start();
+
+			foreach($lvs as &$lv) 
+			{
+				if( !isset($semester[$lv->semester]) ) {
+				$semester[$lv->semester] = array();
+				}
+				$lv->parent = null;
+				$lv->childs = array();
+				$assoclvs[$lv->studienplan_lehrveranstaltung_id] = $lv;
+			}
+			
+			foreach($assoclvs as &$assoclv)
+			{
+				if( $assoclv->studienplan_lehrveranstaltung_id_parent === NULL )
+				{
+					$semester[$assoclv->semester][] = $assoclv;
+				}
+				else
+				{
+					if( isset($assoclvs[$assoclv->studienplan_lehrveranstaltung_id_parent]) ) 
+					{
+						$assoclv->parent = $assoclvs[$assoclv->studienplan_lehrveranstaltung_id_parent];
+						$assoclvs[$assoclv->studienplan_lehrveranstaltung_id_parent]->childs[] = $assoclv;
+					}
+					else
+					{
+						$errors[] = "ERROR: Missing parent lv " . $assoclv->studienplan_lehrveranstaltung_id_parent . "\n";
+					}
+				}
+			}
+
+			function printchilds($childs, $level) {
+				if( count($childs) < 1 )
+				{
+					return;
+				}
+
+				foreach($childs as $child)
+				{
+					echo $level . $child->bezeichnung . " (" . $child->ects . ") "  . $child->lehrtyp_kurzbz . "\n";
+					printchilds($child->childs, $level . "\t");
+				}
+			}
+			
+			echo "<!--\n\n";
+
+			foreach($semester as $sem => $mods)
+			{
+				echo $sem . ". Semester: \n";
+				foreach($mods as $mod)
+				{
+					$level = "\t";
+					echo $level . $mod->bezeichnung . " (" . $mod->ects . ") " . $mod->lehrtyp_kurzbz . "\n";
+					printchilds($mod->childs, $level . "\t");
+				}
+			}
+			echo "-->\n\n";
+			
+			if (count($errors) === 0)
+			{
+				$this->DrawioModel->renderFileStart();
+				$this->maxxoffset = self::DEFAULT_XOFFSET;
+				$this->DrawioModel->renderDiagramStart($studienplan_id, 'Modulgrafik');
+				$this->renderSemester($semester);
+				$this->DrawioModel->renderDiagramEnd();
+				$this->DrawioModel->renderFileEnd();
+			}
+			else 
+			{
+				foreach ($errors as $error)
+				{
+					echo $error;
+				}
+			}
+
+			$output = ob_get_clean();
+			file_put_contents(sys_get_temp_dir().'/Modulgrafik.xml', $output);
+
+			$ret = DocsboxLib::convert(sys_get_temp_dir().'/Modulgrafik.xml', sys_get_temp_dir().'/Modulgrafik.png', 'png');
+
+			echo 'File: '.sys_get_temp_dir().'/Modulgrafik.png'."\n";
+		}
+		else 
+		{
+			echo "Keine LVs gefunden.\n";
+		}
+	}
+	
+	protected function renderSemester($semester)
+	{
+		$cury = self::DEFAULT_YOFFSET;
+		
+		foreach($semester as $sem => $mods)
+		{
+			$curx = self::DEFAULT_XOFFSET;
+			$id = uniqid();
+			$ects = 30; //TODO calc
+			$this->DrawioModel->renderSemesterLabel($id, $sem, $ects, self::DEFAULT_XOFFSET, $cury, self::DEFAULT_SEMESTER_LABEL_WIDTH, self::DEFAULT_HEIGHT);
+			$curx += self::DEFAULT_SEMESTER_LABEL_WIDTH + self::DEFAULT_SPACING;
+			$maxmodulheight = 0;
+			foreach($mods as $mod)
+			{
+				$modid = uniqid();
+				$size = $this->DrawioModel->renderModulList($modid, $mod, $curx, $cury, self::DEFAULT_ECTS_WIDTH, self::DEFAULT_HEIGHT);
+				$curx += $size->width + self::DEFAULT_SPACING;
+				if( $size->height > $maxmodulheight)
+				{
+				$maxmodulheight = $size->height;
+				}
+			}
+			$cury += $maxmodulheight + self::DEFAULT_SPACING;
+		}
+	}
+}
+

application/controllers/jobs/Organigramm.php

@@ -0,0 +1,339 @@
+<?php
+/* Copyright (C) 2024 fhcomplete.net
+ *
+ * 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.
+ *
+ */
+
+if (!defined("BASEPATH")) exit("No direct script access allowed");
+
+class Organigramm extends JOB_Controller
+{
+	const DEFAULT_XOFFSET = 40;
+	const DEFAULT_YOFFSET = 30;
+	const DEFAULT_WIDTH = 160;
+	const DEFAULT_HEIGHT = 50;
+	const DEFAULT_SPACING = 40;
+	const DEFAULT_FONTSIZE = 8;
+	const RENDER_CHILDS_HORIZONTAL  = 1;
+	const RENDER_CHILDS_VERTICAL = 2;
+	
+	protected $maxxoffset;
+	protected $donotrenderchildsoftype;
+
+	public function __construct()
+	{
+		parent::__construct();
+		
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+
+		$this->load->model('CL/Drawio_model', 'DrawioModel');
+
+		$this->load->library('DocsboxLib', null, 'DocsboxLib');
+
+		$this->maxxoffset = self::DEFAULT_XOFFSET;
+		$this->donotrenderchildsoftype = array();
+	}
+	
+	public function getAllActiveOes()
+	{
+		$sql = <<<EOSQL
+		SELECT 
+		  oe.oe_kurzbz, 
+		  CASE 
+			  WHEN oe.oe_parent_kurzbz = 'atw' THEN 'gst'
+			  WHEN oe.oe_parent_kurzbz = 'etw' THEN 'gst'
+			  ELSE oe.oe_parent_kurzbz
+		  END AS oe_parent_kurzbz, 
+		  oe.bezeichnung, 
+		  oe.organisationseinheittyp_kurzbz, 
+		  STRING_AGG(
+			DISTINCT p.vorname || ' ' || p.nachname, 
+			', '
+		  ) AS leitung_uid 
+		FROM 
+		  "public"."tbl_organisationseinheit" oe 
+		  LEFT JOIN public.tbl_benutzerfunktion bf ON bf.oe_kurzbz = oe.oe_kurzbz 
+		  AND (
+			bf.datum_bis IS NULL 
+			OR bf.datum_bis > NOW() :: date
+		  ) 
+		  AND (
+			bf.funktion_kurzbz IS NULL 
+			OR bf.funktion_kurzbz = 'Leitung'
+		  ) 
+		  LEFT JOIN public.tbl_benutzer b USING(uid) 
+		  LEFT JOIN public.tbl_person p USING(person_id) 
+		WHERE 
+		  oe.aktiv = true
+		  AND oe.oe_kurzbz NOT IN ('betriebsrat', 'oeh', 'FUEWahl', 'atw', 'etw', 'gf20')
+		GROUP BY 
+		  oe.oe_kurzbz, 
+		  oe.oe_parent_kurzbz, 
+		  oe.bezeichnung, 
+		  oe.organisationseinheittyp_kurzbz 
+		ORDER BY 
+		  oe.oe_parent_kurzbz ASC NULLS FIRST, 
+		  oe.oe_kurzbz ASC;
+EOSQL;
+		
+		$result = $this->OrganisationseinheitModel->execReadOnlyQuery($sql);
+		$oes = getData($result);
+
+		$errors = array();
+		$assocoes = array();
+		$roots = array();
+		if($oes)
+		{
+			ob_start();
+
+			foreach($oes as &$oe) 
+			{
+				$oe->parent = NULL;
+				$oe->childs = array();
+				$oe->renderchilds = self::RENDER_CHILDS_HORIZONTAL;
+				$oe->childstorender = array();
+				$oe->donotrenderchildsoftype = array();
+				$assocoes[$oe->oe_kurzbz] = $oe;
+			}
+			
+			foreach($assocoes as &$assocoe)
+			{
+				if( $assocoe->oe_parent_kurzbz === NULL )
+				{
+					$roots[$assocoe->oe_kurzbz] = $assocoe;
+					$assocoe->donotrenderchildsoftype = array(
+						'Team',
+						'Lehrgang',
+						'Studiengang',
+						'Kompetenzfeld',
+						'Forschungsfeld',
+						'Container'
+					);
+				}
+				else
+				{
+					if( isset($assocoes[$assocoe->oe_parent_kurzbz]) ) 
+					{
+						$assocoe->parent = $assocoes[$assocoe->oe_parent_kurzbz];
+						$assocoes[$assocoe->oe_parent_kurzbz]->childs[] = $assocoe;
+						
+						if( $assocoe->organisationseinheittyp_kurzbz === 'Fakultaet' )
+						{
+							$roots[$assocoe->oe_kurzbz] = $assocoe;
+						}
+					}
+					else
+					{
+						$errors[] = "ERROR: Missing parent oe " . $assocoe->oe_parent_kurzbz . "\n";
+					}			
+				}
+			}
+			
+			if(count($errors) === 0)
+			{
+				$pages = count($roots);
+				$this->DrawioModel->renderFileStart($pages);
+
+				foreach($roots AS &$root)
+				{
+					$this->maxxoffset = self::DEFAULT_XOFFSET;
+					$this->donotrenderchildsoftype = $root->donotrenderchildsoftype;
+					$this->prepareChildsToRender($root);
+					$this->DrawioModel->renderDiagramStart($root->oe_kurzbz, $root->bezeichnung);
+					$this->renderOE($root, 0, 0);
+					$this->DrawioModel->renderDiagramEnd();
+				}
+				$this->DrawioModel->renderFileEnd();
+			}
+			else 
+			{
+				foreach ($errors as $error)
+				{
+					echo $error;
+				}
+			}
+
+			$output = ob_get_clean();
+                        file_put_contents(sys_get_temp_dir().'/Organigramm.xml', $output);
+                                 
+                        $ret = DocsboxLib::convert(sys_get_temp_dir().'/Organigramm.xml', sys_get_temp_dir().'/Organigramm.png', 'png');
+                         
+                        echo 'File: '.sys_get_temp_dir().'//Organigramm.png'."\n";
+		}
+		else 
+		{
+			echo "Keine Oes gefunden.\n";
+		}
+	}
+
+	protected function prepareChildsToRender(&$oe)
+	{
+		$oe->childstorender = array();
+		$oe->renderchilds = self::RENDER_CHILDS_HORIZONTAL;
+		if( isset($oe->childsxoffset) )
+		{
+			unset($oe->childsxoffset);
+		}
+		
+		foreach($oe->childs AS &$oechild )
+		{
+			$this->prepareChildsToRender($oechild);
+			if( !in_array($oechild->organisationseinheittyp_kurzbz, $this->donotrenderchildsoftype) )
+			{
+				$oe->childstorender[] = $oechild;
+			}
+		}
+		
+		$nurLehrgaengeOderStudiengaengeOhneKinder = true;
+		foreach($oe->childstorender AS &$oechildtorender )
+		{
+			if( !(count($oechildtorender->childstorender) === 0) )
+			{
+				$nurLehrgaengeOderStudiengaengeOhneKinder = false;
+			}
+		}
+		
+		if( $nurLehrgaengeOderStudiengaengeOhneKinder && $oe->parent !== NULL ) 
+		{
+			$oe->renderchilds = self::RENDER_CHILDS_VERTICAL;
+		}
+	}
+	
+	protected function renderOE($oe, $level, $parentrenderedchildcount) 
+	{
+		$width	   = self::DEFAULT_WIDTH;
+		$height	   = self::DEFAULT_HEIGHT;
+		$spacing   = self::DEFAULT_SPACING;
+		$fontsize  = self::DEFAULT_FONTSIZE;
+		$nextlevel = $level + 1;
+		$renderedchildcount = 0;
+		
+		$curxoffset = $this->maxxoffset;
+		
+		if( count($oe->childstorender) > 0 )
+		{
+			if( !isset($oe->childsxoffset) )
+			{
+				$oe->childsxoffset = (object) array(
+					'min' => $curxoffset,
+					'max' => $curxoffset
+				);
+			}
+			
+			foreach($oe->childstorender AS $child) 
+			{	
+				$ret = $this->renderOE($child, $nextlevel, $renderedchildcount);
+				$renderedchildcount++;
+				if( $renderedchildcount === 1 ) 
+				{
+					$oe->childsxoffset->min = $ret->minx;
+				}
+				$oe->childsxoffset->max = $ret->maxx;
+			}
+
+			if( count($oe->childstorender) === $renderedchildcount )
+			{
+				$curxoffset = $oe->childsxoffset->min + 
+					floor((($oe->childsxoffset->max - $oe->childsxoffset->min) / 2)) - 
+					floor((($width + $spacing) / 2));
+			}
+		}
+
+		if( $oe->parent !== null && $oe->parent->renderchilds === self::RENDER_CHILDS_VERTICAL ) 
+		{
+			$x = $curxoffset;
+			$y = self::DEFAULT_YOFFSET
+			+ (($level - 1) * ($height + $spacing))
+			+ (($parentrenderedchildcount + 1) * ($height + floor($spacing / 2)));
+		}
+		else
+		{
+			$x = $curxoffset;
+			$y = self::DEFAULT_YOFFSET + ($level * ($height + $spacing));
+		}
+		$bezeichnung = htmlspecialchars($oe->bezeichnung);
+		$leitung = ($oe->leitung_uid !== null) ? htmlspecialchars($oe->leitung_uid) : 'N.N.';
+		$fillcolors = array(
+			'Team'		 => '#ffe6cc',
+			'Abteilung'		 => '#e6ffcc',
+			'Studiengang'	=> '#cce6ff',
+			'Lehrgang'		 => '#e6ccff',
+			'Fakultaet'		 => '#f8cecc',
+			'Department'	 => '#fff2cc',
+			'Forschungsfeld' => '#e1d5e7',
+			'Kompetenzfeld'  => '#f5f5f5'
+		);
+		$fillcolor = (isset($fillcolors[$oe->organisationseinheittyp_kurzbz])) ? $fillcolors[$oe->organisationseinheittyp_kurzbz] : '#ffffff';
+		$value = <<<EOVAL
+&lt;font	 style=&quot;font-size: {$fontsize}px;&quot;&gt;&lt;div style=&quot;&quot;&gt;[{$oe->organisationseinheittyp_kurzbz}]&lt;/div&gt;&lt;b style=&quot;&quot;&gt;{$bezeichnung}&lt;/b&gt;&lt;div&gt;({$leitung})&lt;/div&gt;&lt;/font&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;treeFolding=1;treeMoving=1;newEdgeStyle={&quot;edgeStyle&quot;:&quot;elbowEdgeStyle&quot;,&quot;startArrow&quot;:&quot;none&quot;,&quot;endArrow&quot;:&quot;none&quot;};fillColor={$fillcolor};
+EOVAL;
+
+		$this->DrawioModel->renderCell($oe->oe_kurzbz, $value, $x, $y, $width, $height);
+
+		if( $oe->oe_parent_kurzbz !== NULL ) 
+		{
+			$exitX = '0.5';
+			$exitY = '1';
+			$entryX = '0.5';
+			$entryY = '0';
+			$points = array();
+			if( $oe->parent !== null && $oe->parent->renderchilds === self::RENDER_CHILDS_VERTICAL) 
+			{
+				$exitX = '0';
+				$exitY = '0.5';
+				$entryX = '0';
+				$entryY = '0.5';
+				$points = array(
+					(object) array(
+					'x' => ($x - floor($spacing / 2)),
+					'y' => ($y + floor($height  / 2))
+					)
+				);
+			}
+			$this->DrawioModel->renderEdge($oe->oe_parent_kurzbz, $oe->oe_kurzbz, $exitX, $exitY, $entryX, $entryY, $points);
+		}
+
+		if( $oe->parent !== null && $oe->parent->renderchilds === self::RENDER_CHILDS_VERTICAL ) 
+		{
+			if( count($oe->parent->childstorender) === ($parentrenderedchildcount + 1) ) 
+			{
+				if( $this->maxxoffset <  ($x + $width + $spacing) )
+				{
+					$this->maxxoffset = ($x + $width + $spacing);
+				}
+				return (object) array(
+					'minx' => $curxoffset,
+					'maxx' => ($x + $width + $spacing)
+				);
+			}
+			return (object) array( 
+				'minx' => $curxoffset,
+				'maxx' => $x
+			);
+		}
+		
+		if( $this->maxxoffset <  ($x + $width + $spacing) )
+		{
+			$this->maxxoffset = ($x + $width + $spacing);
+		}
+		
+		return (object) array(
+			'minx' => $curxoffset,
+			'maxx' => ($x + $width + $spacing)
+		);
+	}
+}
+

application/libraries/DocsboxLib.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2022 fhcomplete.net
+/* Copyright (C) 2024 fhcomplete.net
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -32,7 +32,7 @@ class DocsboxLib
 	const STATUS_QUEUED = 'queued'; // Docsbox status when a file has been queued for the conversion
 	const STATUS_STARTED = 'started'; // Docsbox status when a file has started being worked
 	const STATUS_WORKING = 'working'; // Docsbox status when a file is being converted
-	const OUTPUT_FILENAME = 'out.zip.pdf'; // File name used by docsbox to save a converted document
+	const JSON_FORMATS = '{"formats": ["%s"]}'; // JSON object to be sent to docsbox to specify the file format
 
 	const DEFAULT_FORMAT = 'pdf'; // Default supported format
 
@@ -50,7 +50,7 @@ class DocsboxLib
 		if (($format == null) || ($format != null && ctype_space($format) === true)) $format = self::DEFAULT_FORMAT;
 
 		// Posts the file to docsbox
-		$queueId = self::_postFile($inputFileName);
+		$queueId = self::_postFile($inputFileName, $format);
 		// If an error occurred
 		if ($queueId == null) return self::ERROR;
 
@@ -60,7 +60,7 @@ class DocsboxLib
 		if ($resultUrl == null) return self::ERROR;
 
 		// Download and rename the converted file
-		$downloaded = self::_downloadFile($resultUrl, $outputFileName);
+		$downloaded = self::_downloadFile($inputFileName, $resultUrl, $outputFileName, $format);
 		// If an error occurred
 		if (!$downloaded) return self::ERROR;
 
@@ -74,7 +74,7 @@ class DocsboxLib
 	 * Posts the given file to a Docsboxserver and checks the response to return a valid queue id
 	 * On failure it returns a null value
 	 */
-	private static function _postFile($inputFileName)
+	private static function _postFile($inputFileName, $format)
 	{
 		$queueId = null;
 
@@ -82,8 +82,14 @@ class DocsboxLib
 		{
 			// Posts the given file and expects a response in JSON format
 			$postFileResponse = \Httpful\Request::post(DOCSBOX_SERVER.DOCSBOX_PATH_API)
-				->attach(array('file' => $inputFileName))
+				->sendsType(\Httpful\Mime::FORM)
 				->expectsJson()
+				->body(
+					array(
+						'options' => sprintf(self::JSON_FORMATS, $format)
+					)
+				)
+				->attach(array('file' => $inputFileName))
 				->send();
 
 			// Checks that:
@@ -221,7 +227,7 @@ class DocsboxLib
 	/**
 	 * Download the converted file using the provided URL, unzip it, and renames it into the provided file name
 	 */
-	private static function _downloadFile($resultUrl, $outputFileName)
+	private static function _downloadFile($inputFileName, $resultUrl, $outputFileName, $format)
 	{
 		$downloaded = false; // pessimistic assumption
 
@@ -253,7 +259,7 @@ class DocsboxLib
 						// Opened, extracted and closed!
 
 						// Rename the extracted file to the given output file name
-						if (rename($outputDirectory.'/'.self::OUTPUT_FILENAME, $outputFileName))
+						if (@rename($inputFileName.'.'.$format, $outputFileName))
 						{
 							$downloaded = true;
 						}
@@ -261,7 +267,7 @@ class DocsboxLib
 						{
 							error_log(
 								'An error occurred while renaming the extracted file: '.
-								$outputDirectory.'/'.self::OUTPUT_FILENAME.' into: '.
+								$inputFileName.'.'.$format.' into: '.
 								$outputFileName
 							);
 						}

application/models/CL/Drawio_model.php

@@ -0,0 +1,170 @@
+<?php
+/* Copyright (C) 2024 fhcomplete.net
+ *
+ * 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.
+ *
+ */
+
+class Drawio_model extends CI_Model
+{
+	/**
+	 *
+	 */
+	public function renderFileStart($pages=1, $agent='FH-Complete', $timemodified='now')
+	{
+		$modified = (new DateTime($timemodified, new DateTimeZone('UTC')))->format(DateTime::ATOM);
+
+		echo <<<HEADER
+	<mxfile modified="{$modified}" host="Electron" agent="{$agent}" type="device" pages="{$pages}">
+HEADER;
+	}
+
+	/**
+	 *
+	 */
+	public function renderFileEnd()
+	{
+		echo <<<FOOTER
+</mxfile>
+FOOTER;
+	}
+
+	/**
+	 *
+	 */
+	public function renderDiagramStart($diagram_id, $diagram_bezeichnung)
+	{
+		$bezeichnung = htmlspecialchars($diagram_bezeichnung);
+
+		echo <<<STARTDIAGRAMM
+  <diagram id="diagram_{$diagram_id}" name="{$bezeichnung}">
+	<mxGraphModel dx="1177" dy="687" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+	  <root>
+		<mxCell id="0" />
+		<mxCell id="1" parent="0" />
+STARTDIAGRAMM;
+	}
+
+	/**
+	 *
+	 */
+	public function renderDiagramEnd()
+	{
+		echo <<<ENDDIAGRAMM
+	  </root>
+	</mxGraphModel>
+  </diagram>
+ENDDIAGRAMM;
+	}
+
+	/**
+	 *
+	 */
+	public function renderCell($id, $value, $x, $y, $width, $height)
+	{		
+		echo <<<OE
+	<mxCell id="{$id}" value="{$value}" parent="1" vertex="1">
+		<mxGeometry x="{$x}" y="{$y}" width="{$width}" height="{$height}" as="geometry" />
+	</mxCell>
+OE;
+	}
+
+	/**
+	 *
+	 */
+	public function renderEdge($source, $target, $exitX, $exitY, $entryX, $entryY, $points=array())
+	{
+		if( count($points) > 0 )
+		{
+			$pointsxml = '';
+			foreach($points as $point)
+			{
+				$pointsxml .= <<<EOPOINT
+			  <mxPoint x="{$point->x}" y="{$point->y}" />			
+EOPOINT;
+			}
+
+		$edgegeom = <<<EDGEPOINTS
+	  <mxGeometry relative="1" as="geometry">
+		<Array as="points">
+			{$pointsxml}
+		</Array>
+	  </mxGeometry>
+EDGEPOINTS;
+		}
+		else
+		{
+			$edgegeom = '	  <mxGeometry relative="1" as="geometry" />';
+		}
+
+		echo <<<EDGE
+	<mxCell id="edge_{$source}_{$target}" value="" style="edgeStyle=elbowEdgeStyle;elbow=vertical;sourcePerimeterSpacing=0;targetPerimeterSpacing=0;startArrow=none;endArrow=none;rounded=0;curved=0;exitX={$exitX};exitY={$exitY};exitDx=0;exitDy=0;entryX={$entryX};entryY={$entryY};entryDx=0;entryDy=0;" parent="1" source="{$source}" target="{$target}" edge="1">
+{$edgegeom}
+	</mxCell>
+EDGE;
+	}
+
+	/**
+	 *
+	 */
+	public function renderSemesterLabel($id, $sem, $ects, $x, $y, $width, $height) 
+	{
+		echo <<<RENDERSEM
+			<mxCell id="{$id}" value="&lt;b&gt;{$sem}. Semester&lt;br&gt;&lt;/b&gt;&lt;div style=&quot;text-align: left;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;{$ects} ECTS&lt;/span&gt;&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+	  <mxGeometry x="{$x}" y="{$y}" width="{$width}" height="{$height}" as="geometry" />
+		</mxCell>
+RENDERSEM;
+	}
+
+	/**
+	 *
+	 */
+	public function renderModulList($listid, $mod, $x, $y, $ects_width, $lv_height)
+	{	
+		$width = ceil($mod->ects * $ects_width);
+		$height = (count($mod->childs) + 1) * $lv_height;
+		$modul_ects = (int) $mod->ects;
+
+		echo <<<RENDERMOD
+		<mxCell id="{$listid}" value="{$mod->bezeichnung} ({$modul_ects})" style="swimlane;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize={$lv_height};horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=0;marginBottom=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+		  <mxGeometry x="{$x}" y="{$y}" width="{$width}" height="{$height}" as="geometry">
+			<mxRectangle x="{$x}" y="{$y}" width="{$width}" height="{$height}" as="alternateBounds" />
+		  </mxGeometry>
+		</mxCell>
+RENDERMOD;
+
+		$childnumber = 0;
+
+		foreach ($mod->childs as $child)
+		{
+			$childnumber++;
+			$childid = uniqid();
+			$childheight = $childnumber * $lv_height;
+			$child_ects = (int) $child->ects;
+
+			echo <<<RENDERMODFOR
+			<mxCell id="{$childid}" value="{$child->bezeichnung} ({$child_ects})" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" vertex="1" parent="{$listid}">
+		  <mxGeometry y="{$childheight}" width="{$width}" height="{$lv_height}" as="geometry" />
+	  </mxCell>
+RENDERMODFOR;
+		}
+
+		return (object) array(
+			'width'	=> $width,
+			'height' => $height
+		);
+	}
+}
+

cis/testtool/login.php

@@ -632,6 +632,7 @@ elseif (isset($prestudent_id))
 
 				$ps_obj->lastStatus = $ps_tmp->status_kurzbz; // letzten Status dem result array hinzufügen
 				$ps_obj->status_mehrsprachig = $ps_tmp->status_mehrsprachig;
+				$ps_obj->ausbildungssemester = $ps_tmp->ausbildungssemester;
 			}
 
 			// Falls Status 'Abgewiesene' vorhanden, nach hinten reihen

cis/testtool/menu.php

@@ -29,6 +29,7 @@ require_once('../../include/sprache.class.php');
 require_once '../../include/phrasen.class.php';
 require_once '../../include/studiengang.class.php';
 require_once('../../include/gebiet.class.php');
+require_once('../../include/gebiet_pruefling.class.php');
 
 if (!$db = new basis_db())
 	die('Fehler beim Oeffnen der Datenbankverbindung');
@@ -198,8 +199,8 @@ else if (isset($_SESSION['pruefling_id']))
 		)
 
 
-		SELECT DISTINCT ON
-			(gebiet_id, semester, reihung)
+		SELECT * FROM (SELECT DISTINCT ON
+			(gebiet_id)
 			semester,
 			gebiet_id,
 			STRING_AGG(studiengang_kz::TEXT, ', ' ORDER BY studiengang_kz) AS studiengang_kz_list,
@@ -226,13 +227,7 @@ else if (isset($_SESSION['pruefling_id']))
 				JOIN
 					testtool.tbl_gebiet USING (gebiet_id)
 				WHERE
-					(
-						(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
-						OR
-						(prestudent_data.semester= 2 AND tbl_ablauf.semester = 2)
-						OR
-						(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
-					)
+					tbl_ablauf.semester <= prestudent_data.semester
 				AND (   
 						prestudent_data.studienplan_id = tbl_ablauf.studienplan_id
 						OR
@@ -259,9 +254,7 @@ else if (isset($_SESSION['pruefling_id']))
 				JOIN
 					testtool.tbl_gebiet USING (gebiet_id)
 				WHERE
-					(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
-				OR
-					(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
+					tbl_ablauf.semester <= prestudent_data.semester
 				)
 			) temp
 		) temp2
@@ -270,7 +263,7 @@ else if (isset($_SESSION['pruefling_id']))
 			semester,
 			 gebiet_id,
 			 bezeichnung,
-			". $bezeichnung_mehrsprachig_sel ." 
+			". $bezeichnung_mehrsprachig_sel ." ) temp3
 
 		ORDER BY
 			semester,
@@ -283,6 +276,8 @@ else if (isset($_SESSION['pruefling_id']))
 	$lastsemester = '';
 	$quereinsteiger_stg = '';
 	$_SESSION['alleGebiete']= [];
+	$gebiet_pruefling = new gebiet_pruefling();
+	$quereinsteiger_menu = false;
 	while($row = $db->db_fetch_object($result))
 	{
 		//Jedes Semester in einer eigenen Tabelle anzeigen
@@ -294,8 +289,25 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;
 
-			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
-			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
+			if ($row->semester == '1')
+			{
+				// Basisgebiete anzeigen
+				echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+				echo '<tr><td class="HeaderTesttool">' . $p->t('testtool/basisgebiete') . '</td></tr>';
+			}
+			else
+			{
+				if (!$quereinsteiger_menu)
+				{
+					echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+					echo '<tr><td class="HeaderTesttool">' . $p->t('testtool/quereinstiegsgebiete') . '</td></tr>';
+					$quereinsteiger_menu = true;
+				}
+				else
+				{
+					echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+				}
+			}
 		}
 
 		// Bei Quereinstiegsgebieten nach STG clustern und die STG anzeigen
@@ -394,6 +406,12 @@ else if (isset($_SESSION['pruefling_id']))
 						</td>
 					<!--<td width="10" class="ItemTesttoolRight" nowrap>&nbsp;</td>-->
 					</tr>';
+			if (!$gebiet_pruefling->checkIfExists($_SESSION['pruefling_id'], $row->gebiet_id))
+			{
+				$gebiet_pruefling->pruefling_id = $_SESSION['pruefling_id'];
+				$gebiet_pruefling->gebiet_id = $row->gebiet_id;
+				$gebiet_pruefling->saveGebietForPruefling();
+			}
 			$_SESSION['alleGebiete'][] = $row->gebiet_id;
 		}
 		else

include/dokument_export.class.php

@@ -287,6 +287,7 @@ class dokument_export
 		{
 			case 'pdf':
 			case 'doc':
+			case 'docx':
 				$ret = 0;
 				$this->temp_filename = $this->temp_folder . '/out.' . $this->outputformat;
 
@@ -369,6 +370,11 @@ class dokument_export
 					header('Content-Disposition: attachment; filename="'.$this->filename.'.doc"');
 					header('Content-Length: '.$fsize);
 					break;
+				case 'docx':
+					header('Content-type: application/vnd.ms-word');
+					header('Content-Disposition: attachment; filename="'.$this->filename.'.docx"');
+					header('Content-Length: '.$fsize);
+					break;
 
 				case 'odt':
 					header('Content-type: application/vnd.oasis.opendocument.text');

include/gebiet_pruefling.class.php

@@ -0,0 +1,97 @@
+<?php
+/* Copyright (C) 2024 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.
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+
+class gebiet_pruefling extends basis_db
+{
+	//Tabellenspalten
+	public $prueflinggebiet_id;
+	public $pruefling_id;
+	public $gebiet_id;
+	public $insertamum;
+
+
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function loadByPruefling($pruefling_id)
+	{
+		$qry = "SELECT *
+     			FROM testtool.tbl_pruefling_gebiet
+     			WHERE pruefling_id = ".$this->db_add_param($pruefling_id, FHC_INTEGER);
+
+		if($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				$this->prueflinggebiet_id = $row->prueflinggebiet_id;
+				$this->pruefling_id = $row->pruefling_id;
+				$this->gebiet_id = $row->gebiet_id;
+				return true;
+			}
+			else
+			{
+				$this->errormsg = "Pruefling nicht gefunden";
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = "Fehler beim Laden der Gebiete für den Pruefling";
+			return false;
+		}
+	}
+
+	public function checkIfExists($pruefling_id, $gebiet_id)
+	{
+		$qry = "SELECT 1 
+				FROM testtool.tbl_pruefling_gebiet 
+				WHERE pruefling_id =".$this->db_add_param($pruefling_id, FHC_INTEGER) ." AND gebiet_id =".$this->db_add_param($gebiet_id, FHC_INTEGER);
+
+		if ($result = $this->db_query($qry))
+		{
+			if ($this->db_num_rows($result) > 0)
+				return true;
+			else
+				return false;
+		}
+	}
+
+	public function saveGebietForPruefling()
+	{
+		$qry = "INSERT INTO testtool.tbl_pruefling_gebiet 
+    					(pruefling_id, gebiet_id)
+				VALUES(".
+			$this->db_add_param($this->pruefling_id, FHC_INTEGER).','.
+			$this->db_add_param($this->gebiet_id, FHC_INTEGER).');';
+
+		if ($this->db_query($qry))
+		{
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return true;
+		}
+	}
+
+}
+?>

public/js/apps/Cis/Cis.js

@@ -19,6 +19,7 @@ import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.j
 import Studium from "../../components/Cis/Studium/Studium.js";
 import StgOrgLvPlan from "../../components/Cis/LvPlan/StgOrg.js";
 import OtherLvPlan from "../../components/Cis/LvPlan/OtherLvPlan.js";
+import Compat from "../../components/Cis/Compat.js";
 
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
 import {capitalize} from "../../helpers/StringHelpers.js";
@@ -29,6 +30,18 @@ const isMobile = window.matchMedia("(max-width: 767px)").matches;
 const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(`/${ciPath}`),
 	routes: [
+		{
+			path: `/Cis/Compat/:mode(ci|legacy)/:path(.*)`,
+			name: 'Compat',
+			component: Compat,
+			props: (route) => {
+				return {
+					mode: route.params.mode,
+					path: route.params.path,
+					query_string: VueRouter.stringifyQuery(route.query)
+				};
+			}
+		},
 		{
 			path: `/Cis/Studium`,
 			name: 'Studium',
@@ -277,7 +290,7 @@ const app = Vue.createApp({
 			if (target && this.isInternalRoute(target.href)) {
 				const url = new URL(target.href)
 				
-				const path = url.pathname
+				const path = url.pathname + url.search;
 				const base = this.$router.options.history.base
 				const route = path.replace(base, '') || '/'
 

public/js/components/Cis/Compat.js

@@ -0,0 +1,93 @@
+export default {
+	name: "Compat",
+	props: {
+		mode: { type: String, required: true },
+		path: { type: String, required: true },
+		query_string: { type: String, required: true, default: ''}
+	},
+	data: function() {
+		return {
+			lastLoadediFrameURL: '',
+			srcUrl: ''
+		};
+	},
+	computed: {
+		propsWatchHelper: function() {
+			return this.mode + '#' + this.path + '#' + this.query_string;
+		}
+	},
+	mounted: function() {
+		this.srcUrl = this.buildSrcUrl();
+	},
+	watch: {
+		propsWatchHelper: function() {
+			if(this.lastLoadediFrameURL === '') {
+				return;
+			}
+
+			let currentiFrameURL = this.$refs.compatiframe ? this.$refs.compatiframe.src : '';
+
+			let url = this.buildSrcUrl();
+			if(this.lastLoadediFrameURL !== url) {
+				this.srcUrl = url;
+				if(this.srcUrl === url) {
+					this.$refs.compatiframe.contentWindow.location.href = url;
+				}
+			}
+		}
+	},
+	methods: {
+		buildSrcUrl: function() {
+			let url = false;
+			switch(this.mode) {
+				case 'ci':
+					url = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/' + this.path;
+					break;
+				case 'legacy':
+					url = FHC_JS_DATA_STORAGE_OBJECT.app_root + this.path;
+					break;
+				default:
+					url = false;
+			}
+			if(this.query_string !== '' && url) {
+				url += '?' + this.query_string;
+			}
+
+			return url;
+		},
+		loadHandler: function() {
+			let iframe_href = this.$refs.compatiframe.contentWindow.location.href;
+			let ci_urlstart = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/';
+			let legacy_urlstart = FHC_JS_DATA_STORAGE_OBJECT.app_root;
+			let routerpath = null;
+
+			this.lastLoadediFrameURL = iframe_href;
+
+			if(iframe_href.startsWith(ci_urlstart)) {
+				routerpath = iframe_href.replace(
+					ci_urlstart, '/Cis/Compat/ci/');
+			} else if(iframe_href.startsWith(legacy_urlstart)) {
+				routerpath = iframe_href.replace(
+					legacy_urlstart, '/Cis/Compat/legacy/');
+			} else {
+				return;
+			}
+
+			if(this.$route.fullPath !== routerpath) {
+				this.$router.push(routerpath);
+			}
+		}
+	},
+	template: `
+		<div class="w-100">
+			<iframe
+				ref="compatiframe"
+				v-if="srcUrl"
+				:src="srcUrl"
+				@load="loadHandler"
+				style="width:100%; height:90vh; border:0; display:block;"
+			></iframe>
+		<div v-else class="alert alert-warning">Keine URL gefunden.</div>
+		</div>
+	`
+};

public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js

@@ -2,15 +2,16 @@ export default {
 	props: {
 		data: {
 			type: String,
-		}
+		},
 	},
 	data() {
-		return {}
+		return {};
 	},
-	template: /*html*/`
+	template: /*html*/ `
     <div class="card">
         <div class="card-body">
-            <span  >{{$p.t('profil','fhAusweisStatus',[data])}}</span>
+            <span v-if="data">{{$p.t('profil','fhAusweisStatus',[data])}}</span>
+			<span v-else>{{$p.t('profil','fhAusweisStatusNichtAusgegeben')}}</span>
         </div>
     </div>`,
-}
+};

public/js/components/DetailHeader/DetailHeader.js

@@ -542,10 +542,10 @@ export default {
 
 		<template v-if="typeHeader==='mitarbeiter'">
 
-				<div class="foto-container col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 mt-3 position-relative" style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
+				<div class="foto-container d-flex flex-column align-items-center h-100 position-relative d-inline-block">
 					<img
-					  class="d-block w-100 h-100 rounded"
-					  style="height: 84px; object-fit: contain;"
+					  class="d-block rounded"
+					  style="height: 96px;"
 					  alt="Profilbild"
 					  :src="getFotoSrc(headerDataMa.foto)"
 					/>
@@ -558,15 +558,13 @@ export default {
 					<template v-if="fotoEditable">
 						<button
 							type="button"
-							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
-							style="z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
+							class="fotoedit buttonleft btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
 							@click="showDeleteModal(person_id)">
 							<i class="fa fa-xmark"></i>
 						</button>
 						<button
 							type="button"
-							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
-							style="z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
+							class="fotoedit buttonright btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
 							@click="showModal(person_id)">
 							<i class="fa fa-pen"></i>
 						</button>

system/dbupdate_3.4.php

@@ -102,6 +102,8 @@ require_once('dbupdate_3.4/75959_StudVw_Automatische_Tags.php');
 require_once('dbupdate_3.4/76160_lvv_favorites.php');
 require_once('dbupdate_3.4/77080_tabulator_presets_table.php');
 require_once('dbupdate_3.4/78292_gehaltsanpassungtyp.php');
+require_once('dbupdate_3.4/54225_reihungstest_ablauf_fuer_quereinsteiger.php');
+
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -253,7 +255,7 @@ $tabellen=array(
 	"hr.tbl_lohnguide_modellfunktion" => array("modellfunktion_kurzbz", "bezeichnung", "jobfamilie_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
 	"hr.tbl_lohnguide_modellstelle" => array("modellstelle_kurzbz", "bezeichnung", "grade", "modellfunktion_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
 	"hr.tbl_lohnguide_fachrichtung" => array("fachrichtung_kurzbz", "bezeichnung", "aktiv", "insertvon", "insertamum", "updatevon", "updateamum"),
-	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "vordienstzeit", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),	
+	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "vordienstzeit", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),
 	"lehre.tbl_abschlussbeurteilung"  => array("abschlussbeurteilung_kurzbz","bezeichnung","bezeichnung_english","sort"),
 	"lehre.tbl_abschlusspruefung"  => array("abschlusspruefung_id","student_uid","vorsitz","pruefer1","pruefer2","pruefer3","abschlussbeurteilung_kurzbz","akadgrad_id","pruefungstyp_kurzbz","datum","uhrzeit","sponsion","anmerkung","updateamum","updatevon","insertamum","insertvon","ext_id","note","protokoll","endezeit","pruefungsantritt_kurzbz","freigabedatum"),
 	"lehre.tbl_abschlusspruefung_antritt"  => array("pruefungsantritt_kurzbz","bezeichnung","bezeichnung_english","sort"),
@@ -421,6 +423,7 @@ $tabellen=array(
 	"testtool.tbl_pruefling_frage"  => array("prueflingfrage_id","pruefling_id","frage_id","nummer","begintime","endtime"),
 	"testtool.tbl_frage_sprache"  => array("frage_id","sprache","text","bild","audio","insertamum","insertvon","updateamum","updatevon"),
 	"testtool.tbl_vorschlag_sprache"  => array("vorschlag_id","sprache","text","bild","audio","insertamum","insertvon","updateamum","updatevon"),
+	"testtool.tbl_pruefling_gebiet"  => array("prueflinggebiet_id","pruefling_id","gebiet_id","insertamum"),
 	"system.tbl_app" => array("app"),
 	"system.tbl_appdaten" => array("appdaten_id","uid","app","appversion","version","bezeichnung","daten","freigabe","insertamum","insertvon","updateamum","updatevon"),
 	"system.tbl_cronjob"  => array("cronjob_id","server_kurzbz","titel","beschreibung","file","last_execute","aktiv","running","jahr","monat","tag","wochentag","stunde","minute","standalone","reihenfolge","updateamum", "updatevon","insertamum","insertvon","variablen"),

system/dbupdate_3.4/54225_reihungstest_ablauf_fuer_quereinsteiger.php

@@ -0,0 +1,41 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Creates table public.tbl_notiz_typ if it doesn't exist and grants privileges
+if (!$result = @$db->db_query('SELECT 1 FROM testtool.tbl_pruefling_gebiet LIMIT 1'))
+{
+	$qry = 'CREATE TABLE testtool.tbl_pruefling_gebiet
+			(
+				prueflinggebiet_id integer NOT NULL,
+				pruefling_id integer NOT NULL,
+				gebiet_id integer NOT NULL,
+				insertamum timestamp DEFAULT now()
+			);
+			
+			ALTER TABLE testtool.tbl_pruefling_gebiet OWNER TO fhcomplete;
+			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT pk_tbl_pruefling_gebiet PRIMARY KEY (prueflinggebiet_id);
+			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT fk_tbl_pruefling_gebiet_pruefling_id FOREIGN KEY (pruefling_id) REFERENCES testtool.tbl_pruefling(pruefling_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT fk_tbl_pruefling_gebiet_gebiet_id FOREIGN KEY (gebiet_id) REFERENCES testtool.tbl_gebiet(gebiet_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+			CREATE SEQUENCE testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq
+				START WITH 1
+				INCREMENT BY 1
+				NO MINVALUE
+				NO MAXVALUE
+				CACHE 1;
+
+			ALTER TABLE testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq OWNER TO fhcomplete;
+			ALTER TABLE testtool.tbl_pruefling_gebiet ALTER COLUMN prueflinggebiet_id SET DEFAULT nextval(\'testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq\');
+
+			GRANT SELECT, UPDATE, INSERT, DELETE ON testtool.tbl_pruefling_gebiet TO web;
+			GRANT SELECT, UPDATE, INSERT, DELETE ON testtool.tbl_pruefling_gebiet TO vilesci;
+			GRANT SELECT, UPDATE ON testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq TO vilesci;
+			GRANT SELECT, UPDATE ON testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq TO web;
+			';
+
+	if (!$db->db_query($qry))
+		echo '<strong>public.tbl_pruefling_gebiet: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>public.tbl_pruefling_gebiet table created';
+}
+

system/phrasesupdate.php

@@ -19829,6 +19829,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'massnahmeneinmalig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Maßnahme ist nur einmalig planbar.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This measure may only be planned once.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -20609,6 +20629,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'personenMassnahmen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'alle Maßnahmen der Personen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => ' all measures of the people',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -20689,6 +20729,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'einmalig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur einmal planbar',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'One-time only',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'erroreinmalig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Maßnahme kann nur einmal geplant werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This measure can only be planned once.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'gruppenmanagement',
@@ -29363,6 +29443,26 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'fhAusweisStatusNichtAusgegeben',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Der FH Ausweis wurde noch nicht ausgegeben.',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'The FH ID card has not been issued yet.',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profil',

vilesci/stammdaten/auswertung_fhtw.php

@@ -251,6 +251,31 @@ if ($deleteSingleResult)
 			exit();
 		}
 
+		$qry = "SELECT * FROM testtool.tbl_pruefling_gebiet
+				WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id) . " AND gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "";
+
+		if ($db->db_query($qry))
+		{
+			while ($row = $db->db_fetch_object())
+			{
+				$undo .= " INSERT INTO testtool.tbl_pruefling_gebiet(prueflinggebiet_id,pruefling_id,gebiet_id, insertamum) VALUES (" .
+					$db->db_add_param($row->prueflinggebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->pruefling_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->gebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->insertamum) . ');';
+			}
+		}
+		else
+		{
+			$db->db_query('ROLLBACK');
+			echo json_encode(array(
+				'status' => 'fehler',
+				'msg' => 'Fehler beim Erstellen des UNDO Befehls fuer testtool.tbl_pruefling_gebiet'
+			));
+			exit();
+		}
+
+
 		//Antworten loeschen
 		$qry = "DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . " AND
 				frage_id IN (SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . ");
@@ -258,7 +283,9 @@ if ($deleteSingleResult)
 				DELETE FROM testtool.tbl_antwort
 				WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id) . " AND
 				vorschlag_id IN (SELECT vorschlag_id FROM testtool.tbl_vorschlag WHERE frage_id IN
-				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "));";
+				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "));
+				
+				DELETE FROM testtool.tbl_pruefling_gebiet where pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . " AND gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . ";";
 
 		if ($result = $db->db_query($qry))
 		{
@@ -388,9 +415,35 @@ if ($deleteAllResults)
 			exit();
 		}
 
+		$qry = "SELECT * FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . ";
+				";
+
+		if ($db->db_query($qry))
+		{
+			while ($row = $db->db_fetch_object())
+			{
+				$undo .= " INSERT INTO testtool.tbl_pruefling_gebiet(prueflinggebiet_id,pruefling_id,gebiet_id,insertamum) VALUES (" .
+					$db->db_add_param($row->prueflinggebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->pruefling_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->gebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->insertamum) . ');';
+			}
+		}
+		else
+		{
+			$db->db_query('ROLLBACK');
+			echo json_encode(array(
+				'status' => 'fehler',
+				'msg' => 'Fehler beim Erstellen des UNDO Befehls fuer testtool.tbl_pruefling_gebiet'
+			));
+			exit();
+		}
+
+
 		//Antworten loeschen
 		$qry = "	DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
-					DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
+					DELETE FROM testtool.tbl_antwort where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
+					DELETE FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
 
 		if ($result = $db->db_query($qry))
 		{

vilesci/stammdaten/reihungstest_administration.php

@@ -402,7 +402,10 @@ if(isset($_POST['deleteteilgebiet']))
 				DELETE FROM testtool.tbl_antwort
 				WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id)." AND
 				vorschlag_id IN (SELECT vorschlag_id FROM testtool.tbl_vorschlag WHERE frage_id IN
-				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($_POST['gebiet'])."));";
+				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($_POST['gebiet'])."));
+				
+				DELETE FROM testtool.tbl_pruefling_gebiet
+				WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id)." AND gebiet_id=".$db->db_add_param($_POST['gebiet']).";";
 
 		if($result = $db->db_query($qry))
 		{
@@ -497,7 +500,8 @@ if(isset($_POST['delete_all']))
 		}
 		//Gebiet loeschen
 		$qry = "DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
-				DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
+				DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
+				DELETE FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
 
 		if($result = $db->db_query($qry))
 		{