Studienjahr model: set different default values for getAktOrNextStudienjahr und getLastOrAktStudienjahr, changed getAktOrNextStudienjahr to really return current or next semester

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

@@ -76,7 +76,9 @@ class Vertrag extends FHCAPI_Controller
 
 		if (isError($allOe)) $this->terminateWithError(getError($allOe), self::ERROR_TYPE_GENERAL);
 
-		$allOe = hasData($allOe) ? array_column(getData($allOe), 'oe_kurzbz') : [];
+		$allOe = hasData($allOe) ? getData($allOe) : [];
+
+		$this->addMeta('oe', $allOe);
 
 		// * 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();
+            $studiensemester = $this->StudiensemesterModel->getAktOrNextSemester(62);
             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();
+			$studiensemester = $this->StudiensemesterModel->getAktOrNextSemester(62);
 			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();
+            $studiensemester = $this->StudiensemesterModel->getAktOrNextSemester(62);
             if (hasData($studiensemester))
             {
                 $studiensemester_kurzbz = $studiensemester->retval[0]->studiensemester_kurzbz;

application/models/organisation/Studienjahr_model.php

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

application/models/organisation/Studiensemester_model.php

@@ -45,39 +45,44 @@ 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 = 60)
+	public function getLastOrAktSemester($days = 0)
 	{
-		if (!is_numeric($days))
-		{
-			$days = 60;
-		}
+		if (!is_numeric($days)) $days = 0;
 
-		$query = 'SELECT studiensemester_kurzbz, start, ende
-					FROM public.tbl_studiensemester
-				   WHERE start < NOW() - \'' . $days . ' DAYS\'::INTERVAL
-				ORDER BY start DESC
-				   LIMIT 1';
+		$query = '
+			SELECT
+				studiensemester_kurzbz, start, ende
+			FROM
+				public.tbl_studiensemester
+			WHERE
+				start < NOW() - \'' . $this->escape($days) . ' DAYS\'::INTERVAL
+			ORDER
+				BY start DESC
+			LIMIT 1';
 
 		return $this->execQuery($query);
 	}
 
 	/**
-	 * getNextOrAktSemester
-	 * 62 days - in july and august, semester after summer is returned
+	 * Returns current semester, or next
+	 * @param $days offset in days, if next semester should be returned earlier
 	 */
-	public function getAktOrNextSemester($days = 62)
+	public function getAktOrNextSemester($days = 0)
 	{
-		if (!is_numeric($days))
-		{
-			$days = 62;
-		}
+		$days = is_numeric($days) ? $this->escape($days) : 0;
 
-		$query = 'SELECT studiensemester_kurzbz, start, ende
-					FROM public.tbl_studiensemester
-					WHERE start < NOW() + \'' . $days . ' DAYS\':: INTERVAL
-					ORDER BY start DESC
-					LIMIT 1';
+		$query = "
+			SELECT
+				studiensemester_kurzbz, start, ende
+			FROM
+				public.tbl_studiensemester
+			WHERE
+				ende >= NOW() + '". $this->escape($days) . " DAYS'::INTERVAL
+			ORDER BY
+				ende
+			LIMIT 1;";
 
 		return $this->execQuery($query);
 	}
@@ -177,15 +182,19 @@ class Studiensemester_model extends DB_Model
 	 */
 	public function getByDate($date)
 	{
-		// gets the studiensemster of a date or the next closest previous studiensemester if a date is not within a studiensemester
+		// gets the studiensemster of a date or the closest previous studiensemester if a date is not within a studiensemester
 		$query = "
-			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
+			SELECT
+				studiensemester_kurzbz, start, ende
+			FROM
+				public.tbl_studiensemester
+			WHERE
+				start <= ?::date
+			ORDER BY
+				start DESC
 			LIMIT 1";
 
-		return $this->execQuery($query, array($date,$date,$date,$date));
+		return $this->execQuery($query, array($date));
 	}
 
 	/**
@@ -200,10 +209,13 @@ 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));
 	}
@@ -275,7 +287,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/system/Message_model.php

@@ -242,89 +242,74 @@ class Message_model extends DB_Model
 	 */
 	public function getMessagesForTable($person_id, $offset, $limit)
 	{
-		$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,
+		$sql_base = "
+			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,
-				(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;
+				(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 ?
+				 ";
 
 		$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]);
 	}

include/externe_ueberwachung.class.php

@@ -155,7 +155,7 @@ class externeUeberwachung extends basis_db
 			"examName" => !is_null(trim($reihungstest->anmerkung)) ? ($reihungstest->anmerkung . '_' . $today) : ($reihungstest_id . '_' . $today),
 			"duration" => 1440,
 			"schedule" => false,
-			"trial" => defined('EXTERNE_UEBERWACHUNG_TRIAL_TEST') && EXTERNE_UEBERWACHUNG_TRIAL_TEST,
+			"trial" => EXTERNE_UEBERWACHUNG_TRIAL_TEST,
 			"proctoring" => "offline",
 			"startDate" => $reihungstest->datum . 'T00:00:00Z',
 			"endDate" => $reihungstest->datum . 'T23:59:59Z',

public/js/api/factory/studiengang.js

@@ -16,17 +16,10 @@
  */
 
 export default {
-	studiengangInformation() {
+	getAllStudiensemesterAndAktOrNext() {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Studgang/getStudiengangInfo'
+			url: '/api/frontend/v1/Studiensemester/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,7 +729,6 @@ 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,10 +966,7 @@ export const AbgabetoolAssistenz = {
 			// this.loadProjektarbeiten()
 
 			this.calcMaxTableHeight()
-		},
-		getOptionDisabled(option) {
-			return !option.aktiv
-		},
+		}
 	},
 	computed: {
 		emailItems() {
@@ -1179,8 +1176,7 @@ export const AbgabetoolAssistenz = {
 							:style="{'width': '100%'}"
 							v-model="serienTermin.bezeichnung"
 							:options="abgabeTypeOptions"
-							:optionLabel="getOptionLabelAbgabetyp"
-							:optionDisabled="getOptionDisabled">
+							:optionLabel="getOptionLabelAbgabetyp">
 						</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.note !== null) {
+				if(pa.note !== undefined && pa !== 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/Messages/Details/TableMessages.js

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

public/js/components/Messages/Messages.js

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

system/dbupdate_3.4.php

@@ -91,7 +91,6 @@ 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

@@ -1,28 +0,0 @@
-<?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>';
-	}
-}