diff --git a/Modules/IndividualAssessment/classes/LearningProgress/class.ilIndividualAssessmentLPInterface.php b/Modules/IndividualAssessment/classes/LearningProgress/class.ilIndividualAssessmentLPInterface.php index 13a1bbed1be0..706ead81960d 100644 --- a/Modules/IndividualAssessment/classes/LearningProgress/class.ilIndividualAssessmentLPInterface.php +++ b/Modules/IndividualAssessment/classes/LearningProgress/class.ilIndividualAssessmentLPInterface.php @@ -51,8 +51,8 @@ public static function determineStatusOfMember(int $iass_id, int $usr_id): int return $member->LPStatus(); } elseif ( in_array($member->LPStatus(), [ - ilIndividualAssessmentMembers::LP_FAILED, - ilIndividualAssessmentMembers::LP_COMPLETED + ilLPStatus::LP_STATUS_FAILED_NUM, + ilLPStatus::LP_STATUS_COMPLETED_NUM ]) ) { return ilLPStatus::LP_STATUS_IN_PROGRESS_NUM; diff --git a/Modules/IndividualAssessment/classes/Members/class.ilIndividualAssessmentMember.php b/Modules/IndividualAssessment/classes/Members/class.ilIndividualAssessmentMember.php index bc69b91bc9b4..1dddd0820698 100644 --- a/Modules/IndividualAssessment/classes/Members/class.ilIndividualAssessmentMember.php +++ b/Modules/IndividualAssessment/classes/Members/class.ilIndividualAssessmentMember.php @@ -56,7 +56,7 @@ public function maybeSendNotification( throw new ilIndividualAssessmentException('must finalize before notification'); } if ($this->notify()) { - $notificator = (string) $this->LPStatus() === (string) ilIndividualAssessmentMembers::LP_COMPLETED ? + $notificator = (string) $this->LPStatus() === (string) ilLPStatus::LP_STATUS_COMPLETED_NUM ? $notificator->withOccasionCompleted() : $notificator->withOccasionFailed(); $notificator->withReceiver($this)->send(); @@ -73,8 +73,8 @@ public function mayBeFinalized(): bool return in_array( $this->LPStatus(), [ - ilIndividualAssessmentMembers::LP_COMPLETED, - ilIndividualAssessmentMembers::LP_FAILED + ilLPStatus::LP_STATUS_COMPLETED_NUM, + ilLPStatus::LP_STATUS_FAILED_NUM ] ) && !$this->finalized(); diff --git a/Modules/IndividualAssessment/classes/Members/class.ilIndividualAssessmentMembers.php b/Modules/IndividualAssessment/classes/Members/class.ilIndividualAssessmentMembers.php index 799eaf8661cc..24bb217154f1 100644 --- a/Modules/IndividualAssessment/classes/Members/class.ilIndividualAssessmentMembers.php +++ b/Modules/IndividualAssessment/classes/Members/class.ilIndividualAssessmentMembers.php @@ -46,11 +46,11 @@ class ilIndividualAssessmentMembers implements Iterator, Countable public const FIELD_FILE_NAME = "file_name"; public const FIELD_USER_VIEW_FILE = "user_view_file"; - public const LP_NOT_ATTEMPTED = ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM; - public const LP_IN_PROGRESS = ilLPStatus::LP_STATUS_IN_PROGRESS_NUM; - public const LP_COMPLETED = ilLPStatus::LP_STATUS_COMPLETED_NUM; - public const LP_FAILED = ilLPStatus::LP_STATUS_FAILED_NUM; - public const LP_ASSESSMENT_NOT_COMPLETED = "not_completed"; + public const LP_NOT_ATTEMPTED = \ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM; + public const LP_IN_PROGRESS = \ilLPStatus::LP_STATUS_IN_PROGRESS_NUM; + public const LP_COMPLETED = \ilLPStatus::LP_STATUS_COMPLETED_NUM; + public const LP_FAILED = \ilLPStatus::LP_STATUS_FAILED_NUM; + public const LP_ASSESSMENT_NOT_COMPLETED = \ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM; protected array $member_records = array(); protected int $position = 0; diff --git a/Modules/IndividualAssessment/classes/Members/class.ilIndividualAssessmentMembersStorageDB.php b/Modules/IndividualAssessment/classes/Members/class.ilIndividualAssessmentMembersStorageDB.php index f668fcf96255..85fa789ce85d 100644 --- a/Modules/IndividualAssessment/classes/Members/class.ilIndividualAssessmentMembersStorageDB.php +++ b/Modules/IndividualAssessment/classes/Members/class.ilIndividualAssessmentMembersStorageDB.php @@ -71,7 +71,7 @@ public function loadMembersAsSingleObjects( } $res = $this->db->query($sql); while ($rec = $this->db->fetchAssoc($res)) { - $usr = new ilObjUser((int)$rec["usr_id"]); + $usr = new ilObjUser((int) $rec["usr_id"]); $members[] = $this->createAssessmentMember($obj, $usr, $rec); } return $members; @@ -191,8 +191,8 @@ protected function getActualDateTime(): string */ public function deleteMembers(ilObjIndividualAssessment $obj): void { - foreach($this->loadMembers($obj) as $member) { - if($identifier = $member[ilIndividualAssessmentMembers::FIELD_FILE_NAME]) { + foreach ($this->loadMembers($obj) as $member) { + if ($identifier = $member[ilIndividualAssessmentMembers::FIELD_FILE_NAME]) { $resource_id = $this->irss->manage()->find($identifier); $this->irss->manage()->remove($resource_id, $this->stakeholder); } @@ -353,7 +353,7 @@ public function insertMembersRecord(ilObjIndividualAssessment $iass, array $reco public function removeMembersRecord(ilObjIndividualAssessment $iass, array $record): void { - if(array_key_exists(ilIndividualAssessmentMembers::FIELD_FILE_NAME, $record) + if (array_key_exists(ilIndividualAssessmentMembers::FIELD_FILE_NAME, $record) && $identifier = $record[ilIndividualAssessmentMembers::FIELD_FILE_NAME]) { $resource_id = $this->irss->manage()->find($identifier); $this->irss->manage()->remove($resource_id, $this->stakeholder); @@ -374,13 +374,13 @@ public function removeMembersRecord(ilObjIndividualAssessment $iass, array $reco protected function getWhereFromFilter($filter): string { switch ($filter) { - case ilIndividualAssessmentMembers::LP_ASSESSMENT_NOT_COMPLETED: + case ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM: return " AND finalized = 0 AND examiner_id IS NULL\n"; - case ilIndividualAssessmentMembers::LP_IN_PROGRESS: + case ilLPStatus::LP_STATUS_IN_PROGRESS_NUM: return " AND finalized = 0 AND examiner_id IS NOT NULL\n"; - case ilIndividualAssessmentMembers::LP_COMPLETED: + case ilLPStatus::LP_STATUS_COMPLETED_NUM: return " AND finalized = 1 AND learning_progress = 2\n"; - case ilIndividualAssessmentMembers::LP_FAILED: + case ilLPStatus::LP_STATUS_FAILED_NUM: return " AND finalized = 1 AND learning_progress = 3\n"; default: return ""; diff --git a/Modules/IndividualAssessment/classes/class.ilIndividualAssessmentMemberGUI.php b/Modules/IndividualAssessment/classes/class.ilIndividualAssessmentMemberGUI.php index b43cfd895d94..2d3327753b31 100644 --- a/Modules/IndividualAssessment/classes/class.ilIndividualAssessmentMemberGUI.php +++ b/Modules/IndividualAssessment/classes/class.ilIndividualAssessmentMemberGUI.php @@ -71,6 +71,7 @@ public function __construct( protected ilIndividualAssessmentGradingStakeholder $stakeholder, ) { parent::__construct(); + $this->lng->loadLanguageModule('trac'); } public function executeCommand(): void @@ -177,7 +178,7 @@ protected function downloadFile(): void { $identifier = $this->getMember()->getGrading()->getFile(); $resource_id = $this->irss->manage()->find($identifier); - if($resource_id) { + if ($resource_id) { $this->irss->consume()->download($resource_id)->run(); } } @@ -323,9 +324,9 @@ protected function saveMember( protected function getPossibleLPStates(): array { return [ - ilIndividualAssessmentMembers::LP_IN_PROGRESS => $this->lng->txt('iass_status_pending'), - ilIndividualAssessmentMembers::LP_COMPLETED => $this->lng->txt('iass_status_completed'), - ilIndividualAssessmentMembers::LP_FAILED => $this->lng->txt('iass_status_failed') + ilLPStatus::LP_STATUS_IN_PROGRESS_NUM => $this->lng->txt(ilLPStatus::LP_STATUS_IN_PROGRESS), + ilLPStatus::LP_STATUS_COMPLETED_NUM => $this->lng->txt(ilLPStatus::LP_STATUS_COMPLETED), + ilLPStatus::LP_STATUS_FAILED_NUM => $this->lng->txt(ilLPStatus::LP_STATUS_FAILED) ]; } @@ -353,7 +354,7 @@ protected function getUploadResult(): HandlerResult protected function getRemoveResult(string $identifier): HandlerResult { $resource_id = $this->irss->manage()->find($identifier); - if($resource_id) { + if ($resource_id) { $this->irss->manage()->remove($resource_id, $this->stakeholder); $status = HandlerResult::STATUS_OK; $message = $this->lng->txt('iass_file_deleted'); @@ -368,7 +369,7 @@ protected function getRemoveResult(string $identifier): HandlerResult public function getInfoResult(string $identifier): ?FileInfoResult { $resource_id = $this->irss->manage()->find($identifier); - if(! $resource_id) { + if (! $resource_id) { return null; } $resource = $this->irss->manage()->getResource($resource_id); @@ -388,7 +389,7 @@ public function getInfoForExistingFiles(array $file_ids): array $file_ids = array_filter($file_ids, fn($id) => $id !== ""); return array_map(function ($id) { $resource_id = $this->irss->manage()->find($identifier); - if(! $resource_id) { + if (! $resource_id) { return null; } $resource = $this->irss->manage()->getResource($resource_id); diff --git a/Modules/IndividualAssessment/classes/class.ilIndividualAssessmentMembersGUI.php b/Modules/IndividualAssessment/classes/class.ilIndividualAssessmentMembersGUI.php index b2e2a4baba39..e287b27a7ce4 100644 --- a/Modules/IndividualAssessment/classes/class.ilIndividualAssessmentMembersGUI.php +++ b/Modules/IndividualAssessment/classes/class.ilIndividualAssessmentMembersGUI.php @@ -340,14 +340,14 @@ protected function getModeOptions(): array $ret[$this->txt("iass_filter_all")] = $this->getLinkForStatusFilter(null); if ($this->iass_access->mayViewAnyUser()) { - $ret[$this->txt("iass_filter_not_started")] = - $this->getLinkForStatusFilter(ilIndividualAssessmentMembers::LP_ASSESSMENT_NOT_COMPLETED); - $ret[$this->txt("iass_filter_not_finalized")] = - $this->getLinkForStatusFilter(ilIndividualAssessmentMembers::LP_IN_PROGRESS); - $ret[$this->txt("iass_filter_finalized")] = - $this->getLinkForStatusFilter(ilIndividualAssessmentMembers::LP_COMPLETED); - $ret[$this->txt("iass_filter_failed")] = - $this->getLinkForStatusFilter(ilIndividualAssessmentMembers::LP_FAILED); + $ret[$this->txt(ilLPStatus::LP_STATUS_NOT_ATTEMPTED)] = + $this->getLinkForStatusFilter(ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM); + $ret[$this->txt(ilLPStatus::LP_STATUS_IN_PROGRESS)] = + $this->getLinkForStatusFilter(ilLPStatus::LP_STATUS_IN_PROGRESS_NUM); + $ret[$this->txt(ilLPStatus::LP_STATUS_COMPLETED)] = + $this->getLinkForStatusFilter(ilLPStatus::LP_STATUS_COMPLETED_NUM); + $ret[$this->txt(ilLPStatus::LP_STATUS_FAILED)] = + $this->getLinkForStatusFilter(ilLPStatus::LP_STATUS_FAILED_NUM); } return $ret; } @@ -358,14 +358,14 @@ protected function getModeOptions(): array protected function getActiveLabelForModeByFilter($filter): string { switch ($filter) { - case ilIndividualAssessmentMembers::LP_ASSESSMENT_NOT_COMPLETED: - return $this->txt("iass_filter_not_started"); - case ilIndividualAssessmentMembers::LP_IN_PROGRESS: - return $this->txt("iass_filter_not_finalized"); - case ilIndividualAssessmentMembers::LP_COMPLETED: - return $this->txt("iass_filter_finalized"); - case ilIndividualAssessmentMembers::LP_FAILED: - return $this->txt("iass_filter_failed"); + case ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM: + return $this->txt(ilLPStatus::LP_STATUS_NOT_ATTEMPTED); + case ilLPStatus::LP_STATUS_IN_PROGRESS_NUM: + return $this->txt(ilLPStatus::LP_STATUS_IN_PROGRESS); + case ilLPStatus::LP_STATUS_COMPLETED_NUM: + return $this->txt(ilLPStatus::LP_STATUS_COMPLETED); + case ilLPStatus::LP_STATUS_FAILED_NUM: + return $this->txt(ilLPStatus::LP_STATUS_FAILED); default: return $this->txt("iass_filter_all"); } @@ -394,10 +394,10 @@ protected function getFilterValue(): ?string in_array( $this->request_wrapper->retrieve(self::F_STATUS, $this->refinery->kindlyTo()->string()), [ - ilIndividualAssessmentMembers::LP_ASSESSMENT_NOT_COMPLETED, - ilIndividualAssessmentMembers::LP_IN_PROGRESS, - ilIndividualAssessmentMembers::LP_COMPLETED, - ilIndividualAssessmentMembers::LP_FAILED + ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM, + ilLPStatus::LP_STATUS_IN_PROGRESS_NUM, + ilLPStatus::LP_STATUS_COMPLETED_NUM, + ilLPStatus::LP_STATUS_FAILED_NUM ] ) ) { diff --git a/Modules/IndividualAssessment/classes/class.ilIndividualAssessmentMembersTableGUI.php b/Modules/IndividualAssessment/classes/class.ilIndividualAssessmentMembersTableGUI.php index 8be2b6ffd4ad..bac6dd521fac 100644 --- a/Modules/IndividualAssessment/classes/class.ilIndividualAssessmentMembersTableGUI.php +++ b/Modules/IndividualAssessment/classes/class.ilIndividualAssessmentMembersTableGUI.php @@ -67,7 +67,7 @@ public function setData(array $data): void { $this->data = array_filter( $data, - fn ($record) => + fn($record) => $this->iass_access->mayEditMembers() || $this->iass_access->mayGradeUser($record->id()) || $this->iass_access->mayViewUser($record->id()) @@ -123,7 +123,7 @@ protected function getSubheadline(ilIndividualAssessmentMember $record): string } $examiner_id = $record->examinerId(); - return $this->txt("grading") . ": " . $this->getStatus($record->finalized(), $record->LPStatus(), $examiner_id); + return $this->txt("learning_progress") . ": " . $this->getEntryForStatus($record->LPStatus()); } /** @@ -239,7 +239,7 @@ protected function getFurtherFields(ilIndividualAssessmentMember $record): array } return array_merge( - $record->LPStatus() ? [$this->txt("grading") . ":" => $this->getEntryForStatus($record->LPStatus())] : [], + $record->LPStatus() ? [$this->txt("learning_progress") . ":" => $this->getEntryForStatus($record->LPStatus())] : [], $this->getImportantInfos($record, false), $this->getLocationInfos( $record->finalized(), @@ -290,22 +290,6 @@ protected function getAction(ilIndividualAssessmentMember $record, Factory $ui_f return $ui_factory->dropdown()->standard($items)->withLabel($this->txt("actions")); } - /** - * Returns readable status - */ - protected function getStatus(bool $finalized, int $status, int $examiner_id = null): string - { - if ($status == 0) { - $status = ilIndividualAssessmentMembers::LP_IN_PROGRESS; - } - - if (!$finalized && !is_null($examiner_id)) { - return $this->txt('iass_assessment_not_completed'); - } - - return $this->getEntryForStatus($status); - } - /** * Returns information about the grading * @@ -427,12 +411,14 @@ protected function getFileDownloadLink(int $usr_id): array protected function getEntryForStatus(int $a_status): string { switch ($a_status) { - case ilIndividualAssessmentMembers::LP_IN_PROGRESS: - return $this->txt('iass_status_pending'); - case ilIndividualAssessmentMembers::LP_COMPLETED: - return $this->txt('iass_status_completed'); - case ilIndividualAssessmentMembers::LP_FAILED: - return $this->txt('iass_status_failed'); + case ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM: + return $this->txt(ilLPStatus::LP_STATUS_NOT_ATTEMPTED); + case ilLPStatus::LP_STATUS_IN_PROGRESS_NUM: + return $this->txt(ilLPStatus::LP_STATUS_IN_PROGRESS); + case ilLPStatus::LP_STATUS_COMPLETED_NUM: + return $this->txt(ilLPStatus::LP_STATUS_COMPLETED); + case ilLPStatus::LP_STATUS_FAILED_NUM: + return $this->txt(ilLPStatus::LP_STATUS_FAILED); default: throw new ilIndividualAssessmentException("Invalid status: " . $a_status); } diff --git a/Modules/IndividualAssessment/classes/class.ilObjIndividualAssessmentAccess.php b/Modules/IndividualAssessment/classes/class.ilObjIndividualAssessmentAccess.php index 56bb6a06856a..f86c32c553fa 100644 --- a/Modules/IndividualAssessment/classes/class.ilObjIndividualAssessmentAccess.php +++ b/Modules/IndividualAssessment/classes/class.ilObjIndividualAssessmentAccess.php @@ -53,10 +53,10 @@ public static function checkCondition(int $a_trigger_obj_id, string $a_operator, switch ($a_operator) { case ilConditionHandler::OPERATOR_PASSED: return ilIndividualAssessmentLPInterface::determineStatusOfMember($a_trigger_obj_id, $a_usr_id) - == ilIndividualAssessmentMembers::LP_COMPLETED; + == ilLPStatus::LP_STATUS_COMPLETED_NUM; case ilConditionHandler::OPERATOR_FAILED: return ilIndividualAssessmentLPInterface::determineStatusOfMember($a_trigger_obj_id, $a_usr_id) - == ilIndividualAssessmentMembers::LP_FAILED; + == ilLPStatus::LP_STATUS_FAILED_NUM; default: return false; } diff --git a/Modules/IndividualAssessment/classes/class.ilObjIndividualAssessmentGUI.php b/Modules/IndividualAssessment/classes/class.ilObjIndividualAssessmentGUI.php index ff3030a6012e..e6b7f0ae88b4 100644 --- a/Modules/IndividualAssessment/classes/class.ilObjIndividualAssessmentGUI.php +++ b/Modules/IndividualAssessment/classes/class.ilObjIndividualAssessmentGUI.php @@ -157,7 +157,7 @@ public function executeCommand(): void $cmd = 'members'; } } - if($cmd === 'edit' && $this->object->accessHandler()->simulateMember()) { + if ($cmd === 'edit' && $this->object->accessHandler()->simulateMember()) { $cmd = 'view'; } @@ -209,7 +209,7 @@ protected function addMemberDataToInfo(ilInfoScreenGUI $info): ilInfoScreenGUI $member = $this->object->membersStorage()->loadMember($this->object, $this->usr); $info->addSection($this->txt('grading_info')); if ($member->finalized()) { - $info->addProperty($this->txt('grading'), $this->getEntryForStatus($member->LPStatus())); + $info->addProperty($this->txt('learning_progress'), $this->getEntryForStatus($member->LPStatus())); } if ($member->notify() && $member->finalized()) { $info->addProperty($this->txt('grading_record'), nl2br($member->record())); @@ -237,7 +237,7 @@ protected function downloadFileObject(): void ) { $identifier = $member->getGrading()->getFile(); $resource_id = $this->irss->manage()->find($identifier); - if($resource_id) { + if ($resource_id) { $this->irss->consume()->download($resource_id)->run(); } } @@ -410,12 +410,12 @@ public static function _goto(string $a_target, string $a_add = ''): void protected function getEntryForStatus(int $status): string { switch ($status) { - case ilIndividualAssessmentMembers::LP_IN_PROGRESS: - return $this->txt('iass_status_pending'); - case ilIndividualAssessmentMembers::LP_COMPLETED: - return $this->txt('iass_status_completed'); - case ilIndividualAssessmentMembers::LP_FAILED: - return $this->txt('iass_status_failed'); + case ilLPStatus::LP_STATUS_IN_PROGRESS_NUM: + return $this->txt(ilLPStatus::LP_STATUS_IN_PROGRESS); + case ilLPStatus::LP_STATUS_COMPLETED_NUM: + return $this->txt(ilLPStatus::LP_STATUS_COMPLETED); + case ilLPStatus::LP_STATUS_FAILED_NUM: + return $this->txt(ilLPStatus::LP_STATUS_FAILED); default: throw new ilIndividualAssessmentException("Status for id $status not found!"); } diff --git a/Modules/IndividualAssessment/classes/ilIndividualAssessmentUserGrading.php b/Modules/IndividualAssessment/classes/ilIndividualAssessmentUserGrading.php index 671341e3b117..a5fe0fe20bf1 100644 --- a/Modules/IndividualAssessment/classes/ilIndividualAssessmentUserGrading.php +++ b/Modules/IndividualAssessment/classes/ilIndividualAssessmentUserGrading.php @@ -25,39 +25,18 @@ class ilIndividualAssessmentUserGrading { - protected string $name; - protected string $record; - protected string $internal_note; - protected ?string $file; - protected bool $is_file_visible; - protected int $learning_progress; - protected string $place; - protected ?DateTimeImmutable $event_time; - protected bool $notify; - protected bool $finalized; - public function __construct( - string $name, - string $record, - string $internal_note, - ?string $file, - bool $is_file_visible, - int $learning_progress, - string $place, - ?DateTimeImmutable $event_time, - bool $notify, - bool $finalized = false + protected string $name, + protected string $record, + protected string $internal_note, + protected ?string $file, + protected bool $is_file_visible, + protected int $learning_progress, + protected string $place, + protected ?DateTimeImmutable $event_time, + protected bool $notify, + protected bool $finalized = false ) { - $this->name = $name; - $this->record = $record; - $this->internal_note = $internal_note; - $this->file = $file; - $this->is_file_visible = $is_file_visible; - $this->learning_progress = $learning_progress; - $this->place = $place; - $this->event_time = $event_time; - $this->notify = $notify; - $this->finalized = $finalized; } public function getName(): string @@ -173,8 +152,8 @@ public function toFormInput( ; $learning_progress = $input - ->select($lng->txt('grading'), $grading_options) - ->withValue($this->getLearningProgress() ?: ilIndividualAssessmentMembers::LP_IN_PROGRESS) + ->select($lng->txt('learning_progress'), $grading_options) + ->withValue($this->getLearningProgress() ?: ilLPStatus::LP_STATUS_IN_PROGRESS_NUM) ->withDisabled(!$may_be_edited) ->withRequired(true) ; diff --git a/Modules/IndividualAssessment/test/Members/ilIndividualAssessmentMemberTest.php b/Modules/IndividualAssessment/test/Members/ilIndividualAssessmentMemberTest.php index 8ed6689c6fb9..18e2dafac3aa 100644 --- a/Modules/IndividualAssessment/test/Members/ilIndividualAssessmentMemberTest.php +++ b/Modules/IndividualAssessment/test/Members/ilIndividualAssessmentMemberTest.php @@ -345,8 +345,8 @@ public function test_mayBeFinalized_file_required_filename_empty(?string $filena public function positiveLPStatusDataProvider(): array { return [ - [ilIndividualAssessmentMembers::LP_COMPLETED], - [ilIndividualAssessmentMembers::LP_FAILED] + [ilLPStatus::LP_STATUS_COMPLETED_NUM], + [ilLPStatus::LP_STATUS_FAILED_NUM] ]; } @@ -407,7 +407,7 @@ public function test_mayBeFinalized_already_finalized(): void $this->grading ->expects($this->once()) ->method("getLearningProgress") - ->willReturn(ilIndividualAssessmentMembers::LP_COMPLETED) + ->willReturn(ilLPStatus::LP_STATUS_COMPLETED_NUM) ; $this->grading ->expects($this->once()) @@ -428,8 +428,8 @@ public function test_mayBeFinalized_already_finalized(): void public function negativeLPStatusDataProvider(): array { return [ - [ilIndividualAssessmentMembers::LP_NOT_ATTEMPTED], - [ilIndividualAssessmentMembers::LP_IN_PROGRESS] + [ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM], + [ilLPStatus::LP_STATUS_IN_PROGRESS_NUM] ]; } @@ -589,7 +589,7 @@ public function test_LPStatus(): void $this->grading ->expects($this->once()) ->method("getLearningProgress") - ->willReturn(ilIndividualAssessmentMembers::LP_COMPLETED) + ->willReturn(ilLPStatus::LP_STATUS_COMPLETED_NUM) ; $obj = new ilIndividualAssessmentMember( @@ -599,7 +599,7 @@ public function test_LPStatus(): void 22222 ); - $this->assertEquals(ilIndividualAssessmentMembers::LP_COMPLETED, $obj->LPStatus()); + $this->assertEquals(ilLPStatus::LP_STATUS_COMPLETED_NUM, $obj->LPStatus()); } public function test_notificationTS(): void diff --git a/Modules/IndividualAssessment/test/Members/ilIndividualAssessmentMembersStorageDBTest.php b/Modules/IndividualAssessment/test/Members/ilIndividualAssessmentMembersStorageDBTest.php index 607af7cd33eb..b88cd8df179b 100644 --- a/Modules/IndividualAssessment/test/Members/ilIndividualAssessmentMembersStorageDBTest.php +++ b/Modules/IndividualAssessment/test/Members/ilIndividualAssessmentMembersStorageDBTest.php @@ -631,19 +631,19 @@ public function dataFor_getWhereFromFilter(): array { return [ [ - ilIndividualAssessmentMembers::LP_ASSESSMENT_NOT_COMPLETED, + ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM, " AND finalized = 0 AND examiner_id IS NULL\n" ], [ - ilIndividualAssessmentMembers::LP_IN_PROGRESS, + ilLPStatus::LP_STATUS_IN_PROGRESS_NUM, " AND finalized = 0 AND examiner_id IS NOT NULL\n" ], [ - ilIndividualAssessmentMembers::LP_COMPLETED, + ilLPStatus::LP_STATUS_COMPLETED_NUM, " AND finalized = 1 AND learning_progress = 2\n" ], [ - ilIndividualAssessmentMembers::LP_FAILED, + ilLPStatus::LP_STATUS_FAILED_NUM, " AND finalized = 1 AND learning_progress = 3\n" ], [ diff --git a/Modules/IndividualAssessment/test/ilIndividualAssessmentUserGradingTest.php b/Modules/IndividualAssessment/test/ilIndividualAssessmentUserGradingTest.php index a091075a9ae0..e8f9ee57560b 100644 --- a/Modules/IndividualAssessment/test/ilIndividualAssessmentUserGradingTest.php +++ b/Modules/IndividualAssessment/test/ilIndividualAssessmentUserGradingTest.php @@ -34,7 +34,7 @@ public function test_create_instance() $internal_note = 'This is a node just for me.'; $file = null; $is_file_visible = false; - $learning_progress = ilIndividualAssessmentMembers::LP_IN_PROGRESS; + $learning_progress = ilLPStatus::LP_STATUS_IN_PROGRESS_NUM; $place = 'Area 51'; $event_time = new DateTimeImmutable(); $notify = true; @@ -72,7 +72,7 @@ public function test_with_finalized_changed() $internal_note = 'This is a node just for me.'; $file = 'report.pdf'; $is_file_visible = true; - $learning_progress = ilIndividualAssessmentMembers::LP_IN_PROGRESS; + $learning_progress = ilLPStatus::LP_STATUS_IN_PROGRESS_NUM; $place = 'Area 51 Underground'; $event_time = new DateTimeImmutable(); $notify = false; @@ -140,7 +140,7 @@ public function testToFormInput(): void $internal_note = 'This is a node just for me.'; $file = 'report.pdf'; $is_file_visible = true; - $learning_progress = ilIndividualAssessmentMembers::LP_IN_PROGRESS; + $learning_progress = ilLPStatus::LP_STATUS_IN_PROGRESS_NUM; $place = 'Area 51 Underground'; $event_time = new DateTimeImmutable(); $notify = false; @@ -166,9 +166,9 @@ public function testToFormInput(): void $file_handler, $df->dateFormat()->standard(), [ - ilIndividualAssessmentMembers::LP_IN_PROGRESS, - ilIndividualAssessmentMembers::LP_FAILED, - ilIndividualAssessmentMembers::LP_COMPLETED + ilLPStatus::LP_STATUS_IN_PROGRESS_NUM, + ilLPStatus::LP_STATUS_FAILED_NUM, + ilLPStatus::LP_STATUS_COMPLETED_NUM ] );