Refactor assignment-assistant routing, schemas, and components

messages/de.json

@@ -318,6 +318,7 @@
 	"end": "Ende",
 	"enterCode": "Code eingeben",
 	"enterDateOfdateReceipt": "Empfangsdatum eingeben",
+	"enterNewSchoolName": "Neuen Schulnamen eingeben",
 	"entryCode": "Eintrittscode",
 	"experience": "Erfahrung",
 	"exportFrom": "Export aus {appName}",

schema.graphql

@@ -320,6 +320,7 @@ type Conference {
   postalStreet: String
   postalZip: String
   registrationDeadlineGracePeriodMinutes: Int!
+  schools: [ConferenceSchools!]!
   singleParticipants: [SingleParticipant!]!
   startAssignment: DateTime!
   startConference: DateTime!
@@ -648,6 +649,11 @@ input ConferenceScalarRelationFilter {
   isNot: ConferenceWhereInput
 }
 
+type ConferenceSchools {
+  count: Int!
+  school: String!
+}
+
 enum ConferenceState {
   ACTIVE
   PARTICIPANT_REGISTRATION
@@ -1974,6 +1980,7 @@ type Mutation {
   deleteOneTeamMember(where: TeamMemberWhereUniqueInput!): TeamMember
   deleteOneUser(where: UserWhereUniqueInput!): User
   deleteOneWaitingListEntry(where: WaitingListEntryWhereUniqueInput!): WaitingListEntry
+  normalizeSchoolsInConference(conferenceId: String!, newSchoolName: String!, schoolsToMerge: [String!]!): Conference
   rotateSupervisorConnectionCode(id: ID!): ConferenceSupervisor!
   seedNewConference(data: JSONObject!): SeedNewConferenceResult!
   sendAssignmentData(data: JSONObject!, where: ConferenceWhereUniqueInput!): SetAssignmentDataResult!

src/api/resolvers/modules/conference/conference.ts

@@ -43,7 +43,6 @@ import { toDataURL } from '$api/services/fileToDataURL';
 import { db } from '$db/db';
 import { conferenceSettingsFormSchema } from '../../../../routes/(authenticated)/management/[conferenceId]/configuration/form-schema';
 import { ConferenceState } from '$db/generated/graphql/inputs';
-import { conference } from '$lib/paraglide/messages';
 import { findManyNationQueryObject } from '$db/generated/graphql/Nation';
 
 builder.prismaObject('Conference', {
@@ -215,6 +214,70 @@ builder.prismaObject('Conference', {
 						conferenceId: conference.id
 					}
 				})
+		}),
+		schools: t.field({
+			type: [
+				builder.simpleObject('ConferenceSchools', {
+					fields: (t) => ({
+						school: t.string(),
+						count: t.int()
+					})
+				})
+			],
+			resolve: async (conference, _, ctx) => {
+				const delegations = await db.delegation.groupBy({
+					where: {
+						conferenceId: conference.id,
+						school: {
+							not: null
+						},
+						applied: {
+							equals: true
+						},
+						AND: [ctx.permissions.allowDatabaseAccessTo('list').Delegation]
+					},
+					by: 'school',
+					_count: {
+						school: true
+					}
+				});
+
+				const singleParticipants = await db.singleParticipant.groupBy({
+					where: {
+						conferenceId: conference.id,
+						school: {
+							not: null
+						},
+						applied: {
+							equals: true
+						},
+						AND: [ctx.permissions.allowDatabaseAccessTo('list').SingleParticipant]
+					},
+					by: 'school',
+					_count: {
+						school: true
+					}
+				});
+
+				const res: { school: string; count: number }[] = [];
+
+				for (const delegation of delegations) {
+					if (!delegation.school) continue;
+					res.push({ school: delegation.school, count: delegation._count.school });
+				}
+
+				for (const singleParticipant of singleParticipants) {
+					if (!singleParticipant.school) continue;
+					const existing = res.find((r) => r.school === singleParticipant.school);
+					if (existing) {
+						existing.count += singleParticipant._count.school;
+					} else {
+						res.push({ school: singleParticipant.school, count: singleParticipant._count.school });
+					}
+				}
+
+				return res;
+			}
 		})
 	})
 });
@@ -500,3 +563,53 @@ builder.mutationFields((t) => {
 		})
 	};
 });
+
+builder.mutationFields((t) => {
+	const field = updateOneConferenceMutationObject(t);
+	return {
+		normalizeSchoolsInConference: t.prismaField({
+			...field,
+			args: {
+				conferenceId: t.arg.string({ required: true }),
+				schoolsToMerge: t.arg.stringList(),
+				newSchoolName: t.arg.string({ required: true })
+			},
+			resolve: async (query, root, args, ctx, info) => {
+				await db.$transaction(async (tx) => {
+					const { conferenceId, schoolsToMerge } = args;
+
+					await tx.delegation.updateMany({
+						where: {
+							conferenceId,
+							school: {
+								in: schoolsToMerge
+							},
+							AND: [ctx.permissions.allowDatabaseAccessTo('update').Delegation]
+						},
+						data: {
+							school: args.newSchoolName
+						}
+					});
+
+					await tx.singleParticipant.updateMany({
+						where: {
+							conferenceId,
+							school: {
+								in: schoolsToMerge
+							},
+							AND: [ctx.permissions.allowDatabaseAccessTo('update').SingleParticipant]
+						},
+						data: {
+							school: args.newSchoolName
+						}
+					});
+				});
+				return await db.conference.findUnique({
+					where: {
+						id: args.conferenceId
+					}
+				});
+			}
+		})
+	};
+});

src/routes/(authenticated)/assignment-assistant/+page.svelte

@@ -2,6 +2,7 @@
 	import { goto } from '$app/navigation';
 	import { onMount } from 'svelte';
 	import { RAW_DATA_KEY } from './local_storage_keys';
+	import { graphql } from '$houdini';
 
 	let projects: {
 		id: string;

src/routes/(authenticated)/assignment-assistant/[projectId]/DelegationCard.svelte

@@ -1,10 +1,11 @@
 <script lang="ts">
 	import { graphql } from '$houdini';
 	import StarRating from '$lib/components/StarRating.svelte';
+	import { getAgeAtConference } from '$lib/services/ageChecker';
 	import codenamize from '$lib/services/codenamize';
 	import formatNames from '$lib/services/formatNames';
 	import { getFullTranslatedCountryNameFromISO3Code } from '$lib/services/nationTranslationHelper.svelte';
-	import type { Delegation } from './appData.svelte';
+	import { getConference, type Delegation } from './appData.svelte';
 	import LoadingData from './components/LoadingData.svelte';
 	import { getWeights } from './weights.svelte';
 
@@ -70,6 +71,8 @@
 				id
 				given_name
 				family_name
+				birthday
+				conferenceParticipationsCount
 			}
 		}
 	`);
@@ -121,6 +124,22 @@
 	</p>
 	<StarRating rating={application.evaluation ?? getWeights().nullRating} size="xs" />
 	<div class="flex items-center justify-center gap-2 text-xs">
+		<LoadingData
+			fetching={$getApplicationDetailsQuery.fetching}
+			error={$getApplicationDetailsQuery.error}
+		>
+			<div class="tooltip" data-tip="Durchschnittsalter">
+				{(
+					$getApplicationDetailsQuery.data?.findManyUsers?.reduce((acc, user) => {
+						const age = getAgeAtConference(
+							user.birthday,
+							getConference()?.startConference ?? new Date()
+						);
+						return acc + (age ? age : 0);
+					}, 0) / ($getApplicationDetailsQuery.data?.findManyUsers?.length || 1)
+				).toFixed(1)}
+			</div>
+		</LoadingData>
 		{#if application.note}
 			<div class="tooltip" data-tip={application.note}>
 				<i class="fas fa-sticky-note"></i>
@@ -182,6 +201,18 @@
 				<i class="fas fa-split"></i>
 			</div>
 		{/if}
+		<LoadingData
+			fetching={$getApplicationDetailsQuery.fetching}
+			error={$getApplicationDetailsQuery.error}
+		>
+			<div class="tooltip" data-tip="Durchschnittliche Konferenzteilnahmen">
+				{(
+					$getApplicationDetailsQuery.data?.findManyUsers?.reduce((acc, user) => {
+						return acc + (user.conferenceParticipationsCount ?? 0);
+					}, 0) / ($getApplicationDetailsQuery.data?.findManyUsers?.length || 1)
+				).toFixed(1)}
+			</div>
+		</LoadingData>
 	</div>
 </div>
 

src/routes/(authenticated)/assignment-assistant/[projectId]/appData.svelte.ts

@@ -95,6 +95,7 @@ export const DelegationSchema = z.object({
 	id: z.string(),
 	appliedForRoles: z.array(AppliedForDelegationRoleSchema),
 	members: z.array(MemberSchema),
+	school: z.string().optional(),
 	supervisors: z.undefined(),
 	user: z.undefined(),
 	splittedFrom: z.string().nullish(),
@@ -108,6 +109,7 @@ export const SingleParticipantSchema = z.object({
 	id: z.string(),
 	user: UserSchema,
 	appliedForRoles: z.array(AppliedForSingleRoleSchema),
+	school: z.string().optional(),
 	supervisors: z.optional(z.array(SupervisorSchema)),
 	members: z.undefined(),
 	splittedFrom: z.undefined(),
@@ -180,7 +182,34 @@ export const getConference: () => Conference | undefined = () => {
 export const getApplications = () => {
 	const project = getProject();
 	if (!project) return [];
-	return [...project.data.delegations, ...project.data.singleParticipants];
+	return [
+		...project.data.delegations.toSorted((a, b) => {
+			if (a.members?.length !== b.members?.length) {
+				return b.members?.length - a.members?.length;
+			}
+			return a.id.localeCompare(b.id);
+		}),
+		...project.data.singleParticipants
+	];
+};
+
+export const getSchools = () => {
+	const applications = getApplications();
+	const schools: { school: string; count: number; members: number }[] = [];
+	for (const application of applications) {
+		const schoolEntry = schools.find((x) => x.school === application.school);
+		if (schoolEntry) {
+			schoolEntry.count += 1;
+			schoolEntry.members += application?.members?.length ?? 1;
+		} else {
+			schools.push({
+				school: application.school ?? 'No School',
+				count: 1,
+				members: application?.members?.length ?? 1
+			});
+		}
+	}
+	return schools.toSorted((a, b) => a.school.localeCompare(b.school));
 };
 
 export const getDelegationApplications = () => {
@@ -258,9 +287,9 @@ export const getMoreInfoLink = (id: string) => {
 	const project = getProject();
 	if (!project) return '';
 	if (project.data.singleParticipants.find((singleParticipant) => singleParticipant.id === id)) {
-		return `/management/${project.data.conference.id}/individuals?filter=${id}`;
+		return `/management/${project.data.conference.id}/individuals?selected=${id}`;
 	}
-	return `/management/${project.data.conference.id}/delegations?filter=${id}`;
+	return `/management/${project.data.conference.id}/delegations?selected=${id}`;
 };
 
 export const evaluateApplication = (id: string, evaluation: number) => {