From 6b31ef898f52b0c1017fd18c5f23f3c5ecad81f6 Mon Sep 17 00:00:00 2001 From: Mark Williams Date: Thu, 23 Oct 2025 15:34:58 +0100 Subject: [PATCH 1/2] LIMS-1952: Add select all button to multicrystal page --- .../js/modules/mc/views/datacollections.js | 8 +++++++- client/src/js/modules/mc/views/dcdistl.js | 19 ++++++++++++++++--- .../src/js/templates/mc/datacollection.html | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/client/src/js/modules/mc/views/datacollections.js b/client/src/js/modules/mc/views/datacollections.js index f354ed010..1e5c70493 100644 --- a/client/src/js/modules/mc/views/datacollections.js +++ b/client/src/js/modules/mc/views/datacollections.js @@ -114,6 +114,11 @@ define(['backbone', 'marionette', return } + if (s.length > 1 && this.ui.pipeline.val() == 'fast_dp') { + app.alert({ message: 'Fast DP can only integrate a single sweep' }) + return + } + var self = this var p = this.pipelines.findWhere({ VALUE: self.ui.pipeline.val() }) var reprocessing = new Reprocessing({ @@ -283,7 +288,8 @@ define(['backbone', 'marionette', this.$el.find('input[name='+f+']').val(ap.get('CELL')['CELL_'+k.toUpperCase()]) }, this) - this.$el.find('select[name=sg]').val(ap.get('SG')) + let sg = ap.get('SG')?.replace(/\s/g, '') ?? ""; + this.$el.find('select[name=sg]').val(sg) }, onDestroy: function() { diff --git a/client/src/js/modules/mc/views/dcdistl.js b/client/src/js/modules/mc/views/dcdistl.js index 24097c024..2907791b6 100644 --- a/client/src/js/modules/mc/views/dcdistl.js +++ b/client/src/js/modules/mc/views/dcdistl.js @@ -19,6 +19,7 @@ define(['marionette', events: { 'click .cells': 'sendCell', + 'click .all': 'selectAll', }, sendCell: function(e) { @@ -26,6 +27,16 @@ define(['marionette', this.trigger('set:cell', this.aps.at(0)) }, + selectAll: function(e) { + e.preventDefault() + + var si = parseInt(this.model.get('SI')) + var ni = parseInt(this.model.get('NUMIMG')) + + this.setSelection(si, si+ni-1) + this.plotview.setSelection(si, si+ni-1) + }, + onShow: function() { var w = 0.175*$(window).width()*0.95 @@ -43,11 +54,13 @@ define(['marionette', setCell: function() { + let cells = 'N/A' if (this.aps.length) { var e = this.aps.at(0) var c = e.get('CELL') - this.ui.cells.text(c['CELL_A']+','+c['CELL_B']+','+c['CELL_C']+','+c['CELL_AL']+','+c['CELL_BE']+','+c['CELL_GA']) - } else this.ui.cells.text('N/A') + if (c && Object.keys(c).length) cells = c['CELL_A']+','+c['CELL_B']+','+c['CELL_C']+','+c['CELL_AL']+','+c['CELL_BE']+','+c['CELL_GA'] + } + this.ui.cells.text(cells) }, @@ -75,4 +88,4 @@ define(['marionette', -}) \ No newline at end of file +}) diff --git a/client/src/js/templates/mc/datacollection.html b/client/src/js/templates/mc/datacollection.html index 214d69118..6247f78c0 100644 --- a/client/src/js/templates/mc/datacollection.html +++ b/client/src/js/templates/mc/datacollection.html @@ -1,5 +1,5 @@
-

<%-IMP%>_<%-RUN%>

+

<%-IMP%>_<%-RUN%>

<%-DIR%>

&<%-ROTATIONAXIS%>; Start: <%-AXISSTART%>° &<%-ROTATIONAXIS%>; Osc: <%-AXISRANGE%>° | Images From 5df1fd45e6eceedeeb449b95a1b8529adf753b55 Mon Sep 17 00:00:00 2001 From: Mark Williams Date: Wed, 29 Oct 2025 11:27:05 +0000 Subject: [PATCH 2/2] LIMS-1952: Change cursor to show cell is clickable --- client/src/css/partials/_mc.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/src/css/partials/_mc.scss b/client/src/css/partials/_mc.scss index 05ae5d658..5724fd055 100644 --- a/client/src/css/partials/_mc.scss +++ b/client/src/css/partials/_mc.scss @@ -132,3 +132,7 @@ span.run_state { .yAxis .tickLabel.selected { font-weight: bold; } + +span.cells { + cursor: pointer; +}