Skip to content

#802 [ActionsDolimeet] add: number of formations on contact list #821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
evarisk-kilyan wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

#802 [ActionsDolimeet] add: number of formations on contact list #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8cd6c39
#802 [ActionsDolimeet] add: number of formations on contact list
evarisk-kilyan Jan 16, 2026
66a615e
#792 [PDF] fix: write_file on completioncertificatedocument
nicolas-eoxia Jan 19, 2026
66d8b77
#815 [Contract] fix: banner and php8
nicolas-eoxia Feb 2, 2026
6eccfa2
#802 [ActionsDolimeet] add: number of formations on contact list
evarisk-kilyan Jan 16, 2026
40bdaf3
#802 [Js] fix: moove js and remove console log
evarisk-kilyan Feb 4, 2026
ddefd72
#802 [Merge] fix: merge conflict
evarisk-kilyan Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
184 changes: 130 additions & 54 deletions class/actions_dolimeet.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,17 @@ public function addHtmlHeader(array $parameters): int
$this->resprints = $out;
}

if (preg_match('/thirdpartycontact/', $parameters['context'])) {
$resourcesRequired = [
'js' => '/custom/dolimeet/js/dolimeet.min.js'
];

$out .= '<!-- Includes JS added by module saturne -->';
$out .= '<script src="' . dol_buildpath($resourcesRequired['js'], 1) . '"></script>';

$this->resprints = $out;
}

return 0; // or return 1 to replace standard code
}

Expand All @@ -166,9 +177,14 @@ public function formObjectOptions(array $parameters, $object, $action): int
{
global $conf, $extrafields, $form, $langs;

require_once __DIR__ . '/../../saturne/lib/object.lib.php';
if (!isset($conf->cache['objectsMetadata']) || empty($conf->cache['objectsMetadata'])) {
require_once __DIR__ . '/../../saturne/lib/object.lib.php';
$objectsMetadata = saturne_get_objects_metadata();
$conf->cache['objectsMetadata'] = $objectsMetadata;
} else {
$objectsMetadata = $conf->cache['objectsMetadata'];
}

$objectsMetadata = saturne_get_objects_metadata();
foreach($objectsMetadata as $objectMetadata) {
if ($objectMetadata['link_name'] != $object->element) {
continue;
Expand Down Expand Up @@ -230,11 +246,16 @@ public function formObjectOptions(array $parameters, $object, $action): int
*/
public function printFieldListOption(array $parameters): int
{
global $extrafields, $langs, $object;
global $conf, $extrafields, $langs, $object;

require_once __DIR__ . '/../../saturne/lib/object.lib.php';
if (!isset($conf->cache['objectsMetadata']) || empty($conf->cache['objectsMetadata'])) {
require_once __DIR__ . '/../../saturne/lib/object.lib.php';
$objectsMetadata = saturne_get_objects_metadata();
$conf->cache['objectsMetadata'] = $objectsMetadata;
} else {
$objectsMetadata = $conf->cache['objectsMetadata'];
}

$objectsMetadata = saturne_get_objects_metadata();
foreach($objectsMetadata as $objectMetadata) {
if ($objectMetadata['link_name'] != $object->element) {
continue;
Expand Down Expand Up @@ -652,6 +673,36 @@ function fillTable(data) {
}
}


if (strpos($parameters['context'], 'thirdpartycontact')) {

require_once __DIR__ . '/../../saturne/class/saturnesignature.class.php';

$signatory = new SaturneSignature($db);

$sql = "SELECT t.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
$sql .= " WHERE t.fk_soc = ".GETPOSTINT('socid');
$result = $db->query($sql);
$num = $db->num_rows($result);

$contactIds = [];
$i = 0;
while ($i < $num) {
$obj = $db->fetch_object($result);
$filter = ['customsql' => 'status > 0 AND object_type="trainingsession" AND element_type="socpeople" AND element_id='.$obj->rowid];
$signatories = $signatory->fetchAll('', '', 0, 0, $filter);
$contactIds[$obj->rowid] = count($signatories);
$i++;
}

?>
<script>
window.dolimeet.contactList.insertData(<?php echo json_encode($contactIds); ?>, '<?= $langs->trans('Formations') ?>');
</script>
<?php
}

return 0; // or return 1 to replace standard code.
}

Expand Down Expand Up @@ -1406,65 +1457,90 @@ public function saturneSetVarsFromFetchObj(array $parameters, object $object): i
*/
public function saturnePrintFieldListLoopObject(array $parameters, object $object): int
{
global $conf, $langs;
global $conf;

if (preg_match('/meetinglist|trainingsessionlist|auditlist/', $parameters['context'])) {
$out = [];
$out = [];
$key = $parameters['key'];
$out[$key] = '';

$signatoriesInDictionary = $conf->cache['signatoriesInDictionary'] ?? [];
$isSignatoryColumn = false;

foreach ($signatoriesInDictionary as $signatoryInDictionary) {
if ($signatoryInDictionary->ref === $key) {
$isSignatoryColumn = true;
break;
}
}

if (!$isSignatoryColumn && $key !== 'society_attendants') {
return 0;
}

if ($isSignatoryColumn) {
$signatories = $conf->cache['signatories'] ?? [];
$users = $conf->cache['user'] ?? [];
$contacts = $conf->cache['contact'] ?? [];

$signatoriesInDictionary = $conf->cache['signatoriesInDictionary'];
if (is_array($signatoriesInDictionary) && !empty($signatoriesInDictionary)) {
$users = $conf->cache['user'];
$contacts = $conf->cache['contact'];
$signatories = $conf->cache['signatories'];
foreach ($signatoriesInDictionary as $signatoryInDictionary) {
if ($parameters['key'] == $signatoryInDictionary->ref) {
if (is_array($signatories) && !empty($signatories)) {
$out[$parameters['key']] = '';
foreach ($signatories as $signatory) {
if ($signatory->role != $signatoryInDictionary->ref) {
continue;
}
switch ($signatory->attendance) {
case 1:
break;
$cssButton = '#0d8aff';
$userIcon = 'fa-user-clock';
break;
case 2:
$cssButton = '#e05353';
$userIcon = 'fa-user-slash';
break;
default:
$cssButton = '#47e58e';
$userIcon = 'fa-user';
break;
}
if (is_array($users[$signatory->role]) && !empty($users[$signatory->role]) && $users[$signatory->role][$signatory->id] instanceof User) {
$out[$parameters['key']] .= $users[$signatory->role][$signatory->id]->getNomUrl(1, '', 0, 0, 24, 1);
}
if (is_array($contacts[$signatory->role]) && !empty($contacts[$signatory->role]) && $contacts[$signatory->role][$signatory->id] instanceof Contact) {
$out[$parameters['key']] .= $contacts[$signatory->role][$signatory->id]->getNomUrl(1);
}
if ((is_array($users[$signatory->role]) && !empty($users[$signatory->role])) || (is_array($contacts[$signatory->role]) && !empty($contacts[$signatory->role]))) {
$out[$parameters['key']] .= ' ' . $signatory->getLibStatut(3);
$out[$parameters['key']] .= ' <i class="fas ' . $userIcon . '" style="color: ' . $cssButton . '"></i><br>';
}
}
if ($signatoryInDictionary->ref !== $key) {
continue;
}

foreach ($signatories as $signatory) {
if ($signatory->role != $signatoryInDictionary->ref) {
continue;
}

$role = $signatory->role;
$user = $users[$role][$signatory->id] ?? null;
$contact = $contacts[$role][$signatory->id] ?? null;

if (!$user instanceof User && !$contact instanceof Contact) {
continue;
}

if ($user instanceof User) {
$out[$key] .= $user->getNomUrl(1, '', 0, 0, 24, 1);
}
if ($contact instanceof Contact) {
$out[$key] .= $contact->getNomUrl(1);
}

switch ((int) $signatory->attendance) {
case 1:
$cssButton = '#0d8aff';
$userIcon = 'fa-user-clock';
break;
case 2:
$cssButton = '#e05353';
$userIcon = 'fa-user-slash';
break;
default:
$cssButton = '#47e58e';
$userIcon = 'fa-user';
}

$out[$key] .= ' ' . $signatory->getLibStatut(3);
$out[$key] .= ' <i class="fas ' . $userIcon . '" style="color: ' . $cssButton . '"></i><br>';
}

break;
}
}

if ($parameters['key'] == 'society_attendants') {
$thirdparties = $conf->cache['thirdparty'];
if (is_array($thirdparties) && !empty($thirdparties)) {
$alreadyAddedThirdParties = [];
foreach ($thirdparties as $thirdparty) {
if (!empty($thirdparty->id) && !in_array($thirdparty->id, $alreadyAddedThirdParties)) {
$out[$parameters['key']] .= $thirdparty->getNomUrl(1) . '<br>';
}
$alreadyAddedThirdParties[] = $thirdparty->id;
if ($key === 'society_attendants') {
$thirdParties = $conf->cache['thirdparty'] ?? [];
$alreadyAdded = [];

foreach ($thirdParties as $thirdParty) {
if (empty($thirdParty->id) || isset($alreadyAdded[$thirdParty->id])) {
continue;
}

$out[$key] .= $thirdParty->getNomUrl(1) . '<br>';
$alreadyAdded[$thirdParty->id] = true;
}
}

Expand Down
8 changes: 1 addition & 7 deletions ...t/dolimeetdocuments/trainingsessiondocument/pdf_completioncertificatedocument.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,6 @@ public function write_file($objectDocument, Translate $outputLangs, string $srcT

$object = $moreParam['object'];

$uploadDir = getMultidirOutput($object, $this->module);
if (!$uploadDir) {
$this->error = $langs->transnoentities('ErrorCanNotCreateDir');
return -1;
}

$attendantFullname = dol_strtoupper($moreParam['attendant']->lastname) . ' ' . dol_ucfirst($moreParam['attendant']->firstname);
if (!empty($moreParam['attendant'])) {
$moreParam['documentName'] = $attendantFullname . '_';
Expand All @@ -201,7 +195,7 @@ public function write_file($objectDocument, Translate $outputLangs, string $srcT
}

$moreParam['hideTemplateName'] = 1;
$file = $this->buildDocumentFilename($objectDocument, $outputLangs, $object, $uploadDir, $moreParam);
$file = $this->buildDocumentFilename($objectDocument, $outputLangs, $object, $moreParam);
if ($file < 0) {
$this->error = $langs->transnoentities('ErrorFileNameCanNotBeBuilt');
return -1;
Expand Down
Loading