Refaktoryzacja kodu, poważne zmiany
This commit is contained in:
parent
44d4fa5a60
commit
21fc1b6baa
@ -93,7 +93,6 @@ $status_colors = [
|
|||||||
// Define process groups
|
// Define process groups
|
||||||
// Show all processes from the DB directly.
|
// Show all processes from the DB directly.
|
||||||
$inne_procesy_cols = $processes;
|
$inne_procesy_cols = $processes;
|
||||||
$inne_procesy_cols[] = ['id' => 'temp_szkolenia', 'name' => 'Szkolenia dla nowego członka'];
|
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
@ -120,7 +119,7 @@ $status_colors = [
|
|||||||
<th colspan="<?= count($spotkania_cols) ?>">Spotkania</th>
|
<th colspan="<?= count($spotkania_cols) ?>">Spotkania</th>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<?php if (!empty($inne_procesy_cols)): ?>
|
<?php if (!empty($inne_procesy_cols)): ?>
|
||||||
<th colspan="<?= count($inne_procesy_cols) ?>">Inne procesy</th>
|
<th colspan="<?= count($processes) ?>">Inne procesy</th>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="text-center">
|
<tr class="text-center">
|
||||||
@ -193,7 +192,7 @@ $status_colors = [
|
|||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
|
|
||||||
<?php // Inne Procesy Columns ?>
|
<?php // Inne Procesy Columns ?>
|
||||||
<?php foreach ($inne_procesy_cols as $process):
|
<?php foreach ($processes as $process):
|
||||||
$instance = $instances[$person['id']][$process['id']] ?? null;
|
$instance = $instances[$person['id']][$process['id']] ?? null;
|
||||||
$status = $instance ? $instance['computed_status'] : 'none';
|
$status = $instance ? $instance['computed_status'] : 'none';
|
||||||
$color = $status_colors[$status] ?? 'secondary';
|
$color = $status_colors[$status] ?? 'secondary';
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user