diff --git a/krill/krill/views/home.py b/krill/krill/views/home.py index 1ae600c..c08a812 100644 --- a/krill/krill/views/home.py +++ b/krill/krill/views/home.py @@ -10,7 +10,7 @@ from sample.models.sample import Sample from sample.models.aliquot import Aliquot, AliquotLocation from storage.models.storage import Box -from person.models import UserAuditLog, UserPreference, SiteConfiguration +from person.models import UserAuditLog, UserPreference, SiteConfiguration, UserRole from person.decorators import require_minimum_role __all__ = ( @@ -33,6 +33,7 @@ def get(self, request): 'freezers': freezers, 'show_sites': len({card['device'].site_id for card in freezers}) > 1, 'checked_out': get_checked_out(request.user), + 'lab_checkouts': get_lab_checkouts(request.user), 'audits_in_progress': get_audits_in_progress(), 'recent_activity': get_recent_activity(), }) @@ -187,6 +188,17 @@ def get_checked_out(user, limit=5): } +def get_lab_checkouts(user): + """Everyone's checked-out aliquots and how many people have them. Only for lab managers and admins.""" + if UserRole.get_or_create_for_user(user).role not in ('lab_manager', 'lab_admin'): + return None + out = Aliquot.objects.filter(checked_out_by__isnull=False, disposition__disposition_type='in_use') + return { + 'aliquots': out.count(), + 'people': out.values('checked_out_by').distinct().count(), + } + + def get_audits_in_progress(limit=3): """Storage audits that still have slots to check, most recent first.""" from reports.models import Report diff --git a/krill/reports/templates/reports/checked_out_no_owner.html b/krill/reports/templates/reports/checked_out_no_owner.html index 5a265d1..dd27984 100644 --- a/krill/reports/templates/reports/checked_out_no_owner.html +++ b/krill/reports/templates/reports/checked_out_no_owner.html @@ -96,11 +96,13 @@