Skip to content
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

#4269 [ActionDigiriskDolibarr] fix: no object ticket create #4270

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
+35 −22
Open

#4269 [ActionDigiriskDolibarr] fix: no object ticket create #4270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d16746
#4269 [ActionDigiriskDolibarr] fix: no object ticket create
evarisk-kilyan Feb 5, 2025
70d13c6
#4269 [Hook] fix: trand and missing picto for ticket
nicolas-eoxia Feb 6, 2025
19cc995
#4269 [Hook] fix: fatal require saturneTask
nicolas-eoxia Feb 10, 2025
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
56 changes: 34 additions & 22 deletions class/actions_digiriskdolibarr.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,33 +312,35 @@ public function printCommonFooter($parameters)
}
}

$signatory = new SaturneSignature($db, 'digiriskdolibarr', $object->element);
$signatories = $signatory->fetchSignatory('Attendant', $object->id, $object->element);
if (is_array($signatories) && !empty($signatories)) {
$signatory = array_shift($signatories);
if (dol_strlen( $signatory->signature_url ) > 0) {
$picto = img_picto('', 'digiriskdolibarr_color@digiriskdolibarr', 'class="pictoModule"');
$signatureUrl = dol_buildpath('custom/saturne/public/signature/add_signature.php?track_id=' . $signatory->signature_url . '&entity=' . $conf->entity . '&module_name=digiriskdolibarr&object_type=' . $object->element . '&document_type=TicketDocument', 3);

$out = '<tr class="trextrafields_collapse_' . $object->id . '"><td class="titlefield">' . $picto . $langs->trans('Signature') . '</td>';
$out .= '<td id="ticket_extras_digiriskdolibarr_ticket_signature_'. $object->id . '" class="valuefield ticket_extras_digiriskdolibarr_ticket_signature wordbreak copy-signatureurl-container">';
$out .= '<a href=' . $signatureUrl . ' target="_blank"><div class="wpeo-button button-blue" style="' . ($conf->browser->layout != 'classic' ? 'font-size: 25px;': '') . '"><i class="fas fa-eye"></i></div></a>';
$out .= ' <i class="fas fa-clipboard copy-signatureurl" data-signature-url="' . $signatureUrl . '" style="color: #666;' . ($conf->browser->layout != 'classic' ? 'display: none;': '') . '"></i>';
$out .= '<span class="copied-to-clipboard" style="display: none;">' . ' ' . $langs->trans('CopiedToClipboard') . '</span>';
$out .= '</td>';
$out .= '</tr>';

?>
<script>
jQuery('.tabBar .fichehalfleft table:first').append(<?php echo json_encode($out); ?>);
</script>
<?php
if (is_integer($object->id) && !empty($object->id)) {
$signatory = new SaturneSignature($db, 'digiriskdolibarr', $object->element);
$signatories = $signatory->fetchSignatory('Attendant', $object->id, $object->element);
if (is_array($signatories) && !empty($signatories)) {
$signatory = array_shift($signatories);
if (dol_strlen( $signatory->signature_url ) > 0) {
$picto = img_picto('', 'digiriskdolibarr_color@digiriskdolibarr', 'class="pictoModule"');
$signatureUrl = dol_buildpath('custom/saturne/public/signature/add_signature.php?track_id=' . $signatory->signature_url . '&entity=' . $conf->entity . '&module_name=digiriskdolibarr&object_type=' . $object->element . '&document_type=TicketDocument', 3);

$out = '<tr class="trextrafields_collapse_' . $object->id . '"><td class="titlefield">' . $picto . $langs->trans('Signature') . '</td>';
$out .= '<td id="ticket_extras_digiriskdolibarr_ticket_signature_'. $object->id . '" class="valuefield ticket_extras_digiriskdolibarr_ticket_signature wordbreak copy-signatureurl-container">';
$out .= '<a href=' . $signatureUrl . ' target="_blank"><div class="wpeo-button button-blue" style="' . ($conf->browser->layout != 'classic' ? 'font-size: 25px;': '') . '"><i class="fas fa-eye"></i></div></a>';
$out .= ' <i class="fas fa-clipboard copy-signatureurl" data-signature-url="' . $signatureUrl . '" style="color: #666;' . ($conf->browser->layout != 'classic' ? 'display: none;': '') . '"></i>';
$out .= '<span class="copied-to-clipboard" style="display: none;">' . ' ' . $langs->trans('CopiedToClipboard') . '</span>';
$out .= '</td>';
$out .= '</tr>';

?>
<script>
jQuery('.tabBar .fichehalfleft table:first').append(<?php echo json_encode($out); ?>);
</script>
<?php
}
}
}
} else if (preg_match('/projectcard|projectcontactcard|projecttaskcard|projecttaskscard|projecttasktime|projectOverview|tasklist|category/', $parameters['context'])) {
if ((GETPOST('action') == '' || empty(GETPOST('action')) || GETPOST('action') != 'edit')) {
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
require_once __DIR__ . '/../../saturne/class/task/saturnetask.class.php';

$task = new SaturneTask($db);
$project = new Project($db);
Expand Down Expand Up @@ -749,6 +751,16 @@ public function printFieldListOption(array $parameters, $object): int
}
}

if (strpos($parameters['context'], 'ticketlist') !== false) {
$picto = img_picto('', 'digiriskdolibarr_color@digiriskdolibarr', 'class="pictoModule"');
foreach ($extrafields->attributes['ticket']['label'] as $key => $value) {
if (strpos($key, 'digiriskdolibarr_ticket') === false) {
continue; // Goes to the next element if ‘digiriskdolibarr_ticket’ is not found
}
$extrafields->attributes['ticket']['label'][$key] = $picto . $langs->transnoentities($value);
}
}

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

Expand Down
1 change: 1 addition & 0 deletions langs/fr_FR/digiriskdolibarr.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,6 +1256,7 @@ NonCompliance = Non conformité
FirstName = Prénom
LastName = Nom
Phone = Téléphone
DeclarationDate = Date de déclaration
DigiriskTicketPublicAccess = Une interface publique ne nécessitant aucune identification est disponible à l'url suivante
TicketActivatePublicInterface = Activer l'interface publique
GenerateExtrafields = Génération des extrafields de ticket par défaut
Expand Down