Skip to content
Extraits de code Groupes Projets
Valider fb55f3c4 rédigé par Delphine van Rossum's avatar Delphine van Rossum Validation de Brieuc Dubois
Parcourir les fichiers

Resolve "tests standalone process: code/id > informed consent > groups > surveygroup"

parent 4cf6689c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
2 requêtes de fusion!14Merge dev into main,!13Resolve "tests standalone process: code/id > informed consent > groups > surveygroup"
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
"homeLanguage": "First language", "homeLanguage": "First language",
"education": { "education": {
"title": "What is the highest grade, degree or level of education you achieved?", "title": "What is the highest grade, degree or level of education you achieved?",
"na": "None", "NoEducation": "None",
"PrimarySchool": "Primary school", "PrimarySchool": "Primary school",
"SecondarySchool": "Secondary school/High school", "SecondarySchool": "Secondary school/High school",
"NonUni": "Non-university degree", "NonUni": "Non-university degree",
......
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
"homeLanguage": "Première Langue", "homeLanguage": "Première Langue",
"education": { "education": {
"title": "Quel est le grade, le diplôme ou le niveau d'études le plus élevé que vous ayez obtenu ?", "title": "Quel est le grade, le diplôme ou le niveau d'études le plus élevé que vous ayez obtenu ?",
"na": "Aucun", "NoEducation": "Aucun",
"PrimarySchool": "École primaire", "PrimarySchool": "École primaire",
"SecondarySchool": "École secondaire", "SecondarySchool": "École secondaire",
"NonUni": "Diplôme non universitaire", "NonUni": "Diplôme non universitaire",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</script> </script>
<select <select
class="select select-bordered !ml-0" class="w-full select select-bordered !ml-0"
id="dropdown" id="dropdown"
name="dropdown" name="dropdown"
bind:value={option} bind:value={option}
......
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
</div> </div>
<div class="mx-auto mt-16"> <div class="mx-auto mt-16">
<div class="flex justify-around min-w-[600px] space-x-10"> <div class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-4 gap-4">
{#each displayQuestionOptions as option (option)} {#each displayQuestionOptions as option (option)}
{@const type = option.split(':')[0]} {@const type = option.split(':')[0]}
{#if type == 'dropdown'} {#if type == 'dropdown'}
...@@ -354,8 +354,8 @@ ...@@ -354,8 +354,8 @@
{ value: 'na', label: $t('surveys.genders.na') } { value: 'na', label: $t('surveys.genders.na') }
]} ]}
{#if subStep === 0} {#if subStep === 0}
<div class="mx-auto mt-16 text-center"> <div class="mx-auto mt-16 text-center px-4">
<pre class="text-center font-bold py-4 px-6 m-auto">{$t('surveys.birthYear')}</pre> <p class="text-center font-bold py-4 px-6 m-auto">{$t('surveys.birthYear')}</p>
<Dropdown <Dropdown
values={Array.from({ length: 82 }, (_, i) => { values={Array.from({ length: 82 }, (_, i) => {
const year = 1931 + i; const year = 1931 + i;
...@@ -367,8 +367,8 @@ ...@@ -367,8 +367,8 @@
></Dropdown> ></Dropdown>
</div> </div>
{:else if subStep === 1} {:else if subStep === 1}
<div class="mx-auto mt-16 text-center"> <div class="mx-auto mt-16 text-center px-4">
<pre class="text-center font-bold py-4 px-6 m-auto">{$t('surveys.gender')}</pre> <p class="text-center font-bold py-4 px-6 m-auto">{$t('surveys.gender')}</p>
<div class="flex flex-col items-center space-y-4"> <div class="flex flex-col items-center space-y-4">
{#each genderOptions as { value, label }} {#each genderOptions as { value, label }}
<label class="radio-label flex items-center space-x-2"> <label class="radio-label flex items-center space-x-2">
...@@ -386,8 +386,8 @@ ...@@ -386,8 +386,8 @@
</div> </div>
</div> </div>
{:else if subStep === 2} {:else if subStep === 2}
<div class="mx-auto mt-16 text-center"> <div class="mx-auto mt-16 text-center px-4">
<pre class="text-center font-bold py-4 px-6 m-auto">{$t('surveys.homeLanguage')}</pre> <p class="text-center font-bold py-4 px-6 m-auto">{$t('surveys.homeLanguage')}</p>
<Dropdown <Dropdown
values={Object.entries(config.PRIMARY_LANGUAGE).map(([code, name]) => ({ values={Object.entries(config.PRIMARY_LANGUAGE).map(([code, name]) => ({
value: code, value: code,
...@@ -399,11 +399,11 @@ ...@@ -399,11 +399,11 @@
></Dropdown> ></Dropdown>
</div> </div>
{:else if subStep === 3} {:else if subStep === 3}
<div class="mx-auto mt-16 text-center"> <div class="mx-auto mt-16 text-center px-4">
<pre class="text-center font-bold py-4 px-6 m-auto">{$t('surveys.education.title')}</pre> <p class="text-center font-bold py-4 px-6 m-auto">{$t('surveys.education.title')}</p>
<Dropdown <Dropdown
values={[ values={[
{ value: 'na', display: $t('surveys.education.na') }, { value: 'NoEducation', display: $t('surveys.education.NoEducation') },
{ value: 'PrimarySchool', display: $t('surveys.education.PrimarySchool') }, { value: 'PrimarySchool', display: $t('surveys.education.PrimarySchool') },
{ value: 'SecondarySchool', display: $t('surveys.education.SecondarySchool') }, { value: 'SecondarySchool', display: $t('surveys.education.SecondarySchool') },
{ value: 'NonUni', display: $t('surveys.education.NonUni') }, { value: 'NonUni', display: $t('surveys.education.NonUni') },
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter