entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 4 Releases Wiki Activity

manager: filter timesheet by booking status (#84260) #189

Merged
lguerin merged 1 commits from wip/84260-timesheet-filters into main 2023-12-18 09:43:46 +01:00
Conversation 0 Commits 1 Files Changed 2 +245 -31
lguerin commented 2023-12-05 12:23:07 +01:00
Owner
Copy Link
No description provided.
lguerin added 1 commit 2023-12-05 12:23:07 +01:00
gitea/chrono/pipeline/head This commit looks good Details
e7a856e2cb
manager: filter timesheet by booking status (#84260)
lguerin changed title from manager: filter timesheet by booking status (#84260) to WIP: manager: filter timesheet by booking status (#84260) 2023-12-05 12:23:49 +01:00
lguerin force-pushed wip/84260-timesheet-filters from e7a856e2cb to 89ff8d3ace 2023-12-05 12:28:46 +01:00 Compare
lguerin reviewed 2023-12-05 13:46:48 +01:00
chrono/manager/forms.py Outdated
@ -770,2 +780,4 @@
del self.fields['custom_nb_dates_per_page']
del self.fields['activity_display']
if not self.with_subscriptions:
del self.fields['booking_filter']
lguerin commented 2023-12-05 13:44:59 +01:00
Author
Owner
Copy Link

pas de filtre si on n'a pas de subscription: on n'aura que des lignes qui remontent sur réservation
(donc feature invisible en dehors de publik-famille, probablement)

pas de filtre si on n'a pas de subscription: on n'aura que des lignes qui remontent sur réservation (donc feature invisible en dehors de publik-famille, probablement)
chrono/manager/forms.py Outdated
@ -888,0 +901,4 @@
if self.cleaned_data.get('booking_filter') == 'with_booking':
# remove subscribed users without booking
users = {
k: user for k, user in users.items() if any(any(e['dates'].values()) for e in user['events'])
lguerin commented 2023-12-05 13:45:55 +01:00
Author
Owner
Copy Link

pour afficher les users avec réservation, une seule réservation pour un des events listés, peu importe lequel, suffit

pour afficher les users avec réservation, une seule réservation pour un des events listés, peu importe lequel, suffit
chrono/manager/forms.py Outdated
@ -888,0 +908,4 @@
users = {
k: user
for k, user in users.items()
if not any(any(e['dates'].values()) for e in user['events'])
lguerin commented 2023-12-05 13:46:27 +01:00
Author
Owner
Copy Link

pour afficher les users sans réservation, il ne faut aucune réservation pour aucun des events listés

pour afficher les users sans réservation, il ne faut aucune réservation pour aucun des events listés
lguerin changed title from WIP: manager: filter timesheet by booking status (#84260) to manager: filter timesheet by booking status (#84260) 2023-12-05 13:46:53 +01:00
vdeniaud approved these changes 2023-12-11 17:48:53 +01:00
lguerin force-pushed wip/84260-timesheet-filters from 89ff8d3ace to 60b2a54532 2023-12-18 08:42:28 +01:00 Compare
lguerin merged commit 698bbfc7a4 into main 2023-12-18 09:43:46 +01:00
lguerin deleted branch wip/84260-timesheet-filters 2023-12-18 09:43:46 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
vdeniaud
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: entrouvert/chrono#189
No description provided.
Delete Branch "wip/84260-timesheet-filters"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?