From bcc712e9006f5b658318bb0e241c899b562a50b1 Mon Sep 17 00:00:00 2001 From: ma0048 Date: Wed, 9 Apr 2025 14:27:37 +0200 Subject: [PATCH 1/2] addfaktor beim hinzuefuegen einer lv entfernt --- vilesci/lehre/lehrveranstaltung_details.php | 27 --------------------- 1 file changed, 27 deletions(-) diff --git a/vilesci/lehre/lehrveranstaltung_details.php b/vilesci/lehre/lehrveranstaltung_details.php index 60f2fc3c9..bad2a7d93 100644 --- a/vilesci/lehre/lehrveranstaltung_details.php +++ b/vilesci/lehre/lehrveranstaltung_details.php @@ -30,8 +30,6 @@ require_once('../../include/lehrmodus.class.php'); require_once('../../include/benutzerberechtigung.class.php'); require_once('../../include/studienplan.class.php'); - require_once('../../include/lehrveranstaltung_faktor.class.php'); - require_once('../../include/studiensemester.class.php'); if (!$db = new basis_db()) die('Es konnte keine Verbindung zum Server aufgebaut werden.'); @@ -141,31 +139,6 @@ $reloadstr .= " window.location.href='".$_SERVER['PHP_SELF']."?stg_kz=$lv->studiengang_kz&semester=$lv->semester&neu=true';"; } $reloadstr .= "\n"; - - if (in_array($lv->lehrtyp_kurzbz, array('tpl', 'lv')) && $lv->new === true) - { - $lv_faktor = new lehrveranstaltung_faktor(); - $studiensemester = new studiensemester(); - $studiensemester_von = $studiensemester->getLastOrAktSemester(); - if ($lv->lehrtyp_kurzbz === 'lv' && $_POST['lehrveranstaltung_template_id'] !== '') - { - - $lv_faktor->getAkt($_POST['lehrveranstaltung_template_id']); - //TODO Faktor in eine Config - if (is_null($lv_faktor->faktor)) - $lv_faktor->addFaktor($lv->lehrveranstaltung_id, 2, $studiensemester_von); - else - $lv_faktor->addFaktor($lv->lehrveranstaltung_id, $lv_faktor->faktor, $studiensemester_von); - } - else - { - $lv_faktor->loadByLV($lv->lehrveranstaltung_id); - if (empty($lv_faktor->lv_faktoren)) - { - $lv_faktor->addFaktor($lv->lehrveranstaltung_id, 2, $studiensemester_von); - } - } - } } } From 4bceddcc82f64dc2198aa4994fc49f955ac63cf0 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Fri, 9 May 2025 13:58:14 +0200 Subject: [PATCH 2/2] add systemerror_mailto ci config, render systemerror_mailto to FHC_JS_DATA_STORAGE_OBJECT, use FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto in FhcAlert Plugins --- application/config/javascript.php | 4 +++- application/helpers/hlp_header_helper.php | 4 ++++ public/js/plugin/FhcAlert.js | 8 +++++++- public/js/plugins/FhcAlert.js | 8 +++++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/application/config/javascript.php b/application/config/javascript.php index 5e9aa270a..f3237fde3 100644 --- a/application/config/javascript.php +++ b/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; \ No newline at end of file +$config['use_bundled_javascript'] = false; +// systemerror_mailto use in FHC-Alert Plugin - if empty Link will not be rendered +$config['systemerror_mailto'] = ''; \ No newline at end of file diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php index 14f7ed338..de7e866f4 100644 --- a/application/helpers/hlp_header_helper.php +++ b/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"; diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js index be8d08b81..f32f18d63 100644 --- a/public/js/plugin/FhcAlert.js +++ b/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: ` @@ -162,6 +167,7 @@ const helperApp = Vue.createApp({ Fehler anzeigen @@ -154,6 +159,7 @@ const helperApp = Vue.createApp({ Fehler anzeigen