ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

View and Highlight Vieux people.

This commit is contained in:
Pierre-antoine Comby 2022-04-01 08:53:18 +02:00
parent 3633f66a87
commit 6443d64b69
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/activity/tables.py
View File

@ -1,6 +1,8 @@
# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay # Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
import datetime
from django.utils import timezone from django.utils import timezone
from django.utils.html import escape from django.utils.html import escape
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
@ -75,6 +77,9 @@ def get_row_class(record):
c += " table-info" c += " table-info"
elif record.note.balance < 0: elif record.note.balance < 0:
c += " table-danger" c += " table-danger"
#MODE VIEUXCON=ON
if (datetime.datetime.utcnow().timestamp() - record.note.create_at.timestamp()) > 3600*24*365*3:
c += " font-weight-bold"
return c return c

13
apps/activity/views.py
View File

@ -223,12 +223,13 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
# Keep only users that have a note # Keep only users that have a note
note_qs = note_qs.filter(note__noteuser__isnull=False) note_qs = note_qs.filter(note__noteuser__isnull=False)
# Keep only members if activity.activity_type.name != "Pot Vieux":
note_qs = note_qs.filter( # Keep only members
note__noteuser__user__memberships__club=activity.attendees_club, note_qs = note_qs.filter(
note__noteuser__user__memberships__date_start__lte=timezone.now(), note__noteuser__user__memberships__club=activity.attendees_club,
note__noteuser__user__memberships__date_end__gte=timezone.now(), note__noteuser__user__memberships__date_start__lte=timezone.now(),
) note__noteuser__user__memberships__date_end__gte=timezone.now(),
)
# Filter with permission backend # Filter with permission backend
note_qs = note_qs.filter(PermissionBackend.filter_queryset(self.request, Alias, "view")) note_qs = note_qs.filter(PermissionBackend.filter_queryset(self.request, Alias, "view"))

2
note_kfet/static/js/base.js
View File

@ -96,11 +96,13 @@ function displayStyle (note) {
if (!note) { return '' } if (!note) { return '' }
const balance = note.balance const balance = note.balance
var css = '' var css = ''
var ms_per_year = 31536000000 // 365 * 24 * 3600 * 1000
if (balance < -5000) { css += ' text-danger bg-dark' } if (balance < -5000) { css += ' text-danger bg-dark' }
else if (balance < -1000) { css += ' text-danger' } else if (balance < -1000) { css += ' text-danger' }
else if (balance < 0) { css += ' text-warning' } else if (balance < 0) { css += ' text-warning' }
if (!note.email_confirmed) { css += ' bg-primary' } if (!note.email_confirmed) { css += ' bg-primary' }
else if (!note.is_active || (note.membership && note.membership.date_end < new Date().toISOString())) { css += ' bg-info' } else if (!note.is_active || (note.membership && note.membership.date_end < new Date().toISOString())) { css += ' bg-info' }
if (((Date.now() - Date.parse(note.created_at))/ms_per_year) > 3) { css += 'font-weight-bold' }
return css return css
} }