From 73e248534b58ac2e2aa23f98401d868ce30a14a9 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 3 Oct 2019 10:15:10 +0200 Subject: [PATCH] - infocenterDetails: added phrases rueckstelldatumUeberschritten and parkenZurueckstellenInfo --- .../system/infocenter/infocenterDetails.php | 2 + public/js/infocenter/infocenterDetails.js | 7 +-- system/phrasesupdate.php | 45 ++++++++++++++++++- 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php index 68b6c760e..ab4e3533e 100644 --- a/application/views/system/infocenter/infocenterDetails.php +++ b/application/views/system/infocenter/infocenterDetails.php @@ -40,6 +40,8 @@ 'bewerberOnHoldBis', 'nichtsZumEntfernen', 'fehlerBeimEntfernen', + 'rueckstelldatumUeberschritten', + 'parkenZurueckstellenInfo' ), 'ui' => array( 'gespeichert', diff --git a/public/js/infocenter/infocenterDetails.js b/public/js/infocenter/infocenterDetails.js index 09d2b3447..96975d179 100644 --- a/public/js/infocenter/infocenterDetails.js +++ b/public/js/infocenter/infocenterDetails.js @@ -927,9 +927,7 @@ var InfocenterDetails = { '     '+ FHC_PhrasesLib.t('global', 'bis') + '  '+ ' '+ - ' '+ + ' '+ ''+ ''); @@ -943,7 +941,6 @@ var InfocenterDetails = { function () { - //console.log(date); var date = $("#postponedate").val(); InfocenterDetails.parkPerson(personid, date); } @@ -988,7 +985,7 @@ var InfocenterDetails = { var currdate = new Date(); if (currdate > postponedate) - postponedtext = ""+postponedtext+""; + postponedtext = ""+postponedtext+""; callbackforundo = function () { diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index b38aebb2c..65206c9e9 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -3550,8 +3550,51 @@ $phrases = array( 'insertvon' => 'system' ) ) + ), + array( + 'app' => 'infocenter', + 'category' => 'infocenter', + 'phrase' => 'rueckstelldatumUeberschritten', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Zurückstelldatum überschritten!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Exceeded date for on hold!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'infocenter', + 'category' => 'infocenter', + 'phrase' => 'parkenZurueckstellenInfo', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Geparkte und zurückgestellte BewerberInnen werden von der Bearbeitung temporär ausgenommen. +Geparkte BewerberInnen werden zum angegebenen Datum automatisch entparkt, während zurückgestellte BewerberInnen nur manuell durch Drücken des Buttons den Zurückgestellt-Status verlieren. +Bei einer Zurückstellung dient das Datum nur der Erinnerung.', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Parked applicants and applicants on hold are temporarily excluded from the infocenter workflow. +Parked applicants are unparked automatically, whereas applicants on hold loose the status only when clicking the button manually. +When on hold, the date is only a reminder.', + 'description' => '', + 'insertvon' => 'system' + ) + ) ) - );