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

fix filtering issue on completed instances tab and lint junk

This commit is contained in:
burnettk 2022-12-19 23:08:54 -05:00
parent 77f0660444
commit 9bb3d98594
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spiffworkflow-backend/src/spiffworkflow_backend/models/human_task.py
View File

@ -1,4 +1,4 @@
"""human_task.""" """Human_task."""
from __future__ import annotations from __future__ import annotations
from dataclasses import dataclass from dataclasses import dataclass

2
spiffworkflow-backend/src/spiffworkflow_backend/models/human_task_user.py
View File

@ -1,4 +1,4 @@
"""human_task_user.""" """Human_task_user."""
from __future__ import annotations from __future__ import annotations
from dataclasses import dataclass from dataclasses import dataclass

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

@ -983,6 +983,14 @@ def process_instance_list(
ProcessInstanceModel.status.in_(report_filter.process_status) # type: ignore ProcessInstanceModel.status.in_(report_filter.process_status) # type: ignore
) )
if report_filter.initiated_by_me is True:
process_instance_query = process_instance_query.filter(
ProcessInstanceModel.status.in_(ProcessInstanceModel.terminal_statuses()) # type: ignore
)
process_instance_query = process_instance_query.filter_by(
process_initiator=g.user
)
if report_filter.with_relation_to_me is True: if report_filter.with_relation_to_me is True:
process_instance_query = process_instance_query.outerjoin( process_instance_query = process_instance_query.outerjoin(
HumanTaskModel HumanTaskModel
@ -1000,14 +1008,6 @@ def process_instance_list(
) )
) )
if report_filter.initiated_by_me is True:
process_instance_query = process_instance_query.filter(
ProcessInstanceModel.status.in_(ProcessInstanceModel.terminal_statuses()) # type: ignore
)
process_instance_query = process_instance_query.filter_by(
process_initiator=g.user
)
# 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(
@ -1578,6 +1578,7 @@ def process_instance_task_list_without_task_data_for_me(
all_tasks: bool = False, all_tasks: bool = False,
spiff_step: int = 0, spiff_step: int = 0,
) -> flask.wrappers.Response: ) -> flask.wrappers.Response:
"""Process_instance_task_list_without_task_data_for_me."""
process_instance = _find_process_instance_for_me_or_raise(process_instance_id) process_instance = _find_process_instance_for_me_or_raise(process_instance_id)
print(f"process_instance: {process_instance}") print(f"process_instance: {process_instance}")
return process_instance_task_list( return process_instance_task_list(
@ -2291,8 +2292,11 @@ def commit_and_push_to_git(message: str) -> None:
current_app.logger.info("Git commit on save is disabled") current_app.logger.info("Git commit on save is disabled")
def _find_process_instance_for_me_or_raise(process_instance_id: int) -> ProcessInstanceModel: def _find_process_instance_for_me_or_raise(
process_instance = ( process_instance_id: int,
) -> ProcessInstanceModel:
"""_find_process_instance_for_me_or_raise."""
process_instance: ProcessInstanceModel = (
ProcessInstanceModel.query.filter_by(id=process_instance_id) ProcessInstanceModel.query.filter_by(id=process_instance_id)
.outerjoin(HumanTaskModel) .outerjoin(HumanTaskModel)
.outerjoin( .outerjoin(