diff --git a/application/views/lehre/pruefungsprotokoll.php b/application/views/lehre/pruefungsprotokoll.php index 42edfd57a..7a06f3286 100644 --- a/application/views/lehre/pruefungsprotokoll.php +++ b/application/views/lehre/pruefungsprotokoll.php @@ -20,7 +20,8 @@ $this->load->view( 'beginnzeitFormatError', 'endezeitLeer', 'endezeitFormatError', - 'endezeitBeforeError' + 'endezeitBeforeError', + 'verfNotice' ), 'ui' => array( 'stunde', @@ -171,12 +172,12 @@ $this->load->view( - studiengangstyp == 'b' ? $this->p->t('abschlusspruefung', 'beurteilungKriterienBachelor') : $this->p->t('abschlusspruefung', 'beurteilungKriterienMaster')) ?> + studiengangstyp == 'b' ? $this->p->t('abschlusspruefung', 'beurteilungKriterienBachelor') : $this->p->t('abschlusspruefung', 'beurteilungKriterienMaster') ?> - p->t('abschlusspruefung', 'beurteilung') ?>: + studiengangstyp == 'b' ? $this->p->t('abschlusspruefung', 'beurteilungBachelor') : $this->p->t('abschlusspruefung', 'beurteilungMaster') ?>: + diff --git a/public/js/lehre/pruefungsprotokoll.js b/public/js/lehre/pruefungsprotokoll.js index 0e0715198..b14bc6153 100644 --- a/public/js/lehre/pruefungsprotokoll.js +++ b/public/js/lehre/pruefungsprotokoll.js @@ -72,10 +72,12 @@ var Pruefungsprotokoll = { if ($("#verfCheck").prop('checked')) { $("#abschlussbeurteilung_kurzbz").prop('disabled', false).val(Pruefungsprotokoll.abschlussbeurteilung_kurzbz); + $("#verfNotice").html(""); } else { $("#abschlussbeurteilung_kurzbz").prop('disabled', true).val(null); + $("#verfNotice").html(FHC_PhrasesLib.t("abschlusspruefung", "verfNotice")); } }, checkFields: function(data, verfChecked) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 944f931b9..4af518247 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -7280,7 +7280,7 @@ When on hold, the date is only a reminder.', ), array( 'sprache' => 'English', - 'text' => 'Declaration of Agreement', + 'text' => 'Statement of agreement', 'description' => '', 'insertvon' => 'system' ) @@ -7295,13 +7295,13 @@ When on hold, the date is only a reminder.', array( 'sprache' => 'German', 'text' => 'Der/Die Studierende bestätigt, sich in guter körperlicher und geistiger Verfassung zu befinden, - um die Prüfung durchzuführen und dass die technischen Voraussetzungen und gegeben sind.', + um die Prüfung durchzuführen und dass die technischen Voraussetzungen gegeben sind.', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'The student confirms being in a healthy physical and mental condition and that the technical requirements are met for taking the exam.', + 'text' => 'The student confirms to be in a physical and mental condition to take the exam and that the technical requirements are met.', 'description' => '', 'insertvon' => 'system' ) @@ -7341,7 +7341,7 @@ When on hold, the date is only a reminder.', ), array( 'sprache' => 'English', - 'text' => 'Subject of Examination', + 'text' => 'Subject of the Examination', 'description' => '', 'insertvon' => 'system' ) @@ -7421,7 +7421,7 @@ Allfällige besondere Vorkommnisse 'text' => 'Parts of the examination held in English (Optional - in line with the degree program\'s guidelines): << Delete as appropriate >> * Presentation of the Master\'s Thesis -* Examination interview on the Master\'s Thesis and its links to subjects of the curriculum +* Examination interview on the Master\'s Thesis and its links to the subjects of the curriculum * Examination interview on other subjects relevant to the curriculum Question(s) to open the examination interview @@ -7451,7 +7451,7 @@ Any unusual occurrences ), array( 'sprache' => 'English', - 'text' => 'Presentation and Examination interview on the Bachelor Paper', + 'text' => 'Presentation and Examination interview on the Bachelor Paper and its links to subjects of the curriculum', 'description' => '', 'insertvon' => 'system' ) @@ -7471,8 +7471,8 @@ Any unusual occurrences ), array( 'sprache' => 'English', - 'text' => '', - 'description' => 'Examination interview on the Master’s Thesis and its links to subjects of the curriculum as well as examination interview on a curricular theme', + 'text' => 'Examination interview on the Master’s Thesis and its links to subjects of the curriculum as well as examination interview on a curricular theme', + 'description' => '', 'insertvon' => 'system' ) ) @@ -7488,19 +7488,22 @@ Any unusual occurrences 'text' => 'Beurteilung und Kriterien Bachelorprüfung

', 'description' => '', @@ -7508,22 +7511,25 @@ Any unusual occurrences ), array( 'sprache' => 'English', - 'text' => 'Assessment and criteria Bachelor Examination

+ 'text' => 'Criteria for the assessment of the Bachelor Examination

', 'description' => '', @@ -7542,19 +7548,28 @@ Any unusual occurrences 'text' => 'Beurteilung und Kriterien Masterprüfung

', 'description' => '', @@ -7562,24 +7577,31 @@ Any unusual occurrences ), array( 'sprache' => 'English', - 'text' => 'Assessment and criteria Masters Examination

+ 'text' => 'Criteria for the assessment of the Master Examination

', 'description' => '', @@ -7590,18 +7612,38 @@ Any unusual occurrences array( 'app' => 'core', 'category' => 'abschlusspruefung', - 'phrase' => 'beurteilung', + 'phrase' => 'beurteilungBachelor', 'insertvon' => 'system', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Beurteilung', + 'text' => 'Beurteilung Bachelorprüfung', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'Assessment', + 'text' => 'Assessment of the Bachelor Examination', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'abschlusspruefung', + 'phrase' => 'beurteilungMaster', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Beurteilung Masterprüfung', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Assessment of the Master Examination', 'description' => '', 'insertvon' => 'system' ) @@ -7806,6 +7848,26 @@ Any unusual occurrences 'insertvon' => 'system' ) ) + ), + array( + 'app' => 'core', + 'category' => 'abschlusspruefung', + 'phrase' => 'verfNotice', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => '(Beurteilung kann nur nach Bestätigung der Einverständniserklärung erfolgen)', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => '(Assessment can only be selected after confirming the statement of agreement)', + 'description' => '', + 'insertvon' => 'system' + ) + ) ) );