Skip to content

Commit

Permalink
Evarisk#1680 [Control] fix: change variables from masscontrol to main…
Browse files Browse the repository at this point in the history 
…control & subcontrol
  • Loading branch information
@theodaviddd
theodaviddd committed Sep 3, 2024
1 parent 6691f09 commit 5bdd7f6
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 48 deletions.
70 changes: 35 additions & 35 deletions core/tpl/digiquali_mass_control_list.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

// Fetch the list of mass controls linked to the object
$massControlList = $object->fetchAll('', '', 0, 0, ['fk_control' => $object->id]);
$subControlList = $object->fetchAll('', '', 0, 0, ['fk_control' => $object->id]);
// Start the responsive table container
print '<div class="div-table-responsive-no-min" style="overflow-x: unset !important">';

Expand Down Expand Up @@ -43,23 +43,23 @@
$mainControl = $object;

// Check if there are any mass controls and print them
if (is_array($massControlList) && !empty($massControlList)) {
foreach ($massControlList as $massControl) {
$answersDisabled = $massControl->status == $massControl::STATUS_LOCKED || $mainControl->status >= $mainControl::STATUS_VALIDATED;
$object = $massControl;
$sheet->fetch($massControl->fk_sheet);
if (is_array($subControlList) && !empty($subControlList)) {
foreach ($subControlList as $subControl) {
$answersDisabled = $subControl->status == $subControl::STATUS_LOCKED || $mainControl->status >= $mainControl::STATUS_VALIDATED;
$object = $subControl;
$sheet->fetch($subControl->fk_sheet);
$sheet->fetch_optionals();

$sheet->fetchObjectLinked($object->fk_sheet, 'digiquali_' . $sheet->element);
$massControl->fetch_optionals();
$massControl->fetchLines();
$massControl->fetchObjectLinked('', '', $massControl->id, 'digiquali_control', 'OR', 1, 'sourcetype', 0);
$subControl->fetch_optionals();
$subControl->fetchLines();
$subControl->fetchObjectLinked('', '', $subControl->id, 'digiquali_control', 'OR', 1, 'sourcetype', 0);
//get object controlled
$linkableElements = get_sheet_linkable_objects();

print '<div class="table-row sub-control-'. $massControl->id .'">';
print '<div class="table-cell">' . $massControl->getNomUrl(1) . '</div>';
print '<div class="table-cell">' . $massControl->getLibStatut(5) . '</div>';
print '<div class="table-row sub-control-'. $subControl->id .'">';
print '<div class="table-cell">' . $subControl->getNomUrl(1) . '</div>';
print '<div class="table-cell">' . $subControl->getLibStatut(5) . '</div>';
print '<div class="table-cell maxwidth200">';
foreach ($linkableElements as $linkableElementType => $linkableElement) {
if ($linkableElement['conf'] > 0 && (!empty($object->linkedObjectsIds[$linkableElement['link_name']]))) {
Expand Down Expand Up @@ -88,18 +88,18 @@
print '<div class="table-cell center">';
print '<div class="verdict-container">';
print '<label class="verdict-option">';
print '<input type="radio" name="verdict' . $massControl->id . '" value="1" ' . ($massControl->verdict == '1' ? 'checked' : '') . '>';
print '<span class="verdict-box verdict-ok '. ($answersDisabled ? "disabled" : "") .'" data-control-id="'. $massControl->id .'">OK</span>';
print '<input type="radio" name="verdict' . $subControl->id . '" value="1" ' . ($subControl->verdict == '1' ? 'checked' : '') . '>';
print '<span class="verdict-box verdict-ok '. ($answersDisabled ? "disabled" : "") .'" data-control-id="'. $subControl->id .'">OK</span>';
print '</label>';
print '<label class="verdict-option">';
print '<input data-control-id="'. $massControl->id .'" type="radio" name="verdict' . $massControl->id . '" value="0" ' . ($massControl->verdict == '0' ? 'checked' : '') . '>';
print '<span class="verdict-box verdict-ko '. ($answersDisabled ? "disabled" : "") .'" data-control-id="'. $massControl->id .'">KO</span>';
print '<input data-control-id="'. $subControl->id .'" type="radio" name="verdict' . $subControl->id . '" value="0" ' . ($subControl->verdict == '0' ? 'checked' : '') . '>';
print '<span class="verdict-box verdict-ko '. ($answersDisabled ? "disabled" : "") .'" data-control-id="'. $subControl->id .'">KO</span>';
print '</label>';
print '</div>';
print '</div>';

// Note Control section displaying the public note
print '<div class="table-cell center"><textarea '. ($answersDisabled ? "disabled" : "") .' type="text" class="note-public">' . $massControl->note_public . '</textarea></div>';
print '<div class="table-cell center"><textarea '. ($answersDisabled ? "disabled" : "") .' type="text" class="note-public">' . $subControl->note_public . '</textarea></div>';

print '<div class="table-cell center">';
$questionCounter = 0;
Expand All @@ -108,67 +108,67 @@
}

$answerCounter = 0;
if (is_array($massControl->lines) && !empty($massControl->lines)) {
foreach ($massControl->lines as $massControlLine) {
if (dol_strlen($massControlLine->answer) > 0) {
if (is_array($subControl->lines) && !empty($subControl->lines)) {
foreach ($subControl->lines as $subControlLine) {
if (dol_strlen($subControlLine->answer) > 0) {
$answerCounter++;
}
}
}
//affiche le nombre de questions répondues
print '<span class="answerCounter">' . $answerCounter . '/' . $questionCounter . '</span>';
print '<button type="button" class="'. ($answersDisabled ? "butActionRefused" : "butAction modal-open") .' answerSubControl" data-control-id="'. $massControl->id .'">';
print '<button type="button" class="'. ($answersDisabled ? "butActionRefused" : "butAction modal-open") .' answerSubControl" data-control-id="'. $subControl->id .'">';
print $langs->trans('Answers');
print '<input type="hidden" class="modal-options" data-modal-to-open="modalSubControl'. $massControl->id .'">';
print '<input type="hidden" class="modal-options" data-modal-to-open="modalSubControl'. $subControl->id .'">';
print '</button>';
print '</div>';
$documenturl = DOL_URL_ROOT . '/document.php';
//retrieve last document of the control
print '<div class="table-cell center">';
$documentList = dol_dir_list($conf->digiquali->multidir_output[$massControl->entity ?: 1] . '/controldocument/' . $massControl->ref . '/');
$documentList = dol_dir_list($conf->digiquali->multidir_output[$subControl->entity ?: 1] . '/controldocument/' . $subControl->ref . '/');
if (!empty($documentList)) {
$lastDocument = $documentList[count($documentList) - 1];
$lastDocumentPath = $lastDocument['relativename'];
print '<a class="documentdownload paddingright" href="' . $documenturl . '?modulepart=digiquali&file=controldocument/' . urlencode($massControl->ref . '/' . $lastDocumentPath) . '">';
print '<a class="documentdownload paddingright" href="' . $documenturl . '?modulepart=digiquali&file=controldocument/' . urlencode($subControl->ref . '/' . $lastDocumentPath) . '">';
print '<button type="button" class="wpeo-button button-square-40 button-blue wpeo-tooltip-event" aria-label="' . $langs->trans('ShowDocument') . '"><i class="fas fa-eye button-icon"></i></button>';
print '</a>';
}

print '</div>';
print '<div class="table-cell center">';
if (!$answersDisabled) {
if ($massControl->status == $massControl::STATUS_VALIDATED) {
if ($subControl->status == $subControl::STATUS_VALIDATED) {
$displayButton = $onPhone ? '<i class="fas fa-lock fa-2x"></i>' : '<i class="fas fa-lock"></i>' . ' ' . $langs->trans('Lock');
print '<span class="lockSubControl butAction" id="actionButtonLockSubControl" data-control-id="'. $massControl->id .'" data-mass-control-id="'. $mainControlId .'">' . $displayButton . '</span>';
print '<span class="lockSubControl butAction" id="actionButtonLockSubControl" data-control-id="'. $subControl->id .'" data-main-control-id="'. $mainControlId .'">' . $displayButton . '</span>';
$displayButton = $onPhone ? '<i class="fas fa-unlock fa-2x"></i>' : '<i class="fas fa-unlock"></i>' . ' ' . $langs->trans('ReOpenDoli');
print '<span class="reopenSubControl butAction" id="actionButtonReopenSubControl" data-control-id="'. $massControl->id .'" data-mass-control-id="'. $mainControlId .'">' . $displayButton . '</span>';
print '<span class="reopenSubControl butAction" id="actionButtonReopenSubControl" data-control-id="'. $subControl->id .'" data-main-control-id="'. $mainControlId .'">' . $displayButton . '</span>';
} else {
$validateButtonDisabled = !(dol_strlen($massControl->verdict) && $answerCounter == $questionCounter);
$validateButtonDisabled = !(dol_strlen($subControl->verdict) && $answerCounter == $questionCounter);
$displayButton = $onPhone ? '<i class="fas fa-check fa-2x"></i>' : '<i class="fas fa-check"></i>' . ' ' . $langs->trans('Validate');
print '<span class="validateSubControl validateButton'. $massControl->id .' butAction'. ($validateButtonDisabled ? 'Refused' : '') .'" id="actionButtonValidateSubControl" data-control-id="'. $massControl->id .'" data-mass-control-id="'. $mainControlId .'">' . $displayButton . '</span>';
print '<span class="validateSubControl validateButton'. $subControl->id .' butAction'. ($validateButtonDisabled ? 'Refused' : '') .'" id="actionButtonValidateSubControl" data-control-id="'. $subControl->id .'" data-main-control-id="'. $mainControlId .'">' . $displayButton . '</span>';
$displayButton = $onPhone ? '<i class="fas fa-save fa-2x"></i>' : '<i class="fas fa-save"></i>' . ' ' . $langs->trans('Save');
print '<span class="saveSubControl butAction'. (!$validateButtonDisabled ? 'Refused' : '') .'" id="saveButton'. $massControl->id .'" data-control-id="'. $massControl->id .'" data-mass-control-id="'. $mainControlId .'">' . $displayButton . '</span>';
print '<span class="saveSubControl butAction'. (!$validateButtonDisabled ? 'Refused' : '') .'" id="saveButton'. $subControl->id .'" data-control-id="'. $subControl->id .'" data-main-control-id="'. $mainControlId .'">' . $displayButton . '</span>';
}
} else if ($massControl->status != $massControl::STATUS_LOCKED) {
} else if ($subControl->status != $subControl::STATUS_LOCKED) {
print $langs->trans('MainControlMustBeDraftToEditSubControls');
} else {
print '';
}

print '</div>';

print '<div class="wpeo-modal" id="modalSubControl'. $massControl->id .'">';
print '<div class="wpeo-modal" id="modalSubControl'. $subControl->id .'">';
print '<div class="modal-container">';
print '<div class="modal-content">';
print load_fiche_titre($langs->trans('LinkedQuestionsList') . ' - ' . $massControl->getNomUrl(1), '', '');
print load_fiche_titre($langs->trans('LinkedQuestionsList') . ' - ' . $subControl->getNomUrl(1), '', '');
$conf->global->DIGIQUALI_CONTROLDET_AUTO_SAVE_ACTION = 0;
print '<div id="tablelines" class="question-answer-container noborder noshadow">';
require __DIR__ . '/../../core/tpl/digiquali_answers.tpl.php';
print '</div>';
print '</div>';
print '<div class="modal-footer">';
$displayButton = $onPhone ? '<i class="fas fa-save fa-2x"></i>' : '<i class="fas fa-save"></i>' . ' ' . $langs->trans('Save');
print '<span class="saveSubControlAnswers butAction" id="actionButtonSaveSubControlAnswer" data-control-id="'. $massControl->id .'" data-mass-control-id="'. $mainControlId .'">' . $displayButton . '</span>';
print '<span class="saveSubControlAnswers butAction" id="actionButtonSaveSubControlAnswer" data-control-id="'. $subControl->id .'" data-main-control-id="'. $mainControlId .'">' . $displayButton . '</span>';
print '</div>';
print '</div>';
print '</div>';
Expand All @@ -177,7 +177,7 @@
} else {
// If no mass controls are found, display a message
print '<div class="table-row">';
print '<div class="table-cell" colspan="6">' . $langs->trans('NoMassControlFound') . '</div>';
print '<div class="table-cell" colspan="6">' . $langs->trans('NoSubControlFound') . '</div>';
print '</div>';
}

Expand Down
Loading

0 comments on commit 5bdd7f6

Please sign in to comment.