LIMS-979: Add Unqueue All and Unqueue Selected buttons to Container Q…

…ueue page
DiamondLightSource · Sep 18, 2023 · cb3afa7 · cb3afa7
1 parent 0568e32
commit cb3afa7
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 4 deletions.
diff --git a/api/src/Page/Sample.php b/api/src/Page/Sample.php
@@ -168,7 +168,7 @@ class Sample extends Page
         array('/sub/:ssid', 'put', '_update_sub_sample_full'),
         array('/sub', 'post', '_add_sub_sample'),
         array('/sub/:ssid', 'delete', '_delete_sub_sample'),
-        array('/sub/queue/cid/:cid', 'post', '_queue_all_sub_samples'),
+        array('/sub/queue/cid/:cid', 'get', '_queue_all_sub_samples'),
         array('/sub/queue(/:BLSUBSAMPLEID)', 'get', '_pre_q_sub_sample'),
 
         array('/plan', 'get', '_get_diffraction_plans'),

diff --git a/client/src/js/modules/imaging/views/queuecontainer.js b/client/src/js/modules/imaging/views/queuecontainer.js
@@ -527,6 +527,8 @@ define(['marionette',
             'click a.unqueue': 'unqueueContainer',
             'click a.addpage': 'queuePageSamples',
             'click a.addall': 'queueAllSamples',
+            'click a.unqueuesel': 'unqueueSelectedSamples',
+            'click a.unqueueall': 'unqueueAllSamples',
             'change @ui.nodata': 'refreshSubSamples',
             'change @ui.notcompleted': 'refreshSubSamples',
         },
@@ -571,7 +573,6 @@ define(['marionette',
             this.$el.addClass('loading');
             Backbone.ajax({
                 url: app.apiurl+'/sample/sub/queue/cid/'+this.model.get('CONTAINERID'),
-                method: "post",
                 data: {},
                 success: function(resp) {
                     _.each(resp, function (r) {
@@ -586,6 +587,56 @@ define(['marionette',
             })            
         },
 
+        unqueueSelectedSamples: function(e) {
+            e.preventDefault()
+
+            var self = this
+            this.$el.addClass('loading');
+            var sids = _.map(this.qsubsamples.where({ isGridSelected: true }), function(ss) {return ss.get('BLSUBSAMPLEID')})
+
+            Backbone.ajax({
+                url: app.apiurl+'/sample/sub/queue',
+                data: {
+                    BLSUBSAMPLEID: sids,
+                    UNQUEUE: 1,
+                },
+                success: function(resp) {
+                    _.each(resp, function (r) {
+                        var ss = self.qsubsamples.findWhere({ BLSUBSAMPLEID: r.BLSUBSAMPLEID })
+                        ss.set({ READYFORQUEUE: '0' })
+                    })
+                },
+                complete: function(resp, status) {
+                    self.$el.removeClass('loading')
+                    self.refreshQSubSamples(self)
+                }
+            })
+        },
+
+        unqueueAllSamples: function(e) {
+            e.preventDefault()
+
+            var self = this
+            this.$el.addClass('loading');
+            Backbone.ajax({
+                url: app.apiurl+'/sample/sub/queue/cid/'+this.model.get('CONTAINERID'),
+                data: {
+                    queued: 1,
+                    UNQUEUE: 1,
+                },
+                success: function(resp) {
+                    _.each(resp, function (r) {
+                        var ss = self.qsubsamples.fullCollection.findWhere({ BLSUBSAMPLEID: r.BLSUBSAMPLEID })
+                        ss.set({ READYFORQUEUE: '0' })
+                    })
+                },
+                complete: function(resp, status) {
+                    self.$el.removeClass('loading')
+                    self.refreshQSubSamples(self)
+                }
+            })
+        },
+
 
         unqueueContainer: function(e) {
             e.preventDefault()

diff --git a/client/src/js/templates/imaging/queuecontainer.html b/client/src/js/templates/imaging/queuecontainer.html
@@ -49,12 +49,20 @@ <h2>Available Samples</h2>
 </div>
 
 <h2>Queued Samples</h2>
-<div class="r rpreset">
+
+<div class="filter">
+<span class="r">
+<a href="#" class="button unqueuesel" title="Remove the selected samples from the queue"><i class="fa fa-minus"></i> Unqueue Selected</a>
+<a href="#" class="button unqueueall" title="Remove all samples from the queue"><i class="fa fa-minus"></i> Unqueue All</a>
+</span></div>
+<div>
+<span class="r rpreset">
 Presets: <select name="preset"></select>
 <a href="#" class="button apply" title="Apply this preset to the selected samples"><i class="fa fa-check-square-o"></i> Apply to Selected</a>
 <a href="#" class="button applyall" title="Apply this preset to all samples"><i class="fa fa-file-text-o"></i> Apply to All</a>
+</span>
+<span class="filter filter-nohide qfilt"></span>
 </div>
-<div class="filter filter-nohide qfilt"></div>
 <div class="qsamples"></div>
 
 <% if (!CONTAINERQUEUEID) { %>