[Survey Accounts] Fix formatting of error message (#5855)

Use the full name of the instrument in the survey accounts error message, not the short name. Fixes #5774.
aces · Dec 17, 2019 · 80f7f52 · 80f7f52
1 parent 8480d76
commit 80f7f52
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/modules/survey_accounts/php/addsurvey.class.inc b/modules/survey_accounts/php/addsurvey.class.inc
@@ -110,9 +110,13 @@ class AddSurvey extends \NDB_Form
         $reminder        = " already exists for given candidate for visit ";
         foreach ($instrument_list as $instrument) {
             if ($values['Test_name'] == $instrument['Test_name']) {
+                $instrument_instance = \NDB_BVL_Instrument::factory(
+                    $instrument['Test_name']
+                );
                 return array(
-                    'Test_name' => "Instrument ". $values['Test_name'].
-                                       $reminder. $values['VL'],
+                    'Test_name' => "Instrument ".
+                        $instrument_instance->getFullName().
+                        $reminder. $values['VL'],
                 );
             }
         }