From ef06b469ed70b92be743112faa595a1758fa2254 Mon Sep 17 00:00:00 2001 From: gebele Date: Thu, 1 Sep 2011 14:26:40 +0200 Subject: merge fix --- views/model.haml | 176 +++++++++++++++++++++++++++---------------------------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/views/model.haml b/views/model.haml index 4bb4ee7..41bb72e 100644 --- a/views/model.haml +++ b/views/model.haml @@ -5,98 +5,98 @@ #{js} }); -- if is_authorized(model.web_uri, "POST") - %div{:id => "model_#{model.id}"} - %div{:id => "model_#{model.id}_name"} - = haml :model_name, :locals=>{:model=>model}, :layout => false - .model - %dl - %dt Status: + +%div{:id => "model_#{model.id}"} + %div{:id => "model_#{model.id}_name"} + = haml :model_name, :locals=>{:model=>model}, :layout => false + .model + %dl + %dt Status: + %dd + %span{:id => "model_#{model.id}_status", :class => "model_status"} + = haml :model_status, :locals=>{:model=>model}, :layout => false + - if model.task_uri && model.status !~ /Completed|Cancelled|Error|Deleting/ + - if (task = OpenTox::Task.exist?(model.task_uri)) + %input{:type => 'hidden', :id => "model_#{model.id}_task", :value => "#{model.task_uri}"} + - percentage_completed = task.metadata[OT.percentageCompleted].to_i + - js = "$('#model_#{model.id}_progress').progressbar({ value: #{percentage_completed} });" + :javascript + $(function() { + #{js} + }); + + %div{:id => "model_#{model.id}_progress", :class => "model_progress", :title => "#{percentage_completed}%"} + //= haml :model_progress, :locals=>{:percentage_completed=>percentage_completed}, :layout => false + + %a{:href => url_for("/model/#{model.id}"), :id => "delete_#{model.id}", :class => 'delete_link'} + - if model.status =~ /Completed|Error|Cancelled/ +  (delete) + - else +  (stop) + %span + %br + + %dt Started: + %dd= Time.parse(model.created_at.to_s).strftime("%m/%d/%Y - %I:%M:%S%p %Z") if model.created_at + - if model.nr_compounds + %dt Training compounds: + %dd= model.nr_compounds + - if model.error_messages + %dt Errors: + %dd= model.error_messages + - if CONFIG[:logger]=="debug" + %dt Task: %dd - %span{:id => "model_#{model.id}_status", :class => "model_status"} - = haml :model_status, :locals=>{:model=>model}, :layout => false - - if model.task_uri && model.status !~ /Completed|Cancelled|Error|Deleting/ - - if (task = OpenTox::Task.exist?(model.task_uri)) - %input{:type => 'hidden', :id => "model_#{model.id}_task", :value => "#{model.task_uri}"} - - percentage_completed = task.metadata[OT.percentageCompleted].to_i - - js = "$('#model_#{model.id}_progress').progressbar({ value: #{percentage_completed} });" - :javascript - $(function() { - #{js} - }); - - %div{:id => "model_#{model.id}_progress", :class => "model_progress", :title => "#{percentage_completed}%"} - //= haml :model_progress, :locals=>{:percentage_completed=>percentage_completed}, :layout => false - - if is_authorized(model.web_uri, "POST") - %a{:href => url_for("/model/#{model.id}"), :id => "delete_#{model.id}", :class => 'delete_link'} - - if model.status =~ /Completed|Error|Cancelled/ -  (delete) - - else -  (stop) - %span - %br - - %dt Started: - %dd= Time.parse(model.created_at.to_s).strftime("%m/%d/%Y - %I:%M:%S%p %Z") if model.created_at - - if model.nr_compounds - %dt Training compounds: - %dd= model.nr_compounds - - if model.error_messages - %dt Errors: - %dd= model.error_messages - - if CONFIG[:logger]=="debug" - %dt Task: - %dd - %a{:href => "#{model.task_uri}", :id => "model_#{model.id}_task_link", :rel => "external"} - = model.task_uri - - if model.warnings - %dt Warnings: - %dd - %a{:href => "#", :id => "show_model_#{model.id}_warnings"} show - %div{:id => "model_#{model.id}_warnings", :style => "display: none;"}= model.warnings - %dt Algorithm: - %dd= toggle_link("#lazar_description","lazar") - - if model.type - %dt Type: - %dd= toggle_link("##{model.type}","#{model.type}") - %dt Descriptors: + %a{:href => "#{model.task_uri}", :id => "model_#{model.id}_task_link", :rel => "external"} + = model.task_uri + - if model.warnings + %dt Warnings: %dd - %a{:href => 'http://www.maunz.de/libfminer2-bbrc-doc/', :rel => "external"} Fminer backbone refinement classes - - if model.training_dataset - %dt Training dataset: - %dd - - if model.training_dataset.match(/ambit/i) - %a{:href => "#{model.training_dataset}", :rel => "external"} Ambit database - - else - %a{:href => "#{model.training_dataset}.xls"} Excel sheet - , - -#%a{:href => "#{model.training_dataset}.rdf"} RDF/XML - -#%em (experts) , - %a{:href => "#{model.training_dataset}.sdf" } SDF - , - %a{:href => "#{model.training_dataset}.yaml" } YAML - %em (experts) - - if model.feature_dataset - %dt Feature dataset: - %dd - -#%a{:href => "#{model.feature_dataset}.rdf"} RDF/XML - -#, - %a{:href => "#{model.feature_dataset}.xls"} Excel sheet + %a{:href => "#", :id => "show_model_#{model.id}_warnings"} show + %div{:id => "model_#{model.id}_warnings", :style => "display: none;"}= model.warnings + %dt Algorithm: + %dd= toggle_link("#lazar_description","lazar") + - if model.type + %dt Type: + %dd= toggle_link("##{model.type}","#{model.type}") + %dt Descriptors: + %dd + %a{:href => 'http://www.maunz.de/libfminer2-bbrc-doc/', :rel => "external"} Fminer backbone refinement classes + - if model.training_dataset + %dt Training dataset: + %dd + - if model.training_dataset.match(/ambit/i) + %a{:href => "#{model.training_dataset}", :rel => "external"} Ambit database + - else + %a{:href => "#{model.training_dataset}.xls"} Excel sheet , - %a{:href => "#{model.feature_dataset}.sdf"} SDF + -#%a{:href => "#{model.training_dataset}.rdf"} RDF/XML + -#%em (experts) , + %a{:href => "#{model.training_dataset}.sdf" } SDF , - %a{:href => "#{model.feature_dataset}.yaml"} YAML + %a{:href => "#{model.training_dataset}.yaml" } YAML %em (experts) - - if model.uri - %dt Model: - %dd{:id => "model_qmrf_#{model.id}"} - %input{ :id => "model_validation_qmrf_#{model.id}", :type => "hidden", :value => "#{model.validation_qmrf_status}", :class => "model_validation_qmrf" } - -#%a{:href => "#{model.uri}.rdf"} RDF/XML - -#, - - if model.validation_qmrf_uri - %a{:href => File.join(model.validation_qmrf_uri,"editor")} QMRF Editor, - %a{:href => "#{model.uri}.yaml"} YAML - %em (experts, models cannot be represented in Excel) + - if model.feature_dataset + %dt Feature dataset: + %dd + -#%a{:href => "#{model.feature_dataset}.rdf"} RDF/XML + -#, + %a{:href => "#{model.feature_dataset}.xls"} Excel sheet + , + %a{:href => "#{model.feature_dataset}.sdf"} SDF + , + %a{:href => "#{model.feature_dataset}.yaml"} YAML + %em (experts) + - if model.uri + %dt Model: + %dd{:id => "model_qmrf_#{model.id}"} + %input{ :id => "model_validation_qmrf_#{model.id}", :type => "hidden", :value => "#{model.validation_qmrf_status}", :class => "model_validation_qmrf" } + -#%a{:href => "#{model.uri}.rdf"} RDF/XML + -#, + - if model.validation_qmrf_uri + %a{:href => File.join(model.validation_qmrf_uri,"editor")} QMRF Editor, + %a{:href => "#{model.uri}.yaml"} YAML + %em (experts, models cannot be represented in Excel) - = haml :validation, :locals=>{:model=>model}, :layout => false + = haml :validation, :locals=>{:model=>model}, :layout => false -- cgit v1.2.3