From d0b14fc00186eb875aad4b0aa55085236debe4db Mon Sep 17 00:00:00 2001 From: Brett Williams Date: Thu, 8 Dec 2022 00:08:09 -0800 Subject: [PATCH] Added new commands to index.html --- lib/render_job.py | 10 +++------- templates/index.html | 33 +++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/lib/render_job.py b/lib/render_job.py index e037bc1..fc6bf70 100644 --- a/lib/render_job.py +++ b/lib/render_job.py @@ -58,13 +58,6 @@ class RenderJob: for key in keys_to_remove: job_dict['worker'].pop(key, None) - # jobs from current_session generate percent completed - # jobs after loading server pull in a saved value. Have to check if callable object or not - - percent_complete = self.worker.percent_complete if isinstance(self.worker.percent_complete, numbers.Number) \ - else self.worker.percent_complete() - job_dict['worker']['percent_complete'] = percent_complete - # convert to json and back to auto-convert dates to iso format def date_serializer(o): if isinstance(o, datetime): @@ -105,6 +98,9 @@ class RenderJob: def log_path(self): return self.worker.log_path + def percent_complete(self): + return self.worker.percent_complete() + @classmethod def generate_id(cls): return str(uuid.uuid4()).split('-')[0] \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 823c9f7..c0052af 100644 --- a/templates/index.html +++ b/templates/index.html @@ -6,14 +6,16 @@ Zordon Dashboard + + -