sartography
/
spiff-arena
mirror of https://github.com/sartography/spiff-arena.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

in completed tab, show display name, and filter by all stopped statuses rather than just complete

This commit is contained in:
burnettk 2022-11-25 00:44:06 -05:00
parent cb8c7cd0f9
commit 90ab56b93a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py
View File

@ -857,7 +857,7 @@ def process_instance_list(
if report_filter.initiated_by_me is True: if report_filter.initiated_by_me is True:
process_instance_query = process_instance_query.filter( process_instance_query = process_instance_query.filter(
ProcessInstanceModel.status == "complete" ProcessInstanceModel.status.in_(["complete", "error", "terminated"]) # type: ignore
) )
process_instance_query = process_instance_query.filter_by( process_instance_query = process_instance_query.filter_by(
process_initiator=g.user process_initiator=g.user
@ -866,7 +866,7 @@ def process_instance_list(
# TODO: not sure if this is exactly what is wanted # TODO: not sure if this is exactly what is wanted
if report_filter.with_tasks_completed_by_me is True: if report_filter.with_tasks_completed_by_me is True:
process_instance_query = process_instance_query.filter( process_instance_query = process_instance_query.filter(
ProcessInstanceModel.status == "complete" ProcessInstanceModel.status.in_(["complete", "error", "terminated"]) # type: ignore
) )
process_instance_query = process_instance_query.join( process_instance_query = process_instance_query.join(
SpiffStepDetailsModel, SpiffStepDetailsModel,
@ -889,7 +889,7 @@ def process_instance_list(
# TODO: not sure if this is exactly what is wanted # TODO: not sure if this is exactly what is wanted
if report_filter.with_tasks_completed_by_my_group is True: if report_filter.with_tasks_completed_by_my_group is True:
process_instance_query = process_instance_query.filter( process_instance_query = process_instance_query.filter(
ProcessInstanceModel.status == "complete" ProcessInstanceModel.status.in_(["complete", "error", "terminated"]) # type: ignore
) )
process_instance_query = process_instance_query.join( process_instance_query = process_instance_query.join(
SpiffStepDetailsModel, SpiffStepDetailsModel,

12
spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py
View File

@ -88,8 +88,8 @@ class ProcessInstanceReportService:
"columns": [ "columns": [
{"Header": "id", "accessor": "id"}, {"Header": "id", "accessor": "id"},
{ {
"Header": "process_model_identifier", "Header": "process_model_display_name",
"accessor": "process_model_identifier", "accessor": "process_model_display_name",
}, },
{"Header": "start_in_seconds", "accessor": "start_in_seconds"}, {"Header": "start_in_seconds", "accessor": "start_in_seconds"},
{"Header": "end_in_seconds", "accessor": "end_in_seconds"}, {"Header": "end_in_seconds", "accessor": "end_in_seconds"},
@ -101,8 +101,8 @@ class ProcessInstanceReportService:
"columns": [ "columns": [
{"Header": "id", "accessor": "id"}, {"Header": "id", "accessor": "id"},
{ {
"Header": "process_model_identifier", "Header": "process_model_display_name",
"accessor": "process_model_identifier", "accessor": "process_model_display_name",
}, },
{"Header": "start_in_seconds", "accessor": "start_in_seconds"}, {"Header": "start_in_seconds", "accessor": "start_in_seconds"},
{"Header": "end_in_seconds", "accessor": "end_in_seconds"}, {"Header": "end_in_seconds", "accessor": "end_in_seconds"},
@ -116,8 +116,8 @@ class ProcessInstanceReportService:
"columns": [ "columns": [
{"Header": "id", "accessor": "id"}, {"Header": "id", "accessor": "id"},
{ {
"Header": "process_model_identifier", "Header": "process_model_display_name",
"accessor": "process_model_identifier", "accessor": "process_model_display_name",
}, },
{"Header": "start_in_seconds", "accessor": "start_in_seconds"}, {"Header": "start_in_seconds", "accessor": "start_in_seconds"},
{"Header": "end_in_seconds", "accessor": "end_in_seconds"}, {"Header": "end_in_seconds", "accessor": "end_in_seconds"},