Merge branch 'fix/webservice-elapsed-str' into 'master'

[Webservice] Fix overview page with newly submitted jobs

See merge request !1051

webservice/systemd/cal-job-monitor.service

@@ -6,7 +6,8 @@ PartOf=cal-services.target
 Type=exec
 WorkingDirectory=%h/deployments/development/git.xfel.eu/detectors/pycalibration/current/
 ExecStart=%h/deployments/development/git.xfel.eu/detectors/pycalibration/current/.venv/bin/python -m webservice.job_monitor --log-level DEBUG
-ExecStartPost=/usr/bin/sleep 1  # Pause to make errors in startup more obvious
+# Pause to make errors in startup more obvious
+ExecStartPost=/usr/bin/sleep 1
 Restart=on-failure
 
 [Install]

webservice/systemd/cal-overview-server.service

@@ -6,7 +6,8 @@ PartOf=cal-services.target
 Type=exec
 WorkingDirectory=%h/deployments/development/git.xfel.eu/detectors/pycalibration/current/
 ExecStart=%h/deployments/development/git.xfel.eu/detectors/pycalibration/current/.venv/bin/python -m webservice.serve_overview
-ExecStartPost=/usr/bin/sleep 1  # Pause to make errors in startup more obvious
+# Pause to make errors in startup more obvious
+ExecStartPost=/usr/bin/sleep 1
 Restart=on-failure
 
 [Install]

webservice/systemd/cal-webservice.service

@@ -6,7 +6,8 @@ PartOf=cal-services.target
 Type=exec
 WorkingDirectory=%h/deployments/development/git.xfel.eu/detectors/pycalibration/current/
 ExecStart=%h/deployments/development/git.xfel.eu/detectors/pycalibration/current/.venv/bin/python -m webservice.webservice --mode prod --log-level DEBUG
-ExecStartPost=/usr/bin/sleep 1  # Pause to make errors in startup more obvious
+# Pause to make errors in startup more obvious
+ExecStartPost=/usr/bin/sleep 1
 Restart=on-failure
 
 [Install]

webservice/webservice.py

@@ -486,7 +486,7 @@ async def run_action(job_db, cmd, mode, proposal, run, exec_id) -> str:
                     jobs.append((int(jobid.strip()), exec_id))
                 with time_db_transaction(job_db, 'Insert jobs'):
                     job_db.executemany(
-                        "INSERT INTO slurm_jobs VALUES (?, ?, 'PENDING', 0, 0)",
+                        "INSERT INTO slurm_jobs VALUES (?, ?, 'PENDING', 0, '0')",
                         jobs
                     )