Merge branch 'main' into 2025_09_11_project_size_chart

Author: jeffersoncasimir

locale/ja/LC_MESSAGES/loris.po

@@ -232,6 +232,9 @@ msgstr "詳細フィルターを非表示"
 msgid "Language"
 msgstr "言語"
 
+msgid "Ethnicity"
+msgstr "民族"
+
 # Data table strings
 msgid "{{pageCount}} rows displayed of {{totalCount}}."
 msgstr "{{totalCount}}行中{{pageCount}}行を表示"
@@ -332,3 +335,8 @@ msgstr "{{months}}ヶ月"
 
 msgid "{{years}} years old"
 msgstr "{{years}}歳"
+
+# Other generic terms
+msgid "Loading..."
+msgstr "読み込み中..."
+

locale/loris.pot

@@ -231,6 +231,9 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
+msgid "Ethnicity"
+msgstr ""
+
 # Data table strings
 msgid "{{pageCount}} rows displayed of {{totalCount}}."
 msgstr ""
@@ -331,3 +334,8 @@ msgstr ""
 
 msgid "{{years}} years old"
 msgstr ""
+
+# Other generic terms
+msgid "Loading..."
+msgstr ""
+

modules/dashboard/test/DashboardTest.php

@@ -409,17 +409,17 @@ public function testDashboardRecruitmentView()
             )
         )->getText();
 
-        $this->assertStringContainsString("Recruitment - overall", $assertText1);
+        $this->assertStringContainsString("Recruitment — Overall", $assertText1);
         $this->assertStringContainsString(
-            "Recruitment - site breakdown",
+            "Recruitment — Site Breakdown",
             $assertText2
         );
         $this->assertStringContainsString(
-            "Recruitment - project breakdown",
+            "Recruitment — Project Breakdown",
             $assertText3
         );
         $this->assertStringContainsString(
-            "Recruitment - cohort breakdown",
+            "Recruitment — Cohort Breakdown",
             $assertText4
         );
     }

modules/instrument_list/templates/instrument_list_controlpanel.tpl

@@ -101,7 +101,7 @@
 		<li>
                 	<span class="fa-li"><i class="{$bvl_qc_status_complete.icon|default:'far fa-square'}"></i></span>
 			{if $bvl_qc_status_complete.showlink|default}
-                        	<a href="?candID={$candID}&sessionID={$sessionID}&setBVLQCStatus=Complete">Complete</a>
+                                <a href="?candID={$candID}&sessionID={$sessionID}&setBVLQCStatus=Complete">{dgettext("timepoint_list", "Complete")}</a>
 			{else}
                                                 {dgettext("timepoint_list", "Complete")}
 			{/if}

modules/redcap/php/client/models/records/redcaprecord.class.inc

@@ -26,10 +26,14 @@ use LORIS\redcap\client\RedcapProps;
 class RedcapRecord
 {
     /**
-     * The date at which the record was completed if it was completed using a
-     * survey.
+     * The REDCap record ID.
      */
-    public readonly ?\DateTimeImmutable $datetime;
+    public readonly string $record_id;
+
+    /**
+     * The REDCap unique event name.
+     */
+    public readonly string $unique_event_name;
 
     /**
      * The record completion status.
@@ -39,6 +43,12 @@ class RedcapRecord
      */
     public readonly int $complete;
 
+    /**
+     * The date and time at which the record was completed. This is an undocumented
+     * field in the REDCap API.
+     */
+    public readonly ?\DateTimeImmutable $datetime;
+
     private string $_form_name;
 
     private array $_props;
@@ -67,8 +77,10 @@ class RedcapRecord
             $datetime = null;
         }
 
-        $this->datetime = $datetime;
-        $this->complete = $props->getInt("{$form_name}_complete");
+        $this->record_id         = $props->getString('record_id');
+        $this->unique_event_name = $props->getString('redcap_event_name');
+        $this->datetime          = $datetime;
+        $this->complete          = $props->getInt("{$form_name}_complete");
     }
 
     /**

modules/redcap/php/client/redcaphttpclient.class.inc

@@ -46,7 +46,7 @@ class RedcapHttpClient
     private bool $_verbose;
 
     /**
-     * REDCap URL.
+     * REDCap API URL.
      */
     private string $_url;
 
@@ -70,18 +70,20 @@ class RedcapHttpClient
     /**
      * Create a new REDCap Client for a specific REDCap instance and project.
      *
-     * @param string $instance_api_url  A REDCap instance API URL.
+     * @param string $instance_url      A REDCap instance URL.
      * @param string $project_api_token A REDCap project API token.
      * @param bool   $verbose           Verbose mode.
      */
     public function __construct(
-        string $instance_api_url,
+        string $instance_url,
         string $project_api_token,
         bool $verbose = false
     ) {
-        $this->_url     = $instance_api_url;
+        $trimmed_url    = rtrim($instance_url, '/');
+        $api_url        = "{$trimmed_url}/api/";
+        $this->_url     = $api_url;
         $this->_token   = $project_api_token;
-        $this->_client  = new Client($instance_api_url);
+        $this->_client  = new Client($api_url);
         $this->_verbose = $verbose;
     }
 
@@ -784,7 +786,9 @@ class RedcapHttpClient
             'type'                   => 'flat',
             'csvDelimiter'           => '',
             'forms'                  => $instrument_names,
-            'fields'                 => [],
+            // The 'record_id' parameter adds both the 'record_id' and
+            // 'redcap_event_name' fields to the REDCap records.
+            'fields'                 => ['record_id'],
             'events'                 => $unique_event_names,
             'records'                => $record_ids,
             'rawOrLabel'             => 'raw',

modules/redcap/php/endpoints/notifications.class.inc

@@ -162,7 +162,7 @@ class Notifications extends Endpoint
         // get a new redcap client based on the notification info
         try {
             $redcap_client = new RedcapHttpClient(
-                "{$config->redcap_instance_url}/api/",
+                $config->redcap_instance_url,
                 $config->redcap_api_token,
             );
 

modules/redcap/php/redcapmapper.class.inc

@@ -89,25 +89,22 @@ class RedcapMapper
      * session creation is enabled for that visit in the REDCap module
      * configuration, or throws an error if it is not.
      *
-     * @param RedcapRecord $redcap_record     The REDCap record.
-     * @param string       $unique_event_name The unique event name associated with
-     *                                        that REDCap record.
-     * @param \Candidate   $candidate         The LORIS candidate associated with
-     *                                        that REDCap record.
+     * @param RedcapRecord $redcap_record The REDCap record.
+     * @param \Candidate   $candidate     The LORIS candidate associated with
+     *                                    that REDCap record.
      *
      * @return string The visit label of the relevant session.
      */
     public function getVisitLabel(
         RedcapRecord $redcap_record,
-        string $unique_event_name,
         \Candidate $candidate,
     ): string {
-        $visit_config = $this->getVisitConfig($unique_event_name);
+        $visit_config = $this->getVisitConfig($redcap_record->unique_event_name);
 
         // If no visit mappings are defined in the configuration, use the REDCap
         // unique event name as the visit label directly.
         if ($visit_config === null) {
-            return $unique_event_name;
+            return $redcap_record->unique_event_name;
         }
 
         $session = $this->checkOrCreateSession($candidate, $visit_config);
@@ -140,7 +137,7 @@ class RedcapMapper
         // Find the REDCap event that matches the REDCap notification event.
         $redcap_event = array_find(
             $redcap_events,
-            fn($redcap_event) => $unique_event_name === $redcap_event->unique_name,
+            fn($redcap_event) => $redcap_event->unique_name === $unique_event_name,
         );
 
         // There should always be a REDCap event that matches the REDCap