Merge pull request #40 from superphy/bugfixes

Bugfixes
superphy · Mar 13, 2017 · 07fef30 · 07fef30
2 parents f01f862 + 3c45f67
commit 07fef30
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/app/savvy.py b/app/savvy.py
@@ -308,7 +308,9 @@ def json_return(args_dict, gene_dict):
         if analysis == 'Serotype':
             instance_dict = {}
             instance_dict['filename'] = basename(args_dict['i'])[27:]
-            instance_dict['hitname'] = str(gene_dict[analysis].values()).replace(',', ' ').strip("'").strip("[").strip("]")
+            instance_dict['hitname'] = str(gene_dict[analysis].values()).replace(',', ' ').replace("'","").strip("[").strip("]")
+            if not "No prediction" in instance_dict['hitname']:
+                instance_dict['hitname'] = instance_dict['hitname'].replace(" ",":",1).replace(" ","")
             instance_dict['contigid'] = 'n/a'
             instance_dict['analysis'] = analysis
             instance_dict['hitorientation'] = 'n/a'

diff --git a/app/static/js/main.js b/app/static/js/main.js
@@ -129,12 +129,9 @@ app.controller('SpfyController', [
 
                             //check for "No results found"
                             for(hit in data){
-                              $log.log('hit is:');
-                              $log.log(data[hit]);
-                              if (data[hit].hitname === "No Results Found."){
+                              if (data[hit].hitname === "No Results Found." ||
+                                  data[hit].hitname.includes("No prediction could be made for")){
                                 $scope.foundNull = true;
-                              } else {
-                                $log.log(hit.hitname);
                               }
                             }
 

diff --git a/app/templates/index.html b/app/templates/index.html
@@ -21,7 +21,7 @@
         <div class="col-2 collapse d-md-flex bg-faded pt-2 h-100" id="sidebar">
           <dl>
               <dt><img src="static/img/spfy.png" alt="spfy" id="spfy-logo"></dt>
-              <dt>v0.06-beta</dt>
+              <dt>v0.06b-beta</dt>
               <dt>About:</dt>
               <dd>Quick, Predictive Genomics</dd>
               <dd>AMR is powered by <a href="https://card.mcmaster.ca/analyze/rgi">CARD</a></dd>