Pioreactor
diff --git a/‎asset-manifest.json‎
Lines changed: 3 additions & 3 deletions b/‎asset-manifest.json‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎index.html‎
Lines changed: 1 addition & 1 deletion b/‎index.html‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pioreactorui/api.py‎
Lines changed: 2 additions & 6 deletions b/‎pioreactorui/api.py‎
Lines changed: 2 additions & 6 deletions
diff --git a/‎static/js/main.0a4f5feb.js‎
Lines changed: 0 additions & 103 deletions b/‎static/js/main.0a4f5feb.js‎
Lines changed: 0 additions & 103 deletions
diff --git a/‎static/js/main.7169a98f.js‎
Lines changed: 103 additions & 0 deletions b/‎static/js/main.7169a98f.js‎
Lines changed: 103 additions & 0 deletions
diff --git a/‎static/js/main.0a4f5feb.js.LICENSE.txt‎ ‎static/js/main.7169a98f.js.LICENSE.txt‎static/js/main.0a4f5feb.js.LICENSE.txt renamed to static/js/main.7169a98f.js.LICENSE.txt b/‎static/js/main.0a4f5feb.js.LICENSE.txt‎ ‎static/js/main.7169a98f.js.LICENSE.txt‎static/js/main.0a4f5feb.js.LICENSE.txt renamed to static/js/main.7169a98f.js.LICENSE.txt
diff --git a/‎static/js/main.0a4f5feb.js.map‎ ‎static/js/main.7169a98f.js.map‎static/js/main.0a4f5feb.js.map renamed to static/js/main.7169a98f.js.map
Lines changed: 1 addition & 1 deletion b/‎static/js/main.0a4f5feb.js.map‎ ‎static/js/main.7169a98f.js.map‎static/js/main.0a4f5feb.js.map renamed to static/js/main.7169a98f.js.map
Lines changed: 1 addition & 1 deletion
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.02152627.css",
-    "main.js": "/static/js/main.0a4f5feb.js",
+    "main.js": "/static/js/main.7169a98f.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",
@@ -36,10 +36,10 @@
     "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.0a4f5feb.js.map": "/static/js/main.0a4f5feb.js.map"
+    "main.7169a98f.js.map": "/static/js/main.7169a98f.js.map"
   },
   "entrypoints": [
     "static/css/main.02152627.css",
-    "static/js/main.0a4f5feb.js"
+    "static/js/main.7169a98f.js"
   ]
 }
@@ -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.0a4f5feb.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.7169a98f.js"></script><link href="/static/css/main.02152627.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
@@ -418,12 +418,8 @@ def get_exp_logs(experiment: str) -> ResponseReturnValue:
     min_level = request.args.get("min_level", "INFO")
 
     recent_logs = query_app_db(
-        f"""SELECT l.timestamp, level, l.pioreactor_unit, message, task, l.experiment
+        f"""SELECT l.timestamp, l.level, l.pioreactor_unit, l.message, l.task, l.experiment
             FROM logs AS l
-            JOIN experiment_worker_assignments_history h
-               on h.pioreactor_unit = l.pioreactor_unit
-               and h.assigned_at <= l.timestamp
-               and DATETIME(l.timestamp) <= DATETIME(coalesce(h.unassigned_at, STRFTIME('%Y-%m-%dT%H:%M:%f000Z', 'NOW')), '+5 seconds')
             WHERE (l.experiment=? )
             AND ({get_level_string(min_level)})
             ORDER BY l.timestamp DESC LIMIT 50 OFFSET {skip};""",
@@ -437,7 +433,7 @@ def get_exp_logs(experiment: str) -> ResponseReturnValue:
 def get_recent_logs_for_unit_and_experiment(
     pioreactor_unit: str, experiment: str
 ) -> ResponseReturnValue:
-    """Shows event logs for a specific unit within an experiment"""
+    """Shows event logs for a specific unit within an experiment. This is for the single-page Pioreactor ui"""
 
     min_level = request.args.get("min_level", "INFO")
Original file line number	Diff line number	Diff line change
`@@ -1 +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.0a4f5feb.js"></script><link href="/static/css/main.02152627.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
	`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.7169a98f.js"></script><link href="/static/css/main.02152627.css" rel="stylesheet"></head><body><div id="root"></div></body></html>