blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mails bei freigabe zum RT und Freigabe an Studiengang fuer Master hinzugefuegt

Browse Source
This commit is contained in:
ma0048
2021-05-04 22:09:47 +02:00
parent 989772402d
commit 062ff74b03
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/infocenter/zgvpruefungen.php
+3 -3
View File
@@ -413,16 +413,16 @@
$disabledTxt = $disabledStgTxt = $this->p->t('infocenter', 'bewerbungMussAbgeschickt');
}
if ($studiengangtyp !== 'b')
if ($studiengangtyp !== 'b' && $studiengangtyp !== 'm')
{
$disabled = 'disabled';
$disabledTxt = $this->p->t('infocenter', 'nurBachelorFreigeben');
$disabledTxt = $this->p->t('infocenter', 'nurBachelorMasterFreigeben');
// FIT-Lehrgänge: exceptions, can be freigegeben in Infocenter
if (!in_array($studiengang_kz, $fit_programme_studiengaenge))
{
$disabledStg = 'disabled';
$disabledStgTxt = $this->p->t('infocenter', 'nurBachelorFreigeben');
$disabledStgTxt = $this->p->t('infocenter', 'nurBachelorMasterFreigeben');
}
}
?>
public/js/infocenter/infocenterDetails.js
+17 -3
View File
@@ -3,9 +3,11 @@ const BASE_URL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJEC
const CALLED_PATH = FHC_JS_DATA_STORAGE_OBJECT.called_path;
const CONTROLLER_URL = BASE_URL + "/"+CALLED_PATH;
const RTFREIGABE_MESSAGE_VORLAGE = "InfocenterRTfreigegeben";
const RTFREIGABE_MESSAGE_VORLAGE_MASTER = "InfocenterRTfreigegebenM";
const RTFREIGABE_MESSAGE_VORLAGE_QUER = "InfocenterRTfreigegQuer";
const RTFREIGABE_MESSAGE_VORLAGE_QUER_KURZ = "InfocenterRTfreigegQuerKurz";
const STGFREIGABE_MESSAGE_VORLAGE = "InfocenterSTGfreigegeben";
const STGFREIGABE_MESSAGE_VORLAGE_MASTER = "InfocenterSTGfreigegebenM";
//Statusgründe for which no Studiengang Freigabe Message should be sent
const FIT_PROGRAMM_STUDIENGAENGE = [10021, 10027];
@@ -596,7 +598,7 @@ var InfocenterDetails = {
var fitstg = $.inArray(parseInt(prestudent.studiengang_kz), FIT_PROGRAMM_STUDIENGAENGE) >= 0;
if (receiverPrestudentstatus.studiensemester_kurzbz === prestudentstatus.studiensemester_kurzbz
&& (prestudent.studiengangtyp === "b" || fitstg))
&& (prestudent.studiengangtyp === "b" || prestudent.studiengangtyp === "m" || fitstg))
{
if (prestudent.isRtFreigegeben)
{
@@ -660,7 +662,13 @@ var InfocenterDetails = {
else
{
//send normal RTfreigabe message
vorlage = RTFREIGABE_MESSAGE_VORLAGE
if (receiverPrestudent.studiengangtyp === 'm')
{
vorlage = RTFREIGABE_MESSAGE_VORLAGE_MASTER
}else
{
vorlage = RTFREIGABE_MESSAGE_VORLAGE
}
}
InfocenterDetails.sendFreigabeMessage(prestudent_id, vorlage, msgvars);
@@ -671,7 +679,13 @@ var InfocenterDetails = {
//if Freigabe to Studiengang, send StgFreigabe Message if not already sent and allowed to send
if (!stgFreigegeben && receiverPrestudent.sendStgFreigabeMsg === true)
{
InfocenterDetails.sendFreigabeMessage(prestudent_id, STGFREIGABE_MESSAGE_VORLAGE, msgvars);
if (receiverPrestudent.studiengangtyp === 'm' && (freigabedata.statusgrundbezeichnung === 'Ergänzungsprüfungen' || freigabedata.statusgrundbezeichnung === 'Supplementary exams'))
{
InfocenterDetails.sendFreigabeMessage(prestudent_id, STGFREIGABE_MESSAGE_VORLAGE_MASTER, msgvars);
}else
{
InfocenterDetails.sendFreigabeMessage(prestudent_id, STGFREIGABE_MESSAGE_VORLAGE, msgvars);
}
}
}
};
system/phrasesupdate.php
+3 -3
View File
@@ -3549,18 +3549,18 @@ $phrases = array(
array(
'app' => 'infocenter',
'category' => 'infocenter',
'phrase' => 'nurBachelorFreigeben',
'phrase' => 'nurBachelorMasterFreigeben',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Nur Bachelorstudiengänge können freigegeben werden.',
'text' => 'Nur Bachelorstudiengänge/Masterstudiengänge können freigegeben werden.',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Only bachelor programmes can be approved.',
'text' => 'Only bachelor/master programmes can be approved.',
'description' => '',
'insertvon' => 'system'
)