Merge branch 'master' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren

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

@@ -435,7 +435,10 @@ class Kontakt extends FHCAPI_Controller
 		$this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
 		$this->KontakttypModel->addJoin('public.tbl_kontakttyp kt', 'ON (public.tbl_kontakt.kontakttyp = kt.kontakttyp)');
 		$result = $this->KontaktModel->loadWhere(
-			array('person_id' => $person_id)
+			array(
+				'person_id' => $person_id,
+				'public.tbl_kontakt.kontakttyp !=' => 'hidden'
+			)
 		);
 
 		if (isError($result))
@@ -443,20 +446,18 @@ class Kontakt extends FHCAPI_Controller
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 		$this->terminateWithSuccess((getData($result) ?: []));
+
 	}
 
 	public function getKontakttypen()
 	{
 		$this->load->model('person/Kontakttyp_model', 'KontakttypModel');
+		$this->KontakttypModel->addOrder('beschreibung', 'ASC');
+		$result = $this->KontakttypModel->loadWhere(array('kontakttyp !=' => 'hidden'));
 
-		$result = $this->KontakttypModel->load();
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		else
-		{
-			$this->terminateWithSuccess(getData($result) ?: []);
-		}
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
 	}
 
 	public function loadContact()

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

@@ -276,7 +276,17 @@ class Student extends FHCAPI_Controller
 		$update_person = array();
 		foreach ($array_allowed_props_person as $prop) {
 			$val = $this->input->post($prop);
-			if ($val !== null) {
+			if ($val === null)
+			{
+				continue;
+			}
+			if($prop == 'foto')
+			{
+				$fotoval = ($val == '') ? null : str_replace('data:image/jpeg;base64,', '', $val);
+				$update_person[$prop] = $fotoval;
+			}
+			else
+			{
 				$update_person[$prop] = $val;
 			}
 		}

application/controllers/system/infocenter/InfoCenter.php

@@ -362,6 +362,8 @@ class InfoCenter extends Auth_Controller
 		$data[self::ORIGIN_PAGE] = $origin_page;
 		$data[self::PREV_FILTER_ID] = $this->input->get(self::PREV_FILTER_ID);
 
+		$data['studiensemester'] = $this->variablelib->getVar('infocenter_studiensemester');
+
 		$this->load->view('system/infocenter/infocenterDetails.php', $data);
 	}
 

application/core/Notiz_Controller.php

@@ -393,10 +393,10 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		foreach ($result as $doc) {
 			$res = $this->dmslib->removeAll($doc->dms_id);
-			if (isError($result))
+			if (isError($res))
 			{
 				$this->db->trans_rollback();
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				$this->terminateWithError(getError($res), self::ERROR_TYPE_GENERAL);
 			}
 		}
 

application/libraries/ProfilLib.php

@@ -214,7 +214,7 @@ class ProfilLib{
 	 * @param  integer $uid the userID used to get the kontakt information
 	 * @return array all the kontakt information corresponding to a userID
 	 */
-	private function getKontaktInfo($pid)
+	private function getKontaktInfo($pid, $includehidden=false)
 	{
 		$this->ci->load->model("person/Kontakt_model","KontaktModel");
 		$this->ci->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
@@ -222,7 +222,13 @@ class ProfilLib{
 		$this->ci->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
 		$this->ci->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
 
-		$kontakte_res = $this->ci->KontaktModel->loadWhere(['person_id' => $pid]);
+		$params = array('person_id' => $pid);
+		if(!$includehidden)
+		{
+			$params['kontakttyp <>'] = 'hidden';
+		}
+
+		$kontakte_res = $this->ci->KontaktModel->loadWhere($params);
 		if(isError($kontakte_res)){
 			return error(getData($kontakte_res));
 		}

application/models/person/Person_model.php

@@ -316,72 +316,60 @@ class Person_model extends DB_Model
 
 	public function checkDuplicate($person_id)
 	{
-		$qry = "SELECT person_id
-				FROM public.tbl_prestudent p
-				JOIN
-				(
-					SELECT DISTINCT ON(prestudent_id) *
-					FROM public.tbl_prestudentstatus
-					WHERE prestudent_id IN
-						(
-							SELECT prestudent_id
-							FROM public.tbl_prestudent
-							WHERE person_id IN
-							(
-								SELECT p2.person_id
-								FROM public.tbl_person p
-								JOIN public.tbl_person p2
-								ON lower(p.vorname) = lower(p2.vorname)
-								AND lower(p.nachname) = lower(p2.nachname)
-								AND p.gebdatum = p2.gebdatum
-								AND p.person_id = ?
-							)
-						)
-					ORDER BY prestudent_id, datum DESC, insertamum DESC
-				) ps USING(prestudent_id)
-				JOIN public.tbl_status USING(status_kurzbz)
+		$qry = "
+			WITH person AS (
+				SELECT *
+				FROM public.tbl_person
+				WHERE person_id = ?
+			),
+			allePersonen AS (
+				SELECT p.person_id
+				FROM public.tbl_person p
+					JOIN person
+						ON lower(p.vorname) = lower(person.vorname)
+						AND lower(p.nachname) = lower(person.nachname)
+						AND p.gebdatum = person.gebdatum
+			),
+			lastStatus AS (
+				SELECT DISTINCT ON (tbl_prestudentstatus.prestudent_id)
+					tbl_prestudentstatus.prestudent_id,
+					tbl_prestudentstatus.status_kurzbz,
+					tbl_prestudent.studiengang_kz,
+					tbl_prestudent.person_id
+				FROM public.tbl_prestudentstatus
+				JOIN public.tbl_prestudent USING (prestudent_id)
+				WHERE tbl_prestudent.person_id IN (SELECT person_id FROM allePersonen)
+				ORDER BY tbl_prestudentstatus.prestudent_id, tbl_prestudentstatus.datum DESC, tbl_prestudentstatus.insertamum DESC
+			),
+			interessenten AS (
+				SELECT *
+				FROM lastStatus
 				WHERE status_kurzbz = 'Interessent'
-				AND studiengang_kz IN
-				(
-					SELECT studiengang_kz
-					FROM public.tbl_prestudent p
-					JOIN
-					(
-						SELECT DISTINCT ON(prestudent_id) *
-						FROM public.tbl_prestudentstatus
-						WHERE prestudent_id IN
-						(
-							SELECT prestudent_id
-							FROM public.tbl_prestudent
-							WHERE person_id IN
-							(
-								SELECT p2.person_id
-								FROM public.tbl_person p
-								JOIN public.tbl_person p2
-								ON lower(p.vorname) = lower(p2.vorname)
-								AND lower(p.nachname) = lower(p2.nachname)
-								AND p.gebdatum = p2.gebdatum
-								AND p.person_id = ?
-							)
-						)
-						ORDER BY prestudent_id, datum DESC, insertamum DESC
-					) ps USING(prestudent_id)
-					JOIN public.tbl_status USING(status_kurzbz)
-					WHERE status_kurzbz = 'Abbrecher'
-				)
-
-				UNION
-
+			),
+			keineInteressenten AS (
+				SELECT *
+				FROM lastStatus
+				WHERE status_kurzbz != 'Interessent'
+			),
+			doppeltePerson AS (
 				SELECT p2.person_id
-				FROM tbl_person p1
-				JOIN tbl_prestudent ps ON p1.person_id = ps.person_id
-				INNER JOIN (
-					SELECT vorname, nachname, gebdatum, person.person_id
-					FROM tbl_person person
-					JOIN tbl_prestudent sps ON person.person_id = sps.person_id
-				) p2
-					ON (lower(p1.vorname) = lower(p2.vorname) AND lower(p1.nachname) = lower(p2.nachname) AND p1.gebdatum = p2.gebdatum)
-				WHERE p1.person_id != p2.person_id AND (p1.person_id = ?)";
+				FROM public.tbl_person p1
+				JOIN public.tbl_prestudent ps1 ON ps1.person_id = p1.person_id
+				JOIN public.tbl_person p2
+						ON  lower(p1.vorname) = lower(p2.vorname)
+						AND lower(p1.nachname) = lower(p2.nachname)
+						AND p1.gebdatum = p2.gebdatum
+				WHERE p1.person_id = ?
+				  AND p1.person_id <> p2.person_id
+			)
+			SELECT DISTINCT(interessenten.person_id)
+			FROM interessenten
+				JOIN keineInteressenten
+					ON interessenten.studiengang_kz = keineInteressenten.studiengang_kz
+			WHERE interessenten.person_id = ?
+			UNION
+			SELECT DISTINCT person_id
+			FROM doppeltePerson";
 
 		return $this->execQuery($qry, array($person_id, $person_id, $person_id));
 	}

application/views/system/infocenter/anmerkungenZurBewerbung.php

@@ -18,6 +18,9 @@
 							<?php (!isset($notiz->kurzbzlang)) ?: print_r('(' . nl2br($notiz->kurzbzlang) . ') - ') ?>
 							<?php echo nl2br($notiz->text) ?>
 						</td>
+						<td>
+							<a href="mailto:<?php echo htmlspecialchars($notiz->email)?>?body=<?php echo rawurlencode($notiz->text);; ?>"><i class="fa fa-envelope"></i></a>
+						</td>
 					</tr>
 				<?php endforeach; ?>
 				</tbody>

application/views/system/infocenter/infocenterDetails.php

@@ -57,7 +57,7 @@
 				<div class="row<?php if ($lockedbyother) echo ' alert-danger' ?>">
 					<div class="col-lg-8">
 						<h3 class="page-header">
-							Infocenter Details: <?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?>
+							Infocenter Details: <a target="_blank" title="Studentenverwaltung" href="<?php echo site_url('/Studentenverwaltung/' . $studiensemester . '/person/' . $stammdaten->person_id) ?>"><?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?> <i class="fa fa-external-link" style="font-size:small"></i></a>
 						</h3>
 					</div>
 					<div class="col-lg-4">

public/js/components/Cis/Cms/Content.js

@@ -2,6 +2,8 @@ import raum_contentmittitel from './Content_types/Raum_contentmittitel.js'
 import general from './Content_types/General.js'
 import BsConfirm from "../../Bootstrap/Confirm.js";
 import news_content from './Content_types/News_content.js';
+import iframe_content from './Content_types/Iframe_content.js';
+
 import ApiCms from '../../../api/factory/cms.js';
 
 export default {
@@ -24,42 +26,23 @@ export default {
 		raum_contentmittitel,
 		news_content,
 		general,
+		iframe_content
 	},
 	data() {
 		return {
+			content_type: null,
 			content: null,
 			content_id_internal: this.content_id
 		};
 	},
 	methods: {
 		fetchContent(){
-			return this.$api
+			this.$api
 				.call(ApiCms.content(this.content_id_internal, this.version, this.sprache, this.sichtbar))
 				.then(res => {
-					this.content = res.data.content;
-					this.content_type = res.data.type;
-					
-					document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
-						el.addEventListener("click", (evt) => {
-							evt.preventDefault();
-							BsConfirm.popup(el.dataset.confirm)
-								.then(() => {
-									Axios.get(el.href)
-										.then((res) => {
-											// TODO(chris): check for success then show message and/or reload
-											location = location;
-										})
-										.catch((err) => console.error("ERROR:", err));
-								})
-								.catch(() => {
-								});
-						});
-					});
-					document.querySelectorAll("#cms [data-href]").forEach((el) => {
-						el.href = el.dataset.href.replace(
-							/^ROOT\//,
-							FHC_JS_DATA_STORAGE_OBJECT.app_root
-						);
+					this.$nextTick(function() {
+						this.content = res.data.content;
+						this.content_type = res.data.type;
 					});
 				});
 		}
@@ -83,6 +66,8 @@ export default {
 					return "raum_contentmittitel";
 				case "news":
 					return "news_content";
+				case "iframe":
+					return "iframe_content";
 				default:
 					return "general";
 			};
@@ -91,8 +76,6 @@ export default {
 	created() {
 		this.fetchContent();
 	},
-	mounted() {
-	},
 	template: /*html*/ `
     <!-- div that contains the content -->
 	<div id="fhc-cms-content" v-if="content">

public/js/components/Cis/Cms/Content_types/Iframe_content.js

@@ -0,0 +1,31 @@
+import { replaceRelativeLegacyLink } from "../../../../helpers/LegacyLinkReplaceHelper.js";
+
+export default {
+	name: "iframe_content",
+	props: {
+		content: { type: String, required: true }
+	},
+	computed: {
+		srcUrl() {
+			const parser = new DOMParser()
+			const doc = parser.parseFromString(`<div>${this.content}</div>`, "text/html");
+			const iframe = doc.querySelector("iframe[src]");
+
+			if (!iframe)
+				return "";
+
+			let url = iframe.getAttribute("src") || "";
+			return replaceRelativeLegacyLink(url);
+		}
+	},
+	template: `
+		<div class="w-100">
+			<iframe
+				v-if="srcUrl"
+				:src="srcUrl"
+				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/DetailHeader/DetailHeader.js

@@ -102,6 +102,13 @@ export default {
 		redirectToLeitung(){
 			this.$emit('redirectToLeitung', {
 				person_id: this.leitungData.person_id});
+		},
+		getFotoSrc(foto) {
+			if(foto === null) {
+				return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'skin/images/profilbild_dummy.jpg';
+			} else {
+				return 'data:image/jpeg;base64,' + foto;
+			}
 		}
 	},
 	template: `
@@ -116,7 +123,7 @@ export default {
 						<img
 						  class="d-block h-100 rounded"
 						  alt="Profilbild"
-						  :src="'data:image/jpeg;base64,' + person.foto"
+						  :src="getFotoSrc(person.foto)"
 						/>
 
 						<template v-if="person.foto_sperre">

public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js

@@ -300,8 +300,7 @@ export default{
 		this.$api
 			.call(ApiStvContact.getTypes())
 			.then(result => {
-				//this.kontakttypen = result.data;
-				this.kontakttypen = result.data.filter(item => item.kontakttyp !== 'hidden');
+				this.kontakttypen = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
@@ -326,7 +325,7 @@ export default{
 						v-model="contactData.kontakttyp">
 					>
 						<option value="">keine Auswahl</option>
-						<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.beschreibung}}</option>
+						<option v-for="typ in kontakttypen" :key="typ.kontakttyp" :value="typ.kontakttyp">{{typ.beschreibung}}</option>
 					</form-input>
 				</div>
 				
@@ -455,4 +454,4 @@ export default{
 			>
 		</core-filter-cmpt>
 		</div>`
-};
+};

system/dbupdate_3.4.php

@@ -77,6 +77,7 @@ require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
 require_once('dbupdate_3.4/25999_C4_dashboard.php');
 require_once('dbupdate_3.4/61730_Dashboard_Anpassungen.php');
 require_once('dbupdate_3.4/40128_search.php');
+require_once('dbupdate_3.4/63436_cis4_iframe_component.php');
 require_once('dbupdate_3.4/60882_lehrfaecherverteilung_favorites.php');
 require_once('dbupdate_3.4/66982_berufsschule.php');
 

system/dbupdate_3.4/63436_cis4_iframe_component.php

@@ -0,0 +1,81 @@
+<?php
+
+$xsd= <<<EOD
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+	<xs:element name="content">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="url" type="xs:string"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
+EOD;
+
+$xslt_xhtml= <<<EOD
+<xsl:stylesheet version="1.0"
+				xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output method="html" encoding="UTF-8"/>
+	<xsl:template match="content">
+		<xsl:choose>
+			<xsl:when test="string(url)">
+				<iframe
+					src="{url}"
+					frameborder="0"
+					style="width:100%; height:90vh; border:0; display:block;"
+				>
+				</iframe>
+			</xsl:when>
+			<xsl:otherwise>
+				<div class="alert alert-warning">Keine URL im Inhalt gefunden.</div>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+</xsl:stylesheet>
+EOD;
+
+$xslt_xhtml_c4= <<<EOD
+<xsl:stylesheet version="1.0"
+				xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output method="html" encoding="UTF-8"/>
+	<xsl:template match="content">
+		<xsl:choose>
+			<xsl:when test="string(url)">
+				<iframe
+					src="{url}"
+					frameborder="0"
+					style="width:100%; height:90vh; border:0; display:block;"
+				>
+				</iframe>
+			</xsl:when>
+			<xsl:otherwise>
+				<div class="alert alert-warning">Keine URL im Inhalt gefunden.</div>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+</xsl:stylesheet>
+EOD;
+
+
+if ($result = @$db->db_query("SELECT * FROM campus.tbl_template WHERE template_kurzbz='iframe'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$sql=  <<<EOD
+	INSERT INTO campus.tbl_template 
+	(template_kurzbz, bezeichnung, xsd, xslt_xhtml, xslfo_pdf, xslt_xhtml_c4) 
+	VALUES 
+	('iframe','iFrame Content ', '{$xsd}', '{$xslt_xhtml}' , NULL, '{$xslt_xhtml_c4}');
+EOD;
+
+		if (!$db->db_query($sql))
+		{
+			echo '<strong>campus.tbl_template: ' . $db->db_last_error() . '</strong><br>';
+		}
+		else
+		{
+			echo ' campus.tbl_template: Template "iframe" hinzugefügt.<br>';
+		}
+
+	}
+}

system/phrasesupdate.php

@@ -30686,6 +30686,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'jetztStarten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Jetzt Starten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Start Now',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -42556,6 +42576,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabeStgSpezifischeRichtlinienBeachten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Bitte beachten Sie gegebenenfalls existierende studiengangsspezifische Richtlinien und informieren Sie sich diesbezüglich. Vielen Dank.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please note any existing program-specific guidelines and inform yourself about them. Thank you.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',