lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ajout de picto pour le genre et la civilité

Browse Source
This commit is contained in:
Givriz 2021-03-10 16:31:50 +01:00
parent 628d434823
commit 6e46396b17
5 changed files with 22 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/adherents/card.php
View File

@ -1542,12 +1542,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>'; print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
print '</tr>'; print '</tr>';
// Gender
print '<tr><td>'.$langs->trans("Gender").'</td>';
print '<td>';
if ($object->gender) {
print $langs->trans("Gender".$object->gender);
}
print '</td></tr>'; print '</td></tr>';
// Company // Company

6
htdocs/adherents/subscription.php
View File

@ -493,12 +493,6 @@ if ($rowid > 0) {
print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>'; print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
print '</tr>'; print '</tr>';
// Gender
print '<tr><td>'.$langs->trans("Gender").'</td>';
print '<td>';
if ($object->gender) print $langs->trans("Gender".$object->gender);
print '</td></tr>';
// Company // Company
print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>'; print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';

12
htdocs/contact/card.php
View File

@ -1278,17 +1278,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Civility // Civility
print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>'; print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>';
switch ($object->civility) { print $object->getCivilityLabel();
case 'Madame':
print '<i class="fas fa-venus"></i>';
break;
case 'Monsieur':
print '<i class="fas fa-mars"></i>';
break;
default:
print $object->getCivilityLabel();
break;
}
print '</td></tr>'; print '</td></tr>';
// Job / position // Job / position

22
htdocs/core/class/html.form.class.php
View File

@ -7895,6 +7895,22 @@ class Form
$fieldref = 'ref'; $fieldref = 'ref';
} }
// Preparing gender's display if there is one
if ($object->gender) {
$addgendertxt = ' ';
switch ($object->gender) {
case 'man':
$addgendertxt .= '<i class="fas fa-mars"></i>';
break;
case 'woman':
$addgendertxt .= '<i class="fas fa-venus"></i>';
break;
case 'other':
$addgendertxt .= '<i class="fas fa-genderless"></i>';
break;
}
} else $addgendertxt = '';
// Add where from hooks // Add where from hooks
if (is_object($hookmanager)) { if (is_object($hookmanager)) {
$parameters = array(); $parameters = array();
@ -8021,12 +8037,12 @@ class Form
$ret .= $object->ref.'<br>'; $ret .= $object->ref.'<br>';
$fullname = $object->getFullName($langs); $fullname = $object->getFullName($langs);
if ($object->morphy == 'mor' && $object->societe) { 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 { } 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'))) { } 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'))) { } elseif (in_array($object->element, array('action', 'agenda'))) {
$ret .= $object->ref.'<br>'.$object->label; $ret .= $object->ref.'<br>'.$object->label;
} elseif (in_array($object->element, array('adherent_type'))) { } elseif (in_array($object->element, array('adherent_type'))) {

21
htdocs/user/card.php
View File

@ -1466,27 +1466,6 @@ if ($action == 'create' || $action == 'adduserldap') {
print '</td></tr>'."\n"; print '</td></tr>'."\n";
} }
// Gender
print '<tr><td>'.$langs->trans("Gender").'</td>';
print '<td>';
if ($object->gender) {
switch ($object->gender) {
case 'man':
print '<i class="fas fa-mars"></i>';
break;
case 'woman':
print '<i class="fas fa-venus"></i>';
break;
case 'other':
print '<i class="fas fa-genderless"></i>';
break;
default:
print $langs->trans("Gender".$object->gender);
break;
}
}
print '</td></tr>';
// Employee // Employee
print '<tr><td>'.$langs->trans("Employee").'</td><td colspan="2">'; print '<tr><td>'.$langs->trans("Employee").'</td><td colspan="2">';
print yn($object->employee); print yn($object->employee);