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.

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

Compte épargne : incrémenter après un créneau "extra" validé #768

Merged
merged 3 commits into from
Feb 27, 2023

Conversation

raphodn
Copy link
Member

@raphodn raphodn commented Feb 26, 2023

Quoi ?

  • renommé TimeLog.TYPE_CYCLE_END_REGULATE_OPTIONAL_SHIFTS en TYPE_REGULATE_OPTIONAL_SHIFTS pour le rendre plus ré-utilisable (pas seulement "cycle end")
  • onShiftValidated : basculer le temps "en trop" vers le compteur épargne
    • ajout d'un log négatif "TYPE_REGULATE_OPTIONAL_SHIFTS"
    • et d'un log positif "TYPE_SAVING"

@raphodn raphodn changed the base branch from master to raphodn/time-log-saving-feature February 26, 2023 17:41
@raphodn raphodn force-pushed the raphodn/time-log-saving-events branch from 5ab1529 to c81d478 Compare February 26, 2023 17:52
@raphodn raphodn self-assigned this Feb 26, 2023
@raphodn raphodn marked this pull request as ready for review February 26, 2023 17:57
@raphodn raphodn changed the title Compte épargne : nouvelles actions pour onShiftValidated Compte épargne : incrémenter le compteur après un créneau "extra" validé Feb 26, 2023
@raphodn raphodn changed the title Compte épargne : incrémenter le compteur après un créneau "extra" validé Compte épargne : incrémenter après un créneau "extra" validé Feb 26, 2023
@raphodn raphodn linked an issue Feb 26, 2023 that may be closed by this pull request
@raphodn raphodn force-pushed the raphodn/time-log-saving-feature branch from 54ff720 to e6492c9 Compare February 26, 2023 19:05
@raphodn raphodn force-pushed the raphodn/time-log-saving-events branch 3 times, most recently from d4455d1 to 17e9439 Compare February 26, 2023 22:07
{
$log = $this->initTimeLog($member);
$log->setType(TimeLog::TYPE_REGULATE_OPTIONAL_SHIFTS);
if ($time) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment on peut faire un log sans time ?

Copy link
Member Author

@raphodn raphodn Feb 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bonne question, dans 99,9% des cas le paramètre $time sera non-null, mais j'ai répliqué initCustomTimeLog et initSavingTimeLog.
tu préfères qu'on force la présence du paramètre $time instead ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

j'ai rectifié pour initSavingTimeLog et initRegulateOptionalShiftsTimeLog
pour initCustomTimeLog c'est appelé pour l'instant sans le $time donc je laisse comme ca

Base automatically changed from raphodn/time-log-saving-feature to master February 27, 2023 17:54
@raphodn raphodn force-pushed the raphodn/time-log-saving-events branch from 17e9439 to 80e92a9 Compare February 27, 2023 17:55
@raphodn raphodn force-pushed the raphodn/time-log-saving-events branch from 80e92a9 to 9322e4f Compare February 27, 2023 18:02
@raphodn raphodn merged commit cc965a3 into master Feb 27, 2023
@raphodn raphodn deleted the raphodn/time-log-saving-events branch February 27, 2023 18:04
quot17 pushed a commit to quot17/gestion-compte that referenced this pull request Mar 28, 2023
…grenoble#768)

* Rename TYPE_CYCLE_END_REGULATE_OPTIONAL_SHIFTS to TYPE_REGULATE_OPTIONAL_SHIFTS

* onShiftValidated: move extra time to saving

* Fix stuff
OursDesCavernes pushed a commit to Les400Coop/gestion-compte that referenced this pull request Jan 20, 2024
…grenoble#768)

* Rename TYPE_CYCLE_END_REGULATE_OPTIONAL_SHIFTS to TYPE_REGULATE_OPTIONAL_SHIFTS

* onShiftValidated: move extra time to saving

* Fix stuff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Création d'un deuxième compteur "épargne"
2 participants