Skip to content

Commit 63f64e5

Browse files
ndg63276Mark Williamsgfrn
committed
LIMS-979: Add Unqueue All and Unqueue Selected buttons to Container Queue page (#665)
* LIMS-979: Add Unqueue All and Unqueue Selected buttons to Container Queue page * Use let instead of var Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> * LIMS-979: Use post requests for queueing/unqueueing --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
1 parent bbaa781 commit 63f64e5

File tree

2 files changed

+65
-4
lines changed

2 files changed

+65
-4
lines changed

client/src/js/modules/imaging/views/queuecontainer.js

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,8 @@ define(['marionette',
527527
'click a.unqueue': 'unqueueContainer',
528528
'click a.addpage': 'queuePageSamples',
529529
'click a.addall': 'queueAllSamples',
530+
'click a.unqueuesel': 'unqueueSelectedSamples',
531+
'click a.unqueueall': 'unqueueAllSamples',
530532
'change @ui.nodata': 'refreshSubSamples',
531533
'change @ui.notcompleted': 'refreshSubSamples',
532534
},
@@ -571,8 +573,8 @@ define(['marionette',
571573
this.$el.addClass('loading');
572574
Backbone.ajax({
573575
url: app.apiurl+'/sample/sub/queue/cid/'+this.model.get('CONTAINERID'),
574-
method: "post",
575-
data: {},
576+
method: 'post',
577+
data: data,
576578
success: function(resp) {
577579
_.each(resp, function (r) {
578580
var ss = self.subsamples.fullCollection.findWhere({ BLSUBSAMPLEID: r.BLSUBSAMPLEID })
@@ -586,6 +588,57 @@ define(['marionette',
586588
})
587589
},
588590

591+
unqueueSelectedSamples: function(e) {
592+
e.preventDefault()
593+
594+
let self = this
595+
this.$el.addClass('loading');
596+
let sids = _.map(this.qsubsamples.where({ isGridSelected: true }), function(ss) {return ss.get('BLSUBSAMPLEID')})
597+
598+
Backbone.ajax({
599+
url: app.apiurl+'/sample/sub/queue',
600+
data: {
601+
BLSUBSAMPLEID: sids,
602+
UNQUEUE: 1,
603+
},
604+
success: function(resp) {
605+
_.each(resp, function (r) {
606+
let ss = self.qsubsamples.findWhere({ BLSUBSAMPLEID: r.BLSUBSAMPLEID })
607+
ss.set({ READYFORQUEUE: '0' })
608+
})
609+
},
610+
complete: function(resp, status) {
611+
self.$el.removeClass('loading')
612+
self.refreshQSubSamples(self)
613+
}
614+
})
615+
},
616+
617+
unqueueAllSamples: function(e) {
618+
e.preventDefault()
619+
620+
let self = this
621+
this.$el.addClass('loading');
622+
Backbone.ajax({
623+
url: app.apiurl+'/sample/sub/queue/cid/'+this.model.get('CONTAINERID'),
624+
method: 'post',
625+
data: {
626+
queued: 1,
627+
UNQUEUE: 1,
628+
},
629+
success: function(resp) {
630+
_.each(resp, function (r) {
631+
let ss = self.qsubsamples.fullCollection.findWhere({ BLSUBSAMPLEID: r.BLSUBSAMPLEID })
632+
ss.set({ READYFORQUEUE: '0' })
633+
})
634+
},
635+
complete: function(resp, status) {
636+
self.$el.removeClass('loading')
637+
self.refreshQSubSamples(self)
638+
}
639+
})
640+
},
641+
589642

590643
unqueueContainer: function(e) {
591644
e.preventDefault()

client/src/js/templates/imaging/queuecontainer.html

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,20 @@ <h2>Available Samples</h2>
4949
</div>
5050

5151
<h2>Queued Samples</h2>
52-
<div class="r rpreset">
52+
53+
<div class="filter">
54+
<span class="r">
55+
<a href="#" class="button unqueuesel" title="Remove the selected samples from the queue"><i class="fa fa-minus"></i> Unqueue Selected</a>
56+
<a href="#" class="button unqueueall" title="Remove all samples from the queue"><i class="fa fa-minus"></i> Unqueue All</a>
57+
</span></div>
58+
<div>
59+
<span class="r rpreset">
5360
Presets: <select name="preset"></select>
5461
<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>
5562
<a href="#" class="button applyall" title="Apply this preset to all samples"><i class="fa fa-file-text-o"></i> Apply to All</a>
63+
</span>
64+
<span class="filter filter-nohide qfilt"></span>
5665
</div>
57-
<div class="filter filter-nohide qfilt"></div>
5866
<div class="qsamples"></div>
5967

6068
<% if (!CONTAINERQUEUEID) { %>

0 commit comments

Comments
 (0)