cv fix and translations

LitusProject · Dec 17, 2021 · 4c00931 · 4c00931
1 parent 5ba1cd6
commit 4c00931
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/module/BrBundle/Form/Cv/Add.php b/module/BrBundle/Form/Cv/Add.php
@@ -59,6 +59,23 @@ public function init()
 
         list($currentYear, $allYears) = $this->getYears();
 
+        $this->add(array(
+            'type'=>'fieldset',
+            'name'=>'personal',
+            'label'=>'Personal',
+            'elements'=>array(
+                array(
+                    'type'       => 'textarea',
+                    'name'       => 'email',
+                    'label'      => 'E-mail',
+                    'required'   => false,
+                    ),
+
+                ),
+
+            )
+        );
+
         $this->add(array(
             'type'     => 'fieldset',
             'name'     => 'studies',

diff --git a/module/BrBundle/Hydrator/Cv/Entry.php b/module/BrBundle/Hydrator/Cv/Entry.php
@@ -45,7 +45,7 @@ protected function doHydrate(array $data, $object = null)
             ->setBirthday($person->getBirthDay())
             ->setSex($person->getSex())
             ->setPhoneNumber($person->getPhoneNumber())
-            ->setEmail($person->getPersonalEmail())
+            ->setEmail($data['personal']['email'])
             ->setPriorStudy($data['studies']['prior_degree'])
             ->setPriorGrade($data['studies']['prior_grade'] * 100)
             ->setStudy($this->getEntityManager()
@@ -141,7 +141,7 @@ protected function doExtract($object = null)
         }
 
         $data = array();
-
+        $data['personal']['email'] = $object->getEmail();
         $data['studies']['prior_degree'] = $object->getPriorStudy();
         $data['studies']['prior_grade'] = $object->getPriorGrade() / 100;
         $data['studies']['degree'] = $object->getStudy()->getId();

diff --git a/module/BrBundle/Resources/translations/cv.en.php b/module/BrBundle/Resources/translations/cv.en.php
@@ -79,7 +79,7 @@
     'Grade for the Prior Degree (e.g. 65.48)'                                  => 'Grade for the Previous Degree (e.g. 65.48)',
     '(Provisional) Grade for the Current Degree (e.g. 65.48)'                  => '(Provisional) Grade for the Current Degree (e.g. 65.48)',
     'Extra Information (Year Abroad, Born Outside Belgium, ...)'               => 'Extra Information (Year Abroad, Born Outside Belgium, ...)',
-    'You are advised to use your mother tongue for your CV.'                   => 'You are advised to use your mother tongue for your CV. You can select your language from the menu.',
+    'You are advised to use your mother tongue for your CV.'                   => 'You are advised to fill in your CV in English.',
 
     'Additional Diplomas'   => 'Additional Diplomas',
     'Experiences'           => 'Experiences',

diff --git a/module/BrBundle/Resources/translations/cv.nl.php b/module/BrBundle/Resources/translations/cv.nl.php
@@ -78,7 +78,7 @@
     'Grade for the Prior Degree (e.g. 65.48)'                                  => 'Percentage voor het Vorige Diploma (bv. 65.48)',
     '(Provisional) Grade for the Current Degree (e.g. 65.48)'                  => '(Voorlopig) Percentage voor het Huidige Diploma (bv. 65.48)',
     'Extra Information (Year Abroad, Born Outside Belgium, ...)'               => 'Extra Informatie (Jaar in het Buitenland, Geboren Buiten België, ...)',
-    'You are advised to use your mother tongue for your CV.'                   => 'We raden je aan om je moedertaal te gebruiken voor je CV. Je kunt de taal in het menu selecteren.',
+    'You are advised to use your mother tongue for your CV.'                   => 'We raden je aan om je CV in het Engels in te vullen.',
 
     'Additional Diplomas'   => 'Extra Diploma\'s',
     'Experiences'           => 'Ervaringen',

diff --git a/module/BrBundle/Resources/views/br/cv/cv.twig b/module/BrBundle/Resources/views/br/cv/cv.twig
@@ -27,9 +27,9 @@
             <dt>{{ translate('Sex') }}</dt>
             <dd>{{ authenticatedPerson.getSex()|capitalize }}&nbsp;</dd>
             <dt>{{ translate('Phone Number') }}</dt>
-            <dd>{{ authenticatedPerson.getPhoneNumber() }}&nbsp;</dd>
-            <dt>{{ translate('Email') }}</dt>
-            <dd>{{ authenticatedPerson.getPersonalEmail() }}&nbsp;</dd>
+{#            <dd>{{ authenticatedPerson.getPhoneNumber() }}&nbsp;</dd>#}
+{#            <dt>{{ translate('Email') }}</dt>#}
+{#            <dd>{{ authenticatedPerson.getPersonalEmail() }}&nbsp;</dd>#}
             <dt>{{ translate('Address') }}</dt>
             <dd>
                 {{ authenticatedPerson.getSecondaryAddress().getStreet() }} {{ authenticatedPerson.getSecondaryAddress().getNumber() }}