updated all instance reports for the in progress instances page

This commit is contained in:
jasquat 2023-04-13 07:42:41 -04:00
parent a5fa3f8cde
commit 17e266f9ee
3 changed files with 23 additions and 5 deletions

View File

@ -3,10 +3,14 @@ default_group: everybody
groups: groups:
admin: admin:
users: [admin@spiffworkflow.org] users: [admin@spiffworkflow.org]
group1:
users: [jason@sartography.com, kb@sartography.com]
group2:
users: [dan@sartography.com]
permissions: permissions:
admin: admin:
groups: [admin] groups: [admin, group1, group2]
users: [] users: []
allowed_permissions: [create, read, update, delete] allowed_permissions: [create, read, update, delete]
uri: /* uri: /*

View File

@ -168,6 +168,17 @@ class ProcessInstanceReportService:
], ],
"order_by": ["-start_in_seconds", "-id"], "order_by": ["-start_in_seconds", "-id"],
}, },
"system_report_in_progress_instances_with_tasks_for_my_group": {
"columns": cls.builtin_column_options(),
"filter_by": [
{
"field_name": "with_tasks_assigned_to_my_group",
"field_value": "true",
},
{"field_name": "has_terminal_status", "field_value": "false"},
],
"order_by": ["-start_in_seconds", "-id"],
},
} }
if metadata_key not in temp_system_metadata_map: if metadata_key not in temp_system_metadata_map:
@ -350,6 +361,8 @@ class ProcessInstanceReportService:
for process_instance_row in process_instance_sqlalchemy_rows: for process_instance_row in process_instance_sqlalchemy_rows:
process_instance_mapping = process_instance_row._mapping process_instance_mapping = process_instance_row._mapping
process_instance_dict = process_instance_row[0].serialized process_instance_dict = process_instance_row[0].serialized
if 'task_guid' in process_instance_mapping:
process_instance_dict['task_guid'] = process_instance_mapping['task_guid']
for metadata_column in metadata_columns: for metadata_column in metadata_columns:
if metadata_column["accessor"] not in process_instance_dict: if metadata_column["accessor"] not in process_instance_dict:
process_instance_dict[metadata_column["accessor"]] = process_instance_mapping[ process_instance_dict[metadata_column["accessor"]] = process_instance_mapping[
@ -493,7 +506,10 @@ class ProcessInstanceReportService:
) )
process_instance_query = process_instance_query.join( process_instance_query = process_instance_query.join(
HumanTaskModel, HumanTaskModel,
HumanTaskModel.process_instance_id == ProcessInstanceModel.id, and_(
HumanTaskModel.process_instance_id == ProcessInstanceModel.id,
HumanTaskModel.lane_assignment_id.is_(None), # type: ignore
)
).join( ).join(
HumanTaskUserModel, HumanTaskUserModel,
and_( and_(

View File

@ -30,7 +30,7 @@ export default function InProgressInstances() {
paginationQueryParamPrefix="group_completed_instances" paginationQueryParamPrefix="group_completed_instances"
paginationClassName="with-large-bottom-margin" paginationClassName="with-large-bottom-margin"
perPageOptions={[2, 5, 25]} perPageOptions={[2, 5, 25]}
reportIdentifier="system_report_completed_instances_with_tasks_completed_by_my_groups" reportIdentifier="system_report_in_progress_instances_with_tasks_for_my_group"
showReports={false} showReports={false}
textToShowIfEmpty="This group has no completed instances at this time." textToShowIfEmpty="This group has no completed instances at this time."
additionalParams={`user_group_identifier=${userGroup}`} additionalParams={`user_group_identifier=${userGroup}`}
@ -71,9 +71,7 @@ export default function InProgressInstances() {
paginationClassName="with-large-bottom-margin" paginationClassName="with-large-bottom-margin"
autoReload={false} autoReload={false}
/> />
{/**
{groupTableComponents()} {groupTableComponents()}
* */}
</> </>
); );
} }