[conflict_resolver] Replace 'Value 1 & 2' with 'Incorrect Answer'

aces · Dec 10, 2024 · 0ede23a · 0ede23a
1 parent 2e4211f
commit 0ede23a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/modules/conflict_resolver/jsx/resolved_filterabledatatable.js b/modules/conflict_resolver/jsx/resolved_filterabledatatable.js
@@ -169,12 +169,8 @@ class ResolvedFilterableDataTable extends Component {
         name: 'Description',
         type: 'text',
       }},
-      {label: 'Value 1', show: true, filter: {
-        name: 'Value1',
-        type: 'text',
-      }},
-      {label: 'Value 2', show: true, filter: {
-        name: 'Value2',
+      {label: 'Incorrect Answer', show: true, filter: {
+        name: 'OldValue',
         type: 'text',
       }},
       {label: 'Correct Answer', show: true, filter: {

diff --git a/modules/conflict_resolver/php/models/resolveddto.class.inc b/modules/conflict_resolver/php/models/resolveddto.class.inc
@@ -46,8 +46,7 @@ class ResolvedDTO implements DataInstance, SiteHaver
     protected $instrument;
     protected $question;
     protected $description;
-    protected $value1;
-    protected $value2;
+    protected $oldValue;
     protected $correctanswer;
     protected $user1;
     protected $user2;
@@ -72,8 +71,7 @@ class ResolvedDTO implements DataInstance, SiteHaver
             'Instrument'          => $this->instrument,
             'Question'            => $this->question,
             'Description'         => "",
-            'Value 1'             => $this->value1,
-            'Value 2'             => $this->value2,
+            'Incorrect Answer'    => $this->oldValue,
             'Correct Answer'      => $this->correctanswer,
             'User 1'              => $this->user1,
             'User 2'              => $this->user2,

diff --git a/modules/conflict_resolver/php/provisioners/resolvedprovisioner.class.inc b/modules/conflict_resolver/php/provisioners/resolvedprovisioner.class.inc
@@ -41,18 +41,21 @@ class ResolvedProvisioner extends \LORIS\Data\Provisioners\DBObjectProvisioner
               Project.Name as project,
 	      conflicts_resolved.FieldName as question,
 	      CASE
-    		WHEN conflicts_resolved.FieldName <> "Examiner"
-        	THEN conflicts_resolved.OldValue1
-    	      	    ELSE
-	      CONCAT(conflicts_resolved.OldValue1, " - ",
-			(SELECT full_name FROM examiners WHERE examinerID = conflicts_resolved.OldValue1))
- 		END as value1,
-	      CASE
-    		WHEN conflicts_resolved.FieldName <> "Examiner"
-        	    THEN conflicts_resolved.OldValue2
-		    ELSE CONCAT(conflicts_resolved.OldValue2, " - ",
-			(SELECT full_name FROM examiners WHERE examinerID = conflicts_resolved.OldValue2))
-		END as value2,
+    		WHEN conflicts_resolved.NewValue <> 1
+                AND conflicts_resolved.FieldName <> "Examiner"
+                THEN conflicts_resolved.OldValue1
+            WHEN conflicts_resolved.NewValue <> 1
+                AND conflicts_resolved.FieldName = "Examiner"
+                THEN CONCAT(conflicts_resolved.OldValue1, " - ",
+                (SELECT full_name FROM examiners
+                WHERE examinerID = conflicts_resolved.OldValue1))
+            WHEN conflicts_resolved.NewValue = 1
+            AND conflicts_resolved.FieldName = "Examiner"
+                THEN CONCAT(conflicts_resolved.OldValue2, " - ",
+                (SELECT full_name FROM examiners
+                WHERE examinerID = conflicts_resolved.OldValue2))
+            ELSE conflicts_resolved.OldValue2
+            END AS oldValue,
 	      CASE
 		WHEN conflicts_resolved.NewValue = 1
 			AND conflicts_resolved.FieldName <> "Examiner"