[opendebitdeboisson-commits] r1844 - in branches/bugfix-badges_contact: app/scss/openddb obj

[ebr...@users.adullact.net]

Author: ebrodin
Date: 2024-05-15 08:40:14 +0200 (Wed, 15 May 2024)
New Revision: 1844

Modified:
branches/bugfix-badges_contact/app/scss/openddb/_etablissement.scss
branches/bugfix-badges_contact/obj/etablissement.class.php
Log:
fix: Correction affichage badge sur contact en cas de proprietaire + exploitant


Modified: branches/bugfix-badges_contact/app/scss/openddb/_etablissement.scss
===================================================================
--- branches/bugfix-badges_contact/app/scss/openddb/_etablissement.scss 2024-05-14 07:27:57 UTC (rev 1843)
+++ branches/bugfix-badges_contact/app/scss/openddb/_etablissement.scss 2024-05-15 06:40:14 UTC (rev 1844)
@@ -26,9 +26,24 @@
}
.contact-entete {
justify-content: space-between;
+ align-items: center;
+ h4 {
+ flex: 1;
+ }
+ .contact-badges {
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-end;
+ gap: .5em;
+ .badge {
+ width: 105px;
+ text-align: center;
+ }
+ }
}
.container {
- grid-template-columns: repeat(auto-fit, 350px);
+ grid-template-columns: repeat(auto-fit, minmax(350px, 1fr));
+ justify-content: center;
&.empty_bloc {
grid-template-columns: 1fr;
}

Modified: branches/bugfix-badges_contact/obj/etablissement.class.php
===================================================================
--- branches/bugfix-badges_contact/obj/etablissement.class.php 2024-05-14 07:27:57 UTC (rev 1843)
+++ branches/bugfix-badges_contact/obj/etablissement.class.php 2024-05-15 06:40:14 UTC (rev 1844)
@@ -431,6 +431,9 @@
*/
function personne_physique_template($contact) {
$contact_data="";
+ $badge_label_proprietaire = "";
+ $badge_label_exploitant = '';
+
$contact_data = implode(
" ",
[
@@ -439,20 +442,18 @@
ucfirst($contact['nom']),
]
);
- $badge_label = '';
- if ($contact['proprietaire'] === "t") {
- $badge_label = "propriétaire";
- } else if ($contact['exploitant'] === "t") {
- $badge_label = "exploitant";
- }
+
+ $badge_label_proprietaire = $contact['proprietaire'] === "t" ? "<span class=\"badge propriétaire\">Propriétaire</span>" : "";
+ $badge_label_exploitant = $contact['exploitant'] === "t" ? "<span class=\"badge exploitant\">Exploitant</span>" : "";

return sprintf('
<article class="contact">
<div class="row contact-entete">
<h4>%s</h4>
- <span class="badge %s">
+ <aside class="contact-badges">
%s
- </span>
+ %s
+ </aside>
</div>
<div class="row info">
<p class="email">
@@ -466,8 +467,9 @@
</div>
</article>',
$contact_data,
- $badge_label,
- ucfirst($badge_label),
+
+ $badge_label_proprietaire,
+ $badge_label_exploitant,
$this->data_only_with_placeholder($contact['email']),
$this->data_only_with_placeholder($contact['telephone'])
);
@@ -483,6 +485,8 @@
*/
function personne_morale_template ($contact) {
$contact_data="";
+ $badge_label_proprietaire = "";
+ $badge_label_exploitant = '';
if ($contact['prenom'] || $contact['nom']) {
$contact_data = implode(
" ",
@@ -495,25 +499,23 @@
]
);
}
+ $badge_label_proprietaire = $contact['proprietaire'] === "t" ? "<span class=\"badge propriétaire\">Propriétaire</span>" : "";
+ $badge_label_exploitant = $contact['exploitant'] === "t" ? "<span class=\"badge exploitant\">Exploitant</span>" : "";

- $badge_label = '';
- if ($contact['proprietaire'] === "t") {
- $badge_label = "propriétaire";
- } else if ($contact['exploitant'] === "t") {
- $badge_label = "exploitant";
- }
-
return sprintf('
<article class="contact">
<div class="row contact-entete">
+ <div>
<h4 class="raison_sociale">
%1$s
</h4>
- <span class="badge %2$s">
+ %4$s
+ </div>
+ <aside class="contact-badges">
+ %2$s
%3$s
- </span>
+ </aside>
</div>
- %4$s
<div class="row info">
<p class="email">
<i class="ri-mail-line"></i>
@@ -526,8 +528,8 @@
</div>
</article>',
$contact['raison_sociale'],
- $badge_label,
- ucfirst($badge_label),
+ $badge_label_proprietaire,
+ $badge_label_exploitant,
$contact_data,
$this->data_only_with_placeholder($contact['email']),
$this->data_only_with_placeholder($contact['telephone'])