diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 10acf1e37e92961168f7539a4a84f689280f3710..3c66a0116c6fb5fd335029bb9254e944523753fb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -59,6 +59,7 @@ repos:
hooks:
- id: prettier
name: prettier (with plugin-xml)
+ exclude: ^templates/
additional_dependencies:
- "prettier@2.7.1"
- "@prettier/plugin-xml@2.2.0"
diff --git a/templates/portal_discount_edit.xml b/templates/portal_discount_edit.xml
index 141da40e1a0fe3a08edc2e98beaa6b858efa8c6f..26345e5a11895ea91309c6e3cb8883f5589778e5 100644
--- a/templates/portal_discount_edit.xml
+++ b/templates/portal_discount_edit.xml
@@ -5,57 +5,40 @@
<t t-call="portal.portal_layout">
<t t-set="breadcrumbs_searchbar" t-value="True" />
<div class="mt16">
- <a
- t-att-href="'/my/discounts/%d' % disc_id.contract_id.id"
- title="Retour"
- ><i class="fa fa-chevron-circle-left" /> Retour à la liste</a>
+ <a t-att-href="'/my/discounts/%d' % disc_id.contract_id.id" title="Retour">
+ <i class="fa fa-chevron-circle-left" /> Retour à la liste
+ </a>
</div>
<div class="row o_portal_discount_edit">
<!-- Title -->
<div class="col-12">
<h2 class="mt32">
- Evaluation des loyers - <span
- t-field="disc_id.month"
- class="text-capitalize"
- /> <span t-field="disc_id.year" />
+ Evaluation des loyers - <span t-field="disc_id.month" class="text-capitalize"/> <span t-field="disc_id.year" />
</h2>
<hr />
<!-- Form -->
- <form
- t-attf-action="/my/discount/{{disc_id.id}}/save"
- method="post"
- >
- <input
- type="hidden"
- name="csrf_token"
- t-att-value="request.csrf_token()"
- />
+ <form t-attf-action="/my/discount/{{disc_id.id}}/save" method="post">
+ <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
<t t-foreach="disc_id.criteria_ids" t-as="criteria">
<div class="card">
<div class="card-body">
<h4 class="discount-subtitle">
- <span
- t-field="criteria.name"
- style="padding-right: 3px;"
- />
+ <span t-field="criteria.name" style="padding-right: 3px;" />
<span class="custom-tooltip">
- <i class="fa fa-info-circle" />
- <span
- class="custom-tooltiptext"
- t-field="criteria.criteria_id.criteria_rule"
- />
+ <i class="fa fa-info-circle" /> <span class="custom-tooltiptext" t-field="criteria.criteria_id.criteria_rule" />
</span>
</h4>
<div class="row" name="criterias">
- <div
- class="col-12 col-md-6 criteria-block"
- t-foreach="criteria.question_ids"
- t-as="q"
- >
- <h5><u>Critère <span
- t-field="q.sequence"
- /></u></h5>
+ <div class="col-12 col-md-6 criteria-block" t-foreach="criteria.question_ids" t-as="q">
+ <h5><u>Critère <span t-field="q.sequence" /></u></h5>
+ <p t-if="q.question_id.operational_objectives">
+ <span class="fw-bold">Objectif(s) opérationnel(s) :</span>
+ <br/>
+ <span t-field="q.question_id.operational_objectives" />
+ </p>
<p>
+ <span class="fw-bold">Sous-critère de mise en oeuvre :</span>
+ <br/>
<t t-if="q.long_name">
<span t-field="q.long_name" />
</t>
@@ -64,24 +47,13 @@
</t>
</p>
<p>
- <a
- data-bs-toggle="collapse"
- t-attf-href="#question-{{q.id}}"
- role="button"
- aria-expanded="false"
- aria-controls="discDetail"
- >
+ <a data-bs-toggle="collapse" t-attf-href="#question-{{q.id}}" role="button" aria-expanded="false" aria-controls="discDetail">
Détail des livrables à fournir
</a>
</p>
- <div
- class="collapse"
- t-attf-id="question-{{q.id}}"
- >
+ <div class="collapse" t-attf-id="question-{{q.id}}">
<div class="alert alert-light">
- <span
- t-field="q.question_id.deliverables"
- />
+ <span t-field="q.question_id.deliverables" />
</div>
</div>
<div class="form-check form-switch">
@@ -95,10 +67,7 @@
t-attf-id="is_valid_{{q.id}}"
t-att-value="q.id"
/>
- <label
- class="form-check-label"
- t-attf-for="is_valid_{{q.id}}"
- >
+ <label class="form-check-label" t-attf-for="is_valid_{{q.id}}">
Je remplis ce critère
</label>
</div>
@@ -112,27 +81,15 @@
aria-expanded="false"
aria-controls="comment"
>
- <i
- class="fa fa-plus"
- /> Ajouter un commentaire
+ <i class="fa fa-plus" /> Ajouter un commentaire
</a>
</p>
- <div
- class="collapse"
- t-attf-id="comment-{{q.id}}"
- >
+ <div class="collapse" t-attf-id="comment-{{q.id}}">
<div class="alert-light">
- <label
- t-attf-for="comment_{{q.id}}"
- class="form-label"
- >Commentaire</label>
- <textarea
- class="form-control"
- t-attf-id="comment_{{q.id}}"
- t-attf-name="customer_comment_{{q.id}}"
- ><t
- t-out="q.customer_comment"
- /></textarea>
+ <label t-attf-for="comment_{{q.id}}" class="form-label">Commentaire</label>
+ <textarea class="form-control" t-attf-id="comment_{{q.id}}" t-attf-name="customer_comment_{{q.id}}">
+ <t t-out="q.customer_comment" />
+ </textarea>
</div>
</div>
</div>
@@ -142,35 +99,16 @@
</t>
<!-- Form buttons -->
- <button
- type="submit"
- class="btn btn-secondary"
- name="action"
- value="save"
- >
+ <button type="submit" class="btn btn-secondary" name="action" value="save">
Enregistrer
</button>
- <button
- type="button"
- class="btn btn-primary"
- data-bs-toggle="modal"
- data-bs-target="#confirmSubmit"
- >
+ <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#confirmSubmit">
Valider et transmettre
</button>
+
<!-- Modal validation -->
- <div
- class="modal fade"
- id="confirmSubmit"
- tabindex="-1"
- role="dialog"
- aria-labelledby="confirmSubmit"
- aria-hidden="true"
- >
- <div
- class="modal-dialog modal-dialog-centered"
- role="document"
- >
+ <div class="modal fade" id="confirmSubmit" tabindex="-1" role="dialog" aria-labelledby="confirmSubmit" aria-hidden="true">
+ <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<!-- modal-content-->
<div class="modal-body">
@@ -181,19 +119,10 @@
<!-- modal-footer-->
<div class="modal-footer">
<!-- Button -->
- <button
- type="submit"
- class="btn btn-primary"
- name="action"
- value="send"
- >
+ <button type="submit" class="btn btn-primary" name="action" value="send">
Valider et transmettre
</button>
- <button
- type="button"
- class="btn btn-light"
- data-bs-dismiss="modal"
- >Annuler</button>
+ <button type="button" class="btn btn-light" data-bs-dismiss="modal">Annuler</button>
</div>
</div>
</div>