NiekRabelink/Fociz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Jira 26

Browse Source
This commit is contained in:
Niek Rabelink
2026-09-15 22:31:53 +02:00
parent 8498d82e10
commit 6bc351aaa4
4 changed files with 412 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin.php
+20 -3
View File
@@ -1349,7 +1349,20 @@ require_once __DIR__ . '/includes/header.php';
<?php foreach ($allJiraFilters as $filter): ?>
<?php
$fCodeNorm = strtoupper(trim($filter['filter_code'] ?? ''));
$assignedColleagues = $userNamesByFilter[$fCodeNorm] ?? ($userNamesByFilter[$filter['filter_code'] ?? ''] ?? []);
$fProjNorm = strtoupper(trim($filter['project_key'] ?? ''));
// Verzamel toegewezen collega's op basis van filter code én project key (case-insensitief)
$assignedColleagues = [];
if (!empty($userNamesByFilter[$fCodeNorm])) {
foreach ($userNamesByFilter[$fCodeNorm] as $cn) {
if (!in_array($cn, $assignedColleagues, true)) $assignedColleagues[] = $cn;
}
}
if ($fProjNorm !== '' && !empty($userNamesByFilter[$fProjNorm])) {
foreach ($userNamesByFilter[$fProjNorm] as $cn) {
if (!in_array($cn, $assignedColleagues, true)) $assignedColleagues[] = $cn;
}
}
$filterJsonSafe = htmlspecialchars(json_encode($filter), ENT_QUOTES, 'UTF-8');
?>
<div class="p-4 rounded-2xl bg-slate-50 dark:bg-[#0c0f17] border border-slate-200 dark:border-slate-800 hover:border-indigo-500/40 transition flex flex-col md:flex-row md:items-center justify-between gap-4">
@@ -1495,10 +1508,14 @@ require_once __DIR__ . '/includes/header.php';
</td>
<td class="py-3 px-4">
<div class="flex flex-wrap gap-1.5 items-center">
<?php foreach ($allJiraFilters as $f):
<?php
$userSelectedNorm = array_map(function($c) { return strtoupper(trim($c)); }, $userSelectedCodes);
foreach ($allJiraFilters as $f):
if (!$f['is_active']) continue;
$code = $f['filter_code'];
$isChecked = in_array($code, $userSelectedCodes, true);
$cNorm = strtoupper(trim($code));
$pNorm = strtoupper(trim($f['project_key'] ?? ''));
$isChecked = in_array($cNorm, $userSelectedNorm, true) || ($pNorm !== '' && in_array($pNorm, $userSelectedNorm, true));
?>
<label class="inline-flex items-center space-x-1.5 px-2.5 py-1 rounded-lg border text-xs font-semibold cursor-pointer transition select-none <?= $isChecked ? 'bg-indigo-50 border-indigo-300 text-indigo-700 dark:bg-indigo-950/60 dark:border-indigo-700 dark:text-indigo-300' : 'bg-slate-50 border-slate-200 text-slate-600 dark:bg-slate-900/40 dark:border-slate-800 dark:text-slate-400 hover:border-slate-300 dark:hover:border-slate-700' ?>">
<input type="checkbox" name="user_filters[<?= (int)$usr['id'] ?>][]" value="<?= htmlspecialchars($code) ?>" <?= $isChecked ? 'checked' : '' ?> class="w-3.5 h-3.5 rounded text-indigo-600 border-slate-300 dark:border-slate-700 focus:ring-indigo-500 cursor-pointer">