IndAss: rename grading to learning progress

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;

Modules/IndividualAssessment/classes/Members/class.ilIndividualAssessmentMember.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -18,6 +16,8 @@
  *
  *********************************************************************/
 
+declare(strict_types=1);
+
 /**
  * Edit the record of a user, set LP.
  */
@@ -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();

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;

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 "";

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);

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
                 ]
             )
         ) {

Modules/IndividualAssessment/classes/class.ilIndividualAssessmentMembersTableGUI.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -18,6 +16,8 @@
  *
  *********************************************************************/
 
+declare(strict_types=1);
+
 use ILIAS\UI\Factory;
 use ILIAS\UI\Renderer;
 use ILIAS\UI\Component\Table\PresentationRow;
@@ -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);
         }

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;
         }

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!");
         }