Test zu Fake geändert, weil Namensproblem
Dieser Commit ist enthalten in:
@@ -25,18 +25,18 @@ def dashboard():
|
||||
try:
|
||||
# Hole Statistiken mit sicheren Defaults
|
||||
# Anzahl aktiver Lizenzen (nur echte Daten, keine Testdaten)
|
||||
cur.execute("SELECT COUNT(*) FROM licenses WHERE is_active = true AND is_test = false")
|
||||
cur.execute("SELECT COUNT(*) FROM licenses WHERE is_active = true AND is_fake = false")
|
||||
active_licenses = cur.fetchone()[0] if cur.rowcount > 0 else 0
|
||||
|
||||
# Anzahl Kunden (nur echte Kunden, keine Testkunden)
|
||||
cur.execute("SELECT COUNT(*) FROM customers WHERE is_test = false")
|
||||
# Anzahl Kunden (nur echte Kunden, keine Fake-Kunden)
|
||||
cur.execute("SELECT COUNT(*) FROM customers WHERE is_fake = false")
|
||||
total_customers = cur.fetchone()[0] if cur.rowcount > 0 else 0
|
||||
|
||||
# Testdaten separat zählen für optionale Anzeige
|
||||
cur.execute("SELECT COUNT(*) FROM customers WHERE is_test = true")
|
||||
test_customers_count = cur.fetchone()[0] if cur.rowcount > 0 else 0
|
||||
cur.execute("SELECT COUNT(*) FROM customers WHERE is_fake = true")
|
||||
fake_customers_count = cur.fetchone()[0] if cur.rowcount > 0 else 0
|
||||
|
||||
cur.execute("SELECT COUNT(*) FROM licenses WHERE is_test = true")
|
||||
cur.execute("SELECT COUNT(*) FROM licenses WHERE is_fake = true")
|
||||
test_licenses_count = cur.fetchone()[0] if cur.rowcount > 0 else 0
|
||||
|
||||
# Anzahl aktiver Sessions (Admin-Panel)
|
||||
@@ -61,7 +61,7 @@ def dashboard():
|
||||
FROM license_heartbeats lh
|
||||
JOIN licenses l ON l.id = lh.license_id
|
||||
WHERE lh.timestamp > NOW() - INTERVAL '15 minutes'
|
||||
AND l.is_test = false
|
||||
AND l.is_fake = false
|
||||
""")
|
||||
active_usage = cur.fetchone()[0] if cur.rowcount > 0 else 0
|
||||
except Exception as e:
|
||||
@@ -82,7 +82,7 @@ def dashboard():
|
||||
FROM licenses l
|
||||
LEFT JOIN customers c ON l.customer_id = c.id
|
||||
LEFT JOIN sessions s ON l.id = s.license_id
|
||||
WHERE l.is_test = false AND c.is_test = false
|
||||
WHERE l.is_fake = false AND c.is_fake = false
|
||||
GROUP BY l.license_key, c.name
|
||||
ORDER BY session_count DESC
|
||||
LIMIT 10
|
||||
@@ -109,7 +109,7 @@ def dashboard():
|
||||
cur.execute("""
|
||||
SELECT COUNT(*) as full_licenses
|
||||
FROM licenses
|
||||
WHERE is_test = false
|
||||
WHERE is_fake = false
|
||||
""")
|
||||
license_count = cur.fetchone()
|
||||
full_licenses = license_count[0] if license_count and license_count[0] else 0
|
||||
@@ -123,7 +123,7 @@ def dashboard():
|
||||
COUNT(CASE WHEN valid_until < NOW() THEN 1 END) as expired,
|
||||
COUNT(CASE WHEN is_active = false THEN 1 END) as inactive
|
||||
FROM licenses
|
||||
WHERE is_test = false
|
||||
WHERE is_fake = false
|
||||
""")
|
||||
license_status = cur.fetchone()
|
||||
active_licenses_count = license_status[0] if license_status and license_status[0] else 0
|
||||
@@ -140,8 +140,8 @@ def dashboard():
|
||||
EXTRACT(DAY FROM (l.valid_until - NOW())) as days_remaining
|
||||
FROM licenses l
|
||||
JOIN customers c ON l.customer_id = c.id
|
||||
WHERE l.is_test = false
|
||||
AND c.is_test = false
|
||||
WHERE l.is_fake = false
|
||||
AND c.is_fake = false
|
||||
AND l.is_active = true
|
||||
AND l.valid_until IS NOT NULL
|
||||
AND l.valid_until > NOW()
|
||||
@@ -166,8 +166,8 @@ def dashboard():
|
||||
END as status
|
||||
FROM licenses l
|
||||
JOIN customers c ON l.customer_id = c.id
|
||||
WHERE l.is_test = false
|
||||
AND c.is_test = false
|
||||
WHERE l.is_fake = false
|
||||
AND c.is_fake = false
|
||||
ORDER BY l.created_at DESC
|
||||
LIMIT 5
|
||||
""")
|
||||
@@ -176,15 +176,15 @@ def dashboard():
|
||||
# Stats Objekt für Template erstellen
|
||||
stats = {
|
||||
'total_customers': total_customers,
|
||||
'total_licenses': active_licenses, # This was already filtered for is_test = false
|
||||
'total_licenses': active_licenses, # This was already filtered for is_fake = false
|
||||
'active_sessions': active_sessions, # Admin-Panel Sessions
|
||||
'active_usage': active_usage, # Aktive Kunden-Nutzung
|
||||
'active_licenses': active_licenses_count,
|
||||
'full_licenses': full_licenses,
|
||||
'test_licenses': test_version_licenses, # Test versions, not test data
|
||||
'test_data_count': test_licenses_count, # Actual test data count
|
||||
'test_customers_count': test_customers_count,
|
||||
'test_resources_count': 0,
|
||||
'fake_data_count': test_licenses_count, # Actual test data count
|
||||
'fake_customers_count': fake_customers_count,
|
||||
'fake_resources_count': 0,
|
||||
'expired_licenses': expired_licenses,
|
||||
'inactive_licenses': inactive_licenses,
|
||||
'last_backup': None,
|
||||
@@ -210,7 +210,7 @@ def dashboard():
|
||||
COUNT(CASE WHEN status = 'quarantine' THEN 1 END) as quarantine,
|
||||
COUNT(*) as total
|
||||
FROM resource_pool
|
||||
WHERE type = %s AND is_test = false
|
||||
WHERE type = %s AND is_fake = false
|
||||
""", (resource_type,))
|
||||
|
||||
result = cur.fetchone()
|
||||
@@ -249,9 +249,9 @@ def dashboard():
|
||||
|
||||
# Count test resources separately
|
||||
try:
|
||||
cur.execute("SELECT COUNT(*) FROM resource_pool WHERE is_test = true")
|
||||
test_resources_count = cur.fetchone()[0] if cur.rowcount > 0 else 0
|
||||
stats['test_resources_count'] = test_resources_count
|
||||
cur.execute("SELECT COUNT(*) FROM resource_pool WHERE is_fake = true")
|
||||
fake_resources_count = cur.fetchone()[0] if cur.rowcount > 0 else 0
|
||||
stats['fake_resources_count'] = fake_resources_count
|
||||
except:
|
||||
pass
|
||||
|
||||
|
||||
In neuem Issue referenzieren
Einen Benutzer sperren