[conflict_resolver] Add description field

SQL/New_patches/2023-07-19_add_index_parameter_type.sql

@@ -0,0 +1,2 @@
+-- Index on parameter_type table to speed up the "Description" field on conflict_resolver.
+CREATE INDEX idx_conflictResolverDesc ON parameter_type(SourceFrom(255),SourceField(255));

modules/conflict_resolver/jsx/resolved_filterabledatatable.js

@@ -129,6 +129,10 @@ class ResolvedFilterableDataTable extends Component {
         name: 'Question',
         type: 'text',
       }},
+      {label: 'Description', show: true, filter: {
+        name: 'Description',
+        type: 'text',
+      }},
       {label: 'Value 1', show: true, filter: {
         name: 'Value1',
         type: 'text',

modules/conflict_resolver/jsx/unresolved_filterabledatatable.js

@@ -141,6 +141,10 @@ class UnresolvedFilterableDataTable extends Component {
         name: 'Question',
         type: 'text',
       }},
+      {label: 'Description', show: true, filter: {
+        name: 'Description',
+        type: 'text',
+      }},
       {label: 'Value 1', show: false},
       {label: 'Value 2', show: false},
       {label: 'Correct Answer', show: true},

modules/conflict_resolver/php/models/resolveddto.class.inc

@@ -43,6 +43,7 @@ class ResolvedDTO implements DataInstance, SiteHaver
     protected $visitlabel;
     protected $instrument;
     protected $question;
+    protected $description;
     protected $value1;
     protected $value2;
     protected $correctanswer;
@@ -67,6 +68,7 @@ class ResolvedDTO implements DataInstance, SiteHaver
             'Visit Label'         => $this->visitlabel,
             'Instrument'          => $this->instrument,
             'Question'            => $this->question,
+            'Description'         => $this->description,
             'Value 1'             => $this->value1,
             'Value 2'             => $this->value2,
             'Correct Answer'      => $this->correctanswer,

modules/conflict_resolver/php/models/unresolveddto.class.inc

@@ -43,6 +43,7 @@ class UnresolvedDTO implements DataInstance, SiteHaver
     protected $visitlabel;
     protected $instrument;
     protected $question;
+    protected $description;
     protected $value1;
     protected $value2;
 
@@ -62,6 +63,7 @@ class UnresolvedDTO implements DataInstance, SiteHaver
             'Visit Label' => $this->visitlabel,
             'Instrument'  => $this->instrument,
             'Question'    => $this->question,
+            'Description' => $this->description,
             'Value 1'     => $this->value1,
             'Value 2'     => $this->value2,
         ];

modules/conflict_resolver/php/provisioners/resolvedprovisioner.class.inc

@@ -39,6 +39,7 @@ class ResolvedProvisioner extends \LORIS\Data\Provisioners\DBObjectProvisioner
               session.Visit_label as visitlabel,
               Project.Name as project,
               conflicts_resolved.FieldName as question,
+              parameter_type.Description as description,
               conflicts_resolved.OldValue1 as value1,
               conflicts_resolved.OldValue2 as value2,
               CASE
@@ -55,6 +56,9 @@ class ResolvedProvisioner extends \LORIS\Data\Provisioners\DBObjectProvisioner
               Project.ProjectID as projectid
              FROM
               conflicts_resolved
+             LEFT JOIN parameter_type
+                ON (parameter_type.SourceField = conflicts_resolved.FieldName
+                AND parameter_type.SourceFrom = conflicts_resolved.TableName)
              LEFT JOIN flag ON (conflicts_resolved.CommentId1=flag.CommentID)
              LEFT JOIN session ON (flag.SessionID=session.ID)
              LEFT JOIN candidate ON (candidate.CandID=session.CandID)

modules/conflict_resolver/php/provisioners/unresolvedprovisioner.class.inc

@@ -39,13 +39,17 @@ class UnresolvedProvisioner extends \LORIS\Data\Provisioners\DBObjectProvisioner
               session.Visit_label as visitlabel,
               Project.Name as project,
               conflicts_unresolved.FieldName as question,
+              parameter_type.Description as description,
               conflicts_unresolved.Value1 as value1,
               conflicts_unresolved.Value2 as value2,
               psc.name as site,
               session.CenterID as centerid,
               Project.ProjectID as projectid
              FROM
               conflicts_unresolved 
+             LEFT JOIN parameter_type
+                ON (parameter_type.SourceField = conflicts_unresolved.FieldName
+                AND parameter_type.SourceFrom = conflicts_unresolved.TableName)
              LEFT JOIN flag ON (conflicts_unresolved.CommentId1=flag.CommentID)
              LEFT JOIN session ON (flag.SessionID=session.ID)
              LEFT JOIN candidate ON (candidate.CandID=session.CandID)