fix up merge

backend/samfundet/migrations/0008_recruitmentstatistics_total_rejected.py → backend/samfundet/migrations/0012_recruitmentstatistics_total_rejected.py

@@ -1,11 +1,11 @@
-# Generated by Django 5.1.1 on 2024-12-22 00:13
+# Generated by Django 5.1.1 on 2024-12-22 01:25
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("samfundet", "0007_alter_infobox_color_alter_infobox_image_and_more"),
+        ("samfundet", "0011_recruitmentposition_file_description_en_and_more"),
     ]
 
     operations = [

frontend/src/PagesAdmin/RecruitmentOverviewPage/Components/RecruitmentProgression/RecruitmentProgression.tsx

@@ -1,11 +1,9 @@
-import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 import { Button, Link, ProgressBar, SamfundetLogoSpinner } from '~/Components';
-import { Table, type TableRow } from '~/Components/Table';
+import { Table } from '~/Components/Table';
 import { Text } from '~/Components/Text/Text';
-import { getRecruitmentStats } from '~/api';
-import { GangStatsDto, type RecruitmentForRecruiterDto, type RecruitmentGangStatDto, RecruitmentStatsDto } from '~/dto';
+import type { RecruitmentForRecruiterDto, RecruitmentGangStatDto } from '~/dto';
 import { useCustomNavigate } from '~/hooks';
 import { KEY } from '~/i18n/constants';
 import { reverse } from '~/named-urls';

frontend/src/PagesAdmin/RecruitmentOverviewPage/Components/RecruitmentStatistics/RecruitmentStatistics.tsx

@@ -1,12 +1,10 @@
-import { useQuery } from '@tanstack/react-query';
 import { useCallback, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 import { toast } from 'react-toastify';
 import { Chart, SamfundetLogoSpinner } from '~/Components';
 import { Table } from '~/Components/Table';
 import { Text } from '~/Components/Text/Text';
-import { getRecruitmentStats } from '~/api';
 import type { RecruitmentStatsDto } from '~/dto';
 import { useCustomNavigate, useParentElementWidth } from '~/hooks';
 import { KEY } from '~/i18n/constants';

frontend/src/PagesAdmin/RecruitmentOverviewPage/RecruitmentOverviewPage.tsx

@@ -6,16 +6,16 @@ import { TabView } from '~/Components';
 import type { Tab } from '~/Components/TabBar/TabBar';
 import { AdminPageLayout } from '~/PagesAdmin/AdminPageLayout/AdminPageLayout';
 import { getRecruitmentForRecruiter } from '~/api';
-import { RecruitmentDto, type RecruitmentForRecruiterDto } from '~/dto';
+import type { RecruitmentForRecruiterDto } from '~/dto';
 import { useTitle } from '~/hooks';
 import { KEY } from '~/i18n/constants';
+import { dbT } from '~/utils';
 import { RecruitmentProgression } from './Components/RecruitmentProgression';
 import { RecruitmentStatistics } from './Components/RecruitmentStatistics';
 
 export function RecruitmentOverviewPage() {
   const { t } = useTranslation();
   const { recruitmentId } = useParams();
-  const RECRUITMENT_TITLE_PLACEHOLDER: string = 'PLACEHOLDER-RECRUITMENT-TITLE';
 
   const { data, isLoading, error } = useQuery<RecruitmentForRecruiterDto>({
     queryKey: ['recruitmentStats', recruitmentId],
@@ -29,10 +29,11 @@ export function RecruitmentOverviewPage() {
       { key: 2, label: t(KEY.recruitment_statistics), value: <RecruitmentStatistics statistics={data?.statistics} /> },
     ];
   }, [data, t]);
-    
+
   useTitle(t(KEY.recruitment_overview));
+
   return (
-    <AdminPageLayout title={`${t(KEY.recruitment_overview)}: ${RECRUITMENT_TITLE_PLACEHOLDER}`}>
+    <AdminPageLayout title={`${t(KEY.recruitment_overview)}: ${dbT(data, 'name')}`}>
       <TabView tabs={tabs} />
     </AdminPageLayout>
   );

frontend/src/dto.ts

@@ -441,7 +441,7 @@ export type RecruitmentForRecruiterDto = RecruitmentDto & {
 
 export type RecruitmentWriteDto = RecruitmentDto & {
   organization: number;
-}
+};
 
 export type RecruitmentSeparatePositionDto = {
   id?: number;
@@ -582,8 +582,8 @@ export type RecruitmentCampusStatDto = {
 
 export type RecruitmentGangStatDto = {
   gang: GangDto;
-  total_applications: number;
-  total_applicants: number;
+  application_count: number;
+  applicant_count: number;
   average_priority: number;
   total_accepted: number;
   total_rejected: number;