added that sonderraume also update
This commit is contained in:
Kendrick Bollens
187
dashboard.py
187
dashboard.py
@@ -3,6 +3,7 @@ from flask import Flask, render_template_string, jsonify
|
||||
from datetime import datetime, date
|
||||
|
||||
app = Flask(__name__)
|
||||
# Updated path for Docker volume
|
||||
DB_FILE = "/app/data/cleaning_logs.db"
|
||||
|
||||
# Room definitions
|
||||
@@ -25,7 +26,6 @@ BUILDINGS = {
|
||||
}
|
||||
|
||||
def get_all_defined_rooms():
|
||||
"""Get a set of all room numbers defined in buildings"""
|
||||
rooms = set()
|
||||
for floors in BUILDINGS.values():
|
||||
for floor in floors:
|
||||
@@ -33,9 +33,8 @@ def get_all_defined_rooms():
|
||||
return rooms
|
||||
|
||||
def get_room_statuses():
|
||||
"""Returns dict: {room_number: (last_cleaned_time, is_today)}"""
|
||||
today = date.today().strftime("%Y-%m-%d")
|
||||
|
||||
try:
|
||||
with sqlite3.connect(DB_FILE) as conn:
|
||||
cursor = conn.execute("""
|
||||
SELECT room_number, MAX(cleaned_at) as last_cleaned
|
||||
@@ -43,6 +42,8 @@ def get_room_statuses():
|
||||
GROUP BY room_number
|
||||
""")
|
||||
rows = cursor.fetchall()
|
||||
except sqlite3.OperationalError:
|
||||
return {}
|
||||
|
||||
statuses = {}
|
||||
for room, last_cleaned in rows:
|
||||
@@ -51,18 +52,11 @@ def get_room_statuses():
|
||||
"is_today": is_today,
|
||||
"last_cleaned": last_cleaned
|
||||
}
|
||||
|
||||
return statuses
|
||||
|
||||
def get_special_rooms(statuses):
|
||||
"""Get rooms that aren't in any defined building"""
|
||||
defined_rooms = get_all_defined_rooms()
|
||||
special_rooms = []
|
||||
|
||||
for room_number in statuses.keys():
|
||||
if room_number not in defined_rooms:
|
||||
special_rooms.append(room_number)
|
||||
|
||||
special_rooms = [r for r in statuses.keys() if r not in defined_rooms]
|
||||
return sorted(special_rooms)
|
||||
|
||||
@app.route('/')
|
||||
@@ -78,7 +72,6 @@ def dashboard():
|
||||
|
||||
@app.route('/api/status')
|
||||
def api_status():
|
||||
"""API endpoint for live updates"""
|
||||
statuses = get_room_statuses()
|
||||
special_rooms = get_special_rooms(statuses)
|
||||
return jsonify({
|
||||
@@ -95,46 +88,46 @@ TEMPLATE = '''
|
||||
body { font-family: Arial, sans-serif; margin: 20px; background: #f5f5f5; }
|
||||
h1 { color: #333; }
|
||||
.controls { margin-bottom: 20px; }
|
||||
.toggle { padding: 10px 20px; font-size: 16px; cursor: pointer; }
|
||||
.building { margin-bottom: 30px; background: white; padding: 15px; border-radius: 8px; }
|
||||
.building h2 { margin-top: 0; color: #555; }
|
||||
.toggle { padding: 10px 20px; font-size: 16px; cursor: pointer; border-radius: 5px; border: 1px solid #ccc; }
|
||||
.building { margin-bottom: 30px; background: white; padding: 15px; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); }
|
||||
.building h2 { margin-top: 0; color: #555; border-bottom: 2px solid #eee; padding-bottom: 5px; }
|
||||
.floor { margin-bottom: 15px; }
|
||||
.floor-label { font-weight: bold; margin-bottom: 5px; color: #777; }
|
||||
.floor-label { font-weight: bold; margin-bottom: 8px; color: #777; }
|
||||
.rooms { display: flex; flex-wrap: wrap; gap: 8px; }
|
||||
.room {
|
||||
padding: 10px 15px;
|
||||
border-radius: 5px;
|
||||
min-width: 80px;
|
||||
min-width: 90px;
|
||||
text-align: center;
|
||||
font-weight: bold;
|
||||
transition: background 0.3s ease;
|
||||
transition: all 0.3s ease;
|
||||
}
|
||||
.room.cleaned { background: #4CAF50; color: white; }
|
||||
.room.not-cleaned { background: #f44336; color: white; }
|
||||
.room.cleaned .time-display, .room.not-cleaned .time-display {
|
||||
.time-display {
|
||||
display: block;
|
||||
font-size: 14px;
|
||||
font-weight: normal;
|
||||
margin-top: 6px;
|
||||
line-height: 1.4;
|
||||
line-height: 1.2;
|
||||
}
|
||||
.hidden { display: none !important; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h1>🧹 Room Cleaning Status</h1>
|
||||
|
||||
<div class="controls">
|
||||
<button class="toggle" onclick="toggleFilter()">
|
||||
<span id="toggle-text">Show Only Cleaned Today</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div id="buildings-container">
|
||||
{% for building_name, floors in buildings.items() %}
|
||||
<div class="building" data-building="{{ building_name }}">
|
||||
<h2>{{ building_name }}</h2>
|
||||
{% for floor in floors %}
|
||||
<div class="floor" data-floor="{{ building_name }}-{{ loop.index }}">
|
||||
<div class="floor">
|
||||
<div class="floor-label">Etage {{ loop.index }}</div>
|
||||
<div class="rooms">
|
||||
{% for room in floor %}
|
||||
@@ -145,9 +138,7 @@ TEMPLATE = '''
|
||||
data-room="{{ room }}">
|
||||
{{ room }}
|
||||
<span class="time-display">
|
||||
{% if status.last_cleaned %}
|
||||
{{ status.last_cleaned[5:10] }}<br>{{ status.last_cleaned[11:16] }}
|
||||
{% else %}Never{% endif %}
|
||||
{% if status.last_cleaned %}{{ status.last_cleaned[5:10] }}<br>{{ status.last_cleaned[11:16] }}{% else %}Never{% endif %}
|
||||
</span>
|
||||
</div>
|
||||
{% endfor %}
|
||||
@@ -157,88 +148,70 @@ TEMPLATE = '''
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
{% if special_rooms %}
|
||||
<div class="building" data-building="Sonderräume">
|
||||
<div id="sonderraeume-section" class="building {{ 'hidden' if not special_rooms }}" data-building="Sonderräume">
|
||||
<h2>Sonderräume</h2>
|
||||
<div class="floor" data-floor="Sonderräume-1">
|
||||
<div class="floor">
|
||||
<div class="rooms" id="special-rooms-container">
|
||||
{% for room in special_rooms %}
|
||||
{% set status = statuses.get(room, {"is_today": False, "last_cleaned": None}) %}
|
||||
<div class="room {{ 'cleaned' if status.is_today else 'not-cleaned' }}"
|
||||
data-cleaned="{{ 'yes' if status.is_today else 'no' }}"
|
||||
data-room="{{ room }}"
|
||||
data-special="true">
|
||||
data-room="{{ room }}">
|
||||
{{ room }}
|
||||
<span class="time-display">
|
||||
{% if status.last_cleaned %}
|
||||
{{ status.last_cleaned[5:10] }}<br>{{ status.last_cleaned[11:16] }}
|
||||
{% else %}Never{% endif %}
|
||||
</span>
|
||||
<span class="time-display">{{ status.last_cleaned[5:10] }}<br>{{ status.last_cleaned[11:16] }}</span>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<script>
|
||||
let filterActive = false;
|
||||
|
||||
function formatDateTime(datetimeStr) {
|
||||
if (!datetimeStr) return 'Never';
|
||||
const date = datetimeStr.slice(5, 10);
|
||||
const time = datetimeStr.slice(11, 16);
|
||||
return date + '<br>' + time;
|
||||
function formatDateTime(ts) {
|
||||
if (!ts) return 'Never';
|
||||
return ts.slice(5, 10) + '<br>' + ts.slice(11, 16);
|
||||
}
|
||||
|
||||
function applyFilter() {
|
||||
const rooms = document.querySelectorAll('.room');
|
||||
const floors = document.querySelectorAll('.floor');
|
||||
const buildings = document.querySelectorAll('.building');
|
||||
buildings.forEach(building => {
|
||||
let buildingHasVisibleRoom = false;
|
||||
const floors = building.querySelectorAll('.floor');
|
||||
|
||||
floors.forEach(floor => {
|
||||
let floorHasVisibleRoom = false;
|
||||
const rooms = floor.querySelectorAll('.room');
|
||||
|
||||
if (filterActive) {
|
||||
rooms.forEach(room => {
|
||||
if (room.dataset.cleaned === 'no') {
|
||||
const isCleaned = room.dataset.cleaned === 'yes';
|
||||
if (filterActive && !isCleaned) {
|
||||
room.classList.add('hidden');
|
||||
} else {
|
||||
room.classList.remove('hidden');
|
||||
floorHasVisibleRoom = true;
|
||||
buildingHasVisibleRoom = true;
|
||||
}
|
||||
});
|
||||
|
||||
floors.forEach(floor => {
|
||||
const visibleRooms = floor.querySelectorAll('.room:not(.hidden)');
|
||||
if (visibleRooms.length === 0) {
|
||||
floor.classList.add('hidden');
|
||||
} else {
|
||||
floor.classList.remove('hidden');
|
||||
}
|
||||
if (filterActive && !floorHasVisibleRoom) floor.classList.add('hidden');
|
||||
else floor.classList.remove('hidden');
|
||||
});
|
||||
|
||||
buildings.forEach(building => {
|
||||
const visibleFloors = building.querySelectorAll('.floor:not(.hidden)');
|
||||
if (visibleFloors.length === 0) {
|
||||
if (filterActive && !buildingHasVisibleRoom) building.classList.add('hidden');
|
||||
else building.classList.remove('hidden');
|
||||
|
||||
// Special override: if building is Sonderräume and empty, always hide
|
||||
if (building.dataset.building === 'Sonderräume' && building.querySelectorAll('.room').length === 0) {
|
||||
building.classList.add('hidden');
|
||||
} else {
|
||||
building.classList.remove('hidden');
|
||||
}
|
||||
});
|
||||
} else {
|
||||
rooms.forEach(room => room.classList.remove('hidden'));
|
||||
floors.forEach(floor => floor.classList.remove('hidden'));
|
||||
buildings.forEach(building => building.classList.remove('hidden'));
|
||||
}
|
||||
}
|
||||
|
||||
function toggleFilter() {
|
||||
filterActive = !filterActive;
|
||||
const toggleText = document.getElementById('toggle-text');
|
||||
|
||||
if (filterActive) {
|
||||
toggleText.textContent = 'Show All Rooms';
|
||||
} else {
|
||||
toggleText.textContent = 'Show Only Cleaned Today';
|
||||
}
|
||||
|
||||
document.getElementById('toggle-text').textContent = filterActive ? 'Show All Rooms' : 'Show Only Cleaned Today';
|
||||
applyFilter();
|
||||
}
|
||||
|
||||
@@ -249,68 +222,36 @@ TEMPLATE = '''
|
||||
const statuses = data.statuses;
|
||||
const specialRooms = data.special_rooms;
|
||||
|
||||
// Update existing rooms
|
||||
// Update All existing rooms in standard buildings
|
||||
document.querySelectorAll('.room').forEach(roomDiv => {
|
||||
const roomNumber = roomDiv.dataset.room;
|
||||
const status = statuses[roomNumber] || { is_today: false, last_cleaned: null };
|
||||
|
||||
if (status.is_today) {
|
||||
roomDiv.classList.remove('not-cleaned');
|
||||
roomDiv.classList.add('cleaned');
|
||||
roomDiv.dataset.cleaned = 'yes';
|
||||
} else {
|
||||
roomDiv.classList.remove('cleaned');
|
||||
roomDiv.classList.add('not-cleaned');
|
||||
roomDiv.dataset.cleaned = 'no';
|
||||
const roomNo = roomDiv.dataset.room;
|
||||
const s = statuses[roomNo];
|
||||
if (s) {
|
||||
roomDiv.classList.toggle('cleaned', s.is_today);
|
||||
roomDiv.classList.toggle('not-cleaned', !s.is_today);
|
||||
roomDiv.dataset.cleaned = s.is_today ? 'yes' : 'no';
|
||||
roomDiv.querySelector('.time-display').innerHTML = formatDateTime(s.last_cleaned);
|
||||
}
|
||||
|
||||
const timeDisplay = roomDiv.querySelector('.time-display');
|
||||
timeDisplay.innerHTML = formatDateTime(status.last_cleaned);
|
||||
});
|
||||
|
||||
// Update special rooms section
|
||||
// Rebuild Sonderräume container
|
||||
const specialContainer = document.getElementById('special-rooms-container');
|
||||
if (specialContainer && specialRooms.length > 0) {
|
||||
const existingSpecialRooms = new Set(
|
||||
Array.from(specialContainer.querySelectorAll('.room'))
|
||||
.map(r => r.dataset.room)
|
||||
);
|
||||
const sonderSection = document.getElementById('sonderraeume-section');
|
||||
|
||||
// Add new special rooms
|
||||
specialRooms.forEach(roomNumber => {
|
||||
if (!existingSpecialRooms.has(roomNumber)) {
|
||||
const status = statuses[roomNumber];
|
||||
const roomDiv = document.createElement('div');
|
||||
roomDiv.className = 'room ' + (status.is_today ? 'cleaned' : 'not-cleaned');
|
||||
roomDiv.dataset.cleaned = status.is_today ? 'yes' : 'no';
|
||||
roomDiv.dataset.room = roomNumber;
|
||||
roomDiv.dataset.special = 'true';
|
||||
roomDiv.innerHTML = `
|
||||
${roomNumber}
|
||||
<span class="time-display">${formatDateTime(status.last_cleaned)}</span>
|
||||
`;
|
||||
specialContainer.appendChild(roomDiv);
|
||||
}
|
||||
if (specialRooms.length > 0) {
|
||||
sonderSection.classList.remove('hidden');
|
||||
let html = '';
|
||||
specialRooms.forEach(room => {
|
||||
const s = statuses[room];
|
||||
html += `<div class="room ${s.is_today ? 'cleaned' : 'not-cleaned'}" data-cleaned="${s.is_today ? 'yes' : 'no'}" data-room="${room}">${room}<span class="time-display">${formatDateTime(s.last_cleaned)}</span></div>`;
|
||||
});
|
||||
|
||||
// Show Sonderräume section if it was hidden
|
||||
const sonderraumeBuilding = document.querySelector('[data-building="Sonderräume"]');
|
||||
if (sonderraumeBuilding) {
|
||||
sonderraumeBuilding.classList.remove('hidden');
|
||||
}
|
||||
} else if (specialRooms.length === 0) {
|
||||
// Hide Sonderräume if no special rooms exist
|
||||
const sonderraumeBuilding = document.querySelector('[data-building="Sonderräume"]');
|
||||
if (sonderraumeBuilding) {
|
||||
sonderraumeBuilding.classList.add('hidden');
|
||||
}
|
||||
specialContainer.innerHTML = html;
|
||||
} else {
|
||||
sonderSection.classList.add('hidden');
|
||||
}
|
||||
|
||||
applyFilter();
|
||||
|
||||
} catch (error) {
|
||||
console.error('Failed to update statuses:', error);
|
||||
}
|
||||
} catch (e) { console.error("Update failed", e); }
|
||||
}
|
||||
|
||||
setInterval(updateStatuses, 1000);
|
||||
@@ -320,4 +261,4 @@ TEMPLATE = '''
|
||||
'''
|
||||
|
||||
if __name__ == '__main__':
|
||||
app.run(host='0.0.0.0', port=5001, debug=True)
|
||||
app.run(host='0.0.0.0', port=5001)
|
||||
|
||||
Reference in New Issue
Block a user