feat(Admin des Besoins): Demande de modification ou clôture d'un besoin #1596
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chloend
force-pushed
the
chloend/tender-hs
branch
from
0fba46e to
2a56a9c
Compare
chloend
force-pushed
the
chloend/tender-hs
branch
from
2a56a9c to
f174a7c
Compare
madjid-asa
reviewed
Dec 19, 2024
lemarche/tenders/migrations/0097_add_templatetransactional_tender_author_reject_message.py
Outdated
Show resolved
Hide resolved
chloend
force-pushed
the
chloend/tender-hs
branch
5 times, most recently
from
dbc29a9 to
3e3e43c
Compare
chloend
force-pushed
the
chloend/tender-hs
branch
from
3e3e43c to
f988dcb
Compare
Guilouf
reviewed
Dec 31, 2024
lemarche/tenders/management/commands/update_tender_status_to_rejected.py
Outdated
Show resolved
Hide resolved
lemarche/tenders/management/commands/update_tender_status_to_rejected.py
Outdated
Show resolved
Hide resolved
...ions/0018_add_templatetransactional_tender_author_modification_request_and_reject_message.py
Outdated
Show resolved
Hide resolved
chloend
force-pushed
the
chloend/tender-hs
branch
from
f988dcb to
d0adabc
Compare
- 'email_sent_for_modification' - 'changes_information'
- 'add_log_entry' - 'reset_modification_request'
- 'send_tender_author_modification_request' - 'send_tender_author_reject_message'
chloend
force-pushed
the
chloend/tender-hs
branch
from
d0adabc to
9a3db2b
Compare
SebastienReuiller
requested changes
Jan 21, 2025
| @@ -81,6 +81,10 @@ def perform_create(self, serializer: TenderSerializer): | |||
| source=tender_source, | |||
| import_raw_object=self.request.data, | |||
| ) | |||
| # Check before adding logs or resetting modification request | |||
| if tender.status == tender_constants.STATUS_PUBLISHED: | |||
There was a problem hiding this comment.
Je ne suis pas sûr de l'utilité de ce if vu que status est affecté juste au dessus.
| recipient_email = tender.author.email | ||
| recipient_name = tender.author.full_name | ||
|
|
||
| tender_update_url = reverse("tenders:update", kwargs={"slug": tender.slug}) |
There was a problem hiding this comment.
Je ne pense pas que tu obtienne l'URL absolue en faisant ça, je pense qu'il faut que tu appel la fonction "get_domain_url" comme un peu plus haut.
| @@ -802,6 +840,10 @@ def response_change(self, request, obj: Tender): | |||
| # we don't need to send it in the crm, parteners manage them | |||
| self.message_user(request, "Ce dépôt de besoin a été validé. Il sera envoyé aux partenaires :)") | |||
| return HttpResponseRedirect(".") | |||
| if request.POST.get("_send_modification_request"): | |||
| return self.handle_email_sent_for_modification(request, obj) | |||
| if obj.status == tender_constants.STATUS_REJECTED: | |||
There was a problem hiding this comment.
Pour moi, le status est à juste titre en lecture seule, donc je ne vois pas comment on peut tomber dans ce cas ? Ta volonté était bien de permettre le rejet depuis l'admin ou uniquement après l'expiration de la demande de modifications ?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Quoi ?
Permettre de demander des modifications sur un DDB ou de le clôturer si nécessaire.
Pourquoi ?
Actuellement, les admins sont contraints de mettre une mention "HS" sur le titre des besoins afin de les trier. Cela leur permettra de gagner du temps et d'améliorer le suivi des DDB.
Comment ?
1. Modèle
Tenderemail_sent_for_modification: un booléen à False par défautAjout de deux méthodes :
reset_modification_request: réinitialise les champsemail_sent_for_modificationet/ouchanges_informationlorsque des modifications ont été apportées et que le statut du besoin passe de "brouillon" à "publié".set_modification_request: sauvegarde les champsemail_sent_for_modification,statusetlogsaprès avoir cliqué sur le bouton d'envoi de modification dans l'admin.2. Modèle
Conversationa. Ajout deux de
TemplateTransactionaldans une migration :TENDERS_AUTHOR_MODIFICATION_REQUEST: template de mail de demande de modification d'un DDBTENDERS_AUTHOR_REJECT_MESSAGE: template de mail de rejet du DDBCaptures d'écran (optionnel)
email_sent_for_modificationà TrueAutre (optionnel)