no/flask-webservice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
no
2024-11-29 14:25:23 +01:00
parent f47f09409c
commit b3f0c0b0bd
2 changed files with 71 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/api/fuenf_minuten.py
-9
View File
@@ -5,21 +5,17 @@ fuenf_minuten_bp = Blueprint('fuenf_minuten', __name__, url_prefix='/fuenf_minut
@fuenf_minuten_bp.route('/', strict_slashes=False) @fuenf_minuten_bp.route('/', strict_slashes=False)
def fuenf_minuten(): def fuenf_minuten():
# Abrufen der Filterparameter aus der Anfrage
start_date = request.args.get('start_date') start_date = request.args.get('start_date')
end_date = request.args.get('end_date') end_date = request.args.get('end_date')
start_time = request.args.get('start_time', '00:00') start_time = request.args.get('start_time', '00:00')
end_time = request.args.get('end_time', '23:59') end_time = request.args.get('end_time', '23:59')
# Validierung der Eingabewerte
if not start_date or not end_date: if not start_date or not end_date:
return jsonify({'error': 'Bitte sowohl Start- als auch End-Datum auswählen.'}) return jsonify({'error': 'Bitte sowohl Start- als auch End-Datum auswählen.'})
# Aufbau der Verbindung zur Datenbank
conn = get_db_connection() conn = get_db_connection()
cursor = conn.cursor() cursor = conn.cursor()
# SQL-Abfrage zur Generierung der 5-Minuten-Intervalle und Zählung der Übertragungen
query = """ query = """
WITH RECURSIVE seq AS ( WITH RECURSIVE seq AS (
SELECT 0 AS n SELECT 0 AS n
@@ -43,12 +39,10 @@ def fuenf_minuten():
ORDER BY all_times.time_slot; ORDER BY all_times.time_slot;
""" """
# Setzen der Parameter für die SQL-Abfrage
start_datetime = f"{start_date} {start_time}" start_datetime = f"{start_date} {start_time}"
end_datetime = f"{end_date} {end_time}" end_datetime = f"{end_date} {end_time}"
try: try:
# Ausführen der SQL-Abfrage
cursor.execute(query, ( cursor.execute(query, (
start_datetime, start_datetime,
end_datetime, end_datetime,
@@ -59,11 +53,8 @@ def fuenf_minuten():
)) ))
results = cursor.fetchall() results = cursor.fetchall()
conn.close() conn.close()
# Formatierung der Ergebnisse für die API-Antwort
return jsonify([{'time_slot': row[0], 'transmission_count': row[1]} for row in results]) return jsonify([{'time_slot': row[0], 'transmission_count': row[1]} for row in results])
except Exception as e: except Exception as e:
# Fehlerbehandlung
conn.close() conn.close()
return jsonify({'error': str(e)}) return jsonify({'error': str(e)})
app/static/js/fuenf_minuten.js
+29 -59
View File
@@ -1,38 +1,20 @@
// Globale Variable für den Chart document.addEventListener('DOMContentLoaded', function() {
let fuenfMinutenChart;
// Funktion zum Abrufen und Aktualisieren des Charts
function fetchAndUpdateChart(filter = null) {
const startDateInput = document.getElementById('startDate'); const startDateInput = document.getElementById('startDate');
const endDateInput = document.getElementById('endDate'); const endDateInput = document.getElementById('endDate');
const startTimeInput = document.getElementById('startTime'); const startTimeInput = document.getElementById('startTime');
const endTimeInput = document.getElementById('endTime'); const endTimeInput = document.getElementById('endTime');
// Abrufen von Start- und Enddaten mit Standardwerten function fetchAndUpdateChart() {
let startDate = startDateInput.value || getDefaultDate(-1); // Standardwert: Gestern const startDate = startDateInput.value;
let endDate = endDateInput.value || getDefaultDate(0); // Standardwert: Heute const endDate = endDateInput.value;
let startTime = startTimeInput.value || '00:00'; const startTime = startTimeInput.value || '00:00';
let endTime = endTimeInput.value || '23:59'; const endTime = endTimeInput.value || '23:59';
// Überschreiben mit Zeitraumfilter, falls angegeben if (!startDate || !endDate) {
if (filter) { alert('Bitte sowohl Start- als auch End-Datum auswählen!');
const now = new Date(); return;
if (filter === '24h') {
startDate = getDefaultDate(-1);
endDate = getDefaultDate(0);
} else if (filter === '7d') {
startDate = getDefaultDate(-7);
endDate = getDefaultDate(0);
} else if (filter === '1m') {
startDate = getDefaultDate(-30);
endDate = getDefaultDate(0);
} else if (filter === '1y') {
startDate = getDefaultDate(-365);
endDate = getDefaultDate(0);
}
} }
// API-Aufruf
fetch(`/fuenf_minuten?start_date=${startDate}&end_date=${endDate}&start_time=${startTime}&end_time=${endTime}`) fetch(`/fuenf_minuten?start_date=${startDate}&end_date=${endDate}&start_time=${startTime}&end_time=${endTime}`)
.then(response => { .then(response => {
if (!response.ok) { if (!response.ok) {
@@ -45,31 +27,24 @@ function fetchAndUpdateChart(filter = null) {
throw new Error('Ungültige Daten vom Server.'); throw new Error('Ungültige Daten vom Server.');
} }
// Labels und Werte für den Chart
const labels = data.map(item => item.time_slot); const labels = data.map(item => item.time_slot);
const values = data.map(item => item.transmission_count); const values = data.map(item => item.transmission_count);
// Farben für Balken
const backgroundColors = values.map(value => value === 0 ? 'rgba(255, 99, 132, 0.5)' : 'rgba(54, 162, 235, 0.5)');
const borderColors = values.map(value => value === 0 ? 'rgba(255, 99, 132, 1)' : 'rgba(54, 162, 235, 1)');
const ctx = document.getElementById('fuenfMinutenChart').getContext('2d'); const ctx = document.getElementById('fuenfMinutenChart').getContext('2d');
// Alten Chart zerstören, falls vorhanden if (window.fuenfMinutenChart) {
if (fuenfMinutenChart) { window.fuenfMinutenChart.destroy();
fuenfMinutenChart.destroy();
} }
// Neuer Chart window.fuenfMinutenChart = new Chart(ctx, {
fuenfMinutenChart = new Chart(ctx, {
type: 'bar', type: 'bar',
data: { data: {
labels: labels, labels: labels,
datasets: [{ datasets: [{
label: 'Übertragungen', label: 'Übertragungen',
data: values, data: values,
backgroundColor: backgroundColors, backgroundColor: 'rgba(54, 162, 235, 0.5)',
borderColor: borderColors, borderColor: 'rgba(54, 162, 235, 1)',
borderWidth: 1 borderWidth: 1
}] }]
}, },
@@ -98,25 +73,20 @@ function fetchAndUpdateChart(filter = null) {
}); });
} }
// Funktion zur Berechnung von Standarddaten // Set default dates to pre-fill inputs
function getDefaultDate(offsetDays) { const now = new Date();
const date = new Date(); const yesterday = new Date();
date.setDate(date.getDate() + offsetDays); yesterday.setDate(now.getDate() - 1);
return date.toISOString().split('T')[0];
}
// Event Listener für Zeitfilter startDateInput.value = yesterday.toISOString().split('T')[0];
document.addEventListener('DOMContentLoaded', () => { endDateInput.value = now.toISOString().split('T')[0];
document.getElementById('timeFilter').addEventListener('change', (event) => {
fetchAndUpdateChart(event.target.value); // Event Listener for changes in date and time inputs
}); startDateInput.addEventListener('change', fetchAndUpdateChart);
endDateInput.addEventListener('change', fetchAndUpdateChart);
// Listener für Datumsauswahl startTimeInput.addEventListener('change', fetchAndUpdateChart);
document.getElementById('startDate').addEventListener('change', () => fetchAndUpdateChart()); endTimeInput.addEventListener('change', fetchAndUpdateChart);
document.getElementById('endDate').addEventListener('change', () => fetchAndUpdateChart());
document.getElementById('startTime').addEventListener('change', () => fetchAndUpdateChart()); // Initial chart load
document.getElementById('endTime').addEventListener('change', () => fetchAndUpdateChart()); fetchAndUpdateChart();
// Initiales Laden mit Standardwerten
fetchAndUpdateChart('24h');
}); });