From ced8ef0230acd1405c7d5fe7a190d0bdc48939fa Mon Sep 17 00:00:00 2001 From: Mark Williams Date: Fri, 4 Oct 2024 11:13:22 +0100 Subject: [PATCH] LIMS-1462: Show characterizations on Screenings tab --- api/src/Page/DC.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/Page/DC.php b/api/src/Page/DC.php index bc43ba535..fe21732f2 100644 --- a/api/src/Page/DC.php +++ b/api/src/Page/DC.php @@ -121,11 +121,11 @@ function _data_collections($single = null) $where = ''; if ($this->arg('t') == 'sc') - $where = ' AND (dc.overlap != 0 OR ifnull(et.name, dcg.experimenttype) = "Screening")'; + $where = ' AND (dc.overlap != 0 OR ifnull(et.name, dcg.experimenttype) in ("Screening", "Characterization"))'; else if ($this->arg('t') == 'gr') $where = ' AND dc.axisrange = 0'; else if ($this->arg('t') == 'fc') - $where = ' AND dc.overlap = 0 AND dc.axisrange > 0 AND dc.numberOfImages > 1 AND ifnull(et.name, dcg.experimenttype) != "Screening"'; + $where = ' AND dc.overlap = 0 AND dc.axisrange > 0 AND dc.numberOfImages > 1 AND ifnull(et.name, dcg.experimenttype) not in ("Screening", "Characterization")'; } else if ($this->arg('t') == 'edge') { $where2 = ''; } else if ($this->arg('t') == 'mca') { @@ -139,11 +139,11 @@ function _data_collections($single = null) $where2 = " AND es.comments LIKE '%_FLAG_%'"; $where4 = " AND xrf.comments LIKE '%_FLAG_%'"; } else if ($this->arg('t') == 'ap') { - $where = ' AND app.processingstatus = 1'; + $where = " AND ifnull(et.name, dcg.experimenttype) not in ('Screening', 'Characterization') AND app.processingstatus = 1"; $extj[0] .= "INNER JOIN autoprocintegration ap ON dc.datacollectionid = ap.datacollectionid INNER JOIN autoprocprogram app ON app.autoprocprogramid = ap.autoprocprogramid"; } else if ($this->arg('t') == 'ph') { - $where = " AND app.processingstatus = 1 AND app.processingprograms in ('big_ep', 'fast_ep')"; + $where = " AND ifnull(et.name, dcg.experimenttype) not in ('Screening', 'Characterization') AND app.processingstatus = 1 AND app.processingprograms in ('big_ep', 'fast_ep')"; $extj[0] .= "INNER JOIN processingjob pj ON dc.datacollectionid = pj.datacollectionid INNER JOIN autoprocprogram app ON app.processingjobid = pj.processingjobid"; } else if ($this->arg('t') == 'err') {