From 0ae5436c80ea98545cdeb9583f79424360c5e90e Mon Sep 17 00:00:00 2001 From: Antoine M Date: Mon, 22 Apr 2024 12:25:40 +0200 Subject: [PATCH] updating paper publications order form --- includes/forms/form-OrderPaper.php | 17 +++++++++++-- includes/forms/template-form-order-paper.php | 20 ++++++++++++++-- resources/css/components/forms.css | 25 +++++++++++++++++--- 3 files changed, 55 insertions(+), 7 deletions(-) diff --git a/includes/forms/form-OrderPaper.php b/includes/forms/form-OrderPaper.php index 435f864..9756f45 100644 --- a/includes/forms/form-OrderPaper.php +++ b/includes/forms/form-OrderPaper.php @@ -17,11 +17,23 @@ if (class_exists('GF_Field')) { 'post_type' => 'brochures', 'posts_per_page' => -1, 'post_status' => 'publish', + 'order' => 'DESC', + 'orderby' => 'date', + 'meta_key' => 'brochure_pdf', + 'meta_value' => false, + 'meta_compare' => '!=', )); $choices = []; - foreach ($brochures_query->posts as $key => $post) { - array_push($choices, ['text' => $post->post_title, 'slug' => $post->post_name]); + + + + $sortedBrochuresPosts = sort_posts_per_thematiques_priority($brochures_query); + + + + foreach ($sortedBrochuresPosts->posts as $key => $post) { + array_push($choices, ['text' => $post->post_title, 'slug' => $post->post_name, 'ID' => $post->ID]); } $this->choices = $choices; } @@ -70,6 +82,7 @@ if (class_exists('GF_Field')) { $this->buildChoices(); $form_id = $form['id']; $id = $this->id; + ob_start(); include 'template-form-order-paper.php'; $table = ob_get_clean(); diff --git a/includes/forms/template-form-order-paper.php b/includes/forms/template-form-order-paper.php index db4e310..8093f74 100644 --- a/includes/forms/template-form-order-paper.php +++ b/includes/forms/template-form-order-paper.php @@ -1,20 +1,36 @@
choices as $index => $brochurePost) : ?> + term_id); + + ?> +
+
+ + + +

+ name ?> +

+
+ voir la brochure
- +
- +
diff --git a/resources/css/components/forms.css b/resources/css/components/forms.css index 4d2a1dc..0de3811 100644 --- a/resources/css/components/forms.css +++ b/resources/css/components/forms.css @@ -182,14 +182,33 @@ form:not(.metabox-location-side):not(.metabox-location-normal):not( } */ .field-order-paper-publications { - @apply !grid md:grid-cols-2 gap-x-12 gap-y-2; + @apply !grid gap-x-12 gap-y-2; .brochure-order-field { - @apply flex justify-end gap-3 items-center; + @apply flex justify-end gap-3 items-center max-w-screen-md; + .thematique-tag, legend { - @apply block ml-0 pt-6 !mr-auto !font-normal; + @apply mt-6; + } + .thematique-tag { + @apply !py-1 !px-4 !rounded-lg mr-4 flex items-center shrink-0; + line-height: 1.7; + } + .thematique-icon { + @apply w-8 mr-3 my-2; + } + legend { + @apply block ml-0 !mr-auto !font-normal; font-weight: revert !important; } + .preview-brochure { + @apply !text-neutral-700 flex justify-center items-center; + &:after { + content: ' '; + @apply w-4 h-4 block ml-3 bg-no-repeat bg-center bg-contain; + background-image: url('../resources/img/graphic-assets/icone-external-link.svg'); + } + } .publications-amount-fr, .publications-amount-nl {