From 0accc714c77e033c44d8d3d3032fef9c24ace29e Mon Sep 17 00:00:00 2001
From: Romain Guerrero <romain.guerrero@acseo-conseil.fr>
Date: Wed, 10 Feb 2016 13:56:37 +0100
Subject: [PATCH] affiche plus d'informations sur les contacts dans les champs
 de recherche

---
 templates/groups/add.php      | 23 ++++++++++++++++++++++-
 templates/groups/edit.php     | 22 ++++++++++++++++++++++
 templates/scheduleds/add.php  | 22 ++++++++++++++++++++++
 templates/scheduleds/edit.php | 22 ++++++++++++++++++++++
 4 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/templates/groups/add.php b/templates/groups/add.php
index 788c76f..b837346 100755
--- a/templates/groups/add.php
+++ b/templates/groups/add.php
@@ -62,15 +62,36 @@
 <script>
 	jQuery(document).ready(function()
 	{
+		<?php
+			if (RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS) {
+				$magicSuggestRenderer = "(data['contacts_infos.civility']!=null ? (data['contacts_infos.civility']==1 ? 'M. ' : 'Mme ') : '')";
+				$magicSuggestRenderer .= " + data['contacts.name']";
+				$magicSuggestRenderer .= " + (data['contacts_infos.birthday']!=null ? ' (' + age(data['contacts_infos.birthday']) + ' ans)' : '')";
+			} else {
+				$magicSuggestRenderer = "data['name']";
+			}
+		?>
+
+		// Affiche plus d'infos que le nom du contact si on est en mode infos contacts
 		jQuery('.add-contacts').each(function()
 		{
 			jQuery(this).magicSuggest({
 				data: '<?php echo $this->generateUrl('contacts', 'jsonGetContacts'); ?>',
 				valueField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>id',
 				displayField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>name',
-				name: 'contacts[]'
+				name: 'contacts[]',
+				allowFreeEntries: false, // évite que l'utilisateur ne saisisse autre chose qu'un contact de la liste
+				renderer: function(data) {
+		            return <?php echo $magicSuggestRenderer; ?>;
+		        }
 			});
 		});
+
+		function age(birthday)
+		{
+		  	birthday = new Date(birthday);
+		  	return new Number((new Date().getTime() - birthday.getTime()) / 31536000000).toFixed(0);
+		}
 	});
 </script>
 <?php
diff --git a/templates/groups/edit.php b/templates/groups/edit.php
index 548671a..0b7ab82 100755
--- a/templates/groups/edit.php
+++ b/templates/groups/edit.php
@@ -77,14 +77,36 @@
 <script>
 	jQuery(document).ready(function()
 	{
+		<?php
+			if (RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS) {
+				$magicSuggestRenderer = "(data['contacts_infos.civility']!=null ? (data['contacts_infos.civility']==1 ? 'M. ' : 'Mme ') : '')";
+				$magicSuggestRenderer .= " + data['contacts.name']";
+				$magicSuggestRenderer .= " + (data['contacts_infos.birthday']!=null ? ' (' + age(data['contacts_infos.birthday']) + ' ans)' : '')";
+			} else {
+				$magicSuggestRenderer = "data['name']";
+			}
+		?>
+
+		// Affiche plus d'infos que le nom du contact si on est en mode infos contacts
 		jQuery('.add-contacts').each(function()
 		{
 			jQuery(this).magicSuggest({
 				data: '<?php echo $this->generateUrl('contacts', 'jsonGetContacts'); ?>',
 				valueField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>id',
 				displayField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>name',
+				name: 'contacts[]',
+				allowFreeEntries: false, // évite que l'utilisateur ne saisisse autre chose qu'un contact de la liste
+				renderer: function(data) {
+		            return <?php echo $magicSuggestRenderer; ?>;
+		        }
 			});
 		});
+
+		function age(birthday)
+		{
+		  	birthday = new Date(birthday);
+		  	return new Number((new Date().getTime() - birthday.getTime()) / 31536000000).toFixed(0);
+		}
 	});
 </script>
 <?php
diff --git a/templates/scheduleds/add.php b/templates/scheduleds/add.php
index 55e30bd..070a1b4 100755
--- a/templates/scheduleds/add.php
+++ b/templates/scheduleds/add.php
@@ -87,15 +87,37 @@
 <script>
 	jQuery(document).ready(function()
 	{
+		<?php
+			if (RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS) {
+				$magicSuggestRenderer = "(data['contacts_infos.civility']!=null ? (data['contacts_infos.civility']==1 ? 'M. ' : 'Mme ') : '')";
+				$magicSuggestRenderer .= " + data['contacts.name']";
+				$magicSuggestRenderer .= " + (data['contacts_infos.birthday']!=null ? ' (' + age(data['contacts_infos.birthday']) + ' ans)' : '')";
+			} else {
+				$magicSuggestRenderer = "data['name']";
+			}
+		?>
+
+		// Affiche plus d'infos que le nom du contact si on est en mode infos contacts
 		jQuery('.add-contacts').each(function()
 		{
 			jQuery(this).magicSuggest({
 				data: '<?php echo $this->generateUrl('contacts', 'jsonGetContacts'); ?>',
 				valueField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>id',
 				displayField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>name',
+				name: 'contacts[]',
+				allowFreeEntries: false, // évite que l'utilisateur ne saisisse autre chose qu'un contact de la liste
+				renderer: function(data) {
+		            return <?php echo $magicSuggestRenderer; ?>;
+		        }
 			});
 		});
 
+		function age(birthday)
+		{
+		  	birthday = new Date(birthday);
+		  	return new Number((new Date().getTime() - birthday.getTime()) / 31536000000).toFixed(0);
+		}
+
 		jQuery('.add-groups').each(function()
 		{
 			jQuery(this).magicSuggest({
diff --git a/templates/scheduleds/edit.php b/templates/scheduleds/edit.php
index 7c94e9d..dc17f84 100755
--- a/templates/scheduleds/edit.php
+++ b/templates/scheduleds/edit.php
@@ -105,15 +105,37 @@
 			language: 'fr'
 		});
 
+		<?php
+			if (RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS) {
+				$magicSuggestRenderer = "(data['contacts_infos.civility']!=null ? (data['contacts_infos.civility']==1 ? 'M. ' : 'Mme ') : '')";
+				$magicSuggestRenderer .= " + data['contacts.name']";
+				$magicSuggestRenderer .= " + (data['contacts_infos.birthday']!=null ? ' (' + age(data['contacts_infos.birthday']) + ' ans)' : '')";
+			} else {
+				$magicSuggestRenderer = "data['name']";
+			}
+		?>
+
+		// Affiche plus d'infos que le nom du contact si on est en mode infos contacts
 		jQuery('.add-contacts').each(function()
 		{
 			jQuery(this).magicSuggest({
 				data: '<?php echo $this->generateUrl('contacts', 'jsonGetContacts'); ?>',
 				valueField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>id',
 				displayField: '<?php echo RASPISMS_SETTINGS_EXTENDED_CONTACTS_INFOS ? 'contacts.' : ''; ?>name',
+				name: 'contacts[]',
+				allowFreeEntries: false, // évite que l'utilisateur ne saisisse autre chose qu'un contact de la liste
+				renderer: function(data) {
+		            return <?php echo $magicSuggestRenderer; ?>;
+		        }
 			});
 		});
 
+		function age(birthday)
+		{
+		  	birthday = new Date(birthday);
+		  	return new Number((new Date().getTime() - birthday.getTime()) / 31536000000).toFixed(0);
+		}
+
 		jQuery('.add-groups').each(function()
 		{
 			jQuery(this).magicSuggest({