show all users on ranking board; be able to merge users

src/model/stat.rs

@@ -133,19 +133,14 @@ WHERE l.distance_in_km IS NOT NULL {year_filter} AND not b.external;
         let guest_km: i32 = guests.get(0);
         let guest_amount_trips: i32 = guests.get(1);
 
-        // e.g. scheckbücher
+        // e.g. scheckbücher (users without any role)
         let guest_user = sqlx::query(&format!(
             "
 SELECT CAST(SUM(l.distance_in_km) AS INTEGER) AS rowed_km, COUNT(*) AS amount_trips
 FROM user u
 INNER JOIN rower r ON u.id = r.rower_id
 INNER JOIN logbook l ON r.logbook_id = l.id
-WHERE u.id NOT IN (
-    SELECT ur.user_id
-    FROM user_role ur
-    INNER JOIN role ro ON ur.role_id = ro.id
-    WHERE ro.name = 'Donau Linz'
-)
+WHERE u.id NOT IN (SELECT user_id FROM user_role)
 AND l.distance_in_km IS NOT NULL
 {year_filter}
 AND u.name != 'Externe Steuerperson';
@@ -195,14 +190,7 @@ AND u.name != 'Externe Steuerperson';
         sqlx::query(&format!(
             "
 SELECT u.name, CAST(SUM(l.distance_in_km) AS INTEGER) AS rowed_km, COUNT(*) AS amount_trips
-FROM (
-    SELECT * FROM user
-    WHERE id IN (
-        SELECT user_id FROM user_role
-        JOIN role ON user_role.role_id = role.id
-        WHERE role.name = 'Donau Linz'
-    )
-) u
+FROM user u
 INNER JOIN rower r ON u.id = r.rower_id
 INNER JOIN logbook l ON r.logbook_id = l.id
 WHERE l.distance_in_km IS NOT NULL {year_filter} AND u.name != 'Externe Steuerperson'