From fb54f6912c4759320befe8ef0f5d30b6b0c3e2ff Mon Sep 17 00:00:00 2001 From: Givriz Date: Mon, 8 Mar 2021 18:37:03 +0100 Subject: [PATCH 1/6] feature #16570 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajout de picto pour le genre et la civilité --- htdocs/contact/card.php | 12 +++++++++++- htdocs/user/card.php | 15 ++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 0def459d444..a73eecdd992 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -1272,7 +1272,17 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { // Civility print ''.$langs->trans("UserTitle").''; - print $object->getCivilityLabel(); + switch ($object->civility) { + case 'Madame': + print ''; + break; + case 'Monsieur': + print ''; + break; + default: + print $object->getCivilityLabel(); + break; + } print ''; // Job / position diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 45da6f2d6d0..f90a3664140 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1470,7 +1470,20 @@ if ($action == 'create' || $action == 'adduserldap') { print ''.$langs->trans("Gender").''; print ''; if ($object->gender) { - print $langs->trans("Gender".$object->gender); + switch ($object->gender) { + case 'man': + print ''; + break; + case 'woman': + print ''; + break; + case 'other': + print ''; + break; + default: + print $langs->trans("Gender".$object->gender); + break; + } } print ''; From 5294e10ecf66967ef4cd5799653d7c61031eb491 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Mon, 8 Mar 2021 18:07:15 +0000 Subject: [PATCH 2/6] Fixing style errors. --- htdocs/contact/card.php | 18 +++++++++--------- htdocs/user/card.php | 28 ++++++++++++++-------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index a73eecdd992..faaf4df59eb 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -1273,15 +1273,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { // Civility print ''.$langs->trans("UserTitle").''; switch ($object->civility) { - case 'Madame': - print ''; - break; - case 'Monsieur': - print ''; - break; - default: - print $object->getCivilityLabel(); - break; + case 'Madame': + print ''; + break; + case 'Monsieur': + print ''; + break; + default: + print $object->getCivilityLabel(); + break; } print ''; diff --git a/htdocs/user/card.php b/htdocs/user/card.php index f90a3664140..bf5046ffda9 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1470,20 +1470,20 @@ if ($action == 'create' || $action == 'adduserldap') { print ''.$langs->trans("Gender").''; print ''; if ($object->gender) { - switch ($object->gender) { - case 'man': - print ''; - break; - case 'woman': - print ''; - break; - case 'other': - print ''; - break; - default: - print $langs->trans("Gender".$object->gender); - break; - } + switch ($object->gender) { + case 'man': + print ''; + break; + case 'woman': + print ''; + break; + case 'other': + print ''; + break; + default: + print $langs->trans("Gender".$object->gender); + break; + } } print ''; From 6e46396b17a3e1d9d7a3075fb514b48259b58fb4 Mon Sep 17 00:00:00 2001 From: Givriz Date: Wed, 10 Mar 2021 16:31:50 +0100 Subject: [PATCH 3/6] =?UTF-8?q?Ajout=20de=20picto=20pour=20le=20genre=20et?= =?UTF-8?q?=20la=20civilit=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/adherents/card.php | 8 +------- htdocs/adherents/subscription.php | 8 +------- htdocs/contact/card.php | 12 +----------- htdocs/core/class/html.form.class.php | 22 +++++++++++++++++++--- htdocs/user/card.php | 21 --------------------- 5 files changed, 22 insertions(+), 49 deletions(-) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index f9d6edfd4e5..90c84dce7bc 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -1541,13 +1541,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { // Morphy print ''.$langs->trans("MemberNature").''.$object->getmorphylib().''; print ''; - - // Gender - print ''.$langs->trans("Gender").''; - print ''; - if ($object->gender) { - print $langs->trans("Gender".$object->gender); - } + print ''; // Company diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 9815b824cc5..272bc6c7777 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -492,13 +492,7 @@ if ($rowid > 0) { // Morphy print ''.$langs->trans("MemberNature").''.$object->getmorphylib().''; print ''; - - // Gender - print ''.$langs->trans("Gender").''; - print ''; - if ($object->gender) print $langs->trans("Gender".$object->gender); - print ''; - + // Company print ''.$langs->trans("Company").''.$object->company.''; diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index bd65f912981..e75908adc10 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -1278,17 +1278,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { // Civility print ''.$langs->trans("UserTitle").''; - switch ($object->civility) { - case 'Madame': - print ''; - break; - case 'Monsieur': - print ''; - break; - default: - print $object->getCivilityLabel(); - break; - } + print $object->getCivilityLabel(); print ''; // Job / position diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 8324e500c3c..03ab4dda230 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -7894,6 +7894,22 @@ class Form if (empty($fieldref)) { $fieldref = 'ref'; } + + // Preparing gender's display if there is one + if ($object->gender) { + $addgendertxt = ' '; + switch ($object->gender) { + case 'man': + $addgendertxt .= ''; + break; + case 'woman': + $addgendertxt .= ''; + break; + case 'other': + $addgendertxt .= ''; + break; + } + } else $addgendertxt = ''; // Add where from hooks if (is_object($hookmanager)) { @@ -8021,12 +8037,12 @@ class Form $ret .= $object->ref.'
'; $fullname = $object->getFullName($langs); if ($object->morphy == 'mor' && $object->societe) { - $ret .= dol_htmlentities($object->societe).((!empty($fullname) && $object->societe != $fullname) ? ' ('.dol_htmlentities($fullname).')' : ''); + $ret .= dol_htmlentities($object->societe).((!empty($fullname) && $object->societe != $fullname) ? ' ('.dol_htmlentities($fullname).$addgendertxt.')' : ''); } else { - $ret .= dol_htmlentities($fullname).((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : ''); + $ret .= dol_htmlentities($fullname).$addgendertxt.((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : ''); } } elseif (in_array($object->element, array('contact', 'user', 'usergroup'))) { - $ret .= dol_htmlentities($object->getFullName($langs)); + $ret .= dol_htmlentities($object->getFullName($langs)).$addgendertxt; } elseif (in_array($object->element, array('action', 'agenda'))) { $ret .= $object->ref.'
'.$object->label; } elseif (in_array($object->element, array('adherent_type'))) { diff --git a/htdocs/user/card.php b/htdocs/user/card.php index bf5046ffda9..4496178fe67 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1466,27 +1466,6 @@ if ($action == 'create' || $action == 'adduserldap') { print ''."\n"; } - // Gender - print ''.$langs->trans("Gender").''; - print ''; - if ($object->gender) { - switch ($object->gender) { - case 'man': - print ''; - break; - case 'woman': - print ''; - break; - case 'other': - print ''; - break; - default: - print $langs->trans("Gender".$object->gender); - break; - } - } - print ''; - // Employee print ''.$langs->trans("Employee").''; print yn($object->employee); From d5e6f54b5c6a1390e36db7118f8f71054cad6fc1 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Wed, 10 Mar 2021 15:33:53 +0000 Subject: [PATCH 4/6] Fixing style errors. --- htdocs/adherents/card.php | 2 +- htdocs/adherents/subscription.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 90c84dce7bc..896dddd55e3 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -1541,7 +1541,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { // Morphy print ''.$langs->trans("MemberNature").''.$object->getmorphylib().''; print ''; - + print ''; // Company diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 272bc6c7777..b48328a17e8 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -492,7 +492,7 @@ if ($rowid > 0) { // Morphy print ''.$langs->trans("MemberNature").''.$object->getmorphylib().''; print ''; - + // Company print ''.$langs->trans("Company").''.$object->company.''; From 93675082d714ef25672558eb4abeac526a6c3cf4 Mon Sep 17 00:00:00 2001 From: Damien BENOIT <48482664+Givriz@users.noreply.github.com> Date: Wed, 10 Mar 2021 16:42:14 +0100 Subject: [PATCH 5/6] Update html.form.class.php --- htdocs/core/class/html.form.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 03ab4dda230..05495f527c7 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -7894,7 +7894,7 @@ class Form if (empty($fieldref)) { $fieldref = 'ref'; } - + // Preparing gender's display if there is one if ($object->gender) { $addgendertxt = ' '; From 420a3a73dd3fc65e03179baf885c53125056f2f0 Mon Sep 17 00:00:00 2001 From: Damien BENOIT <48482664+Givriz@users.noreply.github.com> Date: Thu, 11 Mar 2021 18:15:22 +0100 Subject: [PATCH 6/6] Update html.form.class.php --- htdocs/core/class/html.form.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 05495f527c7..3d208d80eb2 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -7896,6 +7896,7 @@ class Form } // Preparing gender's display if there is one + $addgendertxt = ''; if ($object->gender) { $addgendertxt = ' '; switch ($object->gender) { @@ -7909,7 +7910,7 @@ class Form $addgendertxt .= ''; break; } - } else $addgendertxt = ''; + } // Add where from hooks if (is_object($hookmanager)) {