Skip to content

Commit 1e8faa3

Browse files
add yhteistyo question
1 parent 39c8c60 commit 1e8faa3

File tree

5 files changed

+39
-4
lines changed

5 files changed

+39
-4
lines changed

src/client/V2/filterContext.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ interface FilterContextType {
6262
setIndependent: (s: string) => void
6363
mooc: string
6464
setMooc: (s: string) => void
65+
collaboration: string
66+
setCollaboration: (s: string) => void
6567
strictFilters: string[]
6668
setStrictFilters: (s: string[]) => void
6769
}
@@ -158,6 +160,11 @@ export const filterConfigMap = (filters: any) => new Map([
158160
setState: filters.setMooc,
159161
superToggle: true
160162
}],
163+
['collaboration', {
164+
state: filters.collaboration,
165+
setState: filters.setCollaboration,
166+
superToggle: true
167+
}],
161168
])
162169

163170
// Map coordinate keys to filter IDs for recommendation reasons
@@ -175,6 +182,7 @@ export const coordinateKeyToFilterId: { [key: string]: string } = {
175182
flexible: 'flexible',
176183
mooc: 'mooc',
177184
finmu: 'finmu',
185+
collaboration: 'collaboration',
178186
}
179187

180188
// Get translated short name for a coordinate key
@@ -251,6 +259,7 @@ export const FilterContextProvider = ({ children }: { children: ReactNode }) =>
251259
const [integrated, setIntegrated] = useState('')
252260
const [independent, setIndependent] = useState('')
253261
const [mooc, setMooc] = useState('')
262+
const [collaboration, setCollaboration] = useState('')
254263
const [strictFilters, setStrictFilters] = useState<string[]>([])
255264

256265

@@ -335,6 +344,7 @@ export const FilterContextProvider = ({ children }: { children: ReactNode }) =>
335344
'integrated': getTrueFilterValue(integrated, 'integrated'),
336345
'independent': getTrueFilterValue(independent, 'independent'),
337346
'mooc': getTrueFilterValue(mooc, 'mooc'),
347+
'collaboration': getTrueFilterValue(collaboration, 'collaboration'),
338348
}
339349

340350
const answerData = Object.fromEntries(
@@ -376,6 +386,7 @@ export const FilterContextProvider = ({ children }: { children: ReactNode }) =>
376386
integrated,
377387
independent,
378388
mooc,
389+
collaboration,
379390
strictFilters,
380391
])
381392

@@ -433,6 +444,8 @@ export const FilterContextProvider = ({ children }: { children: ReactNode }) =>
433444
setIndependent,
434445
mooc,
435446
setMooc,
447+
collaboration,
448+
setCollaboration,
436449
strictFilters,
437450
setStrictFilters,
438451
}}

src/client/hooks/useQuestions.tsx

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ const useQuestions = () => {
209209
effects: 'none',
210210
mandatory: false,
211211
id: 'previusly-done-lang',
212-
shortName: t('filterShortName:Aikaisemmat opinnot'),
212+
shortName: t('filterShortName:Aikaisemmatopinnot'),
213213
type: 'previusly-done-lang',
214214
explanation: t('form:previoslyDoneLangExplanation'),
215215
extraInfo: t('question:checkInstructionsCrediting'),
@@ -536,6 +536,22 @@ const useQuestions = () => {
536536
// },
537537
// ],
538538
// },
539+
{
540+
number: '',
541+
mandatory: false,
542+
id: 'collaboration',
543+
shortName: t('filterShortName:Yhteistyo'),
544+
effects: 'collaboration',
545+
type: 'multi',
546+
variants: [
547+
{
548+
name: 'default',
549+
question: t('form:collaborationQuestion'),
550+
skipped: false,
551+
options: generateGeneralYesNoOptions(true),
552+
},
553+
],
554+
},
539555
]
540556
return(questions)
541557

src/client/locales/en.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export default {
2525
'independentQuestion': 'I want to work independently or autonomously.',
2626
'flexibleQuestion': 'I want to take a course with a flexible schedule',
2727
'moocQuestion': 'Do you want to search for MOOCs (Massive Open Online Courses)?',
28+
'collaborationQuestion': 'Show collaboration partner courses',
2829
'finnish': 'finnish',
2930
'swedish': 'swedish',
3031
'english': 'english',
@@ -130,7 +131,7 @@ export default {
130131
'Koulukieli': 'School Language',
131132
'Kurssi': 'Course',
132133
'Viestintä': 'Communication',
133-
'Aikaisemmat opinnot': 'Previous Studies',
134+
'Aikaisemmatopinnot': 'Previous Studies',
134135
'Korvaava': 'Replacement',
135136
'Valmentava': 'Preparatory',
136137
'Finmu': 'Finmu',
@@ -142,5 +143,6 @@ export default {
142143
'Lukuvuosi': 'Academic Year',
143144
'Periodi': 'Period',
144145
'MOOC': 'MOOC',
146+
'Yhteistyo': 'Collaboration',
145147
}
146148
}

src/client/locales/fi.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export default {
2525
'independentQuestion': 'Haluan työskennellä itsenäisesti tai autonomisesti.',
2626
'flexibleQuestion': 'Haluan osallistua kurssille, jonka aikataulu on joustava.',
2727
'moocQuestion': 'Haluatko etsiä MOOC-kursseja (Massive Open Online Courses)?',
28+
'collaborationQuestion': 'Näytä yhteistyökumppanien kursseja',
2829
'finnish': 'suomi',
2930
'swedish': 'ruotsi',
3031
'english': 'englanti',
@@ -130,7 +131,7 @@ export default {
130131
'Koulukieli': 'Koulukieli',
131132
'Kurssi': 'Kurssi',
132133
'Viestintä': 'Viestintä',
133-
'Aikaisemmat opinnot': 'Aikaisemmat opinnot',
134+
'Aikaisemmatopinnot': 'Aikaisemmat opinnot',
134135
'Korvaava': 'Korvaava',
135136
'Valmentava': 'Valmentava',
136137
'Finmu': 'Finmu',
@@ -142,5 +143,6 @@ export default {
142143
'Lukuvuosi': 'Lukuvuosi',
143144
'Periodi': 'Periodi',
144145
'MOOC': 'MOOC',
146+
'Yhteistyo': 'Yhteistyö',
145147
}
146148
}

src/client/locales/sv.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export default {
2525
'independentQuestion': 'Jag vill arbeta självständigt eller autonomt.',
2626
'flexibleQuestion': 'Jag vill ta en kurs med ett flexibelt schema.',
2727
'moocQuestion': 'Vill du söka efter MOOCs (Massive Open Online Courses)?',
28+
'collaborationQuestion': 'Visa samarbetspartnerkurser',
2829
'finnish': 'finska',
2930
'swedish': 'svenska',
3031
'english': 'engelska',
@@ -126,7 +127,7 @@ export default {
126127
'Koulukieli': 'Skolspråk',
127128
'Kurssi': 'Kurs',
128129
'Viestintä': 'Kommunikation',
129-
'Aikaisemmat opinnot': 'Tidigare studier',
130+
'Aikaisemmatopinnot': 'Tidigare studier',
130131
'Korvaava': 'Ersättande',
131132
'Valmentava': 'Förberedande',
132133
'Finmu': 'Finmu',
@@ -138,5 +139,6 @@ export default {
138139
'Lukuvuosi': 'Läsår',
139140
'Periodi': 'Period',
140141
'MOOC': 'MOOC',
142+
'Yhteistyo': 'Samarbete',
141143
}
142144
}

0 commit comments

Comments
 (0)