Compare commits

...

2 Commits

Author SHA1 Message Date
Thomas MONCHICOURT 492d2687c5 Fix : modification affichage mois 2018-09-20 11:36:27 +02:00
Thomas MONCHICOURT 2fa50e3d5b Fix : changin month save 2018-09-20 11:05:25 +02:00
3 changed files with 10 additions and 8 deletions
@@ -15,9 +15,14 @@
</div>
<div class="col s12 titleDateCareer">
{% if c.beginMonthCareer is defined %}
<span>{{ c.beginMonthCareer }} {{ c.beginYearCareer }}</span>
{% set fullDate = '2018-' ~ c.beginMonthCareer ~ '-01' %}
{% if c.beginMonthCareer matches '/^\\d+$/' %}
<span>{{ fullDate|datetime }} {{ c.beginYearCareer }}</span>
{% endif %}
{% endif %}
<span>- {% if c.actualJobCareer is defined and c.actualJobCareer == true %}Aujourd'hui{% else %}{{ c.endMonthCareer }} {{ c.endYearCareer }}{% endif %}, {{ c.placeCareer }}
<span>-
{% if c.actualJobCareer is defined and c.actualJobCareer == true %}
Aujourd'hui{% else %} {% set fullDateEnd = '2018-' ~ c.endMonthCareer ~ '-01' %} {% if c.endMonthCareer matches '/^\\d+$/' %}{{ fullDateEnd|datetime }}{% endif %} {{ c.endYearCareer }}{% endif %}, {{ c.placeCareer }}
</span>
</div>
<div class="col s12">
@@ -63,6 +63,7 @@ class TalentController extends Controller
*/
public function talentProfileAction(Request $request)
{
setlocale(LC_TIME, "fr_FR");
$em = $this->getDoctrine()->getManager();
$history = $this->get('edeclic.history.record');
$records = $history->recordShow($this->getUser()->getId(), "r", 'AppBundle\Entity\Ad', null);
@@ -105,8 +106,6 @@ class TalentController extends Controller
if ($formCareer->isSubmitted() && $formCareer->isValid()) {
$careers = $formCareer->getData()->getCareer();
usort($careers, "static::sortByBeginYearCareer");
//dump($careers);
//die();
$user->setCareer($careers);
$em->persist($user);
$em->flush();
@@ -138,7 +137,6 @@ class TalentController extends Controller
$formLanguage->handleRequest($request);
if ($formLanguage->isSubmitted() && $formLanguage->isValid()) {
$languages = $formLanguage->getData()->getLanguage();
//usort($languages, "static::sortByLanguageName");
$user->setLanguage($languages);
$em->persist($user);
$em->flush();
@@ -164,7 +162,6 @@ class TalentController extends Controller
}
return $this->render('talent/profile.html.twig', [
//'form' => $form->createView(),
'formProfile' => $formProfile->createView(),
'formCompany' => $formCompany->createView(),
'formCareer' => $formCareer->createView(),
@@ -99,10 +99,10 @@ class CareerType extends AbstractType
$months = array();
for ($m=1; $m<=12; $m++) {
$month = utf8_encode(strftime('%B', mktime(0,0,0,$m, 1, date('Y'))));
$months[] = $month;
$months[$month] = $m;
}
return array_combine($months, $months);
return $months;
}
public function getName()