many changes
This commit is contained in:
sebastian.serfling
Binary file not shown.
Binary file not shown.
+3
-3
@@ -16,14 +16,14 @@ def get_filtered_users(customer_id, service_id):
|
||||
database=os.getenv("MYSQL_DATABASE")
|
||||
)
|
||||
|
||||
query = f"""SELECT * FROM Kunden.`services.reporting` where DATE(reportingdate) = CURDATE() """
|
||||
query = f"""SELECT * FROM Kunden.`daily.user.online` where DATE(timestamp) = CURDATE() """
|
||||
|
||||
|
||||
if customer_id:
|
||||
query += f"AND customer_ID = {customer_id}"
|
||||
if service_id:
|
||||
query += f" AND service_ID = {service_id}"
|
||||
query += " ORDER BY reportingdate DESC"
|
||||
query += f" AND services_id = {service_id}"
|
||||
query += " ORDER BY timestamp DESC"
|
||||
users = pd.read_sql_query(query, mydb)
|
||||
print(query)
|
||||
mydb.close()
|
||||
|
||||
+101
-162
@@ -1,7 +1,8 @@
|
||||
import streamlit as st
|
||||
import pandas as pd
|
||||
import mysql.connector
|
||||
from datetime import datetime, date
|
||||
from datetime import datetime, date, timedelta
|
||||
from sqlalchemy import create_engine
|
||||
import os
|
||||
from dotenv import load_dotenv
|
||||
import altair as alt
|
||||
@@ -12,91 +13,71 @@ def get_filtered_data(customer_id, service_id, start_date, end_date):
|
||||
"""
|
||||
Fetches the user count data grouped by month within the specified date range.
|
||||
"""
|
||||
mydb = mysql.connector.connect(
|
||||
host=os.getenv("MYSQL_HOST"),
|
||||
user=os.getenv("MYSQL_USER"),
|
||||
password=os.getenv("MYSQL_PASSWORD"),
|
||||
database=os.getenv("MYSQL_DATABASE")
|
||||
db_url = (
|
||||
f"mysql+mysqlconnector://{os.getenv('MYSQL_USER')}:"
|
||||
f"{os.getenv('MYSQL_PASSWORD')}@{os.getenv('MYSQL_HOST')}/"
|
||||
f"{os.getenv('MYSQL_DATABASE')}"
|
||||
)
|
||||
engine = create_engine(db_url)
|
||||
|
||||
query = f"""
|
||||
SELECT DATE_FORMAT(sr.reportingdate, '%Y-%m') AS day,
|
||||
COUNT(DISTINCT sr.username) as count
|
||||
FROM Kunden.`services.reporting` sr
|
||||
JOIN Kunden.services s ON sr.service_ID = s.service_ID
|
||||
WHERE sr.customer_ID = {customer_id}
|
||||
AND sr.service_ID = {service_id}
|
||||
AND sr.username NOT LIKE '%admin%'
|
||||
AND sr.username NOT LIKE '%test%'
|
||||
AND sr.reportingdate BETWEEN '{start_date}' AND '{end_date}'
|
||||
GROUP BY DATE_FORMAT(sr.reportingdate, '%Y-%m')
|
||||
ORDER BY DATE_FORMAT(sr.reportingdate, '%Y-%m');
|
||||
SELECT DATE_FORMAT(add_date, '%Y-%m') AS day,
|
||||
count as count
|
||||
FROM Kunden.`daily.users.count_by_services`
|
||||
WHERE customer_ID = {customer_id}
|
||||
AND services_ID = {service_id}
|
||||
AND add_date BETWEEN '{start_date}' AND '{end_date}'
|
||||
ORDER BY DATE_FORMAT(add_date, '%Y-%m');
|
||||
"""
|
||||
|
||||
service_reporting = pd.read_sql_query(query, mydb)
|
||||
mydb.close()
|
||||
service_reporting = pd.read_sql_query(query, engine)
|
||||
#engine.close()
|
||||
return service_reporting
|
||||
|
||||
|
||||
def get_user_online(customer_id,service_id,start_date,end_date):
|
||||
mydb = mysql.connector.connect(
|
||||
host=os.getenv("MYSQL_HOST"),
|
||||
user=os.getenv("MYSQL_USER"),
|
||||
password=os.getenv("MYSQL_PASSWORD"),
|
||||
database=os.getenv("MYSQL_DATABASE")
|
||||
db_url = (
|
||||
f"mysql+mysqlconnector://{os.getenv('MYSQL_USER')}:"
|
||||
f"{os.getenv('MYSQL_PASSWORD')}@{os.getenv('MYSQL_HOST')}/"
|
||||
f"{os.getenv('MYSQL_DATABASE')}"
|
||||
)
|
||||
engine = create_engine(db_url)
|
||||
if service_id == 100:
|
||||
user_info = "u.primarymail as username"
|
||||
user_info = "sr.primarymail"
|
||||
else:
|
||||
user_info = "u.username"
|
||||
user_info = "sr.username"
|
||||
query = f"""
|
||||
SELECT DATE_FORMAT(sr.reportingdate, '%Y-%m') AS day,
|
||||
sr.username
|
||||
FROM Kunden.`services.reporting` sr
|
||||
JOIN Kunden.services s ON sr.service_ID = s.service_ID
|
||||
SELECT
|
||||
{user_info} as username
|
||||
FROM Kunden.`daily.user.online` sr
|
||||
WHERE sr.customer_ID = {customer_id}
|
||||
AND sr.service_ID = {service_id}
|
||||
AND sr.username NOT LIKE '%admin%'
|
||||
AND sr.username NOT LIKE '%test%'
|
||||
AND sr.reportingdate BETWEEN '{start_date}' AND '{end_date}'
|
||||
GROUP BY day, sr.username
|
||||
ORDER BY sr.username;
|
||||
AND sr.services_ID = {service_id}
|
||||
AND sr.timestamp BETWEEN '{start_date}' AND '{end_date}'
|
||||
GROUP BY {user_info}
|
||||
ORDER BY {user_info};
|
||||
"""
|
||||
|
||||
user_online = pd.read_sql_query(query, mydb)
|
||||
user_online = pd.read_sql_query(query, engine)
|
||||
user_online_count= user_online.shape[0]
|
||||
mydb.close()
|
||||
#mydb.close()
|
||||
return user_online, user_online_count
|
||||
|
||||
def get_max_user_count(customer_id, service_id, start_date, end_date):
|
||||
"""
|
||||
Fetches the maximum user count within the specified date range.
|
||||
"""
|
||||
mydb = mysql.connector.connect(
|
||||
host=os.getenv("MYSQL_HOST"),
|
||||
user=os.getenv("MYSQL_USER"),
|
||||
password=os.getenv("MYSQL_PASSWORD"),
|
||||
database=os.getenv("MYSQL_DATABASE")
|
||||
db_url = (
|
||||
f"mysql+mysqlconnector://{os.getenv('MYSQL_USER')}:"
|
||||
f"{os.getenv('MYSQL_PASSWORD')}@{os.getenv('MYSQL_HOST')}/"
|
||||
f"{os.getenv('MYSQL_DATABASE')}"
|
||||
)
|
||||
|
||||
engine = create_engine(db_url)
|
||||
user_info = "sr.username"
|
||||
query = f"""
|
||||
SELECT MAX(user_counts.count) as max_count
|
||||
FROM (
|
||||
SELECT DATE_FORMAT(sr.reportingdate, '%Y-%m') AS day,
|
||||
COUNT(DISTINCT sr.username) as count
|
||||
FROM Kunden.`services.reporting` sr
|
||||
JOIN Kunden.services s ON sr.service_ID = s.service_ID
|
||||
WHERE sr.customer_ID = {customer_id}
|
||||
AND sr.service_ID = {service_id}
|
||||
AND sr.username NOT LIKE '%admin%'
|
||||
AND sr.username NOT LIKE '%test%'
|
||||
AND sr.reportingdate BETWEEN '{start_date}' AND '{end_date}'
|
||||
GROUP BY DATE_FORMAT(sr.reportingdate, '%Y-%m')
|
||||
) as user_counts;
|
||||
"""
|
||||
SELECT MAX(username) as max_count
|
||||
FROM Kunden.`daily.user.enabled` WHERE customer_ID = {customer_id} AND services_ID = {service_id} AND timestamp BETWEEN '{start_date}' AND '{end_date}'
|
||||
"""
|
||||
|
||||
max_user_count = pd.read_sql_query(query, mydb)
|
||||
mydb.close()
|
||||
max_user_count = pd.read_sql_query(query, engine)
|
||||
#mydb.close()
|
||||
return max_user_count.iloc[0]['max_count'] if not max_user_count.empty else 0
|
||||
|
||||
def get_active_users(customer_id, service_id, start_date, end_date):
|
||||
@@ -104,104 +85,61 @@ def get_active_users(customer_id, service_id, start_date, end_date):
|
||||
Fetch all active users for the given customer, service, and date range
|
||||
based on the most recent activity and status.
|
||||
"""
|
||||
mydb = mysql.connector.connect(
|
||||
host=os.getenv("MYSQL_HOST"),
|
||||
user=os.getenv("MYSQL_USER"),
|
||||
password=os.getenv("MYSQL_PASSWORD"),
|
||||
database=os.getenv("MYSQL_DATABASE")
|
||||
db_url = (
|
||||
f"mysql+mysqlconnector://{os.getenv('MYSQL_USER')}:"
|
||||
f"{os.getenv('MYSQL_PASSWORD')}@{os.getenv('MYSQL_HOST')}/"
|
||||
f"{os.getenv('MYSQL_DATABASE')}"
|
||||
)
|
||||
engine = create_engine(db_url)
|
||||
if service_id == 100:
|
||||
user_info = "u.primarymail as username"
|
||||
user_info = "sr.primarymail"
|
||||
else:
|
||||
user_info = "u.username"
|
||||
user_info = "sr.username"
|
||||
query = f"""
|
||||
SELECT
|
||||
{user_info}
|
||||
FROM Kunden.`users` u
|
||||
JOIN (
|
||||
SELECT
|
||||
us.user_id,
|
||||
us.`timestamp` AS last_active_timestamp,
|
||||
us.status
|
||||
FROM Kunden.`users.services` us
|
||||
JOIN (
|
||||
SELECT
|
||||
user_id,
|
||||
MAX(`timestamp`) AS last_active_timestamp
|
||||
FROM Kunden.`users.services`
|
||||
WHERE `timestamp` <= '{end_date}'
|
||||
AND customer_id = {customer_id}
|
||||
AND service_ID = {service_id}
|
||||
AND user_id NOT IN (
|
||||
SELECT user_id
|
||||
FROM Kunden.`users.status`
|
||||
WHERE status = 0
|
||||
AND `timestamp` < '{start_date}'
|
||||
AND customer_id = {customer_id}
|
||||
)
|
||||
GROUP BY user_id
|
||||
) max_timestamps ON us.user_id = max_timestamps.user_id
|
||||
AND us.`timestamp` = max_timestamps.last_active_timestamp
|
||||
WHERE us.customer_id = {customer_id}
|
||||
AND us.service_ID = {service_id}
|
||||
AND us.status = 1
|
||||
) active_users ON u.user_id = active_users.user_id
|
||||
GROUP BY u.user_id, u.username, active_users.last_active_timestamp, active_users.status ORDER by u.username ASC;
|
||||
{user_info} as username
|
||||
FROM Kunden.`daily.user.enabled` sr
|
||||
WHERE sr.customer_ID = {customer_id}
|
||||
AND sr.services_ID = {service_id}
|
||||
AND sr.timestamp = '{start_date}'
|
||||
ORDER BY {user_info};
|
||||
"""
|
||||
active_users = pd.read_sql_query(query, mydb)
|
||||
active_users = pd.read_sql_query(query, engine)
|
||||
user_active_count = active_users.shape[0]
|
||||
mydb.close()
|
||||
return active_users, user_active_count
|
||||
|
||||
def get_user_not_online(customer_id,service_id,start_date,end_date):
|
||||
mydb = mysql.connector.connect(
|
||||
host=os.getenv("MYSQL_HOST"),
|
||||
user=os.getenv("MYSQL_USER"),
|
||||
password=os.getenv("MYSQL_PASSWORD"),
|
||||
database=os.getenv("MYSQL_DATABASE")
|
||||
db_url = (
|
||||
f"mysql+mysqlconnector://{os.getenv('MYSQL_USER')}:"
|
||||
f"{os.getenv('MYSQL_PASSWORD')}@{os.getenv('MYSQL_HOST')}/"
|
||||
f"{os.getenv('MYSQL_DATABASE')}"
|
||||
)
|
||||
|
||||
engine = create_engine(db_url)
|
||||
if service_id == 100:
|
||||
user_info = "primarymail"
|
||||
else:
|
||||
user_info = "username"
|
||||
query = f"""
|
||||
SELECT u.username, ss.service_ID
|
||||
FROM Kunden.users u
|
||||
JOIN Kunden.`users.services` ss ON ss.user_ID = u.user_ID
|
||||
JOIN (
|
||||
SELECT user_id,
|
||||
MAX(CASE WHEN status = 1 THEN timestamp END) AS latest_active_timestamp,
|
||||
MAX(CASE WHEN status = 0 THEN timestamp END) AS latest_inactive_timestamp
|
||||
FROM Kunden.`users.status`
|
||||
GROUP BY user_id
|
||||
) us ON u.user_ID = us.user_id
|
||||
WHERE ss.service_ID = {service_id}
|
||||
AND (
|
||||
(us.latest_active_timestamp IS NOT NULL AND
|
||||
(us.latest_inactive_timestamp IS NULL OR us.latest_active_timestamp > us.latest_inactive_timestamp))
|
||||
OR us.latest_inactive_timestamp IS NULL
|
||||
)
|
||||
AND u.username NOT IN (
|
||||
SELECT sr.username
|
||||
FROM Kunden.`services.reporting` sr
|
||||
WHERE sr.service_ID = {service_id}
|
||||
AND sr.reportingdate BETWEEN '{start_date}' AND '{end_date}'
|
||||
)
|
||||
AND u.user_ID != 95
|
||||
AND u.user_ID != 102
|
||||
AND u.customer_ID = {customer_id}
|
||||
AND u.username NOT LIKE "%ad-test-user%"
|
||||
SELECT
|
||||
{user_info} as username
|
||||
FROM Kunden.`daily.user.notonline` sr
|
||||
WHERE sr.customer_ID = {customer_id}
|
||||
AND sr.services_ID = {service_id}
|
||||
AND sr.timestamp BETWEEN '{start_date}' AND '{end_date}'
|
||||
GROUP BY {user_info}
|
||||
ORDER BY {user_info};
|
||||
"""
|
||||
|
||||
not_active_users = pd.read_sql_query(query, mydb)
|
||||
not_active_users = pd.read_sql_query(query, engine)
|
||||
user_not_online_count = not_active_users.shape[0]
|
||||
mydb.close()
|
||||
return not_active_users, user_not_online_count
|
||||
|
||||
def get_initial_data():
|
||||
mydb = mysql.connector.connect(
|
||||
host=os.getenv("MYSQL_HOST"),
|
||||
user=os.getenv("MYSQL_USER"),
|
||||
password=os.getenv("MYSQL_PASSWORD"),
|
||||
database=os.getenv("MYSQL_DATABASE")
|
||||
db_url = (
|
||||
f"mysql+mysqlconnector://{os.getenv('MYSQL_USER')}:"
|
||||
f"{os.getenv('MYSQL_PASSWORD')}@{os.getenv('MYSQL_HOST')}/"
|
||||
f"{os.getenv('MYSQL_DATABASE')}"
|
||||
)
|
||||
engine = create_engine(db_url)
|
||||
|
||||
# Fetch unique service IDs and names
|
||||
service_id_query = """
|
||||
@@ -209,7 +147,7 @@ def get_initial_data():
|
||||
FROM Kunden.`services.reporting` sr
|
||||
JOIN Kunden.services s ON sr.service_ID = s.service_ID
|
||||
"""
|
||||
service_ids = pd.read_sql_query(service_id_query, mydb)
|
||||
service_ids = pd.read_sql_query(service_id_query, engine)
|
||||
|
||||
# Fetch customer information
|
||||
customer_query = """
|
||||
@@ -219,15 +157,14 @@ def get_initial_data():
|
||||
JOIN Kunden.`services.reporting`sr ON sr.customer_ID = co.customer_ID
|
||||
GROUP BY c.customer_ID, c.customer, co.companyname;
|
||||
"""
|
||||
customers = pd.read_sql_query(customer_query, mydb)
|
||||
customers = pd.read_sql_query(customer_query, engine)
|
||||
|
||||
# Fetch date range
|
||||
date_query = """
|
||||
SELECT MIN(reportingdate) AS min_date, MAX(reportingdate) AS max_date
|
||||
FROM Kunden.`services.reporting`
|
||||
"""
|
||||
date_range = pd.read_sql_query(date_query, mydb)
|
||||
mydb.close()
|
||||
date_range = pd.read_sql_query(date_query, engine)
|
||||
|
||||
return service_ids, customers, date_range
|
||||
|
||||
@@ -261,16 +198,16 @@ def services_reporting():
|
||||
min_date = initial_date_range['min_date'][0]
|
||||
max_date = initial_date_range['max_date'][0]
|
||||
|
||||
# Date input for start and end date
|
||||
min_date = (date.today().replace(day=1) - timedelta(days=1)).replace(day=1)
|
||||
start_date = st.date_input('Start Date', min_date)
|
||||
end_date = st.date_input('End Date', max_date)
|
||||
end_date = st.date_input('End Date', initial_date_range['max_date'][0])
|
||||
|
||||
if st.button('Apply Filters'):
|
||||
# Fetch filtered data from the database
|
||||
filtered_data = get_filtered_data(selected_customer_id, selected_service_id, start_date, end_date)
|
||||
|
||||
# Fetch max user count in the selected range
|
||||
max_count = get_max_user_count(selected_customer_id, selected_service_id, start_date, end_date)
|
||||
max_count = get_active_users(selected_customer_id, selected_service_id, start_date, end_date)
|
||||
|
||||
# Sort the data by day
|
||||
filtered_data = filtered_data.sort_values('day')
|
||||
@@ -297,31 +234,33 @@ def services_reporting():
|
||||
|
||||
# Combine bars and text into a single chart
|
||||
chart = (bars + text).properties(
|
||||
title='Daily Service Usage with Highlighted Maximum'
|
||||
title='User Enabled'
|
||||
)
|
||||
|
||||
# Fetch the data for users not online, online, and active users
|
||||
not_user_online, max_count_user_not_online = get_user_not_online(selected_customer_id, selected_service_id, start_date, end_date)
|
||||
user_online, user_online_count = get_user_online(selected_customer_id, selected_service_id, start_date, end_date)
|
||||
active_users_data, user_active_count = get_active_users(selected_customer_id, selected_service_id, start_date, end_date)
|
||||
active_users_data, user_active_count = get_active_users(selected_customer_id, selected_service_id, min_date, end_date)
|
||||
# Create three columns for each DataFrame
|
||||
col1, col2, col3, col4, col5 = st.columns([2,2,2,2,2])
|
||||
|
||||
# Display each DataFrame in a separate column
|
||||
with col4:
|
||||
st.subheader(f"{selected_service.split(' - ')[1]} - User not Online")
|
||||
st.metric(label="1",label_visibility="hidden", value=max_count_user_not_online)
|
||||
st.data_editor(not_user_online['username'],use_container_width=True, hide_index=True)
|
||||
|
||||
# with col4:
|
||||
# st.subheader(f"{selected_service.split(' - ')[1]} - User not Online")
|
||||
# st.metric(label="1",label_visibility="hidden", value=max_count_user_not_online)
|
||||
# st.data_editor(not_user_online['username'],key="2",use_container_width=True, hide_index=True)
|
||||
|
||||
with col2:
|
||||
st.subheader(f"{selected_service.split(' - ')[1]} - User Online")
|
||||
st.metric(label="1",label_visibility="hidden", value=user_online_count)
|
||||
st.data_editor(user_online['username'],use_container_width=True, hide_index=True)
|
||||
st.subheader(f"{selected_service.split(' - ')[1]} - Enabled Users")
|
||||
st.metric(label="1",label_visibility="hidden", value=user_active_count)
|
||||
st.data_editor(active_users_data, hide_index=True)
|
||||
|
||||
with col3:
|
||||
st.subheader(f"{selected_service.split(' - ')[1]} - Active Users")
|
||||
st.metric(label="1",label_visibility="hidden", value=user_active_count)
|
||||
st.data_editor(active_users_data['username'],key=active_users_data,use_container_width=True, hide_index=True)
|
||||
st.subheader(f"{selected_service.split(' - ')[1]} - User Online")
|
||||
st.metric(label="1",label_visibility="hidden", value=user_online_count)
|
||||
st.data_editor(user_online,key=2,hide_index=True)
|
||||
|
||||
|
||||
|
||||
st.altair_chart(chart, use_container_width=True)
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user