Skip to content

Commit

Permalink
clean up pour réduire le nombre d'erreur (#1688)
Browse files Browse the repository at this point in the history
* clean up pour éduire le nombre d'erreur

* comment log of SQL request
  • Loading branch information
kolok authored Jan 2, 2025
1 parent 7f522d9 commit a23d787
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 21 deletions.
5 changes: 5 additions & 0 deletions core/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ def get_env_variable(name, cast=str, default=""):
"handlers": ["console"],
"level": LOGLEVEL,
},
# Utile pour afficher les requête SQL dans la console
# "django.db.backends": {
# "handlers": ["console"],
# "level": "DEBUG",
# },
},
"formatters": {
"default": {
Expand Down
2 changes: 1 addition & 1 deletion templates/common/button/next_and_save.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% if not request|is_readonly %}
<button class="fr-btn fr-icon-arrow-right-s-line fr-btn--icon-right" {% if targetted_form %}form="{{ targetted_form }}"{% endif %}>
<button class="fr-btn fr-icon-arrow-right-s-line fr-btn--icon-right">
Enregistrer et Suivant
</button>
{% endif %}
16 changes: 8 additions & 8 deletions templates/conventions/cadastre.html
Original file line number Diff line number Diff line change
Expand Up @@ -137,17 +137,17 @@ <h4>Agrément de gestionnaire ou agrément d'intermédiation</h4>
<p class="notes">
<em>Pour toutes les sections ci-dessous, vous avez la possibilité de renseigner les champs en saisissant les informations ou en téléversant des images.</em>
</p>
{% include "common/form/input_upload.html" with form_input=form.vendeur form_input_files=form.vendeur_files object_name='programme' object_uuid=convention.programme.uuid textarea=True image_only=True file_list=convention.programme.vendeur|get_files_from_textfiles object_field="programme__vendeur__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.vendeur form_input_files=form.vendeur_files object_name='programme' object_uuid=convention.programme.uuid textarea=True image_only=True file_list=convention.programme.vendeur|get_files_from_textfiles object_field="programme__vendeur__"|add:form.uuid.value %}

{% include "common/form/input_upload.html" with form_input=form.acquereur form_input_files=form.acquereur_files object_name='programme' object_uuid=convention.programme.uuid textarea=True image_only=True file_list=convention.programme.acquereur|get_files_from_textfiles object_field="programme__acquereur__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.acquereur form_input_files=form.acquereur_files object_name='programme' object_uuid=convention.programme.uuid textarea=True image_only=True file_list=convention.programme.acquereur|get_files_from_textfiles object_field="programme__acquereur__"|add:form.uuid.value %}

{% include "common/form/input_upload.html" with form_input=form.reference_notaire form_input_files=form.reference_notaire_files object_name='programme' object_uuid=convention.programme.uuid textarea=True image_only=True file_list=convention.programme.reference_notaire|get_files_from_textfiles object_field="programme__reference_notaire__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.reference_notaire form_input_files=form.reference_notaire_files object_name='programme' object_uuid=convention.programme.uuid textarea=True image_only=True file_list=convention.programme.reference_notaire|get_files_from_textfiles object_field="programme__reference_notaire__"|add:form.uuid.value %}

{% include "common/form/input_upload.html" with form_input=form.reference_publication_acte form_input_files=form.reference_publication_acte_files object_name='programme' object_uuid=convention.programme.uuid textarea=True image_only=True file_list=convention.programme.reference_publication_acte|get_files_from_textfiles object_field="programme__reference_publication_acte__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.reference_publication_acte form_input_files=form.reference_publication_acte_files object_name='programme' object_uuid=convention.programme.uuid textarea=True image_only=True file_list=convention.programme.reference_publication_acte|get_files_from_textfiles object_field="programme__reference_publication_acte__"|add:form.uuid.value %}
</div>
<div class="apilos--p-relative">
<a href="https://www.cadastre.gouv.fr" target="_blank" class="fr-link apilos--right-top" rel="noopener">Vérifier mes informations sur cadastre.gouv.fr</a>
{% include "common/form/input_upload.html" with form_input=form.reference_cadastrale form_input_files=form.reference_cadastrale_files object_name='programme' object_uuid=convention.programme.uuid image_only=True file_list=convention.programme.reference_cadastrale|get_files_from_textfiles object_field="programme__reference_cadastrale__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.reference_cadastrale form_input_files=form.reference_cadastrale_files object_name='programme' object_uuid=convention.programme.uuid image_only=True file_list=convention.programme.reference_cadastrale|get_files_from_textfiles object_field="programme__reference_cadastrale__"|add:form.uuid.value %}
</div>
<div id='download_upload_block' {% if not editable %}hidden{% endif %}>
{% include "common/form/download_upload_form.html" with file_type='cadastre' upform=upform what="références cadastrales"%}
Expand Down Expand Up @@ -219,7 +219,7 @@ <h4>Agrément de gestionnaire ou agrément d'intermédiation</h4>
</div>
</div>
<div class="fr-col-12 fr-col-md-12 fr-col-lg-6 fr-my-2w">
{% include "common/form/input_upload.html" with form_input=form.effet_relatif form_input_files=form.effet_relatif_files object_name='programme' object_uuid=convention.programme.uuid image_only=True file_list=convention.programme.effet_relatif|get_files_from_textfiles object_field="programme__effet_relatif__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.effet_relatif form_input_files=form.effet_relatif_files object_name='programme' object_uuid=convention.programme.uuid image_only=True file_list=convention.programme.effet_relatif|get_files_from_textfiles object_field="programme__effet_relatif__"|add:form.uuid.value %}
</div>
<div class="apilos-bordered fr-my-3w">
<p class="notes">
Expand All @@ -228,10 +228,10 @@ <h4>Agrément de gestionnaire ou agrément d'intermédiation</h4>

<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12 fr-col-md-12 fr-col-lg-6 fr-mb-2w">
{% include "common/form/input_upload.html" with form_input=form.acte_de_propriete form_input_files=form.acte_de_propriete_files object_name='programme' object_uuid=convention.programme.uuid file_list=convention.programme.acte_de_propriete|get_files_from_textfiles object_field="programme__acte_de_propriete__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.acte_de_propriete form_input_files=form.acte_de_propriete_files object_name='programme' object_uuid=convention.programme.uuid file_list=convention.programme.acte_de_propriete|get_files_from_textfiles object_field="programme__acte_de_propriete__"|add:form.uuid.value %}
</div>
<div class="fr-col-12 fr-col-md-12 fr-col-lg-6 fr-mb-2w">
{% include "common/form/input_upload.html" with form_input=form.certificat_adressage form_input_files=form.certificat_adressage_files object_name='programme' object_uuid=convention.programme.uuid file_list=convention.programme.certificat_adressage|get_files_from_textfiles object_field="programme__certificat_adressage__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.certificat_adressage form_input_files=form.certificat_adressage_files object_name='programme' object_uuid=convention.programme.uuid file_list=convention.programme.certificat_adressage|get_files_from_textfiles object_field="programme__certificat_adressage__"|add:form.uuid.value %}
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions templates/conventions/common/form_commentaires.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="fr-col-md-12">

{% if convention.programme.is_foyer or convention.programme.is_residence %}
{% include "common/form/input_upload.html" with form_input=form.attached form_input_files=form.attached_files object_name='convention' object_uuid=convention.uuid file_list=convention.attached|get_files_from_textfiles textarea=False object_field="convention__attached__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.attached form_input_files=form.attached_files object_name='convention' object_uuid=convention.uuid file_list=convention.attached|get_files_from_textfiles textarea=False object_field="convention__attached__"|add:form.uuid.value %}
{% endif %}


Expand All @@ -13,7 +13,7 @@
<em>Ces informations sont complémentaires et à destination de l’instructeur. Elles ne figureront pas dans le document final de la convention.</em>
</p>
{% with is_bailleur=request|is_bailleur %}
{% include "common/form/input_upload.html" with form_input=form.commentaires form_input_files=form.commentaires_files object_name='convention' object_uuid=convention.uuid file_list=convention.commentaires|get_files_from_textfiles textarea=True verticalDisplay=True object_field="convention__commentaires__"|add:form.uuid.value editable=is_bailleur %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.commentaires form_input_files=form.commentaires_files object_name='convention' object_uuid=convention.uuid file_list=convention.commentaires|get_files_from_textfiles textarea=True verticalDisplay=True object_field="convention__commentaires__"|add:form.uuid.value editable=is_bailleur %}
{% endwith %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/conventions/denonciation.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h4>Motif de dénonciation</h4>
{% include "common/form/input_textarea.html" with form_input=form.motif_denonciation object_field="convention__motif_denonciation__"|add:form.uuid.value %}
</div>
<div class="fr-col-12 fr-mb-4w">
{% include "common/form/input_upload.html" with form_input=form.fichier_instruction_denonciation form_input_files=form.fichier_instruction_denonciation_files object_name='convention' object_uuid=convention.uuid file_list=convention.fichier_instruction_denonciation|get_files_from_textfiles object_field="convention__fichier_instruction_denonciation__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.fichier_instruction_denonciation form_input_files=form.fichier_instruction_denonciation_files object_name='convention' object_uuid=convention.uuid file_list=convention.fichier_instruction_denonciation|get_files_from_textfiles object_field="convention__fichier_instruction_denonciation__"|add:form.uuid.value %}
</div>
{% include "conventions/common/form_footer_button.html" %}
</div>
Expand Down
6 changes: 3 additions & 3 deletions templates/conventions/edd.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,15 @@ <h4 class="fr-mb-1w">EDD Simplifié</h4>
</div>
</div>
<hr>
{% include "common/form/input_upload.html" with form_input=form.edd_volumetrique form_input_files=form.edd_volumetrique_files object_name='lot' object_uuid=convention.lot.uuid textarea=True image_only=True file_list=convention.lot.edd_volumetrique|get_files_from_textfiles object_field="lot__edd_volumetrique__"|add:form.lot_uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.edd_volumetrique form_input_files=form.edd_volumetrique_files object_name='lot' object_uuid=convention.lot.uuid textarea=True image_only=True file_list=convention.lot.edd_volumetrique|get_files_from_textfiles object_field="lot__edd_volumetrique__"|add:form.lot_uuid.value %}

{% include "common/form/input_textarea.html" with form_input=form.mention_publication_edd_volumetrique object_field="programme__mention_publication_edd_volumetrique__"|add:form.uuid.value %}
<hr>
{% include "common/form/input_upload.html" with form_input=form.edd_classique form_input_files=form.edd_classique_files object_name='lot' object_uuid=convention.lot.uuid textarea=True image_only=True file_list=convention.lot.edd_classique|get_files_from_textfiles object_field="lot__edd_classique__"|add:form.lot_uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.edd_classique form_input_files=form.edd_classique_files object_name='lot' object_uuid=convention.lot.uuid textarea=True image_only=True file_list=convention.lot.edd_classique|get_files_from_textfiles object_field="lot__edd_classique__"|add:form.lot_uuid.value %}

{% include "common/form/input_textarea.html" with form_input=form.mention_publication_edd_classique object_field="programme__mention_publication_edd_classique__"|add:form.uuid.value %}
<hr>
{% include "common/form/input_upload.html" with form_input=form.edd_stationnements form_input_files=form.edd_stationnements_files object_name='programme' object_uuid=convention.programme.uuid textarea=True image_only=True file_list=convention.programme.edd_stationnements|get_files_from_textfiles object_field="programme__edd_stationnements__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.edd_stationnements form_input_files=form.edd_stationnements_files object_name='programme' object_uuid=convention.programme.uuid textarea=True image_only=True file_list=convention.programme.edd_stationnements|get_files_from_textfiles object_field="programme__edd_stationnements__"|add:form.uuid.value %}
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions templates/conventions/journal.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h2 class="fr-text--lg">Ajouter un évènement au journal</h2>
</div>
<div class="fr-col-12 fr-mb-4w">
<label class="fr-label">Ajouter un fichier (optionnel)</label>
{% include "common/form/input_upload.html" with no_title=True form_input=form.pieces_jointes form_input_files=form.pieces_jointes_files object_name='convention' object_uuid=convention.uuid file_list=evenement.pieces_jointes|get_files_from_textfiles object_field="evenement__pieces_jointes__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False no_title=True form_input=form.pieces_jointes form_input_files=form.pieces_jointes_files object_name='convention' object_uuid=convention.uuid file_list=evenement.pieces_jointes|get_files_from_textfiles object_field="evenement__pieces_jointes__"|add:form.uuid.value %}
</div>
<div class="fr-grid-row fr-grid-row--right">
<div class="fr-mr-4w fr-mt-1w">
Expand Down Expand Up @@ -80,7 +80,7 @@ <h2 class="fr-mr-2w fr-text--lg">Modifier l'évènement du {{ evenement.survenu_
</div>
<div class="fr-col-12 fr-mb-4w">
<label class="fr-label">Ajouter des fichiers (optionnel)</label>
{% include "common/form/input_upload.html" with no_title=True form_input=form.pieces_jointes form_input_files=form.pieces_jointes_files object_name='convention' object_uuid=convention.uuid file_list=evenement.pieces_jointes|get_files_from_textfiles object_field="evenement__pieces_jointes__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False no_title=True form_input=form.pieces_jointes form_input_files=form.pieces_jointes_files object_name='convention' object_uuid=convention.uuid file_list=evenement.pieces_jointes|get_files_from_textfiles object_field="evenement__pieces_jointes__"|add:form.uuid.value %}
</div>
</div>
<div class="fr-grid-row fr-grid-row--right">
Expand Down
2 changes: 1 addition & 1 deletion templates/conventions/resiliation.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h4>Motif de résiliation</h4>
{% include "common/form/input_textarea.html" with form_input=form.motif_resiliation object_field="convention__motif_resiliation__"|add:form.uuid.value %}
</div>
<div class="fr-col-12 fr-mb-4w">
{% include "common/form/input_upload.html" with form_input=form.commentaires form_input_files=form.commentaires_files object_name='convention' object_uuid=convention.uuid file_list=convention.commentaires|get_files_from_textfiles textarea=True verticalDisplay=True object_field="convention__commentaires__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.commentaires form_input_files=form.commentaires_files object_name='convention' object_uuid=convention.uuid file_list=convention.commentaires|get_files_from_textfiles textarea=True verticalDisplay=True object_field="convention__commentaires__"|add:form.uuid.value %}
</div>
{% include "conventions/common/form_footer_button.html" %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/conventions/resiliation_acte.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{% csrf_token %}
<div class="fr-grid-row fr-grid-row--gutters fr-mb-3w">
<div class="fr-col-12 fr-mb-4w">
{% include "common/form/input_upload.html" with form_input=form.fichier_instruction_resiliation form_input_files=form.fichier_instruction_resiliation_files object_name='convention' object_uuid=convention.uuid file_list=convention.fichier_instruction_resiliation|get_files_from_textfiles object_field="convention__fichier_instruction_resiliation__"|add:form.uuid.value %}
{% include "common/form/input_upload.html" with single_file=False form_input=form.fichier_instruction_resiliation form_input_files=form.fichier_instruction_resiliation_files object_name='convention' object_uuid=convention.uuid file_list=convention.fichier_instruction_resiliation|get_files_from_textfiles object_field="convention__fichier_instruction_resiliation__"|add:form.uuid.value %}
</div>
{% include "conventions/common/form_footer_button.html" %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/settings/delegataires/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ <h4>Gestion des délégataires</h4>
{% endif %}
<input type="hidden" name="no_dry_run" id="no_dry_run" value=false>
<div class="form-button-footer fr-col-md-12 fr-py-5w">
<button class="fr-btn fr-icon-arrow-right-s-line fr-btn--icon-right" {% if targetted_form %}form="{{ targetted_form }}"{% endif %}>
<button class="fr-btn fr-icon-arrow-right-s-line fr-btn--icon-right">
Suivant
</button>
</div>
Expand Down
Loading

0 comments on commit a23d787

Please sign in to comment.