From 9b28faf75acb5a74ac0fac37433fbed4d1d39c7c Mon Sep 17 00:00:00 2001
From: gebele <gebele@in-silico.ch>
Date: Mon, 24 Sep 2018 14:33:43 +0000
Subject: allow tab separated smi files

---
 views/help.haml    |  4 ++--
 views/predict.haml | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'views')

diff --git a/views/help.haml b/views/help.haml
index 267f0ce..0e54eff 100644
--- a/views/help.haml
+++ b/views/help.haml
@@ -2,7 +2,7 @@
   %h3 How to use batch prediction
 
   %p
-    You have two options to format your comma sperated spreadsheet (CSV) for batch predictions:
+    You have two options to format your comma or tab sperated spreadsheet for batch predictions:
 
   %br
   %p
@@ -66,7 +66,7 @@
               ="..."
   %br
   %p
-    Uploaded CSV files will be stored until you delete them. You can repeat the prediction by selecting a file in the list of uploads.
+    Uploaded files will be stored until you delete them. You can repeat the prediction by selecting a file in the list of uploads.
     %br
     If you upload a file with the same name as one of the existing files, the existing file will be used. 
     If you want to replace an existing file delete it first!
diff --git a/views/predict.haml b/views/predict.haml
index 0afcc99..a776a93 100644
--- a/views/predict.haml
+++ b/views/predict.haml
@@ -142,14 +142,14 @@
           %input{:type => 'text', :name => 'identifier', :id => 'identifier', :size => '60'}
           %p
           %label{:for=>"fileselect"}
-            or upload a CSV file for batch predictions
+            or upload a CSV or SMI file for batch predictions
           %br
           %span.btn.btn-default.btn-file
-            %input{:type=>"file", :name=> "fileselect", :id=>"fileselect", :autocomplete=>"off", :accept=>"text/csv"}
+            %input{:type=>"file", :name=> "fileselect", :id=>"fileselect", :autocomplete=>"off", :accept=>"text/csv,chemical/x-daylight-smiles"}
           %a.btn.btn-warning{:href => to("/help"), :rel => "external", :style=>"margin-left: 1em;"} Help
       %div.col-md-6
         - if !@existing_datasets.blank?
-          %label{:for=>"storage"} or select an uploaded CSV file
+          %label{:for=>"storage"} or select an uploaded file
           #storage.storage-list
             - @existing_datasets.each do |id,values|
               %div.p2
@@ -187,7 +187,7 @@
         %div{:id=>endpoint.gsub(/\s+/, "_")}
           %h4.head-back=endpoint
           - if endpoint !~ /^Oral|Mazzatorta/
-            - @models.select{|m| endpoint = endpoint.gsub("(lazar)","").strip if endpoint =~ /lazar/; m.endpoint == endpoint}.each do |model|
+            - @models.select{|m| m.endpoint == endpoint}.each do |model|
               %div.row{:id => model.id,:style=>"margin-bottom:1em;"}
                 %span.col-lg-4.col-md-4.col-sm-4.col-xs-4
                   %input.check{:type => "checkbox", :name => "selection[#{model.id}]", :id => "selection[#{model.species.gsub(/\s+/, "_")}]", :value => true, :disabled => false}
@@ -234,7 +234,7 @@
               %span.col-lg-4.col-md-4.col-sm-4.col-xs-4
                 %input.check{:type => "checkbox", :name => "selection[Mazzatorta]", :id => "selection[Mazzatorta]", :value => true, :disabled => false}
                 %label{:for => "selection[Mazzatorta]"}
-                  Rats
+                  Rat
   %fieldset#bottom.well
     %div.row
       %div.col-md-2
-- 
cgit v1.2.3