Skip to content

Commit

Permalink
#88 [Attendants] fix: external attendants role
Browse files Browse the repository at this point in the history
  • Loading branch information
Théo David committed Sep 21, 2022
1 parent ab0f8c9 commit 42608c2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 21 deletions.
21 changes: 2 additions & 19 deletions core/tpl/session/dolimeet_session_attendants.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,6 @@
$width = 80; $cssclass = 'photoref';
dol_strlen($object->label) ? $morehtmlref = '<span>' . ' - ' . $object->label . '</span>' : '';
$morehtmlref .= '<div class="refidno">';
// External Society -- Société extérieure

// Project
$project->fetch($object->fk_project);
Expand Down Expand Up @@ -339,14 +338,6 @@
print '<td class="center">' . $langs->trans("Signature") . '</td>';
print '</tr>';

//
// $contacts = fetchAllSocPeople('', '', 0, 0, array('customsql' => "" ));
// $contacts_no_email = array();
// if (is_array($contacts) && ! empty($contacts) && $contacts > 0) {
// foreach ($contacts as $element_id) {
// $contacts_no_email[$element_id->id] = $element_id->id;
// }
// }
$already_added_users = array();
$j = 1;
if (is_array($society_intervenants) && ! empty($society_intervenants) && $society_intervenants > 0) {
Expand Down Expand Up @@ -433,7 +424,7 @@
$thirdparty->fetch($object->fk_soc);
$ext_society_intervenants = $signatory->fetchSignatory(strtoupper($object->element).'_EXTERNAL_ATTENDANT', $object->id, $object->element);

print load_fiche_titre($langs->trans("ExternalIntervenants"), '', '');
print load_fiche_titre($langs->trans("ExternalAttendants"), '', '');

print '<table class="border centpercent tableforfield">';

Expand All @@ -448,14 +439,6 @@
print '<td class="center">' . $langs->trans("ActionsSignature") . '</td>';
print '<td class="center">' . $langs->trans("Signature") . '</td>';
print '</tr>';
//
// $contacts = fetchAllSocPeople('', '', 0, 0, array('customsql' => "" ));
// $contacts_no_email = array();
// if (is_array($contacts) && ! empty($contacts) && $contacts > 0) {
// foreach ($contacts as $element_id) {
// $contacts_no_email[$element_id->id] = $element_id->id;
// }
// }

$already_selected_intervenants = array();
$j = 1;
Expand Down Expand Up @@ -534,7 +517,7 @@
}
print $newcardbutton;
print '</td>';
print '<td>' . $langs->trans("ExtSocietyIntervenants") . '</td>';
print '<td>' . $langs->trans("ExtSocietyIntervenant") . '</td>';
print '<td class="center">';
print '-';
print '</td><td class="center">';
Expand Down
5 changes: 3 additions & 2 deletions langs/fr_FR/dolimeet.lang
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,9 @@ AuditsCategoriesArea = Catégories d'audit

Attendants = Participants
NoSocietyAttendants = Pas de participant interne
ExtSocietyIntervenants = Intervenant externe
ExtSocietyIntervenant = Intervenant externe
ExtSocietyIntervenants = Participants
ExtSocietyIntervenant = Participant
ExternalAttendants = Participants externes
SocietyAttendants = Participants internes
SocietyAttendant = Participant interne
NoExternalAttendants = Pas d'intervenant externe
Expand Down

0 comments on commit 42608c2

Please sign in to comment.