Borgal/domili
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.3.2 - Historische Daten angepasst

Browse Source
This commit is contained in:
Borgal
2026-02-02 12:11:12 +01:00
parent 63ed57d009
commit 1a85212265
1 changed files with 124 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
kasse.php
View File

@@ -25,18 +25,20 @@ if ($is_admin && $_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']
mysqli_stmt_close($check); mysqli_stmt_close($check);
if (!$exists) { if (!$exists) {
// 1. Abschluss in penalty_closings protokollieren
$insert = mysqli_prepare($conn, "INSERT INTO penalty_closings (closing_date, closed_by) VALUES (?, ?)"); $insert = mysqli_prepare($conn, "INSERT INTO penalty_closings (closing_date, closed_by) VALUES (?, ?)");
mysqli_stmt_bind_param($insert, "si", $today, $user_id); mysqli_stmt_bind_param($insert, "si", $today, $user_id);
mysqli_stmt_execute($insert); mysqli_stmt_execute($insert);
mysqli_stmt_close($insert); mysqli_stmt_close($insert);
// 2. E-Mail-Daten: Strafen seit letztem Abschluss (für Benachrichtigung)
$penalty_summary = []; $penalty_summary = [];
$stmt_email = mysqli_prepare($conn, " $stmt_email = mysqli_prepare($conn, "
SELECT u.username, COUNT(*) AS penalty_count SELECT u.username, COUNT(*) AS penalty_count
FROM meeting_teilnehmer mt FROM meeting_teilnehmer mt
JOIN meetings m ON mt.meeting_id = m.id JOIN meetings m ON mt.meeting_id = m.id
JOIN users u ON mt.user_id = u.id JOIN users u ON mt.user_id = u.id
WHERE m.meeting_date >= ? AND m.meeting_date <= ? WHERE m.meeting_date > ? AND m.meeting_date <= ?
AND mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1 AND mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1
GROUP BY u.username GROUP BY u.username
"); ");
@@ -48,6 +50,24 @@ if ($is_admin && $_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']
} }
mysqli_stmt_close($stmt_email); mysqli_stmt_close($stmt_email);
// 3. NEU: Kumulierte Strafen JEDES Benutzers bis heute in penalty_history speichern
$stmt_save = mysqli_prepare($conn, "
INSERT INTO penalty_history (closing_date, user_id, username_at_close, penalty_count)
SELECT ?, u.id, u.username, COUNT(mt.id)
FROM users u
LEFT JOIN meeting_teilnehmer mt ON u.id = mt.user_id
LEFT JOIN meetings m ON mt.meeting_id = m.id
AND m.meeting_date <= ?
AND mt.attended = 1
AND mt.wore_color = 0
AND m.is_completed = 1
GROUP BY u.id, u.username
");
mysqli_stmt_bind_param($stmt_save, "ss", $today, $today);
mysqli_stmt_execute($stmt_save);
mysqli_stmt_close($stmt_save);
// 4. E-Mail-Versand (unverändert)
$all_users = []; $all_users = [];
$stmt_users = mysqli_prepare($conn, "SELECT id, username, email FROM users WHERE email IS NOT NULL AND email != ''"); $stmt_users = mysqli_prepare($conn, "SELECT id, username, email FROM users WHERE email IS NOT NULL AND email != ''");
mysqli_stmt_execute($stmt_users); mysqli_stmt_execute($stmt_users);
@@ -146,6 +166,8 @@ if ($is_admin && $_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']
} }
// --- DATEN FÜR ANZEIGE --- // --- DATEN FÜR ANZEIGE ---
// Letztes Abschlussdatum ermitteln
$last_closing_date = '2020-01-01'; $last_closing_date = '2020-01-01';
$result_last = mysqli_query($conn, "SELECT MAX(closing_date) AS last_date FROM penalty_closings"); $result_last = mysqli_query($conn, "SELECT MAX(closing_date) AS last_date FROM penalty_closings");
if ($result_last) { if ($result_last) {
@@ -155,107 +177,139 @@ if ($result_last) {
} }
} }
$cumulative_penalties = [];
$stmt_cum = mysqli_prepare($conn, "
SELECT u.username, COUNT(*) AS total_penalty_count
FROM meeting_teilnehmer mt
JOIN meetings m ON mt.meeting_id = m.id
JOIN users u ON mt.user_id = u.id
WHERE mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1
GROUP BY u.username
");
mysqli_stmt_execute($stmt_cum);
$result_cum = mysqli_stmt_get_result($stmt_cum);
while ($row = mysqli_fetch_assoc($result_cum)) {
$cumulative_penalties[$row['username']] = (int)$row['total_penalty_count'];
}
mysqli_stmt_close($stmt_cum);
$open_penalties = [];
$total_open = 0;
$penalty_amount = 1; $penalty_amount = 1;
// 🔹 Alle Mitglieder initialisieren
$penalties_data = [];
$stmt_members = mysqli_prepare($conn, "SELECT username FROM users ORDER BY username");
mysqli_stmt_execute($stmt_members);
$result_members = mysqli_stmt_get_result($stmt_members);
while ($row = mysqli_fetch_assoc($result_members)) {
$penalties_data[$row['username']] = [
'username' => $row['username'],
'total_penalty_count' => 0,
'open_penalty_count' => 0
];
}
mysqli_stmt_close($stmt_members);
// 🔹 "Strafen gesamt" = KUMULIERT seit Beginn (nur echte Strafen)
$stmt_total = mysqli_prepare($conn, "
SELECT u.username, COUNT(penalty.meeting_id) AS total_penalty_count
FROM users u
LEFT JOIN (
SELECT mt.user_id, mt.meeting_id
FROM meeting_teilnehmer mt
INNER JOIN meetings m ON mt.meeting_id = m.id
WHERE mt.attended = 1
AND mt.wore_color = 0
AND m.is_completed = 1
) AS penalty ON u.id = penalty.user_id
GROUP BY u.id, u.username
");
mysqli_stmt_execute($stmt_total);
$result_total = mysqli_stmt_get_result($stmt_total);
while ($row = mysqli_fetch_assoc($result_total)) {
if (isset($penalties_data[$row['username']])) {
$penalties_data[$row['username']]['total_penalty_count'] = (int)$row['total_penalty_count'];
}
}
mysqli_stmt_close($stmt_total);
// 🔹 "offener Betrag" = Strafen SEIT letztem Abschluss (>)
$stmt_open = mysqli_prepare($conn, " $stmt_open = mysqli_prepare($conn, "
SELECT u.username, COUNT(*) AS open_penalty_count SELECT u.username, COUNT(*) AS open_penalty_count
FROM meeting_teilnehmer mt FROM meeting_teilnehmer mt
JOIN meetings m ON mt.meeting_id = m.id JOIN meetings m ON mt.meeting_id = m.id
JOIN users u ON mt.user_id = u.id JOIN users u ON mt.user_id = u.id
WHERE m.meeting_date >= ? AND mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1 WHERE m.meeting_date > ? AND mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1
GROUP BY u.username GROUP BY u.username
"); ");
mysqli_stmt_bind_param($stmt_open, "s", $last_closing_date); mysqli_stmt_bind_param($stmt_open, "s", $last_closing_date);
mysqli_stmt_execute($stmt_open); mysqli_stmt_execute($stmt_open);
$result_open = mysqli_stmt_get_result($stmt_open); $result_open = mysqli_stmt_get_result($stmt_open);
while ($row = mysqli_fetch_assoc($result_open)) { while ($row = mysqli_fetch_assoc($result_open)) {
$open_penalties[$row['username']] = (int)$row['open_penalty_count']; if (isset($penalties_data[$row['username']])) {
$total_open += $row['open_penalty_count']; $penalties_data[$row['username']]['open_penalty_count'] = (int)$row['open_penalty_count'];
}
} }
mysqli_stmt_close($stmt_open); mysqli_stmt_close($stmt_open);
$penalties_data = []; // 🔹 Sortieren
$all_usernames = array_unique(array_merge(array_keys($cumulative_penalties), array_keys($open_penalties))); $penalties_data = array_values($penalties_data);
foreach ($all_usernames as $username) { usort($penalties_data, function ($a, $b) {
$total = $cumulative_penalties[$username] ?? 0; if ($b['open_penalty_count'] !== $a['open_penalty_count']) {
$open = $open_penalties[$username] ?? 0; return $b['open_penalty_count'] <=> $a['open_penalty_count'];
$penalties_data[] = [
'username' => $username,
'total_penalty_count' => $total,
'open_penalty_count' => $open
];
} }
usort($penalties_data, fn($a, $b) => $b['open_penalty_count'] <=> $a['open_penalty_count']); return strcmp($a['username'], $b['username']);
});
$total_penalties = array_sum(array_column($penalties_data, 'total_penalty_count')); $total_open = array_sum(array_column($penalties_data, 'open_penalty_count'));
$total_due = $total_open * $penalty_amount; $total_due = $total_open * $penalty_amount;
$historical_table = []; // 🔹 Historische Strafen: pro Abschluss-Zeitraum
$closing_years = []; $historical_periods = [];
$closing_dates = [];
$result_closings = mysqli_query($conn, "SELECT closing_date FROM penalty_closings ORDER BY closing_date"); $result_closings = mysqli_query($conn, "SELECT closing_date FROM penalty_closings ORDER BY closing_date");
while ($row = mysqli_fetch_assoc($result_closings)) { while ($row = mysqli_fetch_assoc($result_closings)) {
$closing_date = new DateTime($row['closing_date']); $closing_dates[] = $row['closing_date'];
$year = (int)$closing_date->format('Y');
$month = (int)$closing_date->format('n');
$closed_year = ($month >= 7) ? $year : ($year - 1);
$closing_years[] = $closed_year;
} }
$closing_years = array_unique($closing_years);
sort($closing_years);
if (!empty($closing_years)) { if (count($closing_dates) >= 2) {
foreach ($closing_years as $year) { for ($i = 1; $i < count($closing_dates); $i++) {
$year_start = "$year-01-01"; $start_date = $closing_dates[$i - 1];
$year_end = "$year-12-31"; $end_date = $closing_dates[$i];
$period_label = date('d.m.Y', strtotime($start_date)) . ' – ' . date('d.m.Y', strtotime($end_date));
$stmt_hist = mysqli_prepare($conn, " $stmt_hist = mysqli_prepare($conn, "
SELECT u.username, COUNT(*) AS penalty_count SELECT u.username, COUNT(*) AS penalty_count
FROM meeting_teilnehmer mt FROM meeting_teilnehmer mt
JOIN meetings m ON mt.meeting_id = m.id JOIN meetings m ON mt.meeting_id = m.id
JOIN users u ON mt.user_id = u.id JOIN users u ON mt.user_id = u.id
WHERE m.meeting_date BETWEEN ? AND ? WHERE m.meeting_date > ? AND m.meeting_date <= ?
AND mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1 AND mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1
GROUP BY u.username GROUP BY u.username
"); ");
mysqli_stmt_bind_param($stmt_hist, "ss", $year_start, $year_end); mysqli_stmt_bind_param($stmt_hist, "ss", $start_date, $end_date);
mysqli_stmt_execute($stmt_hist); mysqli_stmt_execute($stmt_hist);
$result_hist = mysqli_stmt_get_result($stmt_hist); $result_hist = mysqli_stmt_get_result($stmt_hist);
while ($row = mysqli_fetch_assoc($result_hist)) { while ($row = mysqli_fetch_assoc($result_hist)) {
$username = $row['username']; $historical_periods[] = [
$count = (int)$row['penalty_count']; 'username' => $row['username'],
'period' => $period_label,
if (!isset($historical_table[$username])) { 'count' => (int)$row['penalty_count']
$historical_table[$username] = ['years' => [], 'total' => 0]; ];
} }
$historical_table[$username]['years'][] = $year; mysqli_stmt_close($stmt_hist);
$historical_table[$username]['total'] += $count; }
} elseif (count($closing_dates) === 1) {
$end_date = $closing_dates[0];
$period_label = '17.07.2025 – ' . date('d.m.Y', strtotime($end_date));
$stmt_hist = mysqli_prepare($conn, "
SELECT u.username, COUNT(*) AS penalty_count
FROM meeting_teilnehmer mt
JOIN meetings m ON mt.meeting_id = m.id
JOIN users u ON mt.user_id = u.id
WHERE m.meeting_date <= ?
AND mt.attended = 1 AND mt.wore_color = 0 AND m.is_completed = 1
GROUP BY u.username
");
mysqli_stmt_bind_param($stmt_hist, "s", $end_date);
mysqli_stmt_execute($stmt_hist);
$result_hist = mysqli_stmt_get_result($stmt_hist);
while ($row = mysqli_fetch_assoc($result_hist)) {
$historical_periods[] = [
'username' => $row['username'],
'period' => $period_label,
'count' => (int)$row['penalty_count']
];
} }
mysqli_stmt_close($stmt_hist); mysqli_stmt_close($stmt_hist);
} }
foreach ($historical_table as $username => $data) { // --- Rechnungs-Statistik (unverändert) ---
$historical_table[$username]['year_label'] = implode('/', $data['years']);
}
}
$paid_stats = []; $paid_stats = [];
$sql_paid = " $sql_paid = "
SELECT u.username, COUNT(mt.user_id) AS paid_count SELECT u.username, COUNT(mt.user_id) AS paid_count
@@ -308,12 +362,11 @@ require_once 'inc/header.php';
</div> </div>
<div class="card-body"> <div class="card-body">
<p class="fs-5 fw-bold text-center"> <p class="fs-5 fw-bold text-center">
Strafen gesamt: <span class="badge bg-danger"><?= $total_penalties ?></span><br> Strafkasse: <span class="text-danger fw-bold"><?= number_format($total_due, 2, ',', '.') ?> €</span>
offener Betrag: <span class="text-danger fw-bold"><?= number_format($total_due, 2, ',', '.') ?> €</span>
</p> </p>
<?php if (empty($penalties_data)): ?> <?php if (empty($penalties_data)): ?>
<div class="alert alert-info text-center">Keine Strafen erfasst.</div> <div class="alert alert-info text-center">Keine Mitglieder gefunden.</div>
<?php else: ?> <?php else: ?>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-hover"> <table class="table table-striped table-hover">
@@ -349,17 +402,17 @@ require_once 'inc/header.php';
<thead> <thead>
<tr> <tr>
<th>Benutzer</th> <th>Benutzer</th>
<th>Jahr(e)</th> <th>Zeitraum</th>
<th>Strafen</th> <th>Strafen</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php if (!empty($historical_table)): ?> <?php if (!empty($historical_periods)): ?>
<?php foreach ($historical_table as $username => $data): ?> <?php foreach ($historical_periods as $item): ?>
<tr> <tr>
<td><?= htmlspecialchars($username) ?></td> <td><?= htmlspecialchars($item['username']) ?></td>
<td><?= htmlspecialchars($data['year_label']) ?></td> <td><?= htmlspecialchars($item['period']) ?></td>
<td><?= htmlspecialchars($data['total']) ?></td> <td><?= htmlspecialchars($item['count']) ?></td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
<?php else: ?> <?php else: ?>
@@ -390,8 +443,8 @@ require_once 'inc/header.php';
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script> <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
<script> <script>
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
const rawLabels = <?php echo json_encode(array_column($paid_stats, 'username') ?: []); ?>; const rawLabels = <?= json_encode(array_column($paid_stats, 'username') ?: []) ?>;
const rawData = <?php echo json_encode(array_map('intval', array_column($paid_stats, 'paid_count') ?: [])); ?>; const rawData = <?= json_encode(array_map('intval', array_column($paid_stats, 'paid_count') ?: [])) ?>;
const ctx = document.getElementById('paidChart').getContext('2d'); const ctx = document.getElementById('paidChart').getContext('2d');