Skip to content

Commit e5d49ca

Browse files
authored
Add bedex to interest form (#5856)
Make bedex an option in the company interest form
1 parent df513ce commit e5d49ca

File tree

2 files changed

+29
-30
lines changed

2 files changed

+29
-30
lines changed

lego-webapp/pages/bdb/company-interest/CompanyInterestForm.tsx

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import english from '~/assets/flags/great_britain.svg';
99
import norwegian from '~/assets/flags/norway.svg';
1010
import { ContentMain } from '~/components/Content';
1111
import {
12+
CheckBox,
1213
Form,
13-
TextEditor,
14-
TextInput,
1514
LegoFinalForm,
16-
CheckBox,
17-
SelectInput,
18-
RadioButton,
1915
MultiSelectGroup,
16+
RadioButton,
17+
SelectInput,
18+
TextEditor,
19+
TextInput,
2020
} from '~/components/Form';
2121
import SubmissionError from '~/components/Form/SubmissionError';
2222
import { SubmitButton } from '~/components/Form/SubmitButton';
@@ -41,34 +41,34 @@ import { spyValues } from '~/utils/formSpyUtils';
4141
import { useParams } from '~/utils/useParams';
4242
import {
4343
createValidator,
44-
required,
4544
isEmail,
45+
required,
4646
requiredIf,
4747
} from '~/utils/validation';
4848
import styles from './CompanyInterestForm.module.css';
4949
import {
50+
COLLABORATION_DESCRIPTIONS,
51+
COLLABORATION_TYPES,
52+
COMPANY_TYPES,
5053
EVENTS,
54+
FORM_LABELS,
5155
OTHER_OFFERS,
5256
SURVEY_OFFERS,
5357
TARGET_GRADES,
54-
FORM_LABELS,
55-
COLLABORATION_TYPES,
56-
COMPANY_TYPES,
5758
TOOLTIP,
58-
COLLABORATION_DESCRIPTIONS,
5959
} from './Translations';
6060
import {
61-
interestText,
62-
semesterToText,
63-
targetGradeToString,
61+
collaborationDescriptionToString,
62+
collaborationToString,
6463
eventToString,
65-
surveyOffersToString,
64+
interestText,
6665
otherOffersToString,
67-
collaborationToString,
6866
PARTICIPANT_RANGE_MAP,
69-
sortSemesterChronologically,
7067
PARTICIPANT_RANGE_TYPES,
71-
collaborationDescriptionToString,
68+
semesterToText,
69+
sortSemesterChronologically,
70+
surveyOffersToString,
71+
targetGradeToString,
7272
} from './utils';
7373
import type { ReactNode } from 'react';
7474
import type { DetailedCompanyInterest } from '~/redux/models/CompanyInterest';
@@ -496,13 +496,13 @@ const CompanyInterestForm = ({ language }: Props) => {
496496
commentName: 'breakfastTalkComment',
497497
commentPlaceholder: interestText.breakfastTalkComment[language],
498498
},
499-
// {
500-
// name: 'bedex',
501-
// translated: EVENTS.bedex[language],
502-
// description: interestText.bedexDescription[language],
503-
// commentName: 'bedexComment',
504-
// commentPlaceholder: interestText.bedexComment[language],
505-
// },
499+
{
500+
name: 'bedex',
501+
translated: EVENTS.bedex[language],
502+
description: interestText.bedexDescription[language],
503+
commentName: 'bedexComment',
504+
commentPlaceholder: interestText.bedexComment[language],
505+
},
506506
{
507507
name: 'other',
508508
translated: EVENTS.other[language],
@@ -753,8 +753,7 @@ const CompanyInterestForm = ({ language }: Props) => {
753753
{eventTypeEntities.map((eventTypeEntity) => {
754754
return spyValues((values: CompanyInterestFormEntity) => {
755755
const showComment = values.events?.some(
756-
(e) =>
757-
e.name === eventTypeEntity.name && e.checked === true,
756+
(e) => e.name === eventTypeEntity.name && e.checked,
758757
);
759758

760759
return (

lego-webapp/pages/bdb/company-interest/Translations.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ export const EVENTS = {
2121
// norwegian: 'Digital presentasjon',
2222
// english: 'Digital presentation',
2323
// },
24-
// bedex: {
25-
// norwegian: 'Bedriftsekskursjon (BedEx)',
26-
// english: 'Company excursion (BedEx)',
27-
// },
24+
bedex: {
25+
norwegian: 'Bedriftsekskursjon (BedEx)',
26+
english: 'Company excursion (BedEx)',
27+
},
2828
other: {
2929
norwegian: 'Alternativt arrangement',
3030
english: 'Other event',

0 commit comments

Comments
 (0)