fix some ui issues

Author: CamDavidsonPilon

asset-manifest.json

@@ -1,45 +1,37 @@
 {
   "files": {
-    "main.css": "/static/css/main.02152627.css",
-    "main.js": "/static/js/main.0acc5937.js",
+    "main.css": "/static/css/main.dbb6a692.css",
+    "main.js": "/static/js/main.31979bee.js",
     "static/media/roboto-all-500-normal.woff": "/static/media/roboto-all-500-normal.0ab669b7a0d19b178f57.woff",
     "static/media/roboto-all-700-normal.woff": "/static/media/roboto-all-700-normal.a457fde362a540fcadff.woff",
     "static/media/roboto-all-400-normal.woff": "/static/media/roboto-all-400-normal.c5d001fa922fa66a147f.woff",
-    "static/media/roboto-all-300-normal.woff": "/static/media/roboto-all-300-normal.168d6383e73339293ac3.woff",
     "static/media/roboto-latin-500-normal.woff2": "/static/media/roboto-latin-500-normal.f25d774ecfe0996f8eb5.woff2",
     "static/media/roboto-latin-700-normal.woff2": "/static/media/roboto-latin-700-normal.227c93190fe7f82de3f8.woff2",
     "static/media/roboto-latin-400-normal.woff2": "/static/media/roboto-latin-400-normal.b009a76ad6afe4ebd301.woff2",
-    "static/media/roboto-latin-300-normal.woff2": "/static/media/roboto-latin-300-normal.c48fb6765a9fcb00b330.woff2",
     "static/media/roboto-cyrillic-ext-400-normal.woff2": "/static/media/roboto-cyrillic-ext-400-normal.804378952da8a10faae2.woff2",
-    "static/media/roboto-cyrillic-ext-300-normal.woff2": "/static/media/roboto-cyrillic-ext-300-normal.4777461b144e55145268.woff2",
     "static/media/roboto-cyrillic-ext-500-normal.woff2": "/static/media/roboto-cyrillic-ext-500-normal.62ced72e5832f02c2796.woff2",
     "static/media/roboto-cyrillic-ext-700-normal.woff2": "/static/media/roboto-cyrillic-ext-700-normal.be4d02458ce53887dc37.woff2",
     "static/media/roboto-latin-ext-400-normal.woff2": "/static/media/roboto-latin-ext-400-normal.861b791f9de857a6e7bc.woff2",
     "static/media/roboto-latin-ext-700-normal.woff2": "/static/media/roboto-latin-ext-700-normal.ed67ad54b1a8f5d21150.woff2",
     "static/media/roboto-latin-ext-500-normal.woff2": "/static/media/roboto-latin-ext-500-normal.9165081d10e1ba601384.woff2",
-    "static/media/roboto-latin-ext-300-normal.woff2": "/static/media/roboto-latin-ext-300-normal.dc7dcec8e3f654e0ed63.woff2",
     "static/media/roboto-cyrillic-500-normal.woff2": "/static/media/roboto-cyrillic-500-normal.cad7d3d9cb265e334e58.woff2",
     "static/media/roboto-cyrillic-700-normal.woff2": "/static/media/roboto-cyrillic-700-normal.d010f1f324e111a22e53.woff2",
     "static/media/roboto-cyrillic-400-normal.woff2": "/static/media/roboto-cyrillic-400-normal.71a33b6b50457b2c903a.woff2",
-    "static/media/roboto-cyrillic-300-normal.woff2": "/static/media/roboto-cyrillic-300-normal.1431d1cef06ad04f5458.woff2",
-    "static/media/roboto-greek-300-normal.woff2": "/static/media/roboto-greek-300-normal.db2632771401f61463fe.woff2",
     "static/media/roboto-greek-400-normal.woff2": "/static/media/roboto-greek-400-normal.c35e4c3958e209d17b31.woff2",
     "static/media/roboto-greek-500-normal.woff2": "/static/media/roboto-greek-500-normal.9ac81fefbe6c319ea40b.woff2",
     "static/media/roboto-greek-700-normal.woff2": "/static/media/roboto-greek-700-normal.50e795c1345353b0e996.woff2",
     "static/media/roboto-vietnamese-500-normal.woff2": "/static/media/roboto-vietnamese-500-normal.d8642a3d1d4ef6179644.woff2",
     "static/media/roboto-vietnamese-400-normal.woff2": "/static/media/roboto-vietnamese-400-normal.3230f9b040f3c630e0c3.woff2",
     "static/media/roboto-vietnamese-700-normal.woff2": "/static/media/roboto-vietnamese-700-normal.3425a701027d0699e369.woff2",
-    "static/media/roboto-vietnamese-300-normal.woff2": "/static/media/roboto-vietnamese-300-normal.32fc45a3d1e8ea11fabc.woff2",
     "static/media/roboto-greek-ext-500-normal.woff2": "/static/media/roboto-greek-ext-500-normal.6fb9cffb1d3e72bf9293.woff2",
     "static/media/roboto-greek-ext-400-normal.woff2": "/static/media/roboto-greek-ext-400-normal.169619821ea93019d1bb.woff2",
-    "static/media/roboto-greek-ext-300-normal.woff2": "/static/media/roboto-greek-ext-300-normal.35b9d6be04b95f0f0530.woff2",
     "static/media/roboto-greek-ext-700-normal.woff2": "/static/media/roboto-greek-ext-700-normal.bd9854c751441ccc1a70.woff2",
     "index.html": "/index.html",
-    "main.02152627.css.map": "/static/css/main.02152627.css.map",
-    "main.0acc5937.js.map": "/static/js/main.0acc5937.js.map"
+    "main.dbb6a692.css.map": "/static/css/main.dbb6a692.css.map",
+    "main.31979bee.js.map": "/static/js/main.31979bee.js.map"
   },
   "entrypoints": [
-    "static/css/main.02152627.css",
-    "static/js/main.0acc5937.js"
+    "static/css/main.dbb6a692.css",
+    "static/js/main.31979bee.js"
   ]
 }

contrib/automations/dosing/chemostat.yaml

@@ -11,5 +11,5 @@ fields:
   - key: volume
     default: 0.5
     unit: mL
-    label: Volume / dose
+    label: Volume per dose
     type: numeric

contrib/automations/dosing/fed_batch.yaml

@@ -11,5 +11,5 @@ fields:
   - key: volume
     default: 1.0
     unit: mL
-    label: Volume / dose
+    label: Volume per dose
     type: numeric

index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.0acc5937.js"></script><link href="/static/css/main.02152627.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.31979bee.js"></script><link href="/static/css/main.dbb6a692.css" rel="stylesheet"></head><body><div id="root"></div></body></html>

pioreactorui/__init__.py

@@ -224,7 +224,7 @@ def query_app_db(
     rv = cur.fetchall()
     cur.close()
     if one:
-        return rv[0] if rv else None  # only when explicitly requested
+        return rv[0] if rv else None
     return rv
 
 
@@ -244,7 +244,8 @@ def modify_app_db(statement: str, args=()) -> int:
     try:
         cur.execute(statement, args)
         con.commit()
-    except sqlite3.IntegrityError:
+    except sqlite3.IntegrityError as e:
+        print(e)
         return 0
     except Exception as e:
         print(e)

pioreactorui/api.py

@@ -742,7 +742,7 @@ def get_growth_rates_per_unit(pioreactor_unit: str, experiment: str) -> Response
             SELECT pioreactor_unit as unit,
                    json_group_array(json_object('x', timestamp, 'y', round(rate, 5))) as data
             FROM growth_rates
-            WHERE experiment=? AND pioreactor_unit=?
+            WHERE experiment=? AND pioreactor_unit=? AND
                   ((ROWID * 0.61803398875) - cast(ROWID * 0.61803398875 as int) < 1.0/?) AND
                   timestamp > STRFTIME('%Y-%m-%dT%H:%M:%f000Z', 'NOW', ?)
             GROUP BY 1
@@ -2335,11 +2335,12 @@ def get_experiments_worker_assignments() -> ResponseReturnValue:
         """
         SELECT e.experiment, count(a.pioreactor_unit) as worker_count
         FROM experiments e
-        LEFT JOIN experiment_worker_assignments a
+        JOIN experiment_worker_assignments a
           on e.experiment = a.experiment
+        JOIN workers w -- make sure the worker is still part of the inventory
+          on w.pioreactor_unit = a.pioreactor_unit
         GROUP BY 1
         HAVING count(a.pioreactor_unit) > 0
-        ORDER BY 2 DESC
         """,
     )
     if result:

requirements_dev.txt

@@ -3,3 +3,6 @@ pytest
 pytest-timeout
 pytest-random-order
 pytest-mock
+mypy
+black
+flake8