summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2010-07-19 15:39:53 +0200
committerChristoph Helma <helma@in-silico.ch>2010-07-19 15:39:53 +0200
commitbd4b6eae34ccade055bc847da15584765ad2b43d (patch)
tree54673a64d6500b2db7e893fd9149f505edaef471
parent4a691290e63fa1bf9f4935ff782c62aea7df2715 (diff)
page refresh until validation report finished
-rw-r--r--model.rb8
-rwxr-xr-xpublic/javascripts/toxcreate.js4
-rw-r--r--views/classification_validation.haml2
-rw-r--r--views/regression_validation.haml2
4 files changed, 4 insertions, 12 deletions
diff --git a/model.rb b/model.rb
index 5b68558..d10b95f 100644
--- a/model.rb
+++ b/model.rb
@@ -143,14 +143,6 @@ class ToxCreateModel
end
end
- #LOGGER.debug self.to_yaml
- #LOGGER.debug @uri
- #LOGGER.debug @validation_uri
- #LOGGER.debug @validation_uri.nil?
- #LOGGER.debug validation_status
- #LOGGER.debug self.validation_report_task_uri
- #LOGGER.debug self.validation_report_uri
- #self.save
end
end
diff --git a/public/javascripts/toxcreate.js b/public/javascripts/toxcreate.js
index 6d593cc..048bd46 100755
--- a/public/javascripts/toxcreate.js
+++ b/public/javascripts/toxcreate.js
@@ -79,9 +79,9 @@ $(function() {
checkValidation = function() {
var reload_id = "";
- $("input.model_validation").each(function(){
+ $("input.model_validation_report").each(function(){
if($(this).val() != "Completed") {
- reload_id = this.id.replace("model_validation_","");
+ reload_id = this.id.replace("model_validation_report_","");
if(/^\d+$/.test(reload_id)) loadModel(reload_id, 'validation');
};
});
diff --git a/views/classification_validation.haml b/views/classification_validation.haml
index 6d18d09..26f0617 100644
--- a/views/classification_validation.haml
+++ b/views/classification_validation.haml
@@ -1,7 +1,7 @@
%dl{:id => "model_validation_#{model.id}"}
%dt
Validation:
- %input{ :id => "model_validation_#{model.id}", :type => "hidden", :value => "#{model.validation_status}", :class => "model_validation" }
+ %input{ :id => "model_validation_report_#{model.id}", :type => "hidden", :value => "#{model.validation_report_status}", :class => "model_validation_report" }
- if model.validation_report_uri
%a{:href => model.validation_report_uri, :target => "_blank"} (more details)
%dd
diff --git a/views/regression_validation.haml b/views/regression_validation.haml
index 6f9e106..ac45307 100644
--- a/views/regression_validation.haml
+++ b/views/regression_validation.haml
@@ -1,7 +1,7 @@
%dl{:id => "model_validation_#{model.id}"}
%dt
Validation:
- %input{ :id => "model_validation_#{model.id}", :type => "hidden", :value => "#{model.validation_status}", :class => "model_validation" }
+ %input{ :id => "model_validation_report_#{model.id}", :type => "hidden", :value => "#{model.validation_report_status}", :class => "model_validation_report" }
- if model.validation_report_uri
%a{:href => model.validation_report_uri, :target => "_blank"} (more details)
%dd