Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compte épargne : homogénéiser les droits d'annulation d'un créneau (entre membre & admin) #792

Merged
merged 5 commits into from
Mar 18, 2023
Merged

Compte épargne : homogénéiser les droits d'annulation d'un créneau (entre membre & admin) #792

merged 5 commits into from
Mar 18, 2023

Conversation

raphodn
Copy link
Member

@raphodn raphodn commented Mar 16, 2023 •
edited
Loading

Quoi ?

  • ShiftController : simplifications
  • amélioration de ShiftService.canBookShift (créé dans Compte épargne : nouveau paramètre pour définir un délais minimal pour annuler #787) :
    • renvoyer un array (result true / false ; message) pour pouvoir l'afficher ensuite dans le controlleur
    • comportement différent si venant d'une action admin (moins de règles)
  • Admin : rajouter des messages d'informations dans la modale de libération d'un créneau

@raphodn raphodn self-assigned this Mar 16, 2023
@raphodn raphodn requested a review from petitalb March 16, 2023 19:52
@raphodn raphodn changed the title Compteur épargner : finaliser l'annulation de créneau (membre & admin) Compte épargner : finaliser les droits d'annulation d'un créneau (membre & admin) Mar 18, 2023
@raphodn raphodn force-pushed the raphodn/time-log-saving-free-2 branch from 3ef9947 to eb2a11f Compare March 18, 2023 22:59
@raphodn raphodn changed the title Compte épargner : finaliser les droits d'annulation d'un créneau (membre & admin) Compte épargne : finaliser les droits d'annulation d'un créneau (membre & admin) Mar 18, 2023
@raphodn raphodn changed the title Compte épargne : finaliser les droits d'annulation d'un créneau (membre & admin) Compte épargne : homogénéiser les droits d'annulation d'un créneau (entre membre & admin) Mar 18, 2023
@raphodn raphodn merged commit 244d10a into master Mar 18, 2023
@raphodn raphodn deleted the raphodn/time-log-saving-free-2 branch March 18, 2023 23:03
@raphodn raphodn linked an issue Mar 18, 2023 that may be closed by this pull request
Création d'un deuxième compteur "épargne" #684
Open
raphodn added a commit that referenced this pull request Mar 18, 2023
@raphodn
Fix canFreeShift not admin by default. ref #792
9bb190f
raphodn added a commit that referenced this pull request Mar 18, 2023
@raphodn
Fix remove template print. ref #792
c234ebf
raphodn added a commit that referenced this pull request Mar 28, 2023
@raphodn
Hotfix: shift_member in shift_card. ref #792
6c2d7e7
quot17 pushed a commit to quot17/gestion-compte that referenced this pull request Mar 28, 2023
@raphodn @quot17
Compte épargne : homogénéiser les droits d'annulation d'un créneau (e…
3b1f24a 
…ntre membre & admin) (elefan-grenoble#792)

* Improve canBookShift to also send error message

* Simplify freeShiftAction (time_log_saving rules moved to canBookShift)

* Adapt canFreeShift to be called from admin

* Improve messages to admin when freeing shift
quot17 pushed a commit to quot17/gestion-compte that referenced this pull request Mar 28, 2023
@raphodn @quot17
Fix canFreeShift not admin by default. ref elefan-grenoble#792
65de654
quot17 pushed a commit to quot17/gestion-compte that referenced this pull request Mar 28, 2023
@raphodn @quot17
Fix remove template print. ref elefan-grenoble#792
2f5d317
quot17 pushed a commit to quot17/gestion-compte that referenced this pull request Mar 28, 2023
@raphodn @quot17
Hotfix: shift_member in shift_card. ref elefan-grenoble#792
9ecafcc
OursDesCavernes pushed a commit to Les400Coop/gestion-compte that referenced this pull request Jan 20, 2024
@raphodn @OursDesCavernes
Compte épargne : homogénéiser les droits d'annulation d'un créneau (e…
ffb708b 
…ntre membre & admin) (elefan-grenoble#792)

* Improve canBookShift to also send error message

* Simplify freeShiftAction (time_log_saving rules moved to canBookShift)

* Adapt canFreeShift to be called from admin

* Improve messages to admin when freeing shift
OursDesCavernes pushed a commit to Les400Coop/gestion-compte that referenced this pull request Jan 20, 2024
@raphodn @OursDesCavernes
Fix canFreeShift not admin by default. ref elefan-grenoble#792
2e8e0c6
OursDesCavernes pushed a commit to Les400Coop/gestion-compte that referenced this pull request Jan 20, 2024
@raphodn @OursDesCavernes
Fix remove template print. ref elefan-grenoble#792
c7a106a
OursDesCavernes pushed a commit to Les400Coop/gestion-compte that referenced this pull request Jan 20, 2024
@raphodn @OursDesCavernes
Hotfix: shift_member in shift_card. ref elefan-grenoble#792
c6d78ab
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petitalb petitalb Awaiting requested review from petitalb

Assignees

@raphodn raphodn

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Création d'un deuxième compteur "épargne"
1 participant
@raphodn