1. Fix sqlite datetime in sql

2. Fix use pandas fillna to avoid NaNs
laurolins · Nov 12, 2019 · 300ff13 · 300ff13
1 parent 326255b
commit 300ff13
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/web/bin/db_rest_server.py b/web/bin/db_rest_server.py
@@ -20,15 +20,17 @@ def data():
         q = request.form['q']
         format = request.form['format']
         resp = make_response()
+        print(q)
+
+        data=pd.read_sql(q,engine).fillna(None)
+        mime
 
-        data=''
-        mime=''
         if format=='json':
-            data = json.dumps(pd.read_sql(q,engine).to_dict(orient='records'))
+            data = json.dumps(data.to_dict(orient='records'))
             mime = 'text/json'
 
         if format=='csv':
-            data = pd.read_sql(q,engine).to_csv(index=False)
+            data = data.to_csv(index=False)
             mime = 'text/csv'
 
         resp.data=data

diff --git a/web/dist/index.html b/web/dist/index.html
@@ -1,2 +1,2 @@
 <!DOCTYPE html><html><head><meta name="viewport" content="initial-scale=1,maximum-scale=1,
-          user-scalable=no"><link rel="stylesheet" href="web.416d5ffe.css"></head><body> <div id="nc"></div> </body><script src="web.7f0fc0fb.js"></script></html>
+          user-scalable=no"><link rel="stylesheet" href="web.416d5ffe.css"></head><body> <div id="nc"></div> </body><script src="web.44b709ef.js"></script></html>
diff --git a/web/dist/web.7f0fc0fb.js → web/dist/web.44b709ef.js b/web/dist/web.7f0fc0fb.js → web/dist/web.44b709ef.js
diff --git a/web/dist/web.44b709ef.js.map b/web/dist/web.44b709ef.js.map
diff --git a/web/dist/web.7f0fc0fb.js.map b/web/dist/web.7f0fc0fb.js.map
diff --git a/web/src/Nanocube/Viewer.js b/web/src/Nanocube/Viewer.js
@@ -152,6 +152,9 @@ let Viewer = function(opts){
 
         let resp=await fetch(url, {method:'POST',
                                    body: formdata});
+
+        console.log('sql ',sql);
+
         if(format == 'json'){
             return await resp.json();
         }
@@ -471,7 +474,7 @@ Viewer.prototype = {
                 }
             }
             if(c[k].type=='time'){
-                return sprintf('("%s" BETWEEN \'%s\' AND \'%s\')',k,
+                return sprintf('("%s" BETWEEN datetime("%s") AND datetime("%s"))',k,
                                c[k].sel.start.toISOString(),
                                c[k].sel.end.toISOString());
             }