diff --git a/Modules/IndividualAssessment/test/Members/ilIndividualAssessmentMembersStorageDBTest.php b/Modules/IndividualAssessment/test/Members/ilIndividualAssessmentMembersStorageDBTest.php index 607af7cd33eb..63c7c4581985 100644 --- a/Modules/IndividualAssessment/test/Members/ilIndividualAssessmentMembersStorageDBTest.php +++ b/Modules/IndividualAssessment/test/Members/ilIndividualAssessmentMembersStorageDBTest.php @@ -61,7 +61,8 @@ public function getWrapperObj(ilDBInterface $db): ilIndividualAssessmentMembersS return new ilIndividualAssessmentMembersStorageDBWrapper( $db, $irss, - $stakeholder + $stakeholder, + $this->createMock(IASSCustomFieldsStorageDB::class) ); } @@ -72,7 +73,8 @@ public function testCreateObject(): void $obj = new ilIndividualAssessmentMembersStorageDB( $db, $irss, - new ilIndividualAssessmentGradingStakeholder() + new ilIndividualAssessmentGradingStakeholder(), + $this->createMock(IASSCustomFieldsStorageDB::class) ); $this->assertInstanceOf(ilIndividualAssessmentMembersStorageDB::class, $obj); } @@ -129,7 +131,8 @@ public function test_loadMembers(): void $obj = new ilIndividualAssessmentMembersStorageDB( $db, $this->createMock(IRSS::class), - new ilIndividualAssessmentGradingStakeholder() + new ilIndividualAssessmentGradingStakeholder(), + $this->createMock(IASSCustomFieldsStorageDB::class) ); $result = $obj->loadMembers($iass); @@ -193,7 +196,12 @@ public function test_loadMembersAsSingleObjects(): void $irss = $this->createMock(IRSS::class); $stakeholder = new ilIndividualAssessmentGradingStakeholder(); - $obj = new ilIndividualAssessmentMembersStorageDB($db, $irss, $stakeholder); + $obj = new ilIndividualAssessmentMembersStorageDB( + $db, + $irss, + $stakeholder, + $this->createMock(IASSCustomFieldsStorageDB::class) + ); $result = $obj->loadMembersAsSingleObjects($iass); $this->assertIsArray($result); @@ -265,7 +273,12 @@ public function test_loadMember_exception(): void $irss = $this->createMock(IRSS::class); $stakeholder = new ilIndividualAssessmentGradingStakeholder(); - $obj = new ilIndividualAssessmentMembersStorageDB($db, $irss, $stakeholder); + $obj = new ilIndividualAssessmentMembersStorageDB( + $db, + $irss, + $stakeholder, + $this->createMock(IASSCustomFieldsStorageDB::class) + ); $this->expectException(ilIndividualAssessmentException::class); $this->expectExceptionMessage("invalid usr-obj combination"); @@ -337,7 +350,12 @@ public function test_loadMember(): void $irss = $this->createMock(IRSS::class); $stakeholder = new ilIndividualAssessmentGradingStakeholder(); - $obj = new ilIndividualAssessmentMembersStorageDB($db, $irss, $stakeholder); + $obj = new ilIndividualAssessmentMembersStorageDB( + $db, + $irss, + $stakeholder, + $this->createMock(IASSCustomFieldsStorageDB::class) + ); $this->expectException(ilIndividualAssessmentException::class); $this->expectExceptionMessage("invalid usr-obj combination"); @@ -529,7 +547,12 @@ public function test_deleteMembers(): void $irss = $this->createMock(IRSS::class); $stakeholder = new ilIndividualAssessmentGradingStakeholder(); - $obj = new ilIndividualAssessmentMembersStorageDB($db, $irss, $stakeholder); + $obj = new ilIndividualAssessmentMembersStorageDB( + $db, + $irss, + $stakeholder, + $this->createMock(IASSCustomFieldsStorageDB::class) + ); $obj->deleteMembers($iass); } @@ -595,7 +618,7 @@ public function test_removeMembersRecord(): void { $iass = $this->createMock(ilObjIndividualAssessment::class); $iass - ->expects($this->once()) + ->expects($this->exactly(2)) ->method("getId") ->willReturn(11) ; @@ -623,7 +646,12 @@ public function test_removeMembersRecord(): void $irss = $this->createMock(IRSS::class); $stakeholder = new ilIndividualAssessmentGradingStakeholder(); - $obj = new ilIndividualAssessmentMembersStorageDB($db, $irss, $stakeholder); + $obj = new ilIndividualAssessmentMembersStorageDB( + $db, + $irss, + $stakeholder, + $this->createMock(IASSCustomFieldsStorageDB::class) + ); $obj->removeMembersRecord($iass, $record); } diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang index 629f6f4da4ba..7378b9444af5 100644 --- a/lang/ilias_de.lang +++ b/lang/ilias_de.lang @@ -4301,6 +4301,7 @@ common#:#http_not_possible#:#Dieser Server unterstützt keine HTTP-Anfragen. common#:#http_path#:#HTTP-Pfad common#:#https_not_possible#:#Dieser Server unterstützt keine HTTPS-Verbindungen. common#:#i2passwd#:#ILIAS_2-Passwort +common#:#iafp_new#:#Add Individual Assessment Form Pool common#:#iass_import#:#Individuelle Bewertung importieren common#:#iass_new#:#Neue Individuelle Bewertung anlegen common#:#icon#:#Symbol @@ -4930,6 +4931,7 @@ common#:#obj_hlps#:#Online-Hilfe common#:#obj_hlps_desc#:#Einstellungen der Online-Hilfe common#:#obj_htlm#:#Lernmodul HTML common#:#obj_htlm_duplicate#:#HTML Lernmodul kopieren +common#:#obj_iafp#:#Individual Assessment Form Pool common#:#obj_iass#:#Individuelle Bewertung common#:#obj_iass_duplicate#:#Individuelle Bewertung kopieren common#:#obj_iass_select#:#-- Wählen Sie eine Individuelle Bewertung aus -- @@ -5138,6 +5140,7 @@ common#:#objs_glo#:#Glossare common#:#objs_grp#:#Gruppen common#:#objs_grpr#:#Gruppenlinks common#:#objs_htlm#:#HTML-Lernmodule +common#:#objs_iafp#:#Individual Assessment Form Pool common#:#objs_iass#:#Individuelle Bewertungen common#:#objs_itgr#:#Objekteblöcke common#:#objs_lm#:#ILIAS-Lernmodule @@ -10394,6 +10397,52 @@ help#:#help_tooltips_and_help#:#Tooltips und Handlungsanweisungen help#:#help_tooltips_only#:#Nur Tooltips help#:#help_topcis#:#Themen help#:#help_tt_text#:#Text +iafp#:#_settings_saved#:#Settings saved. +iafp#:#add_fields#:#Add Fields to the Form +iafp#:#available_for_examiners#:#available for examiners +iafp#:#confirm_cancel#:#Cancel +iafp#:#confirm_delete#:#Delete +iafp#:#default_value#:#Default Value +iafp#:#field_available_for_examiners#:#Available for Examiners +iafp#:#field_available_for_examiners_byline#:#should the field be available for examiners? +iafp#:#field_default_value#:#Default Value +iafp#:#field_default_value_byline#:#default/initial value +iafp#:#field_description#:#Description +iafp#:#field_description_byline#:#description of the field +iafp#:#field_label#:#Label +iafp#:#field_label_byline#:#label for the field +iafp#:#field_name_byline#:#name for the field +iafp#:#field_options#:#Options +iafp#:#field_options_byline#:#add options the user may choose from +iafp#:#field_section_byline#:#configure the field +iafp#:#field_section_create#:#Edit new Field +iafp#:#field_section_edit#:#Edit Field +iafp#:#field_type_byline#:#type of the field +iafp#:#field_with_notes#:#With Notes +iafp#:#field_with_notes_byline#:#add a textarea for notes? +iafp#:#fields#:#Fields in this Form +iafp#:#fields_added#:#Fields added. +iafp#:#fields_byline#:#Unselect and save to remove a field +iafp#:#fields_count#:#amount of fields +iafp#:#form_description#:#Description +iafp#:#form_description_byline#:#description of the form +iafp#:#form_name#:#Name +iafp#:#form_name_byline#:#name of the form +iafp#:#form_section_byline#:#configure the form +iafp#:#form_section_create#:#Edit new Form +iafp#:#form_section_edit#:#Edit Form +iafp#:#iafp_fields#:#Fields +iafp#:#iafp_forms#:#Forms +iafp#:#iafp_settings#:#Settings +iafp#:#iafp_settings_availability#:#Availability +iafp#:#label#:#label +iafp#:#new_field#:#Add a new Field +iafp#:#new_form#:#Add a new Form +iafp#:#object_saved#:#Saved. +iafp#:#pick_fields#:#Select Fields +iafp#:#tab_fields#:#Fields +iafp#:#tab_forms#:#Forms +iafp#:#with_notes#:#Notes iass#:#download_assessment_paper#:#Prüfungsblatt herunterladen iass#:#general#:#Allgemein iass#:#grading#:#Bewertung @@ -14059,6 +14108,12 @@ rbac#:#htlm_read#:#HTML-Lernmodul lesen rbac#:#htlm_read_learning_progress#:#Benutzer kann Lernfortschritt anderer Benutzer einsehen rbac#:#htlm_visible#:#HTML-Lernmodul ist sichtbar rbac#:#htlm_write#:#HTML-Lernmodul bearbeiten +rbac#:#iafp_copy#:#Copy an Individual Assessment Form Pool +rbac#:#iafp_delete#:#Delete an Individual Assessment Form Pool +rbac#:#iafp_edit_permission#:#Edit permissions of an Individual Assessment Form Pool +rbac#:#iafp_read#:#Read content of an Individual Assessment Form Pool +rbac#:#iafp_visible#:#Individual Assessment Form Pool is visible +rbac#:#iafp_write#:#Edit an Individual Assessment Form Pool rbac#:#iass_amend_grading#:#Finalisierte Bewertung der Individuellen Bewertung ändern rbac#:#iass_copy#:#Individuelle Bewertung kopieren rbac#:#iass_delete#:#Individuelle Bewertung löschen diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang index 334c82a11491..618a038fca73 100644 --- a/lang/ilias_en.lang +++ b/lang/ilias_en.lang @@ -4301,6 +4301,7 @@ common#:#http_not_possible#:#This server is not supporting http requests. common#:#http_path#:#HTTP Path common#:#https_not_possible#:#This server is not supporting HTTPS connections. common#:#i2passwd#:#ILIAS 2 password +common#:#iafp_new#:#Add Individual Assessment Form Pool common#:#iass_import#:#Import Individual Assessment common#:#iass_new#:#Create Individual Assessment common#:#icon#:#Icon @@ -4930,6 +4931,7 @@ common#:#obj_hlps#:#Help System common#:#obj_hlps_desc#:#Settings for the online help common#:#obj_htlm#:#Learning Module HTML common#:#obj_htlm_duplicate#:#Copy HTML Learning Module +common#:#obj_iafp#:#Individual Assessment Form Pool common#:#obj_iass#:#Individual Assessment common#:#obj_iass_duplicate#:#Copy Individual Assessment common#:#obj_iass_select#:#-- Please select one individual assessment -- @@ -5138,6 +5140,7 @@ common#:#objs_glo#:#Glossaries common#:#objs_grp#:#Groups common#:#objs_grpr#:#Group Links common#:#objs_htlm#:#HTML Learning Modules +common#:#objs_iafp#:#Individual Assessment Form Pool common#:#objs_iass#:#Individual Assessments common#:#objs_itgr#:#Item Groups common#:#objs_lm#:#ILIAS Learning Modules @@ -10394,6 +10397,52 @@ help#:#help_tooltips_and_help#:#Tooltips and Workflow Help help#:#help_tooltips_only#:#Tooltips Only help#:#help_topcis#:#Topics help#:#help_tt_text#:#Text +iafp#:#_settings_saved#:#Settings saved. +iafp#:#add_fields#:#Add Fields to the Form +iafp#:#available_for_examiners#:#available for examiners +iafp#:#confirm_cancel#:#Cancel +iafp#:#confirm_delete#:#Delete +iafp#:#default_value#:#Default Value +iafp#:#field_available_for_examiners#:#Available for Examiners +iafp#:#field_available_for_examiners_byline#:#should the field be available for examiners? +iafp#:#field_default_value#:#Default Value +iafp#:#field_default_value_byline#:#default/initial value +iafp#:#field_description#:#Description +iafp#:#field_description_byline#:#description of the field +iafp#:#field_label#:#Label +iafp#:#field_label_byline#:#label for the field +iafp#:#field_name_byline#:#name for the field +iafp#:#field_options#:#Options +iafp#:#field_options_byline#:#add options the user may choose from +iafp#:#field_section_byline#:#configure the field +iafp#:#field_section_create#:#Edit new Field +iafp#:#field_section_edit#:#Edit Field +iafp#:#field_type_byline#:#type of the field +iafp#:#field_with_notes#:#With Notes +iafp#:#field_with_notes_byline#:#add a textarea for notes? +iafp#:#fields#:#Fields in this Form +iafp#:#fields_added#:#Fields added. +iafp#:#fields_byline#:#Unselect and save to remove a field +iafp#:#fields_count#:#amount of fields +iafp#:#form_description#:#Description +iafp#:#form_description_byline#:#description of the form +iafp#:#form_name#:#Name +iafp#:#form_name_byline#:#name of the form +iafp#:#form_section_byline#:#configure the form +iafp#:#form_section_create#:#Edit new Form +iafp#:#form_section_edit#:#Edit Form +iafp#:#iafp_fields#:#Fields +iafp#:#iafp_forms#:#Forms +iafp#:#iafp_settings#:#Settings +iafp#:#iafp_settings_availability#:#Availability +iafp#:#label#:#label +iafp#:#new_field#:#Add a new Field +iafp#:#new_form#:#Add a new Form +iafp#:#object_saved#:#Saved. +iafp#:#pick_fields#:#Select Fields +iafp#:#tab_fields#:#Fields +iafp#:#tab_forms#:#Forms +iafp#:#with_notes#:#Notes iass#:#download_assessment_paper#:#Download Record file iass#:#general#:#General Information iass#:#grading#:#Grading @@ -14059,6 +14108,12 @@ rbac#:#htlm_read#:#User can read HTML learning module rbac#:#htlm_read_learning_progress#:#User can view learning progress of other users rbac#:#htlm_visible#:#HTML learning module is visible rbac#:#htlm_write#:#User can edit content and settings of HTML learning module +rbac#:#iafp_copy#:#Copy an Individual Assessment Form Pool +rbac#:#iafp_delete#:#Delete an Individual Assessment Form Pool +rbac#:#iafp_edit_permission#:#Edit permissions of an Individual Assessment Form Pool +rbac#:#iafp_read#:#Read content of an Individual Assessment Form Pool +rbac#:#iafp_visible#:#Individual Assessment Form Pool is visible +rbac#:#iafp_write#:#Edit an Individual Assessment Form Pool rbac#:#iass_amend_grading#:#Amend gradings in an Individual Assessment rbac#:#iass_copy#:#Copy an Individual Assessment rbac#:#iass_delete#:#Delete an Individual Assessment