Skip to content

Commit 754362f

Browse files
committed
Evarisk#1680 [Control] add: controlled object on mass control list
1 parent c1498a1 commit 754362f

File tree

2 files changed

+32
-4
lines changed

2 files changed

+32
-4
lines changed

core/tpl/digiquali_mass_control_list.tpl.php

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
// Define table headers with appropriate translations
2222
$tableHeaders = [
2323
$langs->trans('Nom'),
24+
$langs->trans('ControlledObject'),
2425
$langs->trans('Verdict'),
2526
$langs->trans('NoteControl'),
2627
$langs->trans('Answers'),
@@ -31,8 +32,10 @@
3132

3233
// Create header row using divs
3334
print '<div class="table-row header-row">';
35+
$i = 0;
3436
foreach ($tableHeaders as $header) {
35-
print '<div class="table-cell header-cell center">' . $header . '</div>';
37+
print '<div class="table-cell header-cell '. ($i >= 2 ? 'center' : '').'">' . $header . '</div>';
38+
$i++;
3639
}
3740
print '</div>';
3841

@@ -43,10 +46,35 @@
4346
$object = $massControl;
4447
$massControl->fetch_optionals();
4548
$massControl->fetchLines();
46-
// Fetch the public note if it exists
49+
$massControl->fetchObjectLinked('', '', $massControl->id, 'digiquali_control', 'OR', 1, 'sourcetype', 0);
50+
//get object controlled
51+
$linkableElements = get_sheet_linkable_objects();
4752

4853
print '<div class="table-row sub-control-'. $massControl->id .'">';
49-
print '<div class="table-cell center">' . $massControl->getNomUrl(1) . '</div>';
54+
print '<div class="table-cell">' . $massControl->getNomUrl(1) . '</div>';
55+
print '<div class="table-cell">';
56+
foreach ($linkableElements as $linkableElementType => $linkableElement) {
57+
if ($linkableElement['conf'] > 0 && (!empty($object->linkedObjectsIds[$linkableElement['link_name']]))) {
58+
$className = $linkableElement['className'];
59+
$linkedObject = new $className($db);
60+
foreach($object->linkedObjectsIds[$linkableElement['link_name']] as $linkedObjectId) {
61+
$linkedObject->fetch($linkedObjectId);
62+
63+
64+
print $linkedObject->getNomUrl(1);
65+
66+
if ($linkedObject->array_options['options_qc_frequency'] > 0) {
67+
print ' ';
68+
print '<strong>';
69+
print $langs->transnoentities('QcFrequency') . ' : ' . $linkedObject->array_options['options_qc_frequency'];
70+
print '</strong>';
71+
}
72+
73+
print '<br/>';
74+
}
75+
}
76+
}
77+
print '</div>';
5078

5179
// Verdict section with interactive OK/KO buttons
5280
print '<div class="table-cell center">';

langs/fr_FR/digiquali.lang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ GenerateSheetTags = Vous n'avez pas généré de ca
347347
MassControl = Contrôle en masse
348348
LinkedControlList = Liste des contrôles liés
349349
NewMassControl = Nouveau contrôle en masse
350-
350+
ControlledObject = Objet contrôlé
351351

352352
#
353353
# ControlDet

0 commit comments

Comments
 (0)