ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-11-04 01:12:08 +01:00
Code Issues Releases Wiki Activity

Highlight non-validated activities

Browse Source
This commit is contained in:
Yohann D'ANELLO
2020-08-30 23:54:54 +02:00
parent 48eb0749e0
commit 56c41258b9
4 changed files with 142 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/activity/tables.py
View File

@@ -20,6 +20,11 @@ class ActivityTable(tables.Table):
attrs = {
'class': 'table table-condensed table-striped table-hover'
}
row_attrs = {
'class': lambda record: 'bg-success' if record.open else ('' if record.valid else 'bg-warning'),
'title': lambda record: _("The activity is currently open.") if record.open else
('' if record.valid else _("The validation of the activity is pending.")),
}
model = Activity
template_name = 'django_tables2/bootstrap4.html'
fields = ('name', 'activity_type', 'organizer', 'attendees_club', 'date_start', 'date_end', )
@@ -33,17 +38,12 @@ class GuestTable(tables.Table):
entry = tables.Column(
empty_values=(),
attrs={
"td": {
"class": lambda record: "" if record.has_entry else "validate btn btn-danger",
"onclick": lambda record: "" if record.has_entry else "remove_guest(" + str(record.pk) + ")"
}
}
verbose_name=_("Remove"),
)
class Meta:
attrs = {
'class': 'table table-condensed table-striped table-hover'
'class': 'table table-condensed table-striped'
}
model = Guest
template_name = 'django_tables2/bootstrap4.html'
@@ -52,7 +52,8 @@ class GuestTable(tables.Table):
def render_entry(self, record):
if record.has_entry:
return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(record.entry.time, )))
return _("remove").capitalize()
return format_html('<button id="{id}" class="btn btn-danger btn-sm" onclick="remove_guest(this.id)"> '
'{delete_trans}</button>'.format(id=record.id, delete_trans=_("remove").capitalize()))
def get_row_class(record):

19
apps/permission/fixtures/initial.json
View File

@@ -2487,6 +2487,22 @@
"description": "Modifier la date de fin d'une activité non validée dont on est l'auteur"
}
},
{
"model": "permission.permission",
"pk": 160,
"fields": {
"model": [
"activity",
"guest"
],
"query": "{\"inviter\": [\"user\", \"note\"], \"entry\": null}",
"type": "delete",
"mask": 1,
"field": "",
"permanent": false,
"description": "Supprimer ses propres invitations non validées à une activité"
}
},
{
"model": "permission.role",
"pk": 1,
@@ -2553,7 +2569,8 @@
156,
157,
158,
159
159,
160
]
}
},