Verschiebung mit aufgenommen
This commit is contained in:
Borgal
153
stats.php
153
stats.php
@@ -38,7 +38,7 @@ while ($row = mysqli_fetch_assoc($result)) {
|
||||
$participation_stats[] = $row;
|
||||
}
|
||||
|
||||
// Neue Statistik: Durchschnittliche Anwesenheit pro Meeting
|
||||
// Durchschnittliche Anwesenheit pro Meeting
|
||||
$avg_attendance = 0;
|
||||
$sql_avg_attendance = "
|
||||
SELECT AVG(attended_count) AS avg_attended
|
||||
@@ -54,7 +54,7 @@ if ($row = mysqli_fetch_assoc($result_avg)) {
|
||||
$avg_attendance = round($row['avg_attended'], 2);
|
||||
}
|
||||
|
||||
// Neue Statistik: Durchschnittliche Anzahl derer, die die korrekte Farbe getragen haben
|
||||
// Durchschnittliche korrekte Farbe
|
||||
$avg_wore_color = 0;
|
||||
$sql_avg_wore_color = "
|
||||
SELECT AVG(wore_color_count) AS avg_wore_color
|
||||
@@ -70,7 +70,7 @@ if ($row = mysqli_fetch_assoc($result_avg_wore)) {
|
||||
$avg_wore_color = round($row['avg_wore_color'], 2);
|
||||
}
|
||||
|
||||
// Neue Statistik: Ranking nach dem Tragen der Farbe
|
||||
// Ranking: Farbe getragen
|
||||
$wore_color_stats = [];
|
||||
$sql_wore_color = "
|
||||
SELECT
|
||||
@@ -88,7 +88,22 @@ while ($row = mysqli_fetch_assoc($result_wore)) {
|
||||
$wore_color_stats[] = $row;
|
||||
}
|
||||
|
||||
// Header einbinden
|
||||
// 🔹 NEU: Ranking der Verschiebungsvorschläge
|
||||
$reschedule_stats = [];
|
||||
$sql_reschedule = "
|
||||
SELECT
|
||||
u.username,
|
||||
COUNT(p.id) AS reschedule_count
|
||||
FROM meeting_reschedule_proposals p
|
||||
JOIN users u ON p.proposed_by_user_id = u.id
|
||||
GROUP BY u.username
|
||||
ORDER BY reschedule_count DESC
|
||||
";
|
||||
$result_reschedule = mysqli_query($conn, $sql_reschedule);
|
||||
while ($row = mysqli_fetch_assoc($result_reschedule)) {
|
||||
$reschedule_stats[] = $row;
|
||||
}
|
||||
|
||||
require_once 'inc/header.php';
|
||||
?>
|
||||
|
||||
@@ -105,21 +120,18 @@ require_once 'inc/header.php';
|
||||
<h5 class="card-title text-center">Häufigkeit der gewählten Farben</h5>
|
||||
<canvas id="colorChart" class="mb-4"></canvas>
|
||||
</div>
|
||||
<!-- Trennlinie, die nur auf Mobilgeräten sichtbar ist -->
|
||||
<hr class="d-lg-none my-4">
|
||||
<div class="col-lg-6">
|
||||
<h5 class="card-title text-center">Teilnahme-Ranking</h5>
|
||||
<p class="text-center text-muted mt-2 mb-3">
|
||||
Durchschnittliche Anwesenheit je Treffen: <strong><?= htmlspecialchars($avg_attendance) ?></strong>
|
||||
</p>
|
||||
<!-- Neuer Container mit fester Höhe, um das unendliche Wachstum zu stoppen -->
|
||||
<div style="height: 40vh;">
|
||||
<canvas id="participationChart"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Trennlinie für die neue Statistik -->
|
||||
<hr class="my-4">
|
||||
|
||||
<div class="row justify-content-center">
|
||||
@@ -128,13 +140,27 @@ require_once 'inc/header.php';
|
||||
<p class="text-center text-muted mt-2 mb-3">
|
||||
Durchschnittliche korrekte Farbe je Treffen: <strong><?= htmlspecialchars($avg_wore_color) ?></strong>
|
||||
</p>
|
||||
<!-- Container für das neue Diagramm -->
|
||||
<div style="height: 40vh;">
|
||||
<canvas id="woreColorChart"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 🔹 NEUER BLOCK: Verschiebungsvorschläge -->
|
||||
<hr class="my-4">
|
||||
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-lg-6">
|
||||
<h5 class="card-title text-center">Ranking - Verschiebungsvorschläge</h5>
|
||||
<p class="text-center text-muted mt-2 mb-3">
|
||||
Wer schlägt am häufigsten eine Terminverschiebung vor?
|
||||
</p>
|
||||
<div style="height: 40vh;">
|
||||
<canvas id="rescheduleChart"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -143,7 +169,7 @@ require_once 'inc/header.php';
|
||||
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
// Daten für Farbhäufigkeits-Diagramm
|
||||
// Farbhäufigkeit
|
||||
const colorData = {
|
||||
labels: <?= json_encode(array_column($color_stats, 'name')); ?>,
|
||||
datasets: [{
|
||||
@@ -154,15 +180,14 @@ require_once 'inc/header.php';
|
||||
borderWidth: 1
|
||||
}]
|
||||
};
|
||||
|
||||
const colorConfig = {
|
||||
new Chart(document.getElementById('colorChart'), {
|
||||
type: 'pie',
|
||||
data: colorData,
|
||||
options: {
|
||||
responsive: true,
|
||||
plugins: {
|
||||
legend: {
|
||||
position: 'top',
|
||||
position: 'top'
|
||||
},
|
||||
title: {
|
||||
display: true,
|
||||
@@ -170,14 +195,9 @@ require_once 'inc/header.php';
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
new Chart(
|
||||
document.getElementById('colorChart'),
|
||||
colorConfig
|
||||
);
|
||||
|
||||
// Daten für Teilnahme-Diagramm
|
||||
// Teilnahme
|
||||
const participationData = {
|
||||
labels: <?= json_encode(array_column($participation_stats, 'username')); ?>,
|
||||
datasets: [{
|
||||
@@ -188,14 +208,13 @@ require_once 'inc/header.php';
|
||||
borderWidth: 1
|
||||
}]
|
||||
};
|
||||
|
||||
const participationConfig = {
|
||||
new Chart(document.getElementById('participationChart'), {
|
||||
type: 'bar',
|
||||
data: participationData,
|
||||
options: {
|
||||
indexAxis: 'y',
|
||||
responsive: true,
|
||||
maintainAspectRatio: false, // Wichtig für die Größenanpassung
|
||||
maintainAspectRatio: false,
|
||||
plugins: {
|
||||
legend: {
|
||||
display: false
|
||||
@@ -212,29 +231,19 @@ require_once 'inc/header.php';
|
||||
y: {
|
||||
ticks: {
|
||||
font: {
|
||||
size: 10 // Kleinere Schriftgröße für bessere Lesbarkeit auf mobilen Geräten
|
||||
size: 10
|
||||
},
|
||||
// Callback, um lange Namen zu kürzen und Überlappungen zu vermeiden
|
||||
callback: function(value, index, ticks) {
|
||||
callback: function(value) {
|
||||
const username = this.getLabelForValue(value);
|
||||
const maxChars = 15; // Maximale Zeichen auf Mobilgeräten
|
||||
if (username.length > maxChars) {
|
||||
return username.substring(0, maxChars) + '...';
|
||||
}
|
||||
return username;
|
||||
return username.length > 15 ? username.substring(0, 15) + '...' : username;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
new Chart(
|
||||
document.getElementById('participationChart'),
|
||||
participationConfig
|
||||
);
|
||||
|
||||
// Daten für "Farbe getragen"-Diagramm
|
||||
// Farbe getragen
|
||||
const woreColorData = {
|
||||
labels: <?= json_encode(array_column($wore_color_stats, 'username')); ?>,
|
||||
datasets: [{
|
||||
@@ -245,8 +254,7 @@ require_once 'inc/header.php';
|
||||
borderWidth: 1
|
||||
}]
|
||||
};
|
||||
|
||||
const woreColorConfig = {
|
||||
new Chart(document.getElementById('woreColorChart'), {
|
||||
type: 'bar',
|
||||
data: woreColorData,
|
||||
options: {
|
||||
@@ -264,31 +272,74 @@ require_once 'inc/header.php';
|
||||
},
|
||||
scales: {
|
||||
x: {
|
||||
beginAtZero: true
|
||||
beginAtZero: true,
|
||||
ticks: {
|
||||
stepSize: 1
|
||||
}
|
||||
},
|
||||
y: {
|
||||
ticks: {
|
||||
font: {
|
||||
size: 10
|
||||
},
|
||||
callback: function(value, index, ticks) {
|
||||
callback: function(value) {
|
||||
const username = this.getLabelForValue(value);
|
||||
const maxChars = 15;
|
||||
if (username.length > maxChars) {
|
||||
return username.substring(0, maxChars) + '...';
|
||||
}
|
||||
return username;
|
||||
return username.length > 15 ? username.substring(0, 15) + '...' : username;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
new Chart(
|
||||
document.getElementById('woreColorChart'),
|
||||
woreColorConfig
|
||||
);
|
||||
// 🔹 NEU: Verschiebungsvorschläge
|
||||
const rescheduleData = {
|
||||
labels: <?= json_encode(array_column($reschedule_stats, 'username')); ?>,
|
||||
datasets: [{
|
||||
label: 'Verschiebungsvorschläge',
|
||||
data: <?= json_encode(array_column($reschedule_stats, 'reschedule_count')); ?>,
|
||||
backgroundColor: 'rgba(255, 159, 64, 0.8)',
|
||||
borderColor: 'rgb(255, 159, 64)',
|
||||
borderWidth: 1
|
||||
}]
|
||||
};
|
||||
new Chart(document.getElementById('rescheduleChart'), {
|
||||
type: 'bar',
|
||||
data: rescheduleData,
|
||||
options: {
|
||||
indexAxis: 'y',
|
||||
responsive: true,
|
||||
maintainAspectRatio: false,
|
||||
plugins: {
|
||||
legend: {
|
||||
display: false
|
||||
},
|
||||
title: {
|
||||
display: true,
|
||||
text: 'Anzahl der Verschiebungsvorschläge pro Benutzer'
|
||||
}
|
||||
},
|
||||
scales: {
|
||||
x: {
|
||||
beginAtZero: true,
|
||||
ticks: {
|
||||
stepSize: 1
|
||||
}
|
||||
},
|
||||
y: {
|
||||
ticks: {
|
||||
font: {
|
||||
size: 10
|
||||
},
|
||||
callback: function(value) {
|
||||
const username = this.getLabelForValue(value);
|
||||
return username.length > 15 ? username.substring(0, 15) + '...' : username;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user