REFINE Update phone number formatting in artisan card template for consistency

includes/artisans.php

@@ -192,8 +192,10 @@ function render_custom_chantier_box_content($post)
 		echo '<ul>';
 		while ($chantiers->have_posts()) {
 			$chantiers->the_post();
+			$date = get_field('date');
+			$city = get_field('city')['city'] ?? null;
 			$chantier_name = get_field('chantier_name');
-			echo '<li><a href="' . get_edit_post_link() . '"> <img src=' . get_stylesheet_directory_uri() . '/resources/img/icons/document-inspect.svg' . ' /> ' . $chantier_name . '</a></li>';
+			echo '<li><a href="' . get_edit_post_link() . '"> <img src=' . get_stylesheet_directory_uri() . '/resources/img/icons/document-inspect.svg' . ' /> ' . $chantier_name . ' | ' . $city . ' | ' . $date . '</a></li>';
 		}
 		echo '</ul>';
 		echo '<a href="' . admin_url('post-new.php?post_type=chantiers&return_to=' . urlencode($return_to)) . '" class="new-chantier">Ajouter un chantier</a>';

includes/export-datas.php

@@ -89,7 +89,7 @@ function generate_artisans_datas_to_csv()
 	}
 
 	// Ajouter les en-têtes du CSV
-	fputcsv($file, ['Artisan', 'N° Téléphone', 'Mail', 'Adresse', 'Site web', 'TVA', 'Conseiller', 'Action requise', 'Précision pour contact', 'ID de l\'artisan', 'Date de création',]);
+	fputcsv($file, ['Artisan', 'N° Téléphone', 'Mail', 'Adresse', 'Site web', 'TVA', 'Statut de travail', 'Conseiller', 'Dernière Action', 'Commentaire', 'ID de l\'artisan', 'Date de création',]);
 
 	// Boucler sur chaque post et écrire les données dans le CSV
 	foreach ($artisans->posts as $artisan) {
@@ -112,8 +112,17 @@ function generate_artisans_datas_to_csv()
 
 		$conseiller = getArtisanConseillerName($postID) ?? '';
 		$requiredAction = get_field('required_action', $postID);
-		$requiredAction = $requiredAction ? 'Oui' : '';
-		$contactComments = get_field('contact_comments', $postID);
+		$lastAction = get_field('last_action', $postID);
+		$lastActionComment = $lastAction['comments'] ?? '';
+		$lastActionDate = $lastAction['last_contact_date'] ?? '';
+		$mdp_status = get_field('mdp_status', $postID)['label'] ?? '';
+		// Formater la date pour la rendre plus lisible
+		if (!empty($lastActionDate)) {
+			$lastActionDate = date('d/m/Y', strtotime($lastActionDate));
+		}
+
+
+		write_log($mdp_status);
 
 		fputcsv($file, [
 			$artisan->post_title,
@@ -122,9 +131,10 @@ function generate_artisans_datas_to_csv()
 			$adresse,
 			$website,
 			$tva,
+			$mdp_status,
 			$conseiller,
-			$requiredAction,
-			$contactComments,
+			$lastActionDate,
+			$lastActionComment,
 			$artisan->ID,
 			$artisan->post_date,
 		]);

includes/init.php

@@ -28,14 +28,16 @@ function metiers_patrimoine_enqueue_back_scripts()
 	wp_enqueue_style('metiers-theme-main-css', get_stylesheet_directory_uri()  . '/css/app.css', array('homegrade-main-css'), $theme->get('Version'));
 	wp_enqueue_script('metiers-theme-main-js', get_stylesheet_directory_uri()  . '/js/app.js', array(), $theme->get('Version'));
 	wp_enqueue_script('metiers-theme-editor-js', get_stylesheet_directory_uri()  . '/js/editor.js', array(), $theme->get('Version'));
+	wp_enqueue_script('metiers-theme-artisans-js', get_stylesheet_directory_uri()  . '/js/artisans.js', array(), $theme->get('Version'));
 }
-add_action('wp_enqueue_scripts', 'metiers_patrimoine_enqueue_scripts');
+add_action('admin_enqueue_scripts', 'metiers_patrimoine_enqueue_back_scripts');
 
 add_action('enqueue_block_editor_assets', 'metiers_patrimoine_enqueue_back_scripts');
 
 
 
 
+
 function wpacg_mtier_patrimoine_admin_color_scheme()
 {
 	//Get the theme directory

package.json

@@ -17,20 +17,23 @@
 		"production:css-admin": "cross-env NODE_ENV=development tailwindcss -i ./resources/css/admin-style.css -o ./css/admin-style.css --postcss --minify",
 		"production:css-login": "cross-env NODE_ENV=development tailwindcss -i ./resources/css/login-style.css -o ./css/login-style.css --postcss --minify",
 		"production:js": "cross-env NODE_ENV=development ./node_modules/.bin/esbuild ./resources/js/app.js --bundle --outfile=./js/app.js --minify",
+		"production:js-artisans": "cross-env NODE_ENV=development ./node_modules/.bin/esbuild ./resources/js/artisans.js --bundle --outfile=./js/artisans.js --minify",
 		"dev:css-app": "cross-env NODE_ENV=development tailwindcss -i ./resources/css/app.css -o ./css/app.css --postcss",
 		"dev:css-editor": "cross-env NODE_ENV=development tailwindcss -i ./resources/css/editor-style.css -o ./css/editor-style.css --postcss",
 		"dev:css-admin": "cross-env NODE_ENV=development tailwindcss -i ./resources/css/admin-style.css -o ./css/admin-style.css --postcss",
 		"dev:css-login": "cross-env NODE_ENV=development tailwindcss -i ./resources/css/login-style.css -o ./css/login-style.css --postcss",
 		"dev:js": "cross-env NODE_ENV=development ./node_modules/.bin/esbuild ./resources/js/app.js --bundle --outfile=./js/app.js",
+		"dev:js-artisans": "cross-env NODE_ENV=development ./node_modules/.bin/esbuild ./resources/js/artisans.js --bundle --outfile=./js/artisans.js",
 		"watch:css-app": "cross-env NODE_ENV=development tailwindcss -i ./resources/css/app.css -o ./css/app.css --postcss --watch",
 		"watch:css-editor": "cross-env NODE_ENV=development tailwindcss -i ./resources/css/editor-style.css -o ./css/editor-style.css --postcss --watch",
 		"watch:css-admin": "cross-env NODE_ENV=development tailwindcss -i ./resources/css/admin-style.css -o ./css/admin-style.css --postcss --watch",
 		"watch:css-login": "cross-env NODE_ENV=development tailwindcss -i ./resources/css/login-style.css -o ./css/login-style.css --postcss --watch",
 		"watch:js-editor": "cross-env NODE_ENV=development ./node_modules/.bin/esbuild ./resources/js/editor.js --bundle --outfile=./js/editor.js --watch --loader:.js=jsx",
 		"watch:js": "cross-env NODE_ENV=development ./node_modules/.bin/esbuild ./resources/js/app.js --bundle --outfile=./js/app.js --watch",
-		"production": "cross-env NODE_ENV=production concurrently \"npm run production:css-app\" \"npm run production:css-editor\" \"npm run production:css-admin\" \"npm run production:css-login\" \"npm run production:js\"",
-		"dev": "cross-env NODE_ENV=development concurrently \"npm run dev:css-app\"  \"npm run dev:css-admin\" \"npm run dev:css-editor\" \"npm run dev:css-login\" \"npm run dev:js\"",
-		"watch": "cross-env NODE_ENV=development concurrently \"npm run watch:css-app\" \"npm run watch:css-editor\"  \"npm run watch:css-admin\"  \"npm run watch:css-login\" \"npm run watch:js\"  \"npm run watch:js-editor\"",
+		"watch:js-artisans": "cross-env NODE_ENV=development ./node_modules/.bin/esbuild ./resources/js/artisans.js --bundle --outfile=./js/artisans.js --watch",
+		"production": "cross-env NODE_ENV=production concurrently \"npm run production:css-app\" \"npm run production:css-editor\" \"npm run production:css-admin\" \"npm run production:css-login\" \"npm run production:js\" \"npm run production:js-artisans\"",
+		"dev": "cross-env NODE_ENV=development concurrently \"npm run dev:css-app\"  \"npm run dev:css-admin\" \"npm run dev:css-editor\" \"npm run dev:css-login\" \"npm run dev:js\" \"npm run dev:js-artisans\"",
+		"watch": "cross-env NODE_ENV=development concurrently \"npm run watch:css-app\" \"npm run watch:css-editor\"  \"npm run watch:css-admin\"  \"npm run watch:css-login\" \"npm run watch:js\"  \"npm run watch:js-editor\" \"npm run watch:js-artisans\"",
 		"browser-sync": "cross-env NODE_ENV=development browser-sync start --proxy \"tailpress.test\" --host=\"tailpress.test\" --no-inject-changes --files=\"./\"",
 		"watch-sync": "cross-env NODE_ENV=development concurrently \"npm run browser-sync\" \"npm run watch\""
 	},
@@ -47,4 +50,4 @@
 		"resolve-url-loader": "^3.1.2",
 		"tailwindcss": "^3.1.0"
 	}
-}
+}

resources/css/admin-style.css

@@ -379,11 +379,17 @@ body.post-type-artisans {
     @apply !hidden;
   }
 
-  ul a {
-    @apply text-patrimoine-sante-securite text-base flex items-center gap-2;
-    filter: brightness(80%);
-    img {
-      @apply w-6 h-6 object-contain filter-patrimoine-sante-securite;
+  ul {
+    li {
+      @apply mb-3;
+    }
+    a {
+      @apply text-patrimoine-sante-securite text-base flex items-center gap-2;
+      text-underline-offset: 4px !important;
+      filter: brightness(80%);
+      img {
+        @apply w-6 h-6 object-contain filter-patrimoine-sante-securite;
+      }
     }
   }
 
@@ -392,7 +398,11 @@ body.post-type-artisans {
   }
 
   .new-chantier {
-    @apply bg-patrimoine-sante-securite text-white py-2 px-4 no-underline rounded-full mb-4 block w-fit;
+    /* @apply bg-patrimoine-sante-securite text-white py-2 px-4  rounded-xl mb-4 block w-fit mt-5; */
+    @apply !bg-patrimoine-sante-securite !text-white !border-none no-underline !rounded-xl !px-3 !py-1 my-8 flex items-center justify-center gap-2 w-fit;
+    &:before {
+      @apply content-['+'] !text-2xl;
+    }
   }
 }
 
@@ -698,6 +708,33 @@ select[data-enpassusermodified='yes'] {
     @apply border-none;
   }
 }
+/* FIELD DES MEMBRES DE L'ÉQUIPE DE L'ARTISAN */
+.acf-field-670d268f2b324 {
+  label[for='acf-field_670d268f2b324'] {
+    @apply !hidden;
+  }
+
+  div[data-layout='membre'] {
+    &.-collapsed {
+      @apply !border-none;
+    }
+    .acf-fc-layout-handle {
+      @apply !flex !gap-4 !text-base !items-center !bg-violet-50 !text-violet-950 !border-none !font-semibold;
+    }
+    span.acf-fc-layout-order {
+      @apply !bg-patrimoine-sante-securite  !rounded-full mr-4 !block !text-white !border-none;
+    }
+  }
+  .acf-actions a[data-name='add-layout'] {
+    @apply !bg-patrimoine-sante-securite !text-white !border-none !rounded-xl !px-3 !py-1 my-8 flex items-center justify-center gap-2 w-fit !mx-auto;
+    &:before {
+      @apply content-['+'] !text-2xl;
+    }
+  }
+}
+
+/* FIELD DE GESTION */
+
 #acf-group_67581cdaf3262 {
   @apply border border-patrimoine-sante-securite border-solid rounded-t-xl p-0;
   @apply bg-white;

resources/js/artisans.ts

@@ -0,0 +1,44 @@
+interface MemberElement extends Element {
+  querySelector(selectors: string): Element | null;
+}
+
+window.addEventListener('DOMContentLoaded', (): void => {
+  const artisansMembers: NodeListOf<MemberElement> = document.querySelectorAll('.acf-field-670d268f2b324 div[data-layout="membre"]');
+
+  artisansMembers.forEach((member: MemberElement): void => {
+    setMemberName(member);
+
+    // Créer un MutationObserver pour surveiller les changements de classe
+    const observer: MutationObserver = new MutationObserver((mutations: MutationRecord[]): void => {
+      mutations.forEach((mutation: MutationRecord): void => {
+        if (mutation.type === 'attributes' && mutation.attributeName === 'class') {
+          setTimeout((): void => {
+            setMemberName(member);
+          }, 200);
+        }
+      });
+    });
+
+    // Configuration de l'observateur pour surveiller les changements de classe
+    observer.observe(member, {
+      attributes: true,
+      attributeFilter: ['class'],
+    });
+  });
+});
+
+function setMemberName(member: MemberElement): void {
+  const memberFirstName: string | undefined = (member.querySelector('div[data-name="first_name"] input') as HTMLInputElement)?.value;
+  const memberLastName: string | undefined = (member.querySelector('div[data-name="last_name"] input') as HTMLInputElement)?.value;
+  const memberName: string = `${memberFirstName} ${memberLastName}`;
+
+  const spanOrder: Element | null = member.querySelector('.acf-fc-layout-handle span');
+  const panelTitleDiv: Element | null = member.querySelector('.acf-fc-layout-handle');
+
+  if (memberName && memberName !== '' && panelTitleDiv) {
+    panelTitleDiv.textContent = memberName;
+    if (spanOrder) {
+      panelTitleDiv.prepend(spanOrder);
+    }
+  }
+}

single-artisans.php

@@ -155,15 +155,13 @@ $pageIcon = get_field('page_icon', get_queried_object_id()) ?? null;
 								<?php
 								$chantier_description = get_field('description', $chantier->ID);
 								$date = get_field('date', $chantier->ID);
-								// $city = get_field('city', $chantier->ID);
 								$city = get_field('city', $chantier->ID)['city'] ?? null;
-
-								// write_log($city);
 								$pictures = get_field('pictures', $chantier->ID);
+								$chantier_name = get_field('chantier_name', $chantier->ID);
 								?>
 								<div class="chantier">
 
-									<h4 class="chantier__title"><?php echo $chantier->post_title ?></h4>
+									<h4 class="chantier__title"><?php echo $chantier_name ?></h4>
 									<div class="chantier__infos">
 										<?php if ($city): ?>
 											<p class="chantier__city"><?php echo $city ?></p>

template-components/artisans/card-artisans-single.php

@@ -1,66 +1,65 @@
-<?php
-$postID = $args['post_ID'];
-$post_thumbnail = get_the_post_thumbnail($postID, 'full', array('class' => 'card-artisans__thumbnail card-post__thumbnail')) ?? null;
-
-$post_title = $args['post_title'];
-$company_members = get_field('company_members', $postID);
-
-$phoneNumber = get_field('phone_number', $postID);
-$gsmNumber = get_field('gsm_number', $postID);
-$faxNumber = get_field('fax_number', $postID);
-$formattedPhoneNumber = preg_replace('/(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/', '+$1 $2 $3 $4 $5', $phoneNumber);
-$formattedGsmNumber = preg_replace('/(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/', '+$1 $2 $3 $4 $5', $gsmNumber);
-$formattedFaxNumber =  preg_replace('/^(\+\d{2})(\d{3})(\d{2})(\d{2})(\d{2})/', '$1 $2 $3 $4 $5', $faxNumber);
-$email = get_field('email', $postID);
-$website = get_field('website', $postID);
-
-$adresse = get_field('adresse', $postID);
-$vatNumber = get_field('vat_number', $postID);
-// write_log(gettype($formattedPhoneNumber));
-?>
-
-
-<article class="card-artisans">
-	<?php echo $post_thumbnail ?>
-	<div class="card-artisans__inner">
-
-		<h2 class="card-artisans__title"><?php echo $post_title ?></h2>
-		<?php if ($company_members): ?>
-			<p class="card-artisans__team-members">
-				<?php foreach ($company_members as $key => $member) : ?>
-					<span><?php echo $member['first_name'] . ' ' . $member['last_name']; ?></span>
-				<?php endforeach; ?>
-			</p>
-		<?php endif; ?>
-
-		<h4 class="card-artisans__contact-details-title"><?php echo __("Coordonnées ", "metiers-patrimoine-theme") ?></h4>
-
-
-		<?php if ($adresse): ?>
-			<p class="card-artisans__adresse"><?php echo $adresse['post_code'] . " " .  $adresse['city'] ?></p>
-		<?php endif; ?>
-
-
-
-		<?php if ($phoneNumber): ?>
-			<a class="card-artisans__phone" href="tel:<?php echo $phoneNumber ?>"><?php echo $formattedPhoneNumber ?></a>
-		<?php endif; ?>
-		<?php if ($gsmNumber): ?>
-			<a class="card-artisans__gsm" href="tel:<?php echo $gsmNumber ?>"><?php echo $formattedGsmNumber ?></a>
-		<?php endif; ?>
-		<?php if ($faxNumber): ?>
-			<a class="card-artisans__fax" href="tel:<?php echo $faxNumber ?>"><?php echo $formattedFaxNumber ?></a>
-		<?php endif; ?>
-		<?php if ($email): ?>
-			<a class="card-artisans__email" href="mailto:<?php echo $email ?>"><?php echo $email ?></a>
-		<?php endif; ?>
-		<?php $clean_website = str_replace(array('http://', 'https://'), '', $website); ?>
-		<?php if ($website && !empty($clean_website)): ?>
-			<?php $clean_website = str_replace(array('http://', 'https://'), '', $website); ?>
-			<a class="card-artisans__website" href="<?php echo $website ?>"><?php echo $clean_website ?></a>
-		<?php endif; ?>
-		<?php if ($vatNumber): ?>
-			<p class="card-artisans__vat-number"><?php echo __("N° d'entreprise", "metiers-patrimoine-theme") . " : " . $vatNumber ?></p>
-		<?php endif; ?>
-
+<?php
+$postID = $args['post_ID'];
+$post_thumbnail = get_the_post_thumbnail($postID, 'full', array('class' => 'card-artisans__thumbnail card-post__thumbnail')) ?? null;
+
+$post_title = $args['post_title'];
+$company_members = get_field('company_members', $postID);
+
+$phoneNumber = get_field('phone_number', $postID);
+$gsmNumber = get_field('gsm_number', $postID);
+$faxNumber = get_field('fax_number', $postID);
+$formattedPhoneNumber = preg_replace('/(\d{2})(\d{3})(\d{2})(\d{2})(\d{2})/', '+$1 $2 $3 $4 $5', $phoneNumber);
+$formattedGsmNumber = preg_replace('/(\d{2})(\d{3})(\d{2})(\d{2})(\d{2})/', '+$1 $2 $3 $4 $5', $gsmNumber);
+$email = get_field('email', $postID);
+$website = get_field('website', $postID);
+
+$adresse = get_field('adresse', $postID);
+$vatNumber = get_field('vat_number', $postID);
+// write_log(gettype($formattedPhoneNumber));
+?>
+
+
+<article class="card-artisans">
+	<?php echo $post_thumbnail ?>
+	<div class="card-artisans__inner">
+
+		<h2 class="card-artisans__title"><?php echo $post_title ?></h2>
+		<?php if ($company_members): ?>
+			<p class="card-artisans__team-members">
+				<?php foreach ($company_members as $key => $member) : ?>
+					<span><?php echo $member['first_name'] . ' ' . $member['last_name']; ?></span>
+				<?php endforeach; ?>
+			</p>
+		<?php endif; ?>
+
+		<h4 class="card-artisans__contact-details-title"><?php echo __("Coordonnées ", "metiers-patrimoine-theme") ?></h4>
+
+
+		<?php if ($adresse): ?>
+			<p class="card-artisans__adresse"><?php echo $adresse['post_code'] . " " .  $adresse['city'] ?></p>
+		<?php endif; ?>
+
+
+
+		<?php if ($phoneNumber): ?>
+			<a class="card-artisans__phone" href="tel:<?php echo $phoneNumber ?>"><?php echo $formattedPhoneNumber ?></a>
+		<?php endif; ?>
+		<?php if ($gsmNumber): ?>
+			<a class="card-artisans__gsm" href="tel:<?php echo $gsmNumber ?>"><?php echo $formattedGsmNumber ?></a>
+		<?php endif; ?>
+		<?php if ($faxNumber): ?>
+			<a class="card-artisans__fax" href="tel:<?php echo $faxNumber ?>"><?php echo $formattedFaxNumber ?></a>
+		<?php endif; ?>
+		<?php if ($email): ?>
+			<a class="card-artisans__email" href="mailto:<?php echo $email ?>"><?php echo $email ?></a>
+		<?php endif; ?>
+		<?php $clean_website = str_replace(array('http://', 'https://'), '', $website); ?>
+		<?php if ($website && !empty($clean_website)): ?>
+			<?php $clean_website = str_replace(array('http://', 'https://'), '', $website); ?>
+			<a class="card-artisans__website" href="<?php echo $website ?>"><?php echo $clean_website ?></a>
+		<?php endif; ?>
+		<?php if ($vatNumber): ?>
+			<p class="card-artisans__vat-number"><?php echo __("N° d'entreprise", "metiers-patrimoine-theme") . " : " . $vatNumber ?></p>
+		<?php endif; ?>
+
 </article>