Skip to content

LIMS-2059: Re-enable reprocess button after any parameter change #1031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ndg63276 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

LIMS-2059: Re-enable reprocess button after any parameter change #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions client/src/js/modules/dc/views/downstreamreprocess.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ define(['backbone', 'marionette', 'views/dialog',
ui: {
pipeline: 'select[name=pipeline]',
warning: '#warning',
fields: 'input, select',
},

buttons: {
Expand All @@ -87,6 +88,8 @@ define(['backbone', 'marionette', 'views/dialog',

events: {
'change @ui.pipeline': 'updatePipeline',
'input @ui.fields': 'onFieldChanged',
'change @ui.fields': 'onFieldChanged',
},

templateHelpers: function() {
Expand Down Expand Up @@ -144,14 +147,24 @@ define(['backbone', 'marionette', 'views/dialog',

},

onFieldChanged: function() {
this._enableIntegrateButton();
},

_disableIntegrateButton: function() {
var btn = $('.ui-dialog-buttonpane button:contains("Submit")')
btn.button('disable').button('option', 'label', 'Submitted!')
setTimeout(function() {
btn.button('enable').button('option', 'label', 'Submit')
btn.addClass('submitted').button('disable').button('option', 'label', 'Submitted!')
this.resetTimeout = setTimeout(() => {
this._enableIntegrateButton()
}, 5000)
},

_enableIntegrateButton: function() {
var btn = $('.ui-dialog-buttonpane button.submitted')
btn.removeClass('submitted').button('enable').button('option', 'label', 'Submit')
clearTimeout(this.resetTimeout);
},

_enqueue: function(options) {
Backbone.ajax({
url: app.apiurl+'/process/enqueue/downstream',
Expand Down
21 changes: 18 additions & 3 deletions client/src/js/modules/dc/views/reprocess.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ define(['backbone', 'marionette', 'views/dialog',
al: 'input[name=alpha]',
be: 'input[name=beta]',
ga: 'input[name=gamma]',
fields: 'input, select',
},

buttons: {
Expand All @@ -281,6 +282,8 @@ define(['backbone', 'marionette', 'views/dialog',
'change @ui.pipeline': 'updatePipeline',
'change @ui.indexingMethod': 'updateIndexingMethod',
'click a.multicrystal': 'closeDialog',
'input @ui.fields': 'onFieldChanged',
'change @ui.fields': 'onFieldChanged',
},

templateHelpers: function() {
Expand Down Expand Up @@ -556,15 +559,27 @@ define(['backbone', 'marionette', 'views/dialog',
},


onFieldChanged: function() {
this._enableIntegrateButton();
},


_disableIntegrateButton: function() {
var btn = $('.ui-dialog-buttonpane button:contains("Integrate")')
btn.button('disable').button('option', 'label', 'Submitted!')
setTimeout(function() {
btn.button('enable').button('option', 'label', 'Integrate')
btn.addClass('submitted').button('disable').button('option', 'label', 'Submitted!')
this.resetTimeout = setTimeout(() => {
this._enableIntegrateButton()
}, 5000)
},


_enableIntegrateButton: function() {
var btn = $('.ui-dialog-buttonpane button.submitted')
btn.removeClass('submitted').button('enable').button('option', 'label', 'Integrate')
clearTimeout(this.resetTimeout);
},


_enqueue: function(options) {
Backbone.ajax({
url: app.apiurl+'/process/enqueue',
Expand Down
25 changes: 20 additions & 5 deletions client/src/js/modules/mc/views/datacollections.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ define(['backbone', 'marionette',
'click .integrate': 'integrate',
'click button.opt': 'toggleOpts',
'change @ui.pipeline': 'updatePipeline',
'input @ui.fields': 'onFieldChanged',
'change @ui.fields': 'onFieldChanged',
},

ui: {
Expand All @@ -73,6 +75,8 @@ define(['backbone', 'marionette',
opts: 'div.options',
sm: 'input[name=sm]',
sg: 'select[name=sg]',
integrateBtn: 'button.integrate',
fields: 'input, select',
},

templateHelpers: function() {
Expand Down Expand Up @@ -211,16 +215,26 @@ define(['backbone', 'marionette',
},


onFieldChanged: function() {
this._enableIntegrateButton();
},


_disableIntegrateButton: function() {
var btn = $('button.integrate')
var btnHtml = btn.html()
btn.prop('disabled', true).html('<i class="fa fa-check"></i> Submitted!');
setTimeout(function() {
btn.prop('disabled', false).html(btnHtml);
this.btnHtml = this.ui.integrateBtn.html()
this.ui.integrateBtn.prop('disabled', true).html('<i class="fa fa-check"></i> Submitted!');
this.resetTimeout = setTimeout(() => {
this._enableIntegrateButton()
}, 5000)
},


_enableIntegrateButton: function() {
this.ui.integrateBtn.prop('disabled', false).html(this.btnHtml);
clearTimeout(this.resetTimeout);
},


_enqueue: function(options) {
Backbone.ajax({
url: app.apiurl+'/process/enqueue',
Expand Down Expand Up @@ -252,6 +266,7 @@ define(['backbone', 'marionette',
},

onRender: function() {
this.btnHtml = this.ui.integrateBtn.html()
this.pages.show(this.paginator)
this.srch.show(this.search)
this.ui.opts.hide()
Expand Down
Loading