status-im/spiff-arena
2
0
Fork 0
mirror of https://github.com/status-im/spiff-arena.git synced 2025-01-30 11:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

add the username to the task list w/ burnettk

Browse Source
This commit is contained in:
jasquat 2022-11-11 17:15:38 -05:00
parent 277054d840
commit 4dd121fac7
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1012,32 +1012,34 @@ def get_tasks(processes_started_by_user: bool = True, page: int = 1, per_page: i
user_id = g.user.id
active_tasks_query = (
ActiveTaskModel.query
.outerjoin(GroupModel, GroupModel.id == ActiveTaskModel.lane_assignment_id)
.join(ProcessInstanceModel)
.order_by(desc(ProcessInstanceModel.created_at_in_seconds)) # type: ignore
.join(UserModel, UserModel.id == ProcessInstanceModel.process_initiator_id)
)
if processes_started_by_user:
active_tasks_query = active_tasks_query.filter_by(process_initiator_id=user_id)
active_tasks_query = (active_tasks_query.filter(ProcessInstanceModel.process_initiator_id==user_id)
.outerjoin(ActiveTaskUserModel, and_(ActiveTaskUserModel.user_id == user_id))
)
else:
active_tasks_query = active_tasks_query.filter(ProcessInstanceModel.process_initiator_id != user_id)
active_tasks_query = (active_tasks_query.filter(ProcessInstanceModel.process_initiator_id != user_id)
.join(ActiveTaskUserModel, and_(ActiveTaskUserModel.user_id == user_id))
)
active_tasks = (
active_tasks_query.outerjoin(GroupModel)
.outerjoin(ActiveTaskUserModel, and_(ActiveTaskUserModel.user_id == user_id))
# just need this add_columns to add the process_model_identifier. Then add everything back that was removed.
.add_columns(
active_tasks_query.add_columns(
ProcessInstanceModel.process_model_identifier,
ProcessInstanceModel.status.label("process_instance_status"),
ProcessInstanceModel.updated_at_in_seconds,
ProcessInstanceModel.created_at_in_seconds,
UserModel.username,
GroupModel.identifier.label("group_identifier"),
ActiveTaskModel.task_name,
ActiveTaskModel.task_title,
ActiveTaskModel.process_model_display_name,
ActiveTaskModel.process_instance_id,
ActiveTaskUserModel.user_id.label("current_user_is_potential_owner")
)
.paginate(page=page, per_page=per_page, error_out=False)
).paginate(page=page, per_page=per_page, error_out=False)
)
response_json = {

2
spiffworkflow-frontend/src/components/MyTasksForProcessesStartedByOthers.tsx
View File

@ -63,6 +63,7 @@ export default function MyTasksForProcessesStartedByOthers() {
>
{rowToUse.task_title}
</td>
<td>{rowToUse.username}</td>
<td>{rowToUse.process_instance_status}</td>
<td>{rowToUse.group_identifier || '-'}</td>
<td>
@ -95,6 +96,7 @@ export default function MyTasksForProcessesStartedByOthers() {
<th>Process Model</th>
<th>Process Instance</th>
<th>Task Name</th>
<th>Process Started By</th>
<th>Process Instance Status</th>
<th>Assigned Group</th>
<th>Process Started</th>