lvverwaltung: vilesci lehrveranstaltung verwaltung verlinkt

- event hinzugefuegt damit tabs erweitert werden können
- berichte hinzugefuegt

application/controllers/api/frontend/v1/lv/Setup.php

@@ -19,6 +19,8 @@
 if (!defined('BASEPATH'))
 	exit('No direct script access allowed');
 
+use CI3_Events as Events;
+
 class Setup extends FHCAPI_Controller
 {
 	private $_ci;
@@ -65,6 +67,11 @@ class Setup extends FHCAPI_Controller
 			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Notiz.js'),
 			'config' => []
 		);
+
+		Events::trigger('lvv_conf_tabs', function & () use (&$tabs) {
+			return $tabs;
+		});
+
 		$this->terminateWithSuccess($tabs);
 	}
 

application/controllers/api/frontend/v1/stv/Vertrag.php

@@ -76,9 +76,7 @@ class Vertrag extends FHCAPI_Controller
 
 		if (isError($allOe)) $this->terminateWithError(getError($allOe), self::ERROR_TYPE_GENERAL);
 
-		$allOe = hasData($allOe) ? getData($allOe) : [];
-
-		$this->addMeta('oe', $allOe);
+		$allOe = hasData($allOe) ? array_column(getData($allOe), 'oe_kurzbz') : [];
 
 		// * then check if the user has permissions to cancel the corresponding lv-organisational units
 		if (!$this->permissionlib->isBerechtigtMultipleOe('admin', $allOe, 'suid') &&

application/controllers/lehre/lehrauftrag/Lehrauftrag.php

@@ -109,7 +109,7 @@ class Lehrauftrag extends Auth_Controller
         $studiensemester_kurzbz = $this->input->get('studiensemester'); // if provided by selected studiensemester
         if (is_null($studiensemester_kurzbz)) // else set next studiensemester as default value
         {
-            $studiensemester = $this->StudiensemesterModel->getAktOrNextSemester(62);
+            $studiensemester = $this->StudiensemesterModel->getAktOrNextSemester();
             if (hasData($studiensemester))
             {
                 $studiensemester_kurzbz = $studiensemester->retval[0]->studiensemester_kurzbz;

application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php

@@ -75,7 +75,7 @@ class LehrauftragAkzeptieren extends Auth_Controller
 		$studiensemester_kurzbz = $this->input->get('studiensemester'); // if provided by selected studiensemester
 		if (is_null($studiensemester_kurzbz)) // else set next studiensemester as default value
 		{
-			$studiensemester = $this->StudiensemesterModel->getAktOrNextSemester(62);
+			$studiensemester = $this->StudiensemesterModel->getAktOrNextSemester();
 			if (hasData($studiensemester))
 			{
 				$studiensemester_kurzbz = $studiensemester->retval[0]->studiensemester_kurzbz;

application/controllers/lehre/lehrauftrag/LehrauftragErteilen.php

@@ -91,7 +91,7 @@ class LehrauftragErteilen extends Auth_Controller
         $studiensemester_kurzbz = $this->input->get('studiensemester'); // if provided by selected studiensemester
         if (is_null($studiensemester_kurzbz)) // else set next studiensemester as default value
         {
-            $studiensemester = $this->StudiensemesterModel->getAktOrNextSemester(62);
+            $studiensemester = $this->StudiensemesterModel->getAktOrNextSemester();
             if (hasData($studiensemester))
             {
                 $studiensemester_kurzbz = $studiensemester->retval[0]->studiensemester_kurzbz;

application/models/organisation/Studienjahr_model.php

@@ -53,9 +53,11 @@ class Studienjahr_model extends DB_Model
 	 * @param int $days
 	 * @return array|stdClass|null
 	 */
-	public function getLastOrAktStudienjahr($days = 0)
+	public function getLastOrAktStudienjahr($days = 60)
 	{
-		$days = is_numeric($days) ? $this->escape($days) : 0;
+		if (!is_numeric($days)) {
+			$days = 60;
+		}
 
 		$query = '
 			SELECT *
@@ -75,25 +77,19 @@ class Studienjahr_model extends DB_Model
 	 * @param int $days
 	 * @return array|stdClass|null
 	 */
-	public function getAktOrNextStudienjahr($days = 0)
+	public function getAktOrNextStudienjahr($days = 62)
 	{
-		$days = is_numeric($days) ? $this->escape($days) : 0;
+		if (!is_numeric($days)) {
+			$days = 62;
+		}
 
 		$query = '
-				SELECT * FROM (
-					SELECT
-						jahr.*, MIN(sem.start) AS beginn,  MAX(sem.ende) AS ende
-					FROM
-						public.tbl_studienjahr jahr
-						JOIN public.tbl_studiensemester sem using(studienjahr_kurzbz)
-					GROUP BY
-						studienjahr_kurzbz
-				) jahre
-				WHERE
-					ende >= NOW() + \'' . $days . ' DAYS\'::INTERVAL
-				ORDER BY
-					ende
-				LIMIT 1
+			SELECT *
+			FROM public.tbl_studienjahr
+			JOIN public.tbl_studiensemester using(studienjahr_kurzbz)
+			WHERE start < NOW() + \'' . $days . ' DAYS\'::INTERVAL
+			ORDER by start DESC
+			LIMIT 1
 		';
 
 		return $this->execQuery($query);

application/models/organisation/Studiensemester_model.php

@@ -45,44 +45,39 @@ class Studiensemester_model extends DB_Model
 
 	/**
 	 * getLastOrAktSemester
-	 * @param $days offset in days, if last semester should be returned instead of current
 	 */
-	public function getLastOrAktSemester($days = 0)
+	public function getLastOrAktSemester($days = 60)
 	{
-		if (!is_numeric($days)) $days = 0;
+		if (!is_numeric($days))
+		{
+			$days = 60;
+		}
 
-		$query = '
-			SELECT
-				studiensemester_kurzbz, start, ende
-			FROM
-				public.tbl_studiensemester
-			WHERE
-				start < NOW() - \'' . $this->escape($days) . ' DAYS\'::INTERVAL
-			ORDER
-				BY start DESC
-			LIMIT 1';
+		$query = 'SELECT studiensemester_kurzbz, start, ende
+					FROM public.tbl_studiensemester
+				   WHERE start < NOW() - \'' . $days . ' DAYS\'::INTERVAL
+				ORDER BY start DESC
+				   LIMIT 1';
 
 		return $this->execQuery($query);
 	}
 
 	/**
-	 * Returns current semester, or next
-	 * @param $days offset in days, if next semester should be returned earlier
+	 * getNextOrAktSemester
+	 * 62 days - in july and august, semester after summer is returned
 	 */
-	public function getAktOrNextSemester($days = 0)
+	public function getAktOrNextSemester($days = 62)
 	{
-		$days = is_numeric($days) ? $this->escape($days) : 0;
+		if (!is_numeric($days))
+		{
+			$days = 62;
+		}
 
-		$query = "
-			SELECT
-				studiensemester_kurzbz, start, ende
-			FROM
-				public.tbl_studiensemester
-			WHERE
-				ende >= NOW() + '". $this->escape($days) . " DAYS'::INTERVAL
-			ORDER BY
-				ende
-			LIMIT 1;";
+		$query = 'SELECT studiensemester_kurzbz, start, ende
+					FROM public.tbl_studiensemester
+					WHERE start < NOW() + \'' . $days . ' DAYS\':: INTERVAL
+					ORDER BY start DESC
+					LIMIT 1';
 
 		return $this->execQuery($query);
 	}
@@ -182,19 +177,15 @@ class Studiensemester_model extends DB_Model
 	 */
 	public function getByDate($date)
 	{
-		// gets the studiensemster of a date or the closest previous studiensemester if a date is not within a studiensemester
+		// gets the studiensemster of a date or the next closest previous studiensemester if a date is not within a studiensemester
 		$query = "
-			SELECT
-				studiensemester_kurzbz, start, ende
-			FROM
-				public.tbl_studiensemester
-			WHERE
-				start <= ?::date
-			ORDER BY
-				start DESC
+			SELECT  studiensemester_kurzbz, start, ende
+			FROM	public.tbl_studiensemester
+			WHERE   ( ende >= ?::date AND start <= ?::date ) OR ( ende >= ?::date + '-45 days'::interval AND start <= ?::date + '-45 days'::interval )
+			ORDER BY start DESC
 			LIMIT 1";
 
-		return $this->execQuery($query, array($date));
+		return $this->execQuery($query, array($date,$date,$date,$date));
 	}
 
 	/**
@@ -209,13 +200,10 @@ class Studiensemester_model extends DB_Model
 			return success(array());
 
 		$query = "
-			SELECT *
-			FROM
-				public.tbl_studiensemester
-			WHERE
-				?::date < ende AND ?::date > start
-			ORDER BY
-				start DESC";
+			SELECT  *
+			FROM	public.tbl_studiensemester
+			WHERE   ( ?::date < ende AND ?::date > start )
+			ORDER BY start DESC";
 
 		return $this->execQuery($query, array($from, $to));
 	}
@@ -287,7 +275,7 @@ class Studiensemester_model extends DB_Model
 			$this->addLimit($minus);
 		$this->db->where('start <= NOW()', null, false);
 		$minus = $this->db->get_compiled_select($this->dbTable);
-
+		
 		$this->db->where_in($this->pk, '(' . $plus . ') UNION (' . $minus . ')', false);
 	}
 

application/models/ressource/Stundenplan_model.php

@@ -470,12 +470,12 @@ class Stundenplan_model extends DB_Model
 				}
 				foreach($studentlehrverbaende[$sem_date] as $key=>$lehrverband)
 				{
-					$query .= "((sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe)." AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
+					$query .= "(((sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe)." AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
 					// Eintraege fuer den ganzen Verband
 					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND (sp.gruppe is null OR sp.gruppe='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
 					// Eintraege fuer das ganze Semester
 					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND (sp.verband is null OR sp.verband='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)
-						." AND ".$this->escape($sem_date_range->ende).")". $stringGroupLv. ")";
+						." AND ".$this->escape($sem_date_range->ende).")) AND gruppe_kurzbz is null)";
 
 					$query .="OR";
 				}

application/models/system/Message_model.php

@@ -242,74 +242,89 @@ class Message_model extends DB_Model
 	 */
 	public function getMessagesForTable($person_id, $offset, $limit)
 	{
-		$sql_base = "
-			SELECT
+		$sql = <<<EOSQL
+			with filtered_messages as (
+				select
+					m.message_id, m.person_id as sender_id, mr.person_id as recipient_id
+				from
+					public.tbl_msg_message m
+				join
+					public.tbl_msg_recipient mr on mr.message_id = m.message_id
+				where
+					m.person_id = ?
+				group by
+					m.message_id, m.person_id, mr.person_id
+
+				union all
+
+				select
+					m.message_id, m.person_id as sender_id, mr.person_id as recipient_id
+				from
+					public.tbl_msg_message m
+				join
+					public.tbl_msg_recipient mr on mr.message_id = m.message_id
+				where
+					mr.person_id = ?
+				group by
+					m.message_id, m.person_id, mr.person_id
+
+			), lastmsgstatus as (
+				select
+					ms.*
+				from (
+						select
+							s.message_id, s.person_id, MAX(s.insertamum) as lastinserted
+						from
+							public.tbl_msg_status s
+						group by
+							s.message_id, s.person_id
+					) ls
+				join
+					public.tbl_msg_status ms on ms.message_id = ls.message_id and ms.person_id = ls.person_id and ms.insertamum = ls.lastinserted
+			)
+
+			select
+				(select count(*) from filtered_messages) as total_msgs,
 				m.message_id AS message_id,
 				m.subject AS subject,
 				m.body AS body,
 				m.insertamum AS insertamum,
 				m.relationmessage_id AS relationmessage_id,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = m.person_id) as sender,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
-				m.person_id as sender_id,
-				r.person_id as recipient_id,
-				MAX(ss.status) as status,
-				MAX(ss.insertamum) as statusdatum
-			FROM public.tbl_msg_message m
-				 JOIN public.tbl_msg_recipient r USING(message_id)
-				 JOIN public.tbl_msg_status ss ON(r.message_id = ss.message_id AND ss.person_id = r.person_id)
-			WHERE m.person_id = ?
-			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
-			UNION ALL
-			SELECT
-				m.message_id AS message_id,
-				m.subject AS subject,
-				m.body AS body,
-				m.insertamum AS insertamum,
-				m.relationmessage_id AS relationmessage_id,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = m.person_id) as sender,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
-				m.person_id as sender_id,
-				r.person_id as recipient_id,
-				MAX(ss.status) as status,
-				MAX(ss.insertamum) as statusdatum
-			FROM public.tbl_msg_recipient r
-				 JOIN public.tbl_msg_status ss USING(message_id, person_id)
-				 JOIN public.tbl_msg_message m USING(message_id)
-			WHERE r.person_id = ?
-			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
-				 ";
-		$sql = "
-			SELECT COUNT(*) AS count FROM (
-				" . $sql_base . "
-			) a
-				 ";
-
-		$parametersArray = array($person_id, $person_id);
-
-		$count = $this->execQuery($sql, $parametersArray);
-
-		if (isError($count))
-			return $count;
-
-		$count = ceil(current(getData($count))->count/$limit);
-		$sql = "
-			SELECT * FROM (
-				" . $sql_base . "
-			) a
-			ORDER BY insertamum DESC
-			LIMIT ?
-			OFFSET ?
-				 ";
+				(COALESCE(ps.titelpre,'') || ' ' || COALESCE(ps.vorname,'') || ' ' || COALESCE(ps.nachname,'') || ' ' || COALESCE(ps.titelpost,'')) as sender,
+				(COALESCE(pr.titelpre,'') || ' ' || COALESCE(pr.vorname,'') || ' ' || COALESCE(pr.nachname,'') || ' ' || COALESCE(pr.titelpost,'')) as recipient,
+				fm.sender_id,
+				fm.recipient_id,
+				ms.status,
+				ms.insertamum as statusdatum
+			from
+				filtered_messages fm
+			join
+				public.tbl_msg_message m on fm.message_id = m.message_id
+			join
+				lastmsgstatus ms on fm.message_id = ms.message_id and fm.recipient_id = ms.person_id
+			left join
+				public.tbl_person ps on ps.person_id = fm.sender_id
+			left join
+				public.tbl_person pr on pr.person_id = fm.recipient_id
+			order by
+				m.insertamum DESC
+			limit ?
+			offset ?;
+EOSQL;
 
 		$parametersArray = array($person_id, $person_id, $limit, $offset);
 
+		$count = 0;
 		$data = $this->execQuery($sql, $parametersArray);
 
 		if (isError($data))
 			return $data;
 
 		$data = getData($data);
+		if($data)
+		{
+			$count = ceil($data[0]->total_msgs / $limit);
+		}
 
 		return success(['data' => $data, 'count' => $count]);
 	}

cis/testtool/frage.php

@@ -581,14 +581,14 @@ if($frage->frage_id!='')
 			else
 				$value=$p->t('testtool/blaettern').' >>';
 
-			echo " <a href='$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$nextfrage' class='Item'>$value</a>";
+			echo "<a href='$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$nextfrage' class='Item' style='padding-left: 5px'>$value</a>";
 		}
 		else
 		{
 			if(!$demo)
 			{
 				//Wenns der letzte Eintrag ist, wieder zum ersten springen
-				echo " <a href='$PHP_SELF?gebiet_id=$gebiet_id' class='Item'>".$p->t('testtool/blaettern')." &gt;&gt;</a>";
+				echo "<a href='$PHP_SELF?gebiet_id=$gebiet_id' class='Item' style='padding-left: 5px'>".$p->t('testtool/blaettern')." &gt;&gt;</a>";
 			}
 		}
 	}

cis/testtool/login.php

@@ -340,13 +340,26 @@ else
 	}
 }
 
-if ((isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id']) &&
-	!isset($_SESSION['confirmation_needed']) && !isset($_SESSION['confirmed_code'])) ||
-	(isset($_SESSION['confirmation_needed']) && $_SESSION['confirmation_needed'] === true &&
-	isset($_SESSION['confirmed_code']) && $_SESSION['confirmed_code'] === true &&
-	isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true &&
-	isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === true &&
-	isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id'])))
+if (
+	(
+		isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id']) &&
+		!isset($_SESSION['confirmation_needed']) && !isset($_SESSION['confirmed_code']) &&
+		!isset($_SESSION['externe_ueberwachung']) && !isset($_SESSION['externe_ueberwachung_verified'])
+	)
+	||
+	(
+		isset($_SESSION['confirmation_needed']) && $_SESSION['confirmation_needed'] === true &&
+		isset($_SESSION['confirmed_code']) && $_SESSION['confirmed_code'] === true &&
+		isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id'])
+	)
+	||
+	(
+		isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true &&
+		isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === true &&
+		isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id'])
+	)
+
+)
 {
 	$pruefling = new pruefling();
 

content/statistik/lehrauftragsliste_gst.xls.php

@@ -41,6 +41,12 @@ else
 $user = get_uid();
 loadVariables($user);
 
+if (isset($_GET['studiensemester_kurzbz']))
+{
+	if (check_stsem($_GET['studiensemester_kurzbz']))
+		$semester_aktuell = $_GET['studiensemester_kurzbz'];
+}
+
 //Studiengang laden
 $studiengang = new studiengang($studiengang_kz);
 

content/statistik/lvplanung.php

@@ -50,6 +50,12 @@ else
 $user = get_uid();
 loadVariables($user);
 
+if (isset($_GET['studiensemester_kurzbz']))
+{
+	if (check_stsem($_GET['studiensemester_kurzbz']))
+		$semester_aktuell = $_GET['studiensemester_kurzbz'];
+}
+
 $rechte = new benutzerberechtigung();
 $rechte->getBerechtigungen($user);
 

include/gebiet.class.php

@@ -345,6 +345,7 @@ class gebiet extends basis_db
 		}
 
 		//Pruefen ob jede Fragen mindestens 2 Vorschlaege hat
+		//Angepasst am 28.01.2026 auf ein Warning.
 		$qry = "SELECT frage_id, nummer FROM testtool.tbl_frage
 				WHERE (SELECT count(*) as anzahl FROM testtool.tbl_vorschlag WHERE frage_id=tbl_frage.frage_id)<2
 				AND gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." AND NOT demo;";
@@ -352,7 +353,7 @@ class gebiet extends basis_db
 		{
 			while($row = $this->db_fetch_object())
 			{
-				$this->errormsg .= "Frage Nummer $row->nummer (ID: $row->frage_id) hat weniger als 2 Vorschlaege.\n";
+				$this->warningmsg .= "Frage Nummer $row->nummer (ID: $row->frage_id) hat weniger als 2 Vorschlaege.\n";
 			}
 		}
 
@@ -448,6 +449,52 @@ class gebiet extends basis_db
 			}
 		}
 
+		//Pruefen ob es leere Fragen (ohne Text, Bild oder Audio) gibt
+		$qry = "SELECT
+					fr.frage_id,
+					fr.nummer,
+					fs.sprache
+				FROM
+					testtool.tbl_frage fr
+				JOIN testtool.tbl_frage_sprache fs
+						USING (frage_id)
+				WHERE
+					(fs.text IS NULL
+						OR fs.text = '')
+					AND fs.bild IS NULL
+					AND fs.audio IS NULL
+					AND demo = false
+					AND gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." 
+					AND EXISTS (
+					SELECT
+						1
+					FROM
+						testtool.tbl_frage fr2
+					JOIN testtool.tbl_frage_sprache fs2
+							USING (frage_id)
+					WHERE
+						fs2.sprache = fs.sprache
+						AND fr2.gebiet_id = fr.gebiet_id
+						AND fr2.frage_id != fr.frage_id
+						AND (
+							(fs2.text IS NOT NULL
+							AND fs2.text != '')
+						OR fs2.bild IS NOT NULL
+						OR fs2.audio IS NOT NULL
+							)
+						AND demo = false
+					)
+				ORDER BY
+					fs.sprache,
+					fr.nummer;";
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$this->warningmsg .= "Frage Nummer $row->nummer (ID: $row->frage_id), Sprache $row->sprache hat keinen Text, Bild oder Audio.\n";
+			}
+		}
+
 		if($this->errormsg=='')
 			return true;
 		else

public/js/api/factory/studiengang.js

@@ -16,10 +16,17 @@
  */
 
 export default {
-	getAllStudiensemesterAndAktOrNext() {
+	studiengangInformation() {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Studiensemester/getStudiengangInfo'
+			url: '/api/frontend/v1/Studgang/getStudiengangInfo'
 		};
 	},
+	getStudiengangByKz(studiengang_kz) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/organisation/StudiengangEP/getStudiengangByKz',
+			params: { studiengang_kz }
+		};
+	}
 };

public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js

@@ -729,6 +729,7 @@ export const AbgabeMitarbeiterDetail = {
 							v-model="newTermin.bezeichnung"
 							:options="getAllowedAbgabeTypeOptions"
 							:optionLabel="getOptionLabelAbgabetyp"
+							:optionDisabled="getOptionDisabled"
 							scrollHeight="300px">
 						</Dropdown>
 					</div>

public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js

@@ -966,7 +966,10 @@ export const AbgabetoolAssistenz = {
 			// this.loadProjektarbeiten()
 
 			this.calcMaxTableHeight()
-		}
+		},
+		getOptionDisabled(option) {
+			return !option.aktiv
+		},
 	},
 	computed: {
 		emailItems() {
@@ -1176,7 +1179,8 @@ export const AbgabetoolAssistenz = {
 							:style="{'width': '100%'}"
 							v-model="serienTermin.bezeichnung"
 							:options="abgabeTypeOptions"
-							:optionLabel="getOptionLabelAbgabetyp">
+							:optionLabel="getOptionLabelAbgabetyp"
+							:optionDisabled="getOptionDisabled">
 						</Dropdown>
 					</div>
 				</div>

public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js

@@ -304,7 +304,7 @@ export const AbgabetoolMitarbeiter = {
 				pa.isCurrent = res.data[1]
 
 				let paIsBenotet = false
-				if(pa.note !== undefined && pa !== null) {
+				if(pa.note !== undefined && pa.note !== null) {
 					// check if the note is not defined as a non final projektarbeit note
 					const opt = this.notenOptionsNonFinal.find(opt => opt.note)
 					// if thats the case allow further work

public/js/components/LVVerwaltung/LVVerwaltung.js

@@ -8,7 +8,6 @@ import LvTabs from "./Setup/Tabs.js";
 
 import ApiDetails from "../../api/lehrveranstaltung/details.js";
 import ApiLektor from "../../api/lehrveranstaltung/lektor.js";
-import ApiGruppe from "../../api/lehrveranstaltung/gruppe.js";
 import ApiStudiengangTree from "../../api/lehrveranstaltung/studiengangtree.js";
 import ApiSearchbar from "../../api/factory/searchbar.js";
 
@@ -205,6 +204,21 @@ export default {
 			this.$router.push({ name: routeName, params: newParams });
 			this.selected = [];
 		},
+		isDisabled(item)
+		{
+			if (!item?.requires?.length)
+				return false;
+
+			const values = {
+				stg: this.stg,
+				emp: this.emp,
+				studiensemester: this.selectedStudiensemester,
+				semester: this.semester
+			};
+
+			return item.requires.some(req => !values[req]);
+
+		}
 	},
 	created() {
 		this.$p.loadCategory(['lehre', 'person', 'global'])
@@ -239,6 +253,74 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
+	computed:
+	{
+		appMenuExtraItems()
+		{
+			let extraItems = [];
+
+			const studiengang_kz = this.stg || '';
+			const studiensemester = this.selectedStudiensemester;
+			const semester = this.semester || '';
+			const uid = this.emp || '';
+
+
+			extraItems.push(
+				{
+					description: 'lehre/berichte',
+					requires: ['stg'],
+					children: [
+						{
+							link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+								+ 'content/statistik/lvplanung.xls.php'
+								+ '?studiengang_kz=' + studiengang_kz
+								+ '&studiensemester_kurzbz=' + studiensemester
+								+ '&semester=' + semester,
+							description: 'lehre/lvplanung',
+							requires: ['stg']
+						},
+						{
+							link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+								+ 'content/statistik/lehrauftragsliste_gst.xls.php'
+								+ '?studiengang_kz=' + studiengang_kz
+								+ '&studiensemester_kurzbz=' + studiensemester
+								+ '&semester=' + semester,
+							description: 'lehre/lehrauftragsliste',
+							requires: ['stg']
+						},
+						{
+							link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+								+ 'content/pdfExport.php?xml=lehrauftrag.xml.php'
+								+ '&xsl=Lehrauftrag'
+								+ '&stg_kz=' + studiengang_kz
+								+ '&ss=' + studiensemester,
+							description: 'lehre/lehrauftraege',
+							requires: ['stg']
+						},
+						{
+							link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+								+ 'content/pdfExport.php?xml=lehrauftrag.xml.php'
+								+ '&xsl=Lehrauftrag'
+								+ '&stg_kz=' + studiengang_kz
+								+ '&ss=' + studiensemester
+								+ '&uid=' + uid,
+							description: 'lehre/lehrauftragslisteemp',
+							requires: ['emp']
+						}
+					]
+				},
+				{
+					link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+						+ 'vilesci/lehre/lehrveranstaltung.php'
+						+ '?stg_kz=' + studiengang_kz,
+					description: 'lehre/extrakvverwaltung',
+					requires: ['stg']
+				}
+			);
+
+			return extraItems;
+		}
+	},
 
 	template: /* html */`
 	<div class="stv">
@@ -278,7 +360,40 @@ export default {
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
 					<div class="offcanvas-body">
-						<app-menu app-identifier="lvv" />
+						<app-menu app-identifier="lvv">
+							<template v-for="(item, key) in appMenuExtraItems" :key="key">
+								<li v-if="item.children" class="dropend">
+									<a
+										class="dropdown-toggle" 
+										href="#"
+										role="button" 
+										data-bs-toggle="dropdown"
+										aria-expanded="false"
+										data-bs-popper-config='{"strategy":"fixed"}'
+									>
+										{{ $p.t(item.description) }}
+									</a>
+									<ul class="dropdown-menu p-0">
+										<li
+											v-for="(child, childKey) in item.children"
+											:key="childKey"
+										>
+											<a class="dropdown-item" :href="child.link" target="_blank" :class="{ disabled: isDisabled(child) }">
+												{{ $p.t(child.description) }}
+											</a>
+										</li>
+									</ul>
+								</li>
+								<li v-else>
+									<a 
+										:href="item.link" 
+										target="_blank" 
+										:class="{ disabled: isDisabled(item) }">
+										{{ $p.t(item.description) }}
+									</a>
+								</li>
+							</template>
+						</app-menu>
 					</div>
 				</aside>
 				<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">

public/js/components/Messages/Details/TableMessages.js

@@ -243,6 +243,7 @@ export default {
 						title: this.$p.t('global', 'aktionen')
 												});
 						*/
+						this.$emit('tabulator_tablebuilt');
 					}
 				},
 				{

public/js/components/Messages/Messages.js

@@ -56,6 +56,7 @@ export default {
 	},
 	data() {
 		return {
+			tablebuilt: false,
 			isVisibleDiv: false,
 			messageId: null
 		}
@@ -139,8 +140,10 @@ export default {
 		},
 		resetMessageId(){
 			this.messageId = null;
+		},
+		tableBuilt: function() {
+			this.tablebuilt = true;
 		}
-
 	},
 	template: `
 	<div class="core-messages h-100 pb-3">
@@ -155,6 +158,7 @@ export default {
 		</form>
 
 		<message-modal
+			v-if="tablebuilt || id.length > 1"
 			ref="modalMsg"
 			:type-id="typeId"
 			:id="id"
@@ -166,8 +170,9 @@ export default {
 		</message-modal>
 		
 		<!--in same page-->
-		<div v-show="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
+		<div v-if="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
 			<form-only
+				v-if="tablebuilt || id.length > 1"
 				ref="templateNewDivMessage"
 				:type-id="typeId"
 				:id="id"
@@ -187,6 +192,7 @@ export default {
 				:openMode="openMode"
 				@newMessage="handleMessage"		
 				@replyToMessage="handleMessage"
+				@tabulator_tablebuilt="tableBuilt"
 			>		
 			</table-messages>
 		</div>

system/dbupdate_3.4.php

@@ -91,6 +91,7 @@ require_once('dbupdate_3.4/69065_Projektarbeiten_Firmen_verwalten.php');
 require_once('dbupdate_3.4/68744_StV_settings.php');
 require_once('dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php');
 require_once('dbupdate_3.4/71399_dashboard_update_widget_paths.php');
+require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';

system/dbupdate_3.4/71645_studvw_messagetab_ladezeit.php

@@ -0,0 +1,28 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_msg_message_person_id'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_msg_message_person_id ON public.tbl_msg_message USING btree (person_id)";
+
+		if (! $db->db_query($qry))
+			echo '<strong>idx_tbl_msg_message_person_id: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Index idx_tbl_msg_message_person_id angelegt<br>';
+	}
+}
+
+if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_msg_recipient_person_id'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_msg_recipient_person_id ON public.tbl_msg_recipient USING btree (person_id)";
+
+		if (! $db->db_query($qry))
+			echo '<strong>idx_tbl_msg_recipient_person_id: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Index idx_tbl_msg_recipient_person_id angelegt<br>';
+	}
+}

system/phrasesupdate.php

@@ -19087,6 +19087,27 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'kvp',
+		'phrase' => 'error.opproject_does_not_exists',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Es ist kein Openproject Projekt verknüpft.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "No Openproject project is linked.",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+    //*******************	KVP end
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -48828,6 +48849,126 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'berichte',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Berichte',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reports',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lvplanung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Planung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course Planning',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lehrauftragsliste',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrauftragsliste',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching Assignments',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lehrauftraege',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehraufträge',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Lectureships',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lehrauftragslisteemp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrauftrag Lehrende',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching Assignment Lecturers',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'extrakvverwaltung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrveranstaltung Verwaltung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course Management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// feature-55614 end
 	array(
 		'app' => 'softwarebereitstellung',