From 015754e0891a2e252211cf460737232ce4506dec Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 26 Apr 2023 19:15:15 -0400 Subject: [PATCH] some styling changes and a better end page. --- .../spiffworkflow_backend/routes/tasks_controller.py | 7 +++---- spiffworkflow-frontend/src/index.css | 12 ++++++------ .../src/routes/ProcessInterstitial.tsx | 10 +++++----- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py index 963064d7b..649ec3160 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py @@ -430,11 +430,10 @@ def _interstitial_stream(process_instance: ProcessInstanceModel) -> Generator[st task = ProcessInstanceService.spiff_task_to_api_task(processor, processor.next_task()) if task.id not in reported_ids: + task_model = TaskModel.query.filter_by(guid=str(task.id)).first() + extensions = TaskService.get_extensions_from_task_model(task_model) + task.properties = extensions yield f"data: {current_app.json.dumps(task)} \n\n" - # Note, this has to be done in case someone leaves the page, - # which can otherwise cancel this function and leave completed tasks un-registered. - spiff_task = processor.next_task() - task_model = TaskModel.query.filter_by(guid=str(spiff_task.id)).first() def get_ready_engine_step_count(bpmn_process_instance: BpmnWorkflow) -> int: diff --git a/spiffworkflow-frontend/src/index.css b/spiffworkflow-frontend/src/index.css index 2cb95276d..2a8e6de73 100644 --- a/spiffworkflow-frontend/src/index.css +++ b/spiffworkflow-frontend/src/index.css @@ -435,17 +435,17 @@ svg.notification-icon { } .user_instructions_1 { - filter: opacity(90%); -} - -.user_instructions_2 { filter: opacity(70%); } -.user_instructions_3 { +.user_instructions_2 { filter: opacity(50%); } -.user_instructions_4 { +.user_instructions_3 { filter: opacity(30%); } + +.user_instructions_4 { + filter: opacity(10%); +} diff --git a/spiffworkflow-frontend/src/routes/ProcessInterstitial.tsx b/spiffworkflow-frontend/src/routes/ProcessInterstitial.tsx index b04f3198b..9483e29a8 100644 --- a/spiffworkflow-frontend/src/routes/ProcessInterstitial.tsx +++ b/spiffworkflow-frontend/src/routes/ProcessInterstitial.tsx @@ -103,16 +103,16 @@ export default function ProcessInterstitial() { const getReturnHomeButton = (index: number) => { if ( index === 0 && - ['WAITING', 'ERROR', 'LOCKED', 'COMPLETED'].includes(getStatus()) + ['WAITING', 'ERROR', 'LOCKED', 'COMPLETED', 'READY'].includes(getStatus()) ) return ( - <> -
-
+
- +
+
+ ); return ''; };