From f5a22d4f6c2a7948a7446368f81d0894ec44b5af Mon Sep 17 00:00:00 2001 From: magsyg Date: Wed, 11 Dec 2024 12:53:47 +0100 Subject: [PATCH] formating --- backend/samfundet/urls.py | 6 +++- backend/samfundet/views.py | 5 ++- .../RecruitmentGangAdminPage.tsx | 32 ++++++++----------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/backend/samfundet/urls.py b/backend/samfundet/urls.py index 63ebf87e5..1b183eab5 100644 --- a/backend/samfundet/urls.py +++ b/backend/samfundet/urls.py @@ -94,7 +94,11 @@ views.RecruitmentInterviewGroupView.as_view(), name='recruitment_shared_interviews', ), - path('recruitment-positions-gang-for-gangs///', views.RecruitmentPositionsPerGangForGangView.as_view(), name='recruitment_positions_gang_for_gangs'), + path( + 'recruitment-positions-gang-for-gangs///', + views.RecruitmentPositionsPerGangForGangView.as_view(), + name='recruitment_positions_gang_for_gangs', + ), path('recruitment-set-interview//', views.RecruitmentApplicationSetInterviewView.as_view(), name='recruitment_set_interview'), path( 'recruitment-application-states-choices', diff --git a/backend/samfundet/views.py b/backend/samfundet/views.py index c70acc721..4ed427c79 100644 --- a/backend/samfundet/views.py +++ b/backend/samfundet/views.py @@ -756,10 +756,9 @@ def get(self, request: Request, recruitment_id: int, gang_id: int) -> Response: gang = get_object_or_404(Gang, id=gang_id) recruitment = get_object_or_404(Recruitment, id=recruitment_id) if recruitment.resolve_org() != gang.resolve_org(): - return Response("Gang not found in recruitment organization", status=status.HTTP_404_NOT_FOUND) + return Response('Gang not found in recruitment organization', status=status.HTTP_404_NOT_FOUND) data = RecruitmentPosition.objects.filter(gang=gang, recruitment=recruitment) - return Response(data=self.serializer_class(data,many=True).data, status=status.HTTP_200_OK) - + return Response(data=self.serializer_class(data, many=True).data, status=status.HTTP_200_OK) class SendRejectionMailView(APIView): diff --git a/frontend/src/PagesAdmin/RecruitmentGangAdminPage/RecruitmentGangAdminPage.tsx b/frontend/src/PagesAdmin/RecruitmentGangAdminPage/RecruitmentGangAdminPage.tsx index a293049fa..df8a4b86e 100644 --- a/frontend/src/PagesAdmin/RecruitmentGangAdminPage/RecruitmentGangAdminPage.tsx +++ b/frontend/src/PagesAdmin/RecruitmentGangAdminPage/RecruitmentGangAdminPage.tsx @@ -10,11 +10,11 @@ import { useTitle } from '~/hooks'; import { STATUS } from '~/http_status_codes'; import { KEY } from '~/i18n/constants'; import { reverse } from '~/named-urls'; +import type { RecruitmentGangLoader } from '~/router/loaders'; import { ROUTES } from '~/routes'; import { dbT, getObjectFieldOrNumber, lowerCapitalize } from '~/utils'; import { AdminPageLayout } from '../AdminPageLayout/AdminPageLayout'; import styles from './RecruitmentGangAdminPage.module.scss'; -import { RecruitmentGangLoader } from '~/router/loaders'; export function RecruitmentGangAdminPage() { const { recruitmentId, gangId } = useParams(); @@ -34,26 +34,24 @@ export function RecruitmentGangAdminPage() { // biome-ignore lint/correctness/useExhaustiveDependencies: t and navigate do not need to be in deplist useEffect(() => { if (recruitmentId && gangId) { - getRecruitmentPositionsGangForGang(recruitmentId, gangId).then((data) => { - setRecruitmentPositions(data.data); - }) - .catch((data) => { - if (data.request.status === STATUS.HTTP_404_NOT_FOUND) { - navigate(ROUTES.frontend.not_found, { replace: true }); - } - toast.error(t(KEY.common_something_went_wrong)); - }) + getRecruitmentPositionsGangForGang(recruitmentId, gangId) + .then((data) => { + setRecruitmentPositions(data.data); + }) + .catch((data) => { + if (data.request.status === STATUS.HTTP_404_NOT_FOUND) { + navigate(ROUTES.frontend.not_found, { replace: true }); + } + toast.error(t(KEY.common_something_went_wrong)); + }); } }, [recruitmentId, gangId]); - - useEffect(()=> { - if(recruitmentPositions && gang && gang) { + useEffect(() => { + if (recruitmentPositions && gang && gang) { setShowSpinner(false); } - }, - [recruitmentPositions, gang, recruitment] - ) + }, [recruitmentPositions, gang, recruitment]); useEffect(() => { if (loader) { @@ -62,8 +60,6 @@ export function RecruitmentGangAdminPage() { } }, [loader]); - - const tableColumns = [ { content: t(KEY.recruitment_position), sortable: true }, { content: t(KEY.recruitment_jobtype), sortable: true },