144 fixes active users count

apps/web/next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

apps/web/package.json

@@ -25,6 +25,7 @@
     "@radix-ui/react-checkbox": "^1.0.4",
     "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-dropdown-menu": "^2.0.6",
+    "@radix-ui/react-hover-card": "^1.1.6",
     "@radix-ui/react-label": "^2.0.2",
     "@radix-ui/react-popover": "^1.0.7",
     "@radix-ui/react-progress": "^1.1.2",

apps/web/src/components/dash/admin/members/MemberStatsSheet.tsx

@@ -16,6 +16,8 @@ async function MemberStatsSheet({}: Props) {
 		{
 			label: "Active Members",
 			value: stats.activeMembers,
+			description:
+				"An active member is defined as a member who has checked in at least once this semester.",
 		},
 	];
 

apps/web/src/components/dash/shared/StatItem.tsx

@@ -1,17 +1,35 @@
 import React from "react";
-
+import {
+	HoverCard,
+	HoverCardContent,
+	HoverCardTrigger,
+} from "@/components/ui/hover-card";
+import { Info } from "lucide-react";
 export type StatItemProps = {
 	label: string;
 	value: number | string;
+	description?: string;
 };
 
 /**
  * Reusable component for displaying a single statistic with a label and value
  */
-function StatItem({ label, value }: StatItemProps) {
+function StatItem({ label, value, description }: StatItemProps) {
 	return (
 		<div className="flex flex-col p-1">
-			<span className="text-xs text-muted-foreground">{label}</span>
+			<div className="flex flex-row items-center space-x-1">
+				<span className="text-xs text-muted-foreground">{label}</span>
+				{description && (
+					<HoverCard>
+						<HoverCardTrigger className="">
+							<Info className="h-3 w-3" />
+						</HoverCardTrigger>
+						<HoverCardContent className="text-xs">
+							{description}
+						</HoverCardContent>
+					</HoverCard>
+				)}
+			</div>
 			<span className="text-lg font-semibold">{value}</span>
 		</div>
 	);

apps/web/src/components/dash/shared/StatsSheet.tsx

@@ -1,4 +1,4 @@
-import React, { ReactNode } from "react";
+import React from "react";
 import { Separator } from "@/components/ui/separator";
 import StatItem, { StatItemProps } from "./StatItem";
 

apps/web/src/components/ui/hover-card.tsx

@@ -0,0 +1,29 @@
+"use client";
+
+import * as React from "react";
+import * as HoverCardPrimitive from "@radix-ui/react-hover-card";
+
+import { cn } from "@/lib/utils";
+
+const HoverCard = HoverCardPrimitive.Root;
+
+const HoverCardTrigger = HoverCardPrimitive.Trigger;
+
+const HoverCardContent = React.forwardRef<
+	React.ElementRef<typeof HoverCardPrimitive.Content>,
+	React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Content>
+>(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
+	<HoverCardPrimitive.Content
+		ref={ref}
+		align={align}
+		sideOffset={sideOffset}
+		className={cn(
+			"z-50 w-64 origin-[--radix-hover-card-content-transform-origin] rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+			className,
+		)}
+		{...props}
+	/>
+));
+HoverCardContent.displayName = HoverCardPrimitive.Content.displayName;
+
+export { HoverCard, HoverCardTrigger, HoverCardContent };

apps/web/src/lib/queries/users.ts

@@ -1,13 +1,7 @@
 import c from "config";
-import { count, db, eq, gte, inArray, sql } from "db";
-import {
-	checkins,
-	data,
-	eventCategories,
-	events,
-	eventsToCategories,
-	users,
-} from "db/schema";
+import { count, db, eq, sum } from "db";
+import { checkins, data, events, users } from "db/schema";
+import { getCurrentSemester } from "./semesters";
 
 export const getAdminUser = async (clerkId: string) => {
 	return db.query.users.findFirst({
@@ -42,25 +36,35 @@ export const getUserWithData = async () => {
 };
 
 export const getMemberStatsOverview = async () => {
+	const currentSemester = await getCurrentSemester();
 	const [{ totalMembers }] = await db
 		.select({
 			totalMembers: count(),
 		})
-		.from(events);
+		.from(users);
 
-	const checkin_counts = db
-		.select({ user_id: checkins.userID, count: count(checkins.eventID) })
-		.from(checkins)
-		.groupBy(checkins.userID)
-		.having(({ count }) => gte(count, c.membership.activeThreshold))
-		.as("checkin_counts");
-	const [{ activeMembers }] = await db
+	const checkin_counts = await db
 		.select({
-			activeMembers: count(checkin_counts.user_id),
+			user_id: checkins.userID,
+			totalPoints: sum(events.points).mapWith(Number),
 		})
-		.from(checkin_counts);
+		.from(checkins)
+		.innerJoin(events, eq(checkins.eventID, events.id))
+		.groupBy(checkins.userID);
+
+	let activeMembers = checkin_counts.length;
+	let banquetQualifiers = 0;
+	checkin_counts.forEach((checkin) => {
+		if (
+			checkin.totalPoints >=
+			(currentSemester?.pointsRequired ??
+				c.semesters.current.pointsRequired)
+		) {
+			banquetQualifiers++;
+		}
+	});
 
-	return { totalMembers, activeMembers };
+	return { totalMembers, activeMembers, banquetQualifiers };
 };
 
 export const getUserCheckin = async (eventID: string, userID: number) => {