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

ETQ instructeur, je peux inclure les dossiers "archivés" quand je télécharge les dossiers de l'onglet "Au total" #11113

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

mmagn
Copy link
Contributor

@mmagn mmagn commented Dec 5, 2024

Fixes #11103
image

Copy link

codecov bot commented Dec 5, 2024

Codecov Report

Attention: Patch coverage is 89.28571% with 3 lines in your changes missing coverage. Please review.

Project coverage is 84.43%. Comparing base (fac38c5) to head (c165b2e).

Files with missing lines Patch % Lines
app/components/dsfr/toggle_component.rb 70.00% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #11113      +/-   ##
==========================================
- Coverage   84.44%   84.43%   -0.02%     
==========================================
  Files        1182     1182              
  Lines       26112    26130      +18     
  Branches     4923     4932       +9     
==========================================
+ Hits        22050    22062      +12     
- Misses       4062     4068       +6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mmagn mmagn force-pushed the fix-11103 branch 4 times, most recently from 140985d to 1444628 Compare December 5, 2024 16:45
@mmagn mmagn marked this pull request as ready for review December 5, 2024 16:45
Copy link
Member

@colinux colinux left a comment

Choose a reason for hiding this comment

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

ya un soucis sur le schema.rb sinon ça me semble OK

@@ -29,6 +30,18 @@ def allowed_format?(item)
item.fetch(:format) != :json || @procedure.active_revision.carte?
end

def can_include_archived?
Copy link
Member

Choose a reason for hiding this comment

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

je me demande si cette méthode ne devrait pas aussi embarquer la logique de && @archived_count > 1 pour que les views n'ont pas à s'en occuper

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oui je suis d'accord. je fais la modif

db/schema.rb Outdated
Copy link
Member

Choose a reason for hiding this comment

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

y a pas mal de changes qui n'ont rien à voir avec cette pr ;)

@mmagn
Copy link
Contributor Author

mmagn commented Dec 11, 2024

@colinux c'est reglé, merci pour ta review

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants