Aug 6 - Add external inspector role
This commit is contained in:
@@ -37,7 +37,7 @@ def index():
|
||||
# Start of the current week (Monday 00:00) for the "Submitted This Week" card.
|
||||
week_start = today_start - timedelta(days=today_start.weekday())
|
||||
|
||||
is_inspector = current_user.role == 'inspector'
|
||||
is_inspector = current_user.is_inspector
|
||||
is_privileged = current_user.role in ['admin', 'director']
|
||||
is_customer = current_user.role == 'customer'
|
||||
is_project_manager = current_user.role == 'project_manager'
|
||||
@@ -336,7 +336,7 @@ def index():
|
||||
if is_privileged or is_project_manager or is_auditor:
|
||||
active_inspectors = (
|
||||
User.query
|
||||
.filter_by(role='inspector', active=True)
|
||||
.filter(User.role.in_(User.INSPECTOR_ROLES), User.active == True)
|
||||
.order_by(User.full_name, User.username)
|
||||
.all()
|
||||
)
|
||||
@@ -354,7 +354,11 @@ def index():
|
||||
.all()
|
||||
)
|
||||
inspector_activity = sorted(
|
||||
[{'name': u.display_name, 'count': today_counts.get(u.id, 0)}
|
||||
[{'name': u.display_name,
|
||||
'count': today_counts.get(u.id, 0),
|
||||
# phase49 — flags customer / third-party inspectors so the table
|
||||
# can badge them; internal and external are listed together.
|
||||
'external': u.is_external_inspector}
|
||||
for u in active_inspectors],
|
||||
key=lambda x: (-x['count'], x['name']),
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user