diff --git a/css/style.css b/css/style.css index 206d492..29a2247 100644 --- a/css/style.css +++ b/css/style.css @@ -1879,6 +1879,10 @@ a.ms1-trad-link.btn-aide-trad{ box-shadow:inset 0 0 0 1px #ffe082; } +.bib-seq-pick-prompt{ + margin-bottom:10px; +} + .batch-pick-prompt{ padding:12px 14px; margin-bottom:0; diff --git a/inc_footer_scripts.php b/inc_footer_scripts.php index 7398a7d..e97e3ca 100644 --- a/inc_footer_scripts.php +++ b/inc_footer_scripts.php @@ -2410,6 +2410,7 @@ if ($strLangue == 'fr') { }); updateAutoSelectionInfo(row); + syncBibUiState(row); }); } @@ -2420,7 +2421,9 @@ if ($strLangue == 'fr') { let avecBib = parseInt(bibQuery(row, '.bib-avec')?.textContent || '0', 10) || 0; let hasSequences = bibHasSavedSequences(row); let hasSelection = bibCountSelectedRanges(row) > 0; - let inAssignFlow = modes.batch || modes.reset; + let inBatchFlow = modes.batch || modes.reset; + let inAutoFlow = modes.auto; + let inPickFlow = inBatchFlow || inAutoFlow; row.querySelectorAll('.team-mode-box input[type="radio"]').forEach(function (radio) { if (!radio.closest('.team-mode-option.disabled')) { @@ -2436,27 +2439,32 @@ if ($strLangue == 'fr') { bibSetVisible('.epr-action-reset-group', showReset, row); bibSetVisible('.epr-action-auto-group', hasSequences && !modes.reset && !modes.auto && !modes.batch, row); - bibSetVisible('.epr-action-desactiver-group', - hasSequences && row.dataset.autoActive === '1' && modes.auto, row); if (hasSequences) { syncAutoUiState(row, row.dataset.autoActive === '1'); } - bibSetVisible('.epr-add-range-row', !inAssignFlow && !modes.auto, row); - bibSetVisible('.batch-config-container', inAssignFlow, row); - bibSetVisible('.auto-config-container', modes.auto, row); + bibSetVisible('.epr-add-range-row', !inPickFlow, row); + bibSetVisible('.batch-config-container', inBatchFlow, row); + bibSetVisible('.auto-config-container', inAutoFlow, row); - let showBatchPick = inAssignFlow && !hasSelection; - let showBatchReady = inAssignFlow && hasSelection; - bibSetVisible('.batch-pick-prompt', showBatchPick, row); + let showPick = inPickFlow && !hasSelection; + let showBatchReady = inBatchFlow && hasSelection; + let showAutoReady = inAutoFlow && hasSelection; + bibSetVisible('.bib-seq-pick-prompt', showPick, row); bibSetVisible('.batch-config-ready', showBatchReady, row); + bibSetVisible('.auto-config-ready', showAutoReady, row); let bibContainer = getBibContainer(row); if (bibContainer) { - bibContainer.classList.toggle('batch-awaiting-selection', showBatchPick); + bibContainer.classList.toggle('batch-awaiting-selection', showPick); } + bibSetVisible('.epr-action-desactiver-group', + hasSequences && row.dataset.autoActive === '1' && inAutoFlow, row); + bibSetVisible('.epr-action-cancel-auto-group', inAutoFlow, row); + bibSetVisible('.epr-action-accept-auto-group', showAutoReady, row); + bibSetVisible('.epr-auto-info-group', showAutoReady, row); bibSetVisible('.batch-reset-warning', showBatchReady && modes.reset, row); bibSetVisible('.epr-batch-order-wrap', showBatchReady && !modes.reset, row); bibSetVisible('.epr-action-sim-group', showBatchReady && !modes.reset, row); @@ -2584,9 +2592,10 @@ if ($strLangue == 'fr') { let row = cb.closest('.epr-row'); if (!row) return; - // MSIN-4379 — En mode auto, pas de logique batch (refresh_ranges / GO). + // MSIN-4379 — Mode auto : même sélection de séquences que le batch, sans GO/simulation. if (row.classList.contains('auto-mode')) { updateAutoSelectionInfo(row); + syncBibUiState(row); return; } diff --git a/php/inc_fx_promoteur.php b/php/inc_fx_promoteur.php index fa0b329..5c18a94 100644 --- a/php/inc_fx_promoteur.php +++ b/php/inc_fx_promoteur.php @@ -2591,6 +2591,18 @@ function fxUpdateQuantites($intEpreuve, $intQuantite, $strLangue) { } +// v2 — encart « choisissez vos séquences » (batch + auto) +function renderBibBatchPickPrompt() { + ob_start(); + ?> +
+

+

+
+ -
-

-

-
-
@@ -3617,26 +3624,32 @@ function renderBibAssignActions($tabBibAssignments, $strLangue, $infoBib, $blnAu
+ +
- - - - -
-
- - - - - +
+ + + +
+
+ + + + + + +
+
+
+