Merge branch 'master' into feature-61758/stv_kontakte_get_funktionen_null_abfangen

application/config/javascript.php

@@ -4,4 +4,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 // use vuejs dev version
 $config['use_vuejs_dev_version'] = false;
 // use bundled javascript
-$config['use_bundled_javascript'] = false;
+$config['use_bundled_javascript'] = false;
+// systemerror_mailto use in FHC-Alert Plugin - if empty Link will not be rendered
+$config['systemerror_mailto'] = '';

application/controllers/jobs/IssueResolver.php

@@ -48,7 +48,9 @@ class IssueResolver extends IssueResolver_Controller
 			'CORE_PERSON_0001' => 'CORE_PERSON_0001',
 			'CORE_PERSON_0002' => 'CORE_PERSON_0002',
 			'CORE_PERSON_0003' => 'CORE_PERSON_0003',
-			'CORE_PERSON_0004' => 'CORE_PERSON_0004'
+			'CORE_PERSON_0004' => 'CORE_PERSON_0004',
+			'CORE_PERSON_0005' => 'CORE_PERSON_0005',
+			'CORE_PERSON_0006' => 'CORE_PERSON_0006'
 		);
 
 		// fehler which are resolved by the job the same way as they are produced

application/helpers/hlp_header_helper.php

@@ -95,6 +95,9 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
 	}, $server_language);
 	$user_language = getUserLanguage();
 
+	$ci->load->config('javascript');
+	$systemerror_mailto = $ci->config->item('systemerror_mailto');
+
 	$FHC_JS_DATA_STORAGE_OBJECT = array(
 		'app_root' => APP_ROOT,
 		'ci_router' => $indexPage,
@@ -103,6 +106,7 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
 		'server_languages' => $server_language,
 		'user_language' => $user_language,
 		'timezone' => date_default_timezone_get(),
+		'systemerror_mailto' => $systemerror_mailto,
 	);
 
 	$toPrint = "\n";

application/libraries/AntragLib.php

@@ -77,7 +77,9 @@ class AntragLib
 					'studiensemester_kurzbz'=>$prestudentstatus->studiensemester_kurzbz,
 					'ausbildungssemester'=>$prestudentstatus->ausbildungssemester
 				], [
-					'statusgrund_id' => null
+					'statusgrund_id' => null,
+					'updateamum' => date('c'),
+					'updatevon' => $insertvon
 				]);
 			}
 		}
@@ -335,7 +337,10 @@ class AntragLib
 						'status_kurzbz'=>$prestudentstatus->status_kurzbz,
 						'studiensemester_kurzbz'=>$prestudentstatus->studiensemester_kurzbz,
 						'ausbildungssemester'=>$prestudentstatus->ausbildungssemester
-					], []);
+					], [
+						'updateamum' => $insertam,
+						'updatevon' => $insertvon
+					]);
 					if (isError($result))
 					{
 						$errors[] = getError($result);

application/libraries/issues/PlausicheckResolverLib.php

@@ -13,7 +13,7 @@ class PlausicheckResolverLib
 	private $_ci; // ci instance
 	private $_extensionName; // name of extension
 	private $_codeLibMappings = []; // mappings for issues which explicitly defined resolver
-	private $_codeProducerLibMappings = []; // mappings for issues which are resolved as produced
+	private $_codeProducerLibMappings = []; // mappings for issues which are resolved with the same check as they are produced
 
 	public function __construct($params = null)
 	{
@@ -99,10 +99,11 @@ class PlausicheckResolverLib
 					$issueResolved = getData($issueResolvedRes) === true;
 				}
 			}
-			elseif (isset($this->_codeProducerLibMappings[$issue->fehlercode]))
+			elseif (isset($this->_codeProducerLibMappings[$issue->fehlercode])) // check if it is an issue without explicit resolver, "self-resolving"
 			{
 				$libName = $this->_codeProducerLibMappings[$issue->fehlercode];
 
+				// execute same check as used for issue production 
 				$issueResolvedRes = $this->_ci->plausicheckproducerlib->producePlausicheckIssue(
 					$libName,
 					$issue->fehler_kurzbz,

application/libraries/issues/resolvers/CORE_PERSON_0005.php

@@ -0,0 +1,36 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Geburtsnation missing
+ */
+class CORE_PERSON_0005 implements IIssueResolvedChecker
+{
+	public function checkIfIssueIsResolved($params)
+	{
+		if (!isset($params['issue_person_id']) || !is_numeric($params['issue_person_id']))
+			return error('Person Id missing, issue_id: '.$params['issue_id']);
+
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		$this->_ci->load->model('person/Person_model', 'PersonModel');
+
+		// load geburtsnation for the given person
+		$this->_ci->PersonModel->addSelect('geburtsnation');
+		$personRes = $this->_ci->PersonModel->load($params['issue_person_id']);
+
+		if (isError($personRes)) return $personRes;
+
+		if (hasData($personRes))
+		{
+			// get person data
+			$personData = getData($personRes)[0];
+
+			// if geburtsnation present, issue is resolved
+			return success(!isEmptyString($personData->geburtsnation));
+		}
+		else
+			return success(false); // if no person found, not resolved
+	}
+}

application/libraries/issues/resolvers/CORE_PERSON_0006.php

@@ -0,0 +1,37 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Geburtsnation missing
+ */
+class CORE_PERSON_0006 implements IIssueResolvedChecker
+{
+	public function checkIfIssueIsResolved($params)
+	{
+		if (!isset($params['issue_person_id']) || !is_numeric($params['issue_person_id']))
+			return error('Person Id missing, issue_id: '.$params['issue_id']);
+
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		$this->_ci->load->model('codex/Uhstat1daten_model', 'UhstatModel');
+
+		$personRes = $this->_ci->UhstatModel->getUHSTAT1PersonData([$params['issue_person_id']]);
+
+		if (isError($personRes)) return $personRes;
+
+		if (hasData($personRes))
+		{
+			// get person data
+			$personData = getData($personRes)[0];
+
+			// if person identification data present, issue is resolved
+			return success(
+				!isEmptyString($personData->ersatzkennzeichen)
+				|| (!isEmptyString($personData->vbpkAs) && !isEmptyString($personData->vbpkBf))
+			);
+		}
+		else
+			return success(false); // if no person found, not resolved
+	}
+}

application/models/codex/Uhstat1daten_model.php

@@ -11,4 +11,44 @@ class Uhstat1daten_model extends DB_Model
 		$this->dbTable = 'bis.tbl_uhstat1daten';
 		$this->pk = 'uhstat1daten_id';
 	}
+
+	/**
+	 * Gets person data needed for sending as UHSTAT1 data.
+	 * @param array $person_id_arr
+	 * @param string $studiensemester
+	 * @param array $status_kurzbz
+	 * @return object success with prestudents or error
+	 */
+	public function getUHSTAT1PersonData($person_id_arr)
+	{
+		if (!isset($person_id_arr) || isEmptyArray($person_id_arr)) return success([]);
+		
+		$params = array($person_id_arr);
+
+		$prstQry = "SELECT
+						DISTINCT ON (pers.person_id)
+						pers.person_id, uhstat_daten.uhstat1daten_id, pers.svnr, pers.ersatzkennzeichen, pers.geburtsnation,
+						uhstat_daten.mutter_geburtsstaat, uhstat_daten.mutter_bildungsstaat, uhstat_daten.mutter_geburtsjahr,
+						uhstat_daten.mutter_bildungmax, uhstat_daten.vater_geburtsstaat, uhstat_daten.vater_bildungsstaat,
+						uhstat_daten.vater_geburtsjahr, uhstat_daten.vater_bildungmax,
+						kzVbpkAs.inhalt AS \"vbpkAs\", kzVbpkBf.inhalt AS \"vbpkBf\"
+					FROM
+						public.tbl_person pers
+						JOIN public.tbl_prestudent ps USING (person_id)
+						JOIN public.tbl_studiengang stg USING (studiengang_kz)
+						JOIN bis.tbl_uhstat1daten uhstat_daten USING (person_id)
+						LEFT JOIN public.tbl_kennzeichen kzVbpkAs ON kzVbpkAs.kennzeichentyp_kurzbz = 'vbpkAs'AND kzVbpkAs.person_id = pers.person_id AND kzVbpkAs.aktiv
+						LEFT JOIN public.tbl_kennzeichen kzVbpkBf ON kzVbpkBf.kennzeichentyp_kurzbz = 'vbpkBf'AND kzVbpkBf.person_id = pers.person_id AND kzVbpkBf.aktiv
+					WHERE
+						ps.bismelden
+						AND stg.melderelevant
+						AND pers.person_id IN ?
+					ORDER BY
+						pers.person_id";
+
+		return $this->execReadOnlyQuery(
+			$prstQry,
+			$params
+		);
+	}
 }

public/js/plugin/FhcAlert.js

@@ -117,7 +117,7 @@ const helperApp = Vue.createApp({
 	},
 	methods: {
 		mailToUrl(slotProps) {
-			let mailTo = 'noreply@technikum-wien.at'; // TODO domain anpassen
+			let mailTo = FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto;
 			let subject = 'Meldung%20Systemfehler';
 			let body = `
 				Danke, dass Sie uns den Fehler melden. %0D%0A %0D%0A
@@ -141,6 +141,11 @@ const helperApp = Vue.createApp({
 	unmounted() {
 		helperAppContainer.parentElement.removeChild(helperAppContainer);
 	},
+	computed: {
+		showmaillink: function() {
+			return FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto !== '';
+		}
+	},
 	template: `
 	<pv-toast ref="toast" class="fhc-alert" :base-z-index="99999"></pv-toast>
 	<pv-toast ref="alert" class="fhc-alert" :base-z-index="99999" position="center">
@@ -162,6 +167,7 @@ const helperApp = Vue.createApp({
 						Fehler anzeigen
 					</a>
 					<a
+						v-if="showmaillink"
 						class="btn btn-primary flex-fill"
 						target="_blank"
 						:href="mailToUrl(slotProps)"

public/js/plugins/FhcAlert.js

@@ -109,7 +109,7 @@ const helperApp = Vue.createApp({
 	},
 	methods: {
 		mailToUrl(slotProps) {
-			let mailTo = 'noreply@technikum-wien.at'; // TODO domain anpassen
+			let mailTo = FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto;
 			let subject = 'Meldung%20Systemfehler';
 			let body = `
 				Danke, dass Sie uns den Fehler melden. %0D%0A %0D%0A
@@ -133,6 +133,11 @@ const helperApp = Vue.createApp({
 	unmounted() {
 		helperAppContainer.parentElement.removeChild(helperAppContainer);
 	},
+	computed: {
+		showmaillink: function() {
+			return FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto !== '';
+		}
+	},
 	template: `
 	<pv-toast ref="toast" class="fhc-alert" :base-z-index="99999"></pv-toast>
 	<pv-toast ref="alert" class="fhc-alert" :base-z-index="99999" position="center">
@@ -154,6 +159,7 @@ const helperApp = Vue.createApp({
 						Fehler anzeigen
 					</a>
 					<a
+						v-if="showmaillink"
 						class="btn btn-primary flex-fill"
 						target="_blank"
 						:href="mailToUrl(slotProps)"

system/fehlerupdate.php

@@ -324,6 +324,22 @@ $fehlerArr = array(
 		'fehlertext' => 'Es sind mehrere oder keine Zustelladressen eingetragen',
 		'fehlertyp_kurzbz' => 'error',
 		'app' => 'core'
+	),
+	array(
+		'fehlercode' => 'CORE_PERSON_0005',
+		'fehler_kurzbz' => 'geburtsnationFehlt',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Geburtsnation nicht vorhanden',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core'
+	),
+	array(
+		'fehlercode' => 'CORE_PERSON_0006',
+		'fehler_kurzbz' => 'uhstatPersonkennungFehltCore',
+		'fehlercode_extern' => null,
+		'fehlertext' => 'Personkennung fehlt (vBpk AS, vBpk BF oder Ersatzkennzeichen fehlt)',
+		'fehlertyp_kurzbz' => 'error',
+		'app' => 'core'
 	)
 	/** Plausichecks end **/
 );