diff --git a/modules/media/jsx/mediaIndex.js b/modules/media/jsx/mediaIndex.js index 71eaa02811..c60b706fdc 100644 --- a/modules/media/jsx/mediaIndex.js +++ b/modules/media/jsx/mediaIndex.js @@ -212,6 +212,7 @@ class MediaIndex extends Component { {label: t('Visit Label', {ns: 'loris'}), show: true, filter: { name: 'visitLabel', type: 'select', + sortByValue: false, options: options.visits, }}, {label: t('Language', {ns: 'loris'}), show: true, filter: { diff --git a/modules/media/php/mediafileprovisioner.class.inc b/modules/media/php/mediafileprovisioner.class.inc index a5530c1093..db16d61c29 100644 --- a/modules/media/php/mediafileprovisioner.class.inc +++ b/modules/media/php/mediafileprovisioner.class.inc @@ -108,6 +108,9 @@ class MediaFileProvisioner extends \LORIS\Data\Provisioners\DBRowProvisioner } $row['fullName'] = $this->_instrumentnames[$testname] ?? null; + if (isset($row['visitLabel'])) { + $row['visitLabel'] = dgettext("visit", $row['visitLabel']); + } return new MediaFile($row); } } diff --git a/php/libraries/Utility.class.inc b/php/libraries/Utility.class.inc index d377ecbbff..a627d24015 100644 --- a/php/libraries/Utility.class.inc +++ b/php/libraries/Utility.class.inc @@ -280,15 +280,16 @@ class Utility AND s.CenterID!= '1' $ExtraProject_Criteria ORDER BY Visit_label"; $result = $db->pselect($query, $qparams); - // The result has several columns; we only want the visit labels. - $visitLabels = array_column(iterator_to_array($result), 'Visit_label'); $translatedVisitLabels = []; - foreach ($visitLabels as $visitLabel) { + foreach ($result as $row) { + $visitLabel = $row['Visit_label']; + $translatedVisitLabels[$visitLabel] = dgettext('visit', $visitLabel); } // Generates an array where the keys are equal to the values. $cache[$projStr] = $translatedVisitLabels; + return $cache[$projStr]; }