From 3086d9d9cc89ababdca2ff434b856e3d1719e904 Mon Sep 17 00:00:00 2001 From: LiviaValenti <54808860+LiviaValenti@users.noreply.github.com> Date: Thu, 8 Jun 2023 11:34:58 +0200 Subject: [PATCH 1/7] feat: add pre-acceptance and pre-rejection status --- backend/utils/enums.ts | 2 ++ frontend/src/components/StatusInput.tsx | 1 + frontend/src/utils/enums.ts | 2 ++ frontend/src/utils/status.tsx | 17 +++++++++++++++++ 4 files changed, 22 insertions(+) diff --git a/backend/utils/enums.ts b/backend/utils/enums.ts index 90b745e9..2675e356 100644 --- a/backend/utils/enums.ts +++ b/backend/utils/enums.ts @@ -20,6 +20,8 @@ enum StatusTypes { INVITED_TO_INTERVIEW = 'Invited to interview', INTERVIEW_DECLINED = 'Interview declined', INTERVIEW_COMPLETED = 'Interview completed', + PLANNED_ACCEPTANCE = 'Planned acceptance', + PLANNED_REJECTION = 'Planned rejection', OFFER_GIVEN = 'Offer given', OFFER_DECLINED = 'Offer declined', ACCEPTED = 'Accepted', diff --git a/frontend/src/components/StatusInput.tsx b/frontend/src/components/StatusInput.tsx index 21b1ffba..f5215a80 100644 --- a/frontend/src/components/StatusInput.tsx +++ b/frontend/src/components/StatusInput.tsx @@ -59,6 +59,7 @@ function isYellow(value: StatusTypes): boolean { return ( value === StatusTypes.PLANNED_INTERVIEW || value === StatusTypes.INVITED_TO_INTERVIEW || + value === StatusTypes.PLANNED_ACCEPTANCE || value === StatusTypes.OFFER_GIVEN || value === StatusTypes.INTERVIEW_COMPLETED ) diff --git a/frontend/src/utils/enums.ts b/frontend/src/utils/enums.ts index a5cefb9a..78c7920b 100644 --- a/frontend/src/utils/enums.ts +++ b/frontend/src/utils/enums.ts @@ -10,6 +10,8 @@ enum StatusTypes { INVITED_TO_INTERVIEW = 'Invited to interview', INTERVIEW_DECLINED = 'Interview declined', INTERVIEW_COMPLETED = 'Interview completed', + PLANNED_ACCEPTANCE = 'Planned acceptance', + PLANNED_REJECTION = 'Planned rejection', OFFER_GIVEN = 'Offer given', OFFER_DECLINED = 'Offer declined', ACCEPTED = 'Accepted', diff --git a/frontend/src/utils/status.tsx b/frontend/src/utils/status.tsx index 8f2e2628..234d4968 100644 --- a/frontend/src/utils/status.tsx +++ b/frontend/src/utils/status.tsx @@ -7,6 +7,7 @@ import { PhoneCheck, PhoneIncoming, PhoneOff, + PhonePause, QuestionMark, UserOff, UserPlus, @@ -25,6 +26,10 @@ export function getStatusTranslation(status: StatusTypes) { return 'Intervju avslått' case StatusTypes.INTERVIEW_COMPLETED: return 'Intervju fullført' + case StatusTypes.PLANNED_ACCEPTANCE: + return 'Planlagt tilbud' + case StatusTypes.PLANNED_REJECTION: + return 'Planlagt avslag' case StatusTypes.OFFER_GIVEN: return 'Tilbud gitt' case StatusTypes.OFFER_DECLINED: @@ -50,6 +55,10 @@ export function getStatus(status: string) { return StatusTypes.INTERVIEW_DECLINED case 'Interview completed': return StatusTypes.INTERVIEW_COMPLETED + case 'Planned acceptance': + return StatusTypes.PLANNED_ACCEPTANCE + case 'Planned rejection': + return StatusTypes.PLANNED_REJECTION case 'Offer given': return StatusTypes.OFFER_GIVEN case 'Offer declined': @@ -75,6 +84,10 @@ export function getStatusColor(status: StatusTypes, theme: MantineTheme) { return theme.colors.ntnui_red[9] case StatusTypes.INTERVIEW_COMPLETED: return theme.colors.ntnui_yellow[9] + case StatusTypes.PLANNED_ACCEPTANCE: + return theme.colors.ntnui_yellow[9] + case StatusTypes.PLANNED_REJECTION: + return theme.colors.ntnui_red[9] case StatusTypes.OFFER_GIVEN: return theme.colors.ntnui_yellow[9] case StatusTypes.OFFER_DECLINED: @@ -100,6 +113,10 @@ export function getIconForStatus(status: string) { return case StatusTypes.INTERVIEW_COMPLETED: return + case StatusTypes.PLANNED_ACCEPTANCE: + return + case StatusTypes.PLANNED_REJECTION: + return case StatusTypes.OFFER_GIVEN: return case StatusTypes.OFFER_DECLINED: From 363361cf04bdfe7e91159dacfc9f5ed43bcb3db8 Mon Sep 17 00:00:00 2001 From: LiviaValenti Date: Tue, 9 Jan 2024 17:42:17 +0100 Subject: [PATCH 2/7] feat: add uncertain status --- backend/utils/enums.ts | 1 + frontend/src/components/StatusInput.tsx | 1 + frontend/src/utils/enums.ts | 1 + frontend/src/utils/status.tsx | 9 +++++++++ 4 files changed, 12 insertions(+) diff --git a/backend/utils/enums.ts b/backend/utils/enums.ts index 2675e356..48141c62 100644 --- a/backend/utils/enums.ts +++ b/backend/utils/enums.ts @@ -20,6 +20,7 @@ enum StatusTypes { INVITED_TO_INTERVIEW = 'Invited to interview', INTERVIEW_DECLINED = 'Interview declined', INTERVIEW_COMPLETED = 'Interview completed', + UNCERTAIN = 'Uncertain', PLANNED_ACCEPTANCE = 'Planned acceptance', PLANNED_REJECTION = 'Planned rejection', OFFER_GIVEN = 'Offer given', diff --git a/frontend/src/components/StatusInput.tsx b/frontend/src/components/StatusInput.tsx index f5215a80..4a10b2df 100644 --- a/frontend/src/components/StatusInput.tsx +++ b/frontend/src/components/StatusInput.tsx @@ -59,6 +59,7 @@ function isYellow(value: StatusTypes): boolean { return ( value === StatusTypes.PLANNED_INTERVIEW || value === StatusTypes.INVITED_TO_INTERVIEW || + value === StatusTypes.UNCERTAIN || value === StatusTypes.PLANNED_ACCEPTANCE || value === StatusTypes.OFFER_GIVEN || value === StatusTypes.INTERVIEW_COMPLETED diff --git a/frontend/src/utils/enums.ts b/frontend/src/utils/enums.ts index 78c7920b..58966a10 100644 --- a/frontend/src/utils/enums.ts +++ b/frontend/src/utils/enums.ts @@ -10,6 +10,7 @@ enum StatusTypes { INVITED_TO_INTERVIEW = 'Invited to interview', INTERVIEW_DECLINED = 'Interview declined', INTERVIEW_COMPLETED = 'Interview completed', + UNCERTAIN = 'Uncertain', PLANNED_ACCEPTANCE = 'Planned acceptance', PLANNED_REJECTION = 'Planned rejection', OFFER_GIVEN = 'Offer given', diff --git a/frontend/src/utils/status.tsx b/frontend/src/utils/status.tsx index 234d4968..754e0ce4 100644 --- a/frontend/src/utils/status.tsx +++ b/frontend/src/utils/status.tsx @@ -3,6 +3,7 @@ import { StatusTypes } from './enums' import { Check, ClipboardText, + Clock, File, PhoneCheck, PhoneIncoming, @@ -26,6 +27,8 @@ export function getStatusTranslation(status: StatusTypes) { return 'Intervju avslått' case StatusTypes.INTERVIEW_COMPLETED: return 'Intervju fullført' + case StatusTypes.UNCERTAIN: + return 'Under vurdering' case StatusTypes.PLANNED_ACCEPTANCE: return 'Planlagt tilbud' case StatusTypes.PLANNED_REJECTION: @@ -55,6 +58,8 @@ export function getStatus(status: string) { return StatusTypes.INTERVIEW_DECLINED case 'Interview completed': return StatusTypes.INTERVIEW_COMPLETED + case 'Uncertain': + return StatusTypes.UNCERTAIN case 'Planned acceptance': return StatusTypes.PLANNED_ACCEPTANCE case 'Planned rejection': @@ -84,6 +89,8 @@ export function getStatusColor(status: StatusTypes, theme: MantineTheme) { return theme.colors.ntnui_red[9] case StatusTypes.INTERVIEW_COMPLETED: return theme.colors.ntnui_yellow[9] + case StatusTypes.UNCERTAIN: + return theme.colors.ntnui_yellow[9] case StatusTypes.PLANNED_ACCEPTANCE: return theme.colors.ntnui_yellow[9] case StatusTypes.PLANNED_REJECTION: @@ -113,6 +120,8 @@ export function getIconForStatus(status: string) { return case StatusTypes.INTERVIEW_COMPLETED: return + case StatusTypes.UNCERTAIN: + return case StatusTypes.PLANNED_ACCEPTANCE: return case StatusTypes.PLANNED_REJECTION: From d1f2c290511b9f84b6e85797529c9f0b13523f99 Mon Sep 17 00:00:00 2001 From: Livia Valenti <54808860+LiviaValenti@users.noreply.github.com> Date: Mon, 15 Jan 2024 18:40:59 +0100 Subject: [PATCH 3/7] fix: main board required when not present (#167) --- frontend/src/components/ApplicationForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/ApplicationForm.tsx b/frontend/src/components/ApplicationForm.tsx index dc8c229b..6d0b125e 100644 --- a/frontend/src/components/ApplicationForm.tsx +++ b/frontend/src/components/ApplicationForm.tsx @@ -298,7 +298,7 @@ export function Form({ committees }: IFormProps) { description='Nevn gjerne alder, klasse, studieretning, erfaring og motivasjon' label={`Søknadstekst for ${MAIN_BOARD_NAME}`} autosize - required + required={isToMainBoard && form.values.committees.length > 1} maxRows={10} minRows={3} onBlur={() => form.validateField('main_board_text')} From 4918057467f967a8be6fdd8bc3d5a19ccc6c7b8a Mon Sep 17 00:00:00 2001 From: Danielk131 <89570342+Danielk131@users.noreply.github.com> Date: Fri, 6 Jun 2025 13:56:59 +0200 Subject: [PATCH 4/7] Added Bumerang group to the fixture json file --- backend/fixtures/production/committees.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backend/fixtures/production/committees.json b/backend/fixtures/production/committees.json index 594d351d..c91622f7 100644 --- a/backend/fixtures/production/committees.json +++ b/backend/fixtures/production/committees.json @@ -90,5 +90,12 @@ "slug": "materialutvalget", "access_roles": ["deputy_leader"], "accepts_admissions": false + }, + { + "_id": 67, + "name": "Bumerang", + "slug": "bumerang", + "access_roles": ["deputy_leader"], + "accepts_admissions": false } ] From 8f58a715e0fa01aefc8a571676814fcbe1910430 Mon Sep 17 00:00:00 2001 From: Danielk131 <89570342+Danielk131@users.noreply.github.com> Date: Sat, 2 Aug 2025 11:35:07 +0200 Subject: [PATCH 5/7] Update committees.json (#172) --- backend/fixtures/production/committees.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/fixtures/production/committees.json b/backend/fixtures/production/committees.json index c91622f7..b9db4aa3 100644 --- a/backend/fixtures/production/committees.json +++ b/backend/fixtures/production/committees.json @@ -34,7 +34,7 @@ }, { "_id": 93, - "name": "Moment", + "name": "Politikk", "slug": "moment", "access_roles": [], "accepts_admissions": false From 39ac8d5762dc0557ff1f2b9a81882d29f141baad Mon Sep 17 00:00:00 2001 From: Danielk131 <89570342+Danielk131@users.noreply.github.com> Date: Sun, 10 Aug 2025 15:21:46 +0200 Subject: [PATCH 6/7] Update committees.json (#173) * Update committees.json --- backend/fixtures/production/committees.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backend/fixtures/production/committees.json b/backend/fixtures/production/committees.json index b9db4aa3..5116f00f 100644 --- a/backend/fixtures/production/committees.json +++ b/backend/fixtures/production/committees.json @@ -97,5 +97,12 @@ "slug": "bumerang", "access_roles": ["deputy_leader"], "accepts_admissions": false + }, + { + "_id": 79, + "name": "Baneutvalget", + "slug": "baneutvalget", + "access_roles": ["deputy_leader"], + "accepts_admissions": true } ] From f03ec8d7866bbe884793c5a2104347d022fed3ef Mon Sep 17 00:00:00 2001 From: Mateo Souto Date: Wed, 13 Aug 2025 11:46:22 +0200 Subject: [PATCH 7/7] chore: change admission period end to 2030 --- backend/fixtures/development/admissionperiod.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/fixtures/development/admissionperiod.json b/backend/fixtures/development/admissionperiod.json index a307f9e0..b31dfc9c 100644 --- a/backend/fixtures/development/admissionperiod.json +++ b/backend/fixtures/development/admissionperiod.json @@ -1,6 +1,6 @@ [ { - "start_date": "2022-02-25", - "end_date": "2022-03-31" + "start_date": "2025-08-12", + "end_date": "2030-09-03" } ]