Merge branch 'main' into dependabot/pip/werkzeug-3.0.1

Author: FreekBes

requirements.txt

@@ -1,30 +1,30 @@
 APScheduler==3.9.1
 arrow==1.3.0
 attrs==23.1.0
-Authlib==1.0.1
+Authlib==1.3.1
 blinker==1.6.2
 cachelib==0.9.0
-certifi==2023.7.22
+certifi==2024.7.4
 cffi==1.15.1
 charset-normalizer==2.1.1
 click==8.1.3
-cryptography==41.0.6
+cryptography==42.0.4
 decorator==5.1.1
 Flask==2.3.2
 Flask-Reuploaded==1.2.0
 Flask-SQLAlchemy==2.5.1
 Flask-WTF==1.1.1
 greenlet==1.1.2
-gunicorn==20.1.0
+gunicorn==22.0.0
 httplib2==0.20.4
 ics==0.7.2
-idna==3.3
+idna==3.7
 importlib-metadata==4.12.0
 itsdangerous==2.1.2
-Jinja2==3.1.3
+Jinja2==3.1.4
 MarkupSafe==2.1.1
 oauth2==1.9.0.post1
-Pillow==10.2.0
+Pillow==10.3.0
 psycopg2==2.9.3
 pycparser==2.21
 Pygments==2.15.0
@@ -33,19 +33,19 @@ python-dateutil==2.8.2
 python-dotenv==0.20.0
 pytz==2022.2.1
 pytz-deprecation-shim==0.1.0.post0
-requests==2.31.0
+requests==2.32.2
 six==1.16.0
 SQLAlchemy==1.4.40
 SQLAlchemy-serializer==1.4.1
 SQLAlchemy-Utils==0.38.3
 TatSu==5.8.3
 tokenlib==2.0.0
-tqdm==4.56.0
+tqdm==4.66.3
 types-python-dateutil==2.8.19.14
 tzdata==2022.2
 tzlocal==4.2
-urllib3==1.26.18
+urllib3==1.26.19
 uuid==1.30
 Werkzeug==3.0.1
 WTForms==3.0.1
-zipp==3.8.1
+zipp==3.19.1

useful/queries.sql

@@ -1,8 +1,17 @@
---- Get an overview of users per campus
-SELECT COUNT(users.intra_id), campuses.name FROM users JOIN campuses ON campuses.intra_id = users.campus_id GROUP BY campuses.name;
+--- Get the amount of users that ever used Improved Intra
+SELECT COUNT(users.intra_id) FROM users;
+
+--- Get the amount of active users in the past month
+SELECT COUNT(users.intra_id) FROM users LEFT JOIN user_tokens ON user_tokens.user_id = users.intra_id WHERE user_tokens.last_used_at > date_trunc('month', current_date - interval '1' month);
+
+--- Get the amount of users per campus
+SELECT COUNT(users.intra_id), campuses.name FROM users JOIN campuses ON campuses.intra_id = users.campus_id GROUP BY campuses.name ORDER BY campuses.name;
+
+--- Get the amount of active users per campus in the past month
+SELECT COUNT(users.intra_id), campuses.name FROM users JOIN campuses ON campuses.intra_id = users.campus_id LEFT JOIN user_tokens ON user_tokens.user_id = users.intra_id WHERE user_tokens.last_used_at > date_trunc('month', current_date - interval '1' month) GROUP BY campuses.name ORDER BY campuses.name;
 
 --- Get an overview of active users in the past month
-SELECT users.login, users.created_at, user_tokens.last_used_at, settings.updated_ver, campuses.name FROM users JOIN campuses ON campuses.intra_id = users.campus_id LEFT JOIN settings ON settings.user_id = users.intra_id LEFT JOIN user_tokens ON user_tokens.user_id = users.intra_id WHERE user_tokens.last_used_at > date_trunc('month', current_date - interval '1'month) ORDER BY campuses.name;
+SELECT users.login, users.created_at, user_tokens.last_used_at, settings.updated_ver, campuses.name FROM users JOIN campuses ON campuses.intra_id = users.campus_id LEFT JOIN settings ON settings.user_id = users.intra_id LEFT JOIN user_tokens ON user_tokens.user_id = users.intra_id WHERE user_tokens.last_used_at > date_trunc('month', current_date - interval '1' month) ORDER BY campuses.name;
 
 --- See which staff used the extension
 SELECT users.login, users.created_at, user_tokens.last_used_at, settings.updated_ver, campuses.name FROM users JOIN campuses ON campuses.intra_id = users.campus_id LEFT JOIN settings ON settings.user_id = users.intra_id LEFT JOIN user_tokens ON user_tokens.user_id = users.intra_id WHERE staff='t' ORDER BY users.created_at;