PFMP Validation constraints + Rebalancing of amounts according to Wage cap #625

pskl · 2024-03-26T17:39:02Z

Checklist:

Prevent PFMP transition to validated unless all previous pfmps are validated
~~Hide~~ Deactivate validate button on a Pfmp#show that cannot be validated
Rajouter un petit label pour certifier que la feature est désactivée (Hover sur le bouton)
Hide classes or pfmps that cannot be validated on "Paiements" page
Modifying one PFMP should update the amount of subsequent pfmps: updating the amount on one pfmp triggers chain updates on follow ups
rajouter une checkbox "je certifie que je suis un chef d'établissement" sur la show: check_confirmed_director

Closes #566

… new constraint

… of specific error (potential false positive)

… role

…ck to update_amount

…o see the effect on the test suite

…elete action

…lidation

… :forbidden when director not confirmed

JeSuisUnCaillou · 2024-03-29T16:53:12Z

Hide pfmps that can't be validated from the list of student pfmps on student #show

Bizarre qu'on ait noté ça. C'était pas plutôt "Hide Pfmps that can't be validated from the validations show page" ?

En tout cas y'a un truc à faire avec la page validations#show, pour qu'on évite d'y valider des pfmps qui ont des "précédentes" non validées.
Par contre si y'en a genre 3 d'un coup à valider pour un élève, on peut les valider en cascade là.

…n -> classes -> show

app/controllers/validations_controller.rb

app/models/concerns/pfmp_amount_calculator.rb

README.md

app/models/pfmp.rb

app/controllers/validations_controller.rb

Makefile

app/models/concerns/pfmp_amount_calculator.rb

app/models/pfmp_state_machine.rb

spec/models/asp/payment_request_state_machine_spec.rb

app/controllers/validations_controller.rb

app/models/concerns/pfmp_amount_calculator.rb

This reverts commit 157b05f.

app/models/pfmp.rb

freesteph · 2024-04-05T11:43:33Z

app/views/pfmps/show.html.haml

+          = render partial: "shared/confirmed_director"
+
+      - else
+        = button_tag "Valider", disabled: true, class: 'fr-btn fr-btn--secondary', title: "Vous ne pouvez pas valider cette PFMP car les PFMPs précédentes ne sont pas validées"


donc on explique pas à part au survol ?

freesteph · 2024-04-05T11:45:50Z

features/modification_des_montants.feature

+      | État             | Nombre de jours | Montant |
+      | Saisie à valider |               5 | 75 €    |
+      | Saisie à valider |               12| 125 €   |
+


Super mais c'aurait été cool qu'on ait un test qui couvre la partie tricky de l'algo qui est de redistribuer les montants des PFMPs après celle modifiée (là c'est juste la dernière c'est plus facile).

Je vais m'en occuper comme ça tu peux passer à autre chose

Y'a un scénario à 3 pfmp dans les tests unitaires

et ? faut faire l'un ou l'autre ?

pskl added 4 commits March 26, 2024 18:35

pfpmp: add state machine guard transition to validated state

1911ce6

chore: add readme info

54f9a12

chore: allow passing of arguments to Makefile

2b780a9

feat: disable validation button on pfmp show if cannot be validated

0b45150

pskl changed the title ~~PFMP Validation constraints~~ WIP: PFMP Validation constraints Mar 27, 2024

pfmp: spec out the guard transition to validated

adfe20d

pskl force-pushed the feat/pfpmp-validation-constraint branch from e0806c9 to adfe20d Compare March 27, 2024 14:55

pskl added 7 commits March 27, 2024 18:10

fix: remove seemingly redundant code

5409771

spec: reorder the feature scenario element so as to not bump into the…

c80db24

… new constraint

fix: rewrite some expectations to avoid checking for absence of raise…

9a7a47c

… of specific error (potential false positive)

fix: disable validate button and display help text

11cecf5

pfmp: order student pfmps by created_at timestamp instead of start_date

4f3aff2

pfmp: add checkbox on pfmp#show validate action to check for director…

e3e8f71

… role

chore: rename after_save callback to be more explicit, move error che…

2c86068

…ck to update_amount

pskl force-pushed the feat/pfpmp-validation-constraint branch from 30cf3de to 2a1fb65 Compare March 28, 2024 15:51

pfmp: implement naive way to recalculate follow up modifiable pfmps t…

886a3a4

…o see the effect on the test suite

pskl force-pushed the feat/pfpmp-validation-constraint branch from 2a1fb65 to 886a3a4 Compare March 28, 2024 15:54

chore: skip payment fixer

c176673

pskl force-pushed the feat/pfpmp-validation-constraint branch from d5081da to c176673 Compare March 28, 2024 16:14

pskl added 10 commits March 28, 2024 18:11

spec: add a test case for recalculation of follow up pfmps

b4bbef3

Merge branch 'main' into feat/pfpmp-validation-constraint

719a06a

Merge branch 'main' into feat/pfpmp-validation-constraint

c8b6b7b

chore: rename callback

fe57f9e

fix: make specs pass

368630d

pfmp: reorg pfmp show to have validate + checkbox apart from modify/d…

6a84b2e

…elete action

pfmp: enforce confirmation of director role on the show action for va…

7e4c89c

…lidation

Merge branch 'main' into feat/pfpmp-validation-constraint

a3226b2

fix: redirect_back to current show page on pfmp#show validate, return…

a959008

… :forbidden when director not confirmed

fix: fix payment_request incomplete factory

d9c0877

Merge branch 'main' into feat/pfpmp-validation-constraint

483efd1

pskl requested a review from freesteph April 2, 2024 11:55

Filter validatable_pfmps using statesman guard condition on validatio…

af4849e

…n -> classes -> show

pskl commented Apr 3, 2024

View reviewed changes

app/controllers/validations_controller.rb Show resolved Hide resolved

freesteph reviewed Apr 3, 2024

View reviewed changes

app/models/concerns/pfmp_amount_calculator.rb Show resolved Hide resolved

README.md Show resolved Hide resolved

app/models/pfmp.rb Show resolved Hide resolved

app/controllers/validations_controller.rb Show resolved Hide resolved

pskl added 2 commits April 3, 2024 15:06

Use before scope

d6be00f

Merge branch 'main' into feat/pfpmp-validation-constraint

e12187f

freesteph reviewed Apr 3, 2024

View reviewed changes

Makefile Outdated Show resolved Hide resolved

app/models/concerns/pfmp_amount_calculator.rb Show resolved Hide resolved

app/models/pfmp_state_machine.rb Outdated Show resolved Hide resolved

spec/models/asp/payment_request_state_machine_spec.rb Show resolved Hide resolved

Revert Makefile changes

b3248b2

freesteph reviewed Apr 3, 2024

View reviewed changes

app/controllers/validations_controller.rb Show resolved Hide resolved

Factor student_pfmps_with_classe

de52c79

freesteph reviewed Apr 3, 2024

View reviewed changes

app/models/concerns/pfmp_amount_calculator.rb Outdated Show resolved Hide resolved

pskl added 6 commits April 3, 2024 15:32

Merge branch 'main' into feat/pfpmp-validation-constraint

6913936

Prevent double scope

157b05f

Update submodule?

bdb294e

Rename method to student_pfmps_for_mef_with_classe

ac9c93c

Revert "Prevent double scope"

cbc3abb

This reverts commit 157b05f.

Rename pfpms_for_mef

7a5b571

pskl requested review from freesteph and JeSuisUnCaillou April 3, 2024 14:45

Merge branch 'main' into feat/pfpmp-validation-constraint

018421b

freesteph reviewed Apr 3, 2024

View reviewed changes

app/models/pfmp.rb Show resolved Hide resolved

pskl added 4 commits April 5, 2024 10:15

Merge branch 'main' into feat/pfpmp-validation-constraint

ae62916

Add cucumber scenario for modification des montants

467d61d

Merge branch 'main' into feat/pfpmp-validation-constraint

baf43a1

Use previous_pfmps method in pfmp state machine guard

35b60f7

pskl requested a review from freesteph April 5, 2024 10:05

freesteph approved these changes Apr 5, 2024

View reviewed changes

pskl merged commit ce5b15a into main Apr 5, 2024
5 checks passed

pskl deleted the feat/pfpmp-validation-constraint branch April 5, 2024 14:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PFMP Validation constraints + Rebalancing of amounts according to Wage cap #625

PFMP Validation constraints + Rebalancing of amounts according to Wage cap #625

pskl commented Mar 26, 2024 •

edited

Loading

JeSuisUnCaillou commented Mar 29, 2024 •

edited

Loading

freesteph Apr 5, 2024

freesteph Apr 5, 2024

pskl Apr 5, 2024

freesteph Apr 5, 2024 •

edited

Loading

PFMP Validation constraints + Rebalancing of amounts according to Wage cap #625

PFMP Validation constraints + Rebalancing of amounts according to Wage cap #625

Conversation

pskl commented Mar 26, 2024 • edited Loading

JeSuisUnCaillou commented Mar 29, 2024 • edited Loading

freesteph Apr 5, 2024

Choose a reason for hiding this comment

freesteph Apr 5, 2024

Choose a reason for hiding this comment

pskl Apr 5, 2024

Choose a reason for hiding this comment

freesteph Apr 5, 2024 • edited Loading

Choose a reason for hiding this comment

pskl commented Mar 26, 2024 •

edited

Loading

JeSuisUnCaillou commented Mar 29, 2024 •

edited

Loading

freesteph Apr 5, 2024 •

edited

Loading