Skip to content

Commit

Permalink
LIMS-499: Make reciprocal space viewer more obvious (#653)
Browse files Browse the repository at this point in the history
Co-authored-by: Mark Williams <[email protected]>
  • Loading branch information
ndg63276 and Mark Williams authored Sep 11, 2023
1 parent eeb3e2d commit 828e161
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
5 changes: 5 additions & 0 deletions api/src/Page/DC.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 6 additions & 2 deletions client/src/js/templates/dc/dc_title.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
</span>
<a href="#" class="comments button button-notext" title="Comments"><i class="fa fa-comments"></i> <b class="DCCC"><%-DCCC%></b> <span>Comment(s)</span></a>

<a href="#" class="button attach"><i class="fa fa-file"></i> <b class="DCAC"><%-DCAC%></b></a>
<% if (RECIP == "1") { %>
<a href="#" class="button attach" title="Reciprocal Space Viewer"><i class="fa fa-snowflake-o"></i> <b class="DCAC"><%-DCAC%></b></a>
<% } else { %>
<a href="#" class="button attach" title="Attachments"><i class="fa fa-file"></i> <b class="DCAC"><%-DCAC%></b></a>
<% } %>

<span class="extra"></span>
</span>
Expand All @@ -18,4 +22,4 @@

<% if (ARCHIVED == "1") { %>
<i class="fa fa-archive r" title="This data collection is archived and data is no longer available on disk"></i>
<% } %>
<% } %>

0 comments on commit 828e161

Please sign in to comment.