From 828e1612a055e1c6d7a3c51641660e3a0d637a10 Mon Sep 17 00:00:00 2001 From: Mark W <24956497+ndg63276@users.noreply.github.com> Date: Mon, 11 Sep 2023 18:23:37 +0100 Subject: [PATCH] LIMS-499: Make reciprocal space viewer more obvious (#653) Co-authored-by: Mark Williams --- api/src/Page/DC.php | 5 +++++ client/src/js/templates/dc/dc_title.html | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/api/src/Page/DC.php b/api/src/Page/DC.php index c6e49a59c..f6cff5ab3 100644 --- a/api/src/Page/DC.php +++ b/api/src/Page/DC.php @@ -394,6 +394,7 @@ function _data_collections($single = null) # Data collection group if ($this->has_arg('dcg') || $this->has_arg('PROCESSINGJOBID')) { $fields = "count(distinct dca.datacollectionfileattachmentid) as dcac, + if(dca.fileType='recip',1,0) as recip, count(distinct dcc.datacollectioncommentid) as dccc, 1 as dcc, smp.name as sample, @@ -527,6 +528,7 @@ function _data_collections($single = null) } } else { $fields = "count(distinct dca.datacollectionfileattachmentid) as dcac, + if(dca.fileType='recip',1,0) as recip, count(distinct dcc.datacollectioncommentid) as dccc, count(distinct dc.datacollectionid) as dcc, min(smp.name) as sample, @@ -677,6 +679,7 @@ function _data_collections($single = null) SELECT $extc 1 as dcac, + 0 as recip, 1 as dccc, 1 as dcc, smp.name as sample, @@ -769,6 +772,7 @@ function _data_collections($single = null) SELECT $extc 1 as dcac, + 0 as recip, 1 as dccc, 1 as dcc, smp.name as sample, @@ -861,6 +865,7 @@ function _data_collections($single = null) SELECT $extc 1 as dcac, + 0 as recip, 1 as dccc, 1 as dcc, smp.name as sample, diff --git a/client/src/js/templates/dc/dc_title.html b/client/src/js/templates/dc/dc_title.html index ed306f528..1d6422b1a 100644 --- a/client/src/js/templates/dc/dc_title.html +++ b/client/src/js/templates/dc/dc_title.html @@ -9,7 +9,11 @@ <%-DCCC%> Comment(s) - <%-DCAC%> + <% if (RECIP == "1") { %> + <%-DCAC%> + <% } else { %> + <%-DCAC%> + <% } %> @@ -18,4 +22,4 @@ <% if (ARCHIVED == "1") { %> - <% } %> \ No newline at end of file + <% } %>