Merge branch 'release-48.14.2'

oat-sa · Nov 22, 2024 · 257efc4 · 257efc4
2 parents e67e033 + 432c326
commit 257efc4
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/models/classes/class.QtiTestService.php b/models/classes/class.QtiTestService.php
@@ -629,7 +629,7 @@ protected function importTest(
 
                 // If any, assessmentSectionRefs will be resolved and included as part of the main test definition.
                 $testDefinition->includeAssessmentSectionRefs(true);
-                $testLabel = $packageLabel ?? $testDefinition->getDocumentComponent()->getTitle();
+                $testLabel = $packageLabel ?? $this->getTestLabel($reportCtx->testMetadata);
 
                 if ($overwriteTestUri || $overwriteTest) {
                     $itemsClassLabel = $testLabel;
@@ -807,9 +807,8 @@ protected function importTest(
                             $this->importTestAuxiliaryFiles($testContent, $qtiTestResource, $folder, $report);
 
                             // 3. Give meaningful names to resources.
-                            $definitionTitle = $testDefinition->getDocumentComponent()->getTitle();
-                            $testResource->setLabel($packageLabel ?? $definitionTitle);
-                            $targetItemClass->setLabel($packageLabel ?? $definitionTitle);
+                            $testResource->setLabel($packageLabel ?? $testLabel);
+                            $targetItemClass->setLabel($packageLabel ?? $testLabel);
 
                             // 4. Import metadata for the resource (use same mechanics as item resources).
                             // Metadata will be set as property values.
@@ -1571,4 +1570,17 @@ private function createTestIdentifier(core_kernel_classes_Resource $test): strin
 
         return str_replace('_', '-', Format::sanitizeIdentifier($identifier));
     }
+
+    private function getTestLabel(array $testMetadata): string
+    {
+        $labelMetadata = array_filter($testMetadata, function ($metadata) {
+            return in_array(RDFS_LABEL, $metadata->getPath());
+        });
+
+        if (count($labelMetadata) > 1) {
+            common_Logger::w('Multiple labels found for test. Using the first one.');
+        }
+
+        return reset($labelMetadata)->getValue();
+    }
 }