From e586662c19866aaa197b3eb1143dc4339d33c1ec Mon Sep 17 00:00:00 2001
From: echo <petrovskidimitar@yandex.com>
Date: Thu, 19 Mar 2026 05:04:12 +0100
Subject: [PATCH] reports fully implemented

---
 apps/admin/data/fitai.db                      | Bin 253952 -> 258048 bytes
 .../src/components/reports/ReportFilters.tsx  | 109 ++++++++++++------
 2 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/apps/admin/data/fitai.db b/apps/admin/data/fitai.db
index ccd543a8aed2cae07d2e22d803b651c8a75f3768..77add3ce5326d5ac3d052ed4a797f4e4495f48cb 100644
GIT binary patch
delta 2055
zcma)7O>9(E6n?KWt^J{Msfb8`a#|sDn$9@CowmVL`;(SPV`FJp2!T8A-I=+}`x)+g
zuXQ#~S*Vc(sFUzwB56!aj4NU$QhpZV8loFxNW{M`2nz{;g)St~bKlU0ouuh|x%b?A
z&Ue1=J8xEQkd@!bN4r{YDvC1xF^sD>zdrfJrAUZ8#0_Pf{6qdC4;y`3e`ss`ad~UU
z0o)vX4j<dY_;{hE6QAvos|tCaT#Brd<K%YaD(NDbMjw10i4KGoRW_<K#<YB_kj=AL
zCX>#`Muu}*Y;;6tIZE>*=}fl0vHpF(x+T<oQ0YF{eT$sxzJ&>fx*G?7IiRYY4gJ?P
zHG5`T+qStmCH9J<w)cd?%FgzkN;o{C(_E^c(M%?*kFr!clPcu%X*xQbOXYH@5x=ij
z?VD$o?g?sX?1W22k-2Yq7C6l0U{XQdl5K5&!{pcPfBB!$DXO`AiJ462UULukJINg-
zL`;ROkxz(8%tlY;IH{Wt_V3>pnp6J=0&8omJ(xQgY3;hJka*-+_t`C1y6z&SKXxU~
zyxH2ZI5%@<a%V?4n@O_lXjYHqvdL5|Lleo^XeyP6(Nrcy_2G1qX7&1a7r}q`gjx$-
z7umHd$JE22NGr)m`frmA(tin|^^<`3XUW&<AGg&nF~zJx?mX#k7E=rp->j+o)K>ZO
zF@8@WkICQU5xGz9t@W&^KatjOr~~8o&#OByKB<tO$v5OY;bao;CyCEj)%_ShkFO8T
zt*ZFnvUYAYBwo94BNT2^+aD|KkCB8&?ZfBP_N|L^d*3^BcGuar_n@-j@H3dEe&b@F
zKmS=vM{Pzh>cX-u%3xcd*=EIHF1L!{mKY=xWfKJIy}nY%nB{QCWtI!9P_Tsy+<`Ky
zf@=fSN}MgpYgOA5fjwdy_JE>IjXpS9;s%3?u#18@4wR?^dB$q!CBt4G0<5~e@~Hy_
zTk{+Vr6{QGQNySLw=@LlY-UG5mR#tFM*0${rOQLMsMzR88FE~~tfE^2S5O`tMv!@r
z8+y=}#Wch~MHOnB?hdk41Y42~a_f{QICJ7~lp!p`cygJ7X$uCz&U=mv6@yx`duBNv
z?mD=K)oA{yKI2DhomQXf3^~K*0w@ybixl$IVc50+!?ub{NWL9^c2eC_o2pvW<XX^;
ziwxs=DTKkW!DU=ILqLTI8W)<uaN*j*vB6zNUYvO6;Gmq;fph{)Zh0<qqGN-Duz*91
zdUNE40uD$s2FPzUP#VoZrPNDI)Ep$!wx|IWiYyOMVSC8*a4ZLAr4)?=9I`aS(;1{=
z8E{I{5=cDPnF9mKY%G;PBVa1si9(RJK+!&;nGJbH`m-C@B#qoecPt^hPxPIVmu<5e
z2kd2GL(wA}ieib4+p@FHK>(Pr_3AR?#gYpPr#<RAWB%bOb$2VW0pJ_;mfpQ%kVaUp
zBP$jtH&D4C3iGIDdCY%)TJ3L%clvx<9STdn{R`9T_=)IKN+O$rOKO@92rP>|<GSE6
zL&_9P!KU}5KLs`;TaI^PGZX0NvSb4Wa$|`EyguiDIHQi#d#~*vFpx?V<(#;TThX}x
z+l>0s%gsZ9fH<(Mj0K7w(v2J>iqSyMy8Z3;-BRviRBC_Nv$PV%<<0pyd9(iNwccG#
z<xTz$({aKWIv4AK=2e`i|JAJ8Uz1$V3l@{!S+J;9hJj2o2gIQ1B{{h0*FdNM(gd~e
z4~s$b%ijb9NpSN{1uBdpVQ6_5#h1{gxMiUYnyojn!2~TMB8U2mt1Ue>VN0jrdYLgC
zGux%E9hhpffTR?UP%H>}VQZRga0viAL1Rug2a@Vcnt(y6s>=@p3gnj1#Kn@0faC`b
vXEPWn%FSQ|(WVBYaTI0*iUxHYDQf|iF^P!NO5jhOUq5}B<4;KQefsi$SH7WF

delta 389
zcmXYs%}WAN6vf{iUuiZoS0jm#Xsk@A2!p6aVnG|D{0}k&burLT^sx-xRM0}xS<F%w
zLG4T)F)m%%CW3ZCYUW;q7Pcs&XT;&23+KR(ds8h;Rq)z9P$h%}v&uSDOVOL6C}58V
zWDdWu$2^XgLGyhDTtf=aT$J0WVCQa?+XOGLD7P_!H5|re=J7wtto=L%q96r`6p)_!
zVjg8dVu6MapupnIL6|7vqgtAdaY!Z{CO$U-8=;g=!Z=@gtE=cjQ_+KOlAdo2tS<St
z)wR8I^=vDo-nYcqfp)l`I7!6gS|YBVYJVNi?U*A1Y6MNx`eM$*2<lqbOR-M8`cG2<
z3p2ans7S>!!9{sjx)RI$xI57-@4}A7MlsU=sAkGhm_^<1m^UH^a4XV2wa&S@f2t8m
z!i<qk!ZGhU1i$eUKd@su3(!ELlYy~eiYmcZe83Evo{A-8Wq!wq&DhL?_cEOaK7yIf
ITaGq<0RcLBbN~PV

diff --git a/apps/admin/src/components/reports/ReportFilters.tsx b/apps/admin/src/components/reports/ReportFilters.tsx
index 441877c..651b617 100644
--- a/apps/admin/src/components/reports/ReportFilters.tsx
+++ b/apps/admin/src/components/reports/ReportFilters.tsx
@@ -44,48 +44,87 @@ export function ReportFilters({
     try {
       setLoading(true);
 
-      // Fetch current user info
       const userResponse = await fetch("/api/users/me");
-      if (userResponse.ok) {
-        const userData = await userResponse.json();
-        setCurrentUser(userData.user);
+      if (!userResponse.ok) {
+        setLoading(false);
+        return;
+      }
 
-        // Determine which clients to show based on role
-        if (userData.user.role === "client") {
-          // Regular users can only view their own report
-          setUsers([userData.user]);
-          onUserChange(userData.user.id);
-        } else if (userData.user.role === "trainer") {
-          // Trainers can only view their assigned clients
-          const assignmentsRes = await fetch("/api/trainer-client");
-          if (assignmentsRes.ok) {
-            const assignmentsData = await assignmentsRes.json();
-            const assignedClientIds = (assignmentsData.assignments || [])
-              .filter((a: any) => a.isActive)
-              .map((a: any) => a.clientId);
+      const userData = await userResponse.json();
+      setCurrentUser(userData.user);
 
-            if (assignedClientIds.length > 0) {
-              // Fetch assigned clients
-              const clientsRes = await fetch(
-                `/api/users?role=client&ids=${assignedClientIds.join(",")}`,
-              );
-              if (clientsRes.ok) {
-                const clientsData = await clientsRes.json();
-                setUsers(clientsData.data?.users || []);
-              }
-            } else {
-              setUsers([]);
+      const currentRole = userData.user.role;
+      let allUsers: (User & { client?: Client | null })[] = [];
+
+      if (currentRole === "client") {
+        setUsers([userData.user]);
+        onUserChange(userData.user.id);
+        setLoading(false);
+        return;
+      }
+
+      if (currentRole === "trainer") {
+        allUsers.push(userData.user);
+        const assignmentsRes = await fetch("/api/trainer-client");
+        if (assignmentsRes.ok) {
+          const assignmentsData = await assignmentsRes.json();
+          const assignedClientIds = (assignmentsData.assignments || [])
+            .filter((a: any) => a.isActive)
+            .map((a: any) => a.clientId);
+
+          if (assignedClientIds.length > 0) {
+            const clientsRes = await fetch(
+              `/api/users?role=client&ids=${assignedClientIds.join(",")}`,
+            );
+            if (clientsRes.ok) {
+              const clientsData = await clientsRes.json();
+              allUsers = [...allUsers, ...(clientsData.data?.users || [])];
             }
           }
-        } else {
-          // Admins and superadmins can view all clients
-          const clientsRes = await fetch("/api/users?role=client");
-          if (clientsRes.ok) {
-            const clientsData = await clientsRes.json();
-            setUsers(clientsData.data?.users || []);
+        }
+        setUsers(allUsers);
+        setLoading(false);
+        return;
+      }
+
+      if (currentRole === "admin") {
+        allUsers.push(userData.user);
+      }
+
+      if (currentRole === "superAdmin" || currentRole === "admin") {
+        const [adminsRes, trainersRes, clientsRes] = await Promise.all([
+          fetch("/api/users?role=admin"),
+          fetch("/api/users?role=trainer"),
+          fetch("/api/users?role=client"),
+        ]);
+
+        const [adminsData, trainersData, clientsData] = await Promise.all([
+          adminsRes.ok ? adminsRes.json() : { data: { users: [] } },
+          trainersRes.ok ? trainersRes.json() : { data: { users: [] } },
+          clientsRes.ok ? clientsRes.json() : { data: { users: [] } },
+        ]);
+
+        allUsers = [
+          ...allUsers,
+          ...(adminsData.data?.users || []),
+          ...(trainersData.data?.users || []),
+          ...(clientsData.data?.users || []),
+        ];
+
+        if (currentRole === "superAdmin") {
+          const superAdminsRes = await fetch("/api/users?role=superAdmin");
+          if (superAdminsRes.ok) {
+            const superAdminsData = await superAdminsRes.json();
+            allUsers = [...(superAdminsData.data?.users || []), ...allUsers];
           }
         }
+
+        setUsers(allUsers);
+        setLoading(false);
+        return;
       }
+
+      setUsers(allUsers);
     } catch (error) {
       log.error("Failed to fetch users:", error);
     } finally {
@@ -120,7 +159,7 @@ export function ReportFilters({
               <SelectContent>
                 {users.map((user) => (
                   <SelectItem key={user.id} value={user.id}>
-                    {user.firstName} {user.lastName}
+                    {user.firstName} {user.lastName} ({user.role})
                   </SelectItem>
                 ))}
               </SelectContent>