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

Infocenter Details:

Browse Source 
- added notice for entering the placement test points when Freigabe after RT participation
This commit is contained in:
alex
2020-02-14 18:23:14 +01:00
parent b41ef00b3d
commit ed332717ce
3 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/infocenter/InfoCenter.php
+7 -4
View File
@@ -532,6 +532,8 @@ class InfoCenter extends Auth_Controller
if (isSuccess($result))
{
$this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
$json->retval['nonCriticalErrors'] = array();
$json->retval['infoMessages'] = array();
//set documents which have been formal geprüft to accepted
$dokument_kurzbzs = array();
@@ -545,7 +547,7 @@ class InfoCenter extends Auth_Controller
// acceptresult returns null if no documents to accept
if ($acceptresult !== null && isError($acceptresult))
$json->retval['nonCriticalErrors'] = 'error when accepting documents in FAS';
$json->retval['nonCriticalErrors'][] = 'error when accepting documents in FAS';
$logparams = array($prestudent_id, $logdata['studiengang_kurzbz'], '');
@@ -584,7 +586,7 @@ class InfoCenter extends Auth_Controller
);
if (isError($bewerberresult))
$json->retval['nonCriticalErrors'] = 'error when inserting Bewerberstatus';
$json->retval['nonCriticalErrors'][] = 'error when inserting Bewerberstatus';
$rtangetretenres = $this->PrestudentModel->update(
$prestudent_id,
@@ -595,10 +597,11 @@ class InfoCenter extends Auth_Controller
if (isError($rtangetretenres))
{
$json->retval['nonCriticalErrors'] = 'error when setting reihungstestangetreten';
$json->retval['nonCriticalErrors'][] = 'error when setting reihungstestangetreten';
}
else
{
$json->retval['infoMessages'][] = $this->p->t('infocenter', 'rtPunkteEintragenInfo');
$this->load->model('crm/RtPerson_model', 'RtPersonModel');
$rtteilgenommenres = $this->RtPersonModel->update(
@@ -612,7 +615,7 @@ class InfoCenter extends Auth_Controller
);
if (isError($rtteilgenommenres))
$json->retval['nonCriticalErrors'] = 'error when setting reihungstest teilgenommen';
$json->retval['nonCriticalErrors'][] = 'error when setting reihungstest teilgenommen';
}
}
}
public/js/infocenter/infocenterDetails.js
+6 -3
View File
@@ -284,10 +284,13 @@ var InfocenterDetails = {
{
var freigabeResponseData = FHC_AjaxClient.getData(data);
if (freigabeResponseData.nonCriticalErrors && freigabeResponseData.nonCriticalErrors.length > 0
&& typeof freigabeResponseData.nonCriticalErrors == "string")
if (freigabeResponseData.nonCriticalErrors && freigabeResponseData.nonCriticalErrors.length > 0)
{
FHC_DialogLib.alertWarning(freigabeResponseData.nonCriticalErrors);
FHC_DialogLib.alertWarning(freigabeResponseData.nonCriticalErrors.join(", "));
}
else if (freigabeResponseData.infoMessages && freigabeResponseData.infoMessages.length > 0)
{
FHC_DialogLib.alertInfo(freigabeResponseData.infoMessages.join(", "));
}
FHC_AjaxClient.showVeil();
InfocenterDetails.initFrgMessageSend(freigabeData);
system/phrasesupdate.php
+24
View File
@@ -3615,6 +3615,30 @@ When on hold, the date is only a reminder.',
)
)
),
array(
'app' => 'infocenter',
'category' => 'infocenter',
'phrase' => 'rtPunkteEintragenInfo',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Es existierte bereits ein Bewerberstatus und eine Reihungstestteilnahme.
Deshalb wurde bei der Freigabe der Bewerberstatus automatisch hinzugefügt und der Bewerber als Reihungstestabsolvent markiert.
Die Reihungstestpunkte müssen aber noch manuell eingetragen werden!',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'An applicant status and a placement test participation already existed for this person.
Thus, the applicant status was added automatically and the applicant was marked as placement test participant.
However, the placement test result is yet to be entered manually!',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'password',