From 51e46624619697f844cf6abbfc067288961fb2a2 Mon Sep 17 00:00:00 2001
From: cmadjar <cecile.madjar@gmail.com>
Date: Tue, 21 Feb 2023 15:35:40 -0500
Subject: [PATCH] removed tabs from mri violation module remove
 noDynamicDataTable fix the filter not working for resolution status update
 test plan

---
 .../mri_violations/jsx/mriViolationsIndex.js  |  57 ++----
 .../mri_violations/jsx/resolvedViolations.js  | 190 ------------------
 ...{unresolvedViolations.js => violations.js} |  81 +++++++-
 .../mri_violations/php/provisioner.class.inc  |  17 +-
 .../php/resolved_violations.class.inc         | 104 ----------
 .../php/resolvedviolation.class.inc           |  62 ------
 .../resolvedviolationsprovisioner.class.inc   | 125 ------------
 modules/mri_violations/test/TestPlan.md       |  22 +-
 8 files changed, 105 insertions(+), 553 deletions(-)
 delete mode 100644 modules/mri_violations/jsx/resolvedViolations.js
 rename modules/mri_violations/jsx/{unresolvedViolations.js => violations.js} (72%)
 delete mode 100644 modules/mri_violations/php/resolved_violations.class.inc
 delete mode 100644 modules/mri_violations/php/resolvedviolation.class.inc
 delete mode 100644 modules/mri_violations/php/resolvedviolationsprovisioner.class.inc

diff --git a/modules/mri_violations/jsx/mriViolationsIndex.js b/modules/mri_violations/jsx/mriViolationsIndex.js
index 9240d84b4d1..8fdd235c8ec 100644
--- a/modules/mri_violations/jsx/mriViolationsIndex.js
+++ b/modules/mri_violations/jsx/mriViolationsIndex.js
@@ -1,12 +1,8 @@
-import {Tabs, TabPane} from 'Tabs';
 import Loader from 'Loader';
 import FilterableDataTable from 'FilterableDataTable';
 import React, {useEffect, useState} from 'react';
 
-import {formatColumnUnresolved, unresolvedFilters}
-    from './unresolvedViolations.js';
-import {formatColumnResolved, resolvedFilters}
-    from './resolvedViolations.js';
+import {formatColumn, violationFilters} from './violations.js';
 
 import ProtocolModal from './protocolModal.js';
 
@@ -20,10 +16,6 @@ import ProtocolModal from './protocolModal.js';
 function MRIViolationsIndex(props) {
   const [fieldOptions, setFieldOptions] = useState({});
   const [violationModal, setViolationModal] = useState(false);
-  const tabs = [
-    {id: 'notresolved', label: 'Not Resolved'},
-    {id: 'resolved', label: 'Resolved'},
-  ];
 
   const mapper = columnMapper(fieldOptions);
 
@@ -35,33 +27,18 @@ function MRIViolationsIndex(props) {
 
   return <div>
       {violationsModal}
-      <Tabs tabs={tabs} defaultTab="notresolved" updateURL={true}>
-        <TabPane TabId={tabs[0].id}>
-          <ViolationsTable
-            URL={props.unresolvedURL}
-            name="notresolved"
-            mapper={mapper}
-            formatter={formatColumnUnresolved(
-              mapper,
-              setViolationModal,
-              props.ModuleURL + '/resolve'
-            )}
-            fields={unresolvedFilters(fieldOptions)}
-            setFieldOptions={setFieldOptions}
-            noDynamicTable={true}
-          />
-        </TabPane>
-        <TabPane TabId={tabs[1].id}>
-          <ViolationsTable
-            URL={props.resolvedURL}
-            name="resolved"
-            formatter={formatColumnResolved(mapper, setViolationModal)}
-            fields={resolvedFilters(fieldOptions)}
-            mapper={mapper}
-            noDynamicTable={true}
-          />
-        </TabPane>
-    </Tabs>
+      <ViolationsTable
+        URL={props.dataURL}
+        name="violations"
+        mapper={mapper}
+        formatter={formatColumn(
+          mapper,
+          setViolationModal,
+          props.ModuleURL + '/resolve'
+        )}
+        fields={violationFilters(fieldOptions)}
+        setFieldOptions={setFieldOptions}
+      />
   </div>;
 }
 
@@ -106,7 +83,6 @@ function ViolationsTable(props) {
           fields={props.fields}
           getFormattedCell={props.formatter}
           getMappedCell={props.mapper}
-          noDynamicTable={props.noDynamicTable}
         />;
 }
 
@@ -142,11 +118,8 @@ window.addEventListener('load', () => {
   root.render(
     <MRIViolationsIndex
       ModuleURL={`${loris.BaseURL}/mri_violations/`}
-      unresolvedURL={`${loris.BaseURL}/mri_violations/?format=json`}
-      resolvedURL={
-        `${loris.BaseURL}/mri_violations/resolved_violations?format=json`
-      }
-    />
+      dataURL={`${loris.BaseURL}/mri_violations/?format=json`}
+    />,
   );
 });
 
diff --git a/modules/mri_violations/jsx/resolvedViolations.js b/modules/mri_violations/jsx/resolvedViolations.js
deleted file mode 100644
index 8bb0befd96a..00000000000
--- a/modules/mri_violations/jsx/resolvedViolations.js
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * Return a list of filter objects shared between tabs
- *
- * @param {object} fieldoptions - the dynamic field options
- * @return {array}
- */
-export function resolvedFilters(fieldoptions) {
-  return [
-    {
-      label: 'Resolution Status', show: true, filter: {
-        name: 'resolutionStatus',
-        type: 'select',
-        options: {
-            'reran': 'Reran',
-            'emailed': 'emailed site/pending',
-            'inserted': 'Inserted',
-            'rejected': 'Rejected',
-            'inserted_flag': 'Inserted with flag',
-            'other': 'Other',
-        },
-      },
-    },
-    {
-      label: 'Project', show: true, filter: {
-        name: 'project',
-        type: 'select',
-        options: fieldoptions.projects,
-     },
-    },
-    {
-      label: 'Cohort', show: true, filter: {
-        name: 'cohort',
-        type: 'select',
-        options: fieldoptions.cohorts,
-     },
-    },
-    {
-      label: 'Patient Name', show: true, filter: {
-        name: 'patientName',
-        type: 'text',
-      },
-    },
-    {
-      label: 'Site', show: true, filter: {
-        name: 'site',
-        type: 'select',
-        options: fieldoptions.sites,
-     },
-    },
-    {
-      label: 'Time Run', show: true, filter: {
-        name: 'timeRun',
-        type: 'date',
-      },
-    },
-    {
-      label: 'Image File', show: true, filter: {
-        name: 'mincFile',
-        type: 'text',
-      },
-    },
-    {
-      label: 'Series Description or Scan Type', show: true, filter: {
-        name: 'seriesOrType',
-        type: 'text',
-      },
-    },
-    {
-      label: 'Problem', show: true, filter: {
-        name: 'problem',
-        type: 'select',
-        options: {
-            'CandID and PSCID do not match database': 'Candidate Mismatch',
-            'Could not identify scan type': 'Could not identify scan type',
-            'Protocol Violation': 'MRI Protocol Check violation',
-        },
-     },
-    },
-    {
-      label: 'Series UID', show: false, filter: {
-        name: 'seriesUID',
-        type: 'text',
-      },
-    },
-    {label: 'hash', show: false},
-    {label: 'JoinID', show: false},
-    {label: 'SiteID', show: false},
-  ];
-}
-
-/**
- * Modify behaviour of specified column cells in the Data Table component
- *
- * @param {function} mapper - A data mapper for dynamic columns
- * @param {function} setPage - a callback to set the current page
- * @return {function} a formated table cell formatter
- */
-export function formatColumnResolved(mapper, setPage) {
-    const Mapper = (column, cell, rowData, rowHeaders) => {
-        cell = mapper(column, cell);
-        // Create the mapping between rowHeaders and rowData in a row object.
-        const fontColor = {color: '#FFFFFF'};
-        let resolutionStatusStyle;
-        let resolutionStatus;
-
-        if (column === 'Problem' && cell === 'Protocol Violation') {
-            return (
-                    <td>
-                    <a href="#" onClick={
-                        () => setPage({
-                              ViolationType: 'protocolcheck',
-                              PatientName: rowData['Patient Name'],
-                              SeriesUID: rowData['Series UID'],
-                              TarchiveID: rowData['TarchiveID'],
-                              CandID: rowData.CandId,
-                          })
-                    }>Protocol Violation</a>
-                    </td>
-                   );
-        }
-        if (
-            column === 'Problem' &&
-            cell === 'Could not identify scan type'
-            ) {
-            const seriesDescription
-              = rowData['Series Description or Scan Type'];
-            return (
-                    <td>
-                    <a href= "#"
-                        onClick={() => setPage({
-                              ViolationType: 'protocolviolation',
-                              PatientName: rowData['Patient Name'],
-                              SeriesUID: rowData['Series UID'],
-                              TarchiveID: rowData['TarchiveId'],
-                              CandID: rowData.CandID,
-                              PSCID: rowData.PSCID,
-                              TimeRun: rowData['Time Run'],
-                              SeriesDescription: seriesDescription,
-                            })}>Could not identify scan type</a>
-                    </td>
-                   );
-        }
-        if (column === 'Resolution Status') {
-            switch (rowData['Resolution Status']) {
-                case 'unresolved':
-                    resolutionStatusStyle = 'label-danger';
-                    resolutionStatus = 'Unresolved';
-                    break;
-
-                case 'reran':
-                    resolutionStatusStyle = 'label-success';
-                    resolutionStatus = 'Reran';
-                    break;
-
-                case 'emailed':
-                    resolutionStatusStyle = 'label-info';
-                    resolutionStatus = 'Emailed site/pending';
-                    break;
-
-                case 'rejected':
-                    resolutionStatusStyle = 'label-danger';
-                    resolutionStatus = 'Rejected';
-                    break;
-
-                case 'inserted':
-                    resolutionStatusStyle = 'label-warning';
-                    resolutionStatus = 'Inserted';
-                    break;
-
-                case 'other':
-                    resolutionStatusStyle = 'label-primary';
-                    resolutionStatus = 'Other';
-                    break;
-
-                case 'inserted_flag':
-                    resolutionStatusStyle = 'label-default';
-                    resolutionStatus = 'Inserted with flag';
-                    break;
-            }
-
-            return (
-                    <td className= {resolutionStatusStyle} style={fontColor}>
-                    {resolutionStatus}
-                    </td>
-                   );
-        }
-        return <td>{cell}</td>;
-    };
-    return Mapper;
-}
diff --git a/modules/mri_violations/jsx/unresolvedViolations.js b/modules/mri_violations/jsx/violations.js
similarity index 72%
rename from modules/mri_violations/jsx/unresolvedViolations.js
rename to modules/mri_violations/jsx/violations.js
index a8f0bb720af..de7ed0ace9f 100644
--- a/modules/mri_violations/jsx/unresolvedViolations.js
+++ b/modules/mri_violations/jsx/violations.js
@@ -1,10 +1,10 @@
 /**
- * Return a list of filter objects shared between tabs
+ * Return a list of filter objects for the violation module.
  *
  * @param {object} fieldoptions - The dynamic field options
  * @return {array}
  */
-export function unresolvedFilters(fieldoptions) {
+export function violationFilters(fieldoptions) {
   let problemtypes = {};
   if (fieldoptions.problemtypes) {
       for (const ptype of fieldoptions.problemtypes) {
@@ -64,6 +64,21 @@ export function unresolvedFilters(fieldoptions) {
         options: problemtypes,
      },
     },
+    {
+      label: 'Resolution Status', show: true, filter: {
+        name: 'resolutionStatus',
+        type: 'select',
+        options: {
+          'unresolved': 'Unresolved',
+          'reran': 'Reran',
+          'emailed': 'emailed site/pending',
+          'inserted': 'Inserted',
+          'rejected': 'Rejected',
+          'inserted_flag': 'Inserted with flag',
+          'other': 'Other',
+        },
+      },
+    },
     {
       label: 'Series UID', show: false, filter: {
         name: 'seriesUID',
@@ -72,18 +87,17 @@ export function unresolvedFilters(fieldoptions) {
     },
     {label: 'hash', show: false},
     {label: 'JoinID', show: false},
-    {label: 'Resolution Status', show: false},
     {label: 'TarchiveID', show: false},
     {label: 'CandID', show: false},
     {label: 'PSCID', show: false},
 
-    // Add fake column for dropdown
-    {label: 'Resolution Status', show: true},
+    // Add fake column for resolution dropdown
+    {label: 'Select Resolution', show: true},
   ];
 }
 
 /**
- * Returns a formatter to handle the unresolved violations
+ * Returns a formatter to handle the violations
  *
  * @param {function} mapper - a data mapper to map from ID to display
  * @param {function} setPage - a callback to set the current page
@@ -91,10 +105,14 @@ export function unresolvedFilters(fieldoptions) {
  *                                  a resolution status is selected
  * @return {function} a formatter callback which uses mapper for data mapping
  */
-export function formatColumnUnresolved(mapper, setPage, resolvePostURL) {
+export function formatColumn(mapper, setPage, resolvePostURL) {
     const Mapper = function(column, cell, rowData, rowHeaders) {
         cell = mapper(column, cell);
         // Create the mapping between rowHeaders and rowData in a row object.
+        let fontColor = {color: '#FFFFFF'};
+        let resolutionStatusStyle;
+        let resolutionStatus;
+
         if (column === 'Type of Problem' && cell === 'Protocol Violation') {
             return (
                     <td>
@@ -133,19 +151,59 @@ export function formatColumnUnresolved(mapper, setPage, resolvePostURL) {
                    );
         }
         if (column === 'Resolution Status') {
+          switch (rowData['Resolution Status']) {
+            case 'unresolved':
+              fontColor = {color: '#000000'};
+              resolutionStatus = 'Unresolved';
+              break;
+
+            case 'reran':
+              resolutionStatusStyle = 'label-success';
+              resolutionStatus = 'Reran';
+              break;
+
+            case 'emailed':
+              resolutionStatusStyle = 'label-info';
+              resolutionStatus = 'Emailed site/pending';
+              break;
+
+            case 'rejected':
+              resolutionStatusStyle = 'label-danger';
+              resolutionStatus = 'Rejected';
+              break;
+
+            case 'inserted':
+              resolutionStatusStyle = 'label-warning';
+              resolutionStatus = 'Inserted';
+              break;
+
+            case 'other':
+              resolutionStatusStyle = 'label-primary';
+              resolutionStatus = 'Other';
+              break;
+
+            case 'inserted_flag':
+              resolutionStatusStyle = 'label-default';
+              resolutionStatus = 'Inserted with flag';
+              break;
+          }
+          return (
+            <td className= {resolutionStatusStyle} style={fontColor}>
+              {resolutionStatus}
+            </td>
+          );
+        }
+        if (column === 'Select Resolution') {
             const hashName = rowData.hash;
             return (
                     <td>
                     <select
                         name={hashName}
                         className="form-control input-sm"
-                        id="resolution-status"
+                        id="select-resolution"
                         style={{width: '13em'}}
                         onChange={(e) => {
                             const value = e.target.value;
-                            if (value == 'Unresolved') {
-                              return;
-                            }
 
                             fetch(resolvePostURL,
                             {
@@ -160,6 +218,7 @@ export function formatColumnUnresolved(mapper, setPage, resolvePostURL) {
                           }
                         }
                       >
+                      <option value=""> </option>
                       <option value="unresolved" >Unresolved</option>
                       <option value="reran" >Reran</option>
                       <option value="emailed" >Emailed site/pending</option>
diff --git a/modules/mri_violations/php/provisioner.class.inc b/modules/mri_violations/php/provisioner.class.inc
index fecc8c5d14d..21415705b69 100644
--- a/modules/mri_violations/php/provisioner.class.inc
+++ b/modules/mri_violations/php/provisioner.class.inc
@@ -24,10 +24,10 @@ class Provisioner extends \LORIS\Data\Provisioners\DBRowProvisioner
                     v.MincFile,
                     v.Series_Description as Series_Description_Or_Scan_Type,
                     v.Problem,
+                    v.Resolved as Resolution_status,
                     v.SeriesUID,
                     v.hash,
                     v.join_id,
-                    v.Resolved,
                     v.TarchiveID,
                     v.CandID,
                     v.PSCID
@@ -60,7 +60,9 @@ class Provisioner extends \LORIS\Data\Provisioners\DBRowProvisioner
                        ) AS hash,
                        mpvs.ID AS join_id,
                        p.CenterID AS Site,
-                       violations_resolved.Resolved AS Resolved,
+                       COALESCE(
+                         violations_resolved.Resolved, 'unresolved'
+                       ) AS Resolved,
                        mpvs.TarchiveID AS TarchiveID,
                        mpvs.CandID AS CandID,
                        c.PSCID AS PSCID
@@ -75,7 +77,6 @@ class Provisioner extends \LORIS\Data\Provisioners\DBRowProvisioner
                   AND mpvs.CandID = s.CandID
                 )
                 LEFT JOIN psc p ON (p.CenterID = s.CenterID)
-                WHERE Resolved is NULL
               UNION
                 SELECT PatientName,
                        TimeRun,
@@ -90,7 +91,9 @@ class Provisioner extends \LORIS\Data\Provisioners\DBRowProvisioner
                        ) AS hash,
                        mrl.LogID AS join_id,
                        p.CenterID AS Site,
-                       violations_resolved.Resolved AS Resolved,
+                       COALESCE(
+                         violations_resolved.Resolved, 'unresolved'
+                       ) AS Resolved,
                        mrl.TarchiveID AS TarchiveID,
                        mrl.CandID AS CandID,
                        c.PSCID AS PSCID
@@ -105,7 +108,6 @@ class Provisioner extends \LORIS\Data\Provisioners\DBRowProvisioner
                   mrl.Visit_label = s.Visit_label AND mrl.CandID=s.CandID
                 )
                 LEFT JOIN psc p ON (p.CenterID = s.CenterID)
-                WHERE Resolved is NULL
               UNION
                   SELECT PatientName,
                          TimeRun,
@@ -120,7 +122,9 @@ class Provisioner extends \LORIS\Data\Provisioners\DBRowProvisioner
                          ) AS hash,
                          MRICandidateErrors.ID AS join_id,
                          null,
-                         violations_resolved.Resolved AS Resolved,
+                         COALESCE(
+                            violations_resolved.Resolved, 'unresolved'
+                         ) AS Resolved,
                          MRICandidateErrors.TarchiveID AS TarchiveID,
                          NULL AS CandID,
                          NULL AS PSCID
@@ -129,7 +133,6 @@ class Provisioner extends \LORIS\Data\Provisioners\DBRowProvisioner
                         violations_resolved.ExtID=MRICandidateErrors.ID
                     AND violations_resolved.TypeTable='MRICandidateErrors'
                   )
-                  WHERE Resolved is NULL
             ) AS v";
     }
 
diff --git a/modules/mri_violations/php/resolved_violations.class.inc b/modules/mri_violations/php/resolved_violations.class.inc
deleted file mode 100644
index 258a8996d0d..00000000000
--- a/modules/mri_violations/php/resolved_violations.class.inc
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * This page displays the list of Resolved violations which have been
- * marked as resolved by one of the following methods: Reran,
- * Emailed site/pending,
- * Inserted, Rejected, Inserted with flag, Other.
- *
- * PHP Version 7
- *
- * @category MRI
- * @package  Main
- * @author   Ted Strauss <ted.strauss@mcgill.ca>
- * @license  Loris license
- * @link     https://www.github.com/aces/Loris-Trunk/
- */
-namespace LORIS\mri_violations;
-/**
- * Implement the menu filter for searching through resolved violations
- *
- * @category MRI
- * @package  Main
- * @author   Ted Strauss <ted.strauss@mcgill.ca>
- * @license  Loris license
- * @link     https://www.github.com/aces/Loris-Trunk/
- */
-class Resolved_Violations extends \DataFrameworkMenu
-{
-    /**
-     * Check if user should be allowed to see this page.
-     *
-     * @param \User $user The user whose access is being checked
-     *
-     * @return bool true if the user is permitted to see violated scans
-     */
-    function _hasAccess(\User $user) : bool
-    {
-        return $user->hasAnyPermission(
-            [
-                'violated_scans_view_allsites',
-                'violated_scans_view_ownsite'
-            ]
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return array
-     */
-    protected function getFieldOptions() : array
-    {
-        return [];
-    }
-    /**
-     * Tells the base class that this page's provisioner can support the
-     * HasAnyPermissionOrUserSiteMatch filter.
-     *
-     * @return ?array of site permissions or null
-     */
-    public function allSitePermissionNames() : ?array
-    {
-        return ['violated_scans_view_allsites'];
-    }
-
-    /**
-     * We do not use the base project filter because since it's a violated
-     * scan, it's possible that the project will be null. Instead we add
-     * our own UserProjectMatchOrNull filter.
-     *
-     * @return bool false
-     */
-    public function useProjectFilter() : bool
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return \LORIS\Data\Provisioner
-     */
-    public function getBaseDataProvisioner(): \LORIS\Data\Provisioner
-    {
-        return (new ResolvedViolationsProvisioner())
-            ->filter(new UserProjectMatchOrNull);
-    }
-
-    /**
-     * Overload filters to allow posssibility of a null CenterID
-     *
-     * @return \LORIS\Data\Provisioner
-     */
-    public function getDataProvisionerWithFilters() : \LORIS\Data\Provisioner
-    {
-        $provisioner = $this->getBaseDataProvisioner()->filter(
-            new UserCenterMatchOrNullOrAnyPermission(
-                $this->allSitePermissionNames()
-            )
-        );
-
-        return $provisioner;
-    }
-}
-
diff --git a/modules/mri_violations/php/resolvedviolation.class.inc b/modules/mri_violations/php/resolvedviolation.class.inc
deleted file mode 100644
index 8510789c195..00000000000
--- a/modules/mri_violations/php/resolvedviolation.class.inc
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-namespace LORIS\mri_violations;
-
-/**
- * A ResolvedViolation represents a row in the resolved violations
- * tab.
- *
- * @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- */
-class ResolvedViolation implements \LORIS\Data\DataInstance
-{
-    protected $DBRow;
-    protected $CenterID;
-
-    /**
-     * Create a new ResolvedViolation
-     *
-     * @param array $row The data from the database.
-     */
-    public function __construct(array $row)
-    {
-        $this->DBRow = $row;
-    }
-
-    /**
-     * Implements \LORIS\Data\DataInstance interface for this row.
-     *
-     * @return array which can be serialized by json_encode()
-     */
-    public function jsonSerialize() : array
-    {
-        return $this->DBRow;
-    }
-
-    /**
-     * Returns the CenterID for this instance, for filters such as
-     * \LORIS\Data\Filters\UserSiteMatch to match against.
-     *
-     * @return ?\CenterID
-     */
-    public function getCenterID(): ?\CenterID
-    {
-        if ($this->DBRow['Site'] === null) {
-            return null;
-        }
-        return new \CenterID($this->DBRow['Site']);
-    }
-
-    /**
-     * Returns the ProjectID for this instance, for filters such as
-     * \LORIS\Data\Filters\UserProjectMatch to match against.
-     *
-     * @return ?\ProjectID
-     */
-    public function getProjectID(): ?\ProjectID
-    {
-        if ($this->DBRow['Project'] === null) {
-            return null;
-        }
-        return new \ProjectID($this->DBRow['Project']);
-    }
-}
diff --git a/modules/mri_violations/php/resolvedviolationsprovisioner.class.inc b/modules/mri_violations/php/resolvedviolationsprovisioner.class.inc
deleted file mode 100644
index e7d7c3acc3e..00000000000
--- a/modules/mri_violations/php/resolvedviolationsprovisioner.class.inc
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php declare(strict_types=1);
-namespace LORIS\mri_violations;
-
-/**
- * A Provisioner to return all resolved violations for the
- * resolved tab in the module.
- *
- * @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- */
-class ResolvedViolationsProvisioner extends \LORIS\Data\Provisioners\DBRowProvisioner
-{
-    /**
-     * Create a ResolvedViolationsProvisioner.
-     */
-    function __construct()
-    {
-        parent::__construct(
-            "SELECT 
-                v.Resolved as Resolution_status,
-                v.Project,
-                v.Cohort,
-                v.PatientName as PatientName,
-                v.Site,
-                v.TimeRun as TimeRun,
-                v.MincFile as MincFile,
-                v.Series_Description as Series_Description_Or_Scan_Type,
-                v.Problem as Problem,
-                v.SeriesUID as SeriesUID,
-                v.hash as Hash,
-                v.join_id as JoinID
-            FROM (
-                SELECT PatientName as PatientName,
-                    time_run as TimeRun,
-                    s.ProjectID as Project,
-                    s.CohortID as Cohort,
-                    minc_location as MincFile,
-                    series_description as Series_Description,
-                    'Could not identify scan type' as Problem, 
-                    SeriesUID,
-                    md5(concat_WS(':',
-                                  minc_location,
-                                  PatientName,
-                                  SeriesUID,
-                                  time_run
-                       )
-                    ) as hash,
-                    mpvs.ID as join_id,                
-                    p.CenterID as Site,
-                    violations_resolved.Resolved as Resolved
-                FROM mri_protocol_violated_scans AS mpvs
-                    LEFT JOIN violations_resolved
-                    ON (violations_resolved.ExtID=mpvs.ID 
-                    AND violations_resolved.TypeTable='mri_protocol_violated_scans')
-                    LEFT JOIN candidate c
-                    ON (mpvs.CandID = c.CandID)
-                    LEFT JOIN session s
-                    ON (SUBSTRING_INDEX(mpvs.PatientName,'_',-1) = s.Visit_label 
-                        AND mpvs.CandID = s.CandID
-                    )
-                    LEFT JOIN psc p
-                    ON (p.CenterID = s.CenterID)
-                    WHERE Resolved <> '0'
-             UNION
-                SELECT PatientName,
-                    TimeRun,
-                    s.ProjectID as Project,
-                    s.CohortID as Cohort,
-                    MincFile,
-                    mri_scan_type.Scan_type,
-                    'Protocol Violation',
-                    SeriesUID,
-                    md5(concat_WS(':',MincFile,PatientName,SeriesUID,TimeRun))
-                       as hash,
-                    mrl.LogID as join_id,
-                    p.CenterID as Site,
-                    violations_resolved.Resolved as Resolved
-                FROM mri_violations_log AS mrl
-                    LEFT JOIN mri_scan_type 
-                    ON (mri_scan_type.ID=mrl.Scan_type)
-                    LEFT JOIN violations_resolved
-                    ON (violations_resolved.ExtID=mrl.LogID 
-                    AND violations_resolved.TypeTable='mri_violations_log')
-                    LEFT JOIN candidate c
-                    ON (mrl.CandID=c.CandID)
-                    LEFT JOIN session s
-                    ON (mrl.Visit_label = s.Visit_label AND mrl.CandID = s.CandID)
-                    LEFT JOIN psc p
-                    ON (p.CenterID = s.CenterID)
-                    WHERE Resolved <> '0'
-             UNION
-                SELECT PatientName,
-                    TimeRun,
-                    null,
-                    null,
-                    MincFile,
-                    null,
-                    Reason, 
-                    SeriesUID,
-                    md5(concat_WS(':',MincFile,PatientName,SeriesUID,TimeRun))
-                       as hash,
-                    MRICandidateErrors.ID as join_id,
-                    null,
-                    violations_resolved.Resolved as Resolved
-                FROM MRICandidateErrors
-                    LEFT JOIN violations_resolved
-                        ON (violations_resolved.ExtID=MRICandidateErrors.ID 
-                        AND violations_resolved.TypeTable='MRICandidateErrors')
-                WHERE Resolved <> '0'
-             ) as v",
-            []
-        );
-    }
-
-    /**
-     * Returns an instance of a ResolvedViolation object.
-     *
-     * @param array $row The database row from the LORIS Database class.
-     *
-     * @return \LORIS\Data\DataInstance An instance representing this row.
-     */
-    public function getInstance($row) : \LORIS\Data\DataInstance
-    {
-            return new ResolvedViolation($row);
-    }
-}
diff --git a/modules/mri_violations/test/TestPlan.md b/modules/mri_violations/test/TestPlan.md
index 249413ba206..a20687b9d49 100644
--- a/modules/mri_violations/test/TestPlan.md
+++ b/modules/mri_violations/test/TestPlan.md
@@ -3,8 +3,9 @@
 ## Functionality to be tested manually
 
 ### MRI Violations page
-1.  Check Selection Filter works for each of `Patient Name`, `File Name`,
-    `Series Description or Scan Type`, `Time Run`, `Type of Problem`,
+1.  Check Selection Filter works for each of `Patient Name`, `Project`, `Cohort`,
+    `Site`, `Time Run`, `Image File`, 
+    `Series Description or Scan Type`,  `Type of Problem`, `Resolution Status`
     `SeriesUID`.
     - Note: `SeriesUID` does not have a column in the table on this page,
     but the filter should still limit results based on the MRI Violations data.
@@ -12,20 +13,17 @@
   with details of why the scan failed.
 3. The `Problem` column with the entry `Could not identify scan type` should 
    display a popup with details of  why the scan type could not be identified.
-4. Go back to the MRI_violations page and resolve issues with each of the
-    different types of resolutions, and ensure that they show up in the 
-    `Resolved` tab, and are no longer in the `Not resolved` tab.
-5. Ensure that the link to the `protocol violation` and `Could not identify scan
-   type` works within the `Resolved` tab (`Problem` column).
-6. Ensure all filters and sorting work in the `Resolved` tab.
-7. Click on the question mark on the right upper side of the windows and ensure
+4. Go back to the MRI violations menu filter page and resolve issues with each of the
+    different types of resolutions. Once the page is refreshed, ensure the proper 
+    resolution was set in column `Resolution Status`.
+5. Click on the question mark on the right upper side of the windows and ensure
    that the help content about MRI Violation is showing up and is up-to-date.
-8. Ensure user has access to this page if and only if he/she has either permission
+6. Ensure user has access to this page if and only if he/she has either permission
    `mri_violations_view_allsite` or `mri_violations_view_ownsite`.
-9. Check that if the user only has the permission `mri_violations_view_ownsite`, he/she
+7. Check that if the user only has the permission `mri_violations_view_ownsite`, he/she
    is not allowed to see the violations associated to sites other than his/her
    own.
-10. Check that the violations for which the site is unknown can always be seen 
+8. Check that the violations for which the site is unknown can always be seen 
     no matter what permission the user has (violated_scans_view_allsite or
     violated_scans_view_ownsite).