Compare commits

...

6 Commits

Author SHA1 Message Date
llaniau a93d58e119 Bug push git 2020-10-05 23:58:07 +02:00
llaniau 6babd6976c Amélioration employmentType 2020-10-05 17:55:50 +02:00
llaniau 468f5baed6 Changement stat page accueil recruteur 2020-10-05 15:18:11 +02:00
llaniau 6a1c231fcb Ajout unpublished dans le groupe ad_detail 2020-10-05 14:05:01 +02:00
llaniau 6b25e5b5e7 Correction de fautes d'orthographe 2020-10-01 17:01:44 +02:00
llaniau bb231fbeb3 Ajout d'un commentaire dans Answerrepo 2020-09-29 11:02:19 +02:00
24 changed files with 157 additions and 77 deletions
@@ -1,6 +1,15 @@
<!DOCTYPE html>
<html lang="fr">
<head>
<!-- Global site tag (gtag.js) - Google Analytics -->
{# <script async src="https://www.googletagmanager.com/gtag/js?id=UA-98246968-7"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-98246968-7');
</script> #}
<!-- Title -->
<title>{% block title %}{% endblock %}</title>
@@ -47,14 +56,6 @@
{% endblock %}
{# {% include 'defaultv2/footer.html.twig' %} #}
{{ include('FairlaneCookieConsentBundle::cookie-info.html.twig') }}
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-98246968-7"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-98246968-7');
</script>
</body>
</html>
@@ -90,6 +90,11 @@ Afin de créer votre annonce, renseignez lensemble des champs relatifs au pos
{{ form_row(form.contract_type) }}
</td>
</tr>
<tr>
<td class="col-lg-12 col-md-12 col-sm-12">
{{ form_row(form.temps_type) }}
</td>
</tr>
<tr>
<td class="col-lg-12 col-md-12 col-sm-12">
{{ form_row(form.status) }}
@@ -90,6 +90,11 @@ Afin de créer votre annonce, renseignez lensemble des champs relatifs au pos
{{ form_row(form.contract_type) }}
</td>
</tr>
<tr>
<td class="col-lg-12 col-md-12 col-sm-12">
{{ form_row(form.temps_type) }}
</td>
</tr>
<tr>
<td class="col-lg-12 col-md-12 col-sm-12">
{{ form_row(form.publicTag) }}
@@ -82,8 +82,8 @@
-->
<th style="width:15%">Objet</th>
<th style="width:15%">Message</th>
<th style="width:70%">Envoyé le</th>
<th style="width:15%">Envoyé le</th>
<th style="width:70%">Message</th>
</tr>
</thead>
<tbody>
@@ -59,7 +59,7 @@
</div>
</div>
</div>
<div class="row">
{# <div class="row">
<div class="col-md-12">
<div class="form-group ">
@@ -68,7 +68,7 @@
</div>
</div>
</div>
<br />
<br /> #}
<div style="text-align: right;">
<button class="btn btn-default" type="submit">Sauvegarde</button>
@@ -72,7 +72,7 @@
</div>
</div>
<div class="row">
{# <div class="row">
<div class="col-md-12">
<div class="form-group ">
@@ -80,7 +80,7 @@
{{ form_row(form.gender) }}
</div>
</div>
</div>
</div> #}
{% if form.password is defined%}
<div class="row">
<div class="col-md-12">
@@ -11,8 +11,8 @@
<div class="media">
<div class="media-body px-4">
<h2 class="statChiffre">1500+</h2>
<p class="statTexte">Talents connectés</p>
<h2 class="statChiffre">10000+</h2>
<p class="statTexte">Visiteurs par mois</p>
</div>
</div>
</div>
@@ -24,7 +24,7 @@
<div class="card-body p-4">
<div class="media">
<div class="media-body px-4">
<h2 class="statChiffre">900+</h2>
<h2 class="statChiffre">1050+</h2>
<p class="statTexte">Vues par vidéo</p>
</div>
</div>
@@ -38,7 +38,7 @@
<div class="media">
<div class="media-body px-4">
<h2 class="statChiffre">350</h2>
<h2 class="statChiffre">550+</h2>
<p class="statTexte">Candidatures vidéo</p>
</div>
</div>
@@ -35,7 +35,7 @@
aria-label="Email" data-msg="Please enter a valid email address." data-error-class="u-has-error"
data-success-class="u-has-success"> #}
<input type="text" id="username" name="_username" value="{{ last_username }}" required="required" class="form-control" placeholder="Identifiant"/>
<input type="text" id="username" name="_username" value="{{ last_username }}" required="required" class="form-control" placeholder="Saisissez votre adresse email"/>
</div>
</div>
<!-- End Input -->
@@ -51,7 +51,7 @@
{# <input type="password" class="form-control form__input" name="password" required placeholder="Password"
aria-label="Password" data-msg="Your password is invalid. Please try again."
data-error-class="u-has-error" data-success-class="u-has-success"> #}
<input type="password" id="password" name="_password" required="required" class="form-control" placeholder="Mot de passe" />
<input type="password" id="password" name="_password" required="required" class="form-control" placeholder="Saisissez votre mot de passe" />
</div>
</div>
<!-- End Input -->
@@ -75,9 +75,9 @@
<div class="mb-3">
<input type="hidden" name="_target_path" value="redirect_dashboard" />
<input type="hidden" name="_target_path" value="redirect_dashboard" />
<input type="submit" id="_submit" name="_submit" class="btn btn-block btn-primary"/>
<input type="submit" id="_submit" name="_submit" class="btn btn-block btn-primary" value="Se connecter"/>
</div>
<div class="text-center mb-3">
@@ -12,7 +12,7 @@
<br />
Bonjour {{ user.firstname }} {{ user.lastname }},<br /><br />
<strong>Vous avez reçu une réponse vidéo de lentreprise {{ message.sender.company.brandname }}.</strong><br />
Découvez la réponse vidéo en cliquant sur le bouton ci-dessous.
Découvrez la réponse vidéo en cliquant sur le bouton ci-dessous.
<br/>
<br/>
<div style="text-align:center;">
@@ -28,7 +28,7 @@
<br />
Bonjour {{ user.firstname }} {{ user.lastname }},<br /><br />
<strong>Vous avez reçu une réponse de lentreprise {{ message.sender.company.brandname }}.</strong><br />
Découvez la réponse en cliquant sur le bouton ci-dessous.
Découvrez la réponse en cliquant sur le bouton ci-dessous.
<br/>
<br/>
<div style="text-align:center;">
@@ -247,9 +247,9 @@
<div class="col s6">
{{ form_row(formProfile.birthday) }}
</div>
<div class="col s6">
{# <div class="col s6">
{{ form_row(formProfile.gender) }}
</div>
</div> #}
<div class="col s12">
{{ form_row(formProfile.company.address) }}
{{ form_row(formProfile.company.addressComp) }}
@@ -35,8 +35,8 @@ monolog:
# type: chromephp
# level: info
swiftmailer:
delivery_addresses: ['%delivery_addresses%']
# swiftmailer:
# delivery_addresses: ['%delivery_addresses%']
# Twig Configuration
twig:
@@ -55,9 +55,12 @@ class AdController extends Controller
$form = $this->createForm(AdType::class, $ad);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$type_contract = $form['contract_type']->getData();
$arrayExtra = $ad->getExtra();
$type_contract = $form['contract_type']->getData();
$arrayExtra['contract_type'] = $type_contract;
//LLAN Ajout de la notion de temps partiel, plein temps (5 oct 2020)
$temps_type = $form['temps_type']->getData();
$arrayExtra['temps_type'] = $temps_type;
$ad->setExtra($arrayExtra);
$adManager = $this->get('app.ad_manager');
$adManager->updateAd($ad);
@@ -105,8 +108,10 @@ class AdController extends Controller
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$type_contract = $form['contract_type']->getData();
$temps_type = $form['temps_type']->getData();
$arrayExtra = $ad->getExtra();
$arrayExtra['contract_type'] = $type_contract;
$arrayExtra['temps_type'] = $temps_type;
$ad->setExtra($arrayExtra);
$adManager = $this->get('app.ad_manager');
$adManager->updateAd($ad);
@@ -128,8 +133,10 @@ class AdController extends Controller
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$type_contract = $form['contract_type']->getData();
$temps_type = $form['temps_type']->getData();
$arrayExtra = $ad->getExtra();
$arrayExtra['contract_type'] = $type_contract;
$arrayExtra['temps_type'] = $temps_type;
$ad->setExtra($arrayExtra);
$adManager = $this->get('app.ad_manager');
$adManager->updateAd($ad);
@@ -376,8 +376,8 @@ class AnswerController extends Controller
));
$email = \Swift_Message::newInstance()
->setSubject('Candidature : ' . $title)
->setFrom($this->getParameter('mailer_user'), $user->getEmail())
->setReplyTo($user->getEmail())
->setFrom($this->getParameter('mailer_user'))
->setReplyTo($this->getParameter('mailer_user'))
->setTo($answer->getUser()->getEmail())
->setBody($htmlView, 'text/html')
->addPart($plainView, 'text/plain');
@@ -119,11 +119,11 @@ class AnswerController extends FOSRestController
$status = 'failure';
throw new ResourceValidationException($message, $status);
} else if ($existAdAnswer) {
$message = 'Tu as déjà postulé aujourdhui !';
$message = "Tu as déjà postulé aujourdhui !";
$status = 'failure';
throw new ResourceValidationException($message, $status);
} else if ($existCompanyAnswer) {
$message = 'Tu as déjà postulé aujourd\hui pour cette entreprise !';
$message = "Tu as déjà postulé aujourdhui pour cette entreprise !";
$status = 'failure';
throw new ResourceValidationException($message, $status);
} else {
@@ -123,6 +123,7 @@ class Ad
* @var \DateTime
*
* @ORM\Column(name="unpublished_at", type="datetime", nullable=true)
* @Groups({"ad_detail", "answer_detail"})
*/
private $unpublishedAt;
@@ -375,6 +376,24 @@ class Ad
return $contract_type;
}
/**
* @return array|null
*
* Search temps type in the extra field
*/
public function getTempstType()
{
$temps_type = null;
$extra = $this->extra;
if ($extra) {
if (array_key_exists('temps_type', $extra)) {
$temps_type = $extra['temps_type'];
}
}
return $temps_type;
}
/**
* @return array|null
*
@@ -31,7 +31,8 @@ class AdSearchType extends AbstractType
'Apprentissage' => 'Apprentissage',
'Professionnalisation' => 'Contrat de professionnalisation',
'Stage' => 'Stage',
'Indépendant' => 'Indépendant'
'Indépendant' => 'Indépendant',
'Interim' => 'Interim'
)
))
->add('location_gmap', TextType::class, array(
@@ -20,10 +20,15 @@ class AdSoftType extends AbstractType
}
}
$contract_type = "";
$temps_type = "";
$extra = $options['data']->getExtra();
if ($extra != null) {
if(is_array($extra)){
$contract_type = $extra['contract_type'];
if (array_key_exists("temps_type",$extra)){
$temps_type = $extra['temps_type'];
}
}
}
@@ -76,13 +81,27 @@ class AdSoftType extends AbstractType
'CDI' => 'CDI',
'CDD' => 'CDD',
'Apprentissage' => 'Apprentissage',
'Professionalisation' => 'Professionalisation',
'Contrat de professionnalisation' => 'professionnalisation',
'Stage' => 'Stage',
'Indépendant' => 'Indépendant',
'Interim' => 'Interim'
),
'attr' => array(
'class' => 'form-control'
'class' => 'cs-select cs-skin-slide'
)
))
->add('temps_type', ChoiceType::class, array(
'mapped' => false,
'label' => 'Type d emploi',
'data' => $temps_type,
'choices' => array(
'Temps plein ' => 'FULL_TIME',
'Temps partiel ' => 'PART_TIME',
'Temps plein ou temps partiel' => 'MIX_TIME',
),
'attr' => array(
'class' => 'cs-select cs-skin-slide',
)
))
->add('status', ChoiceType::class, array(
@@ -92,7 +111,7 @@ class AdSoftType extends AbstractType
'A publier (Validation par Talents Tube)' => 'TO_PUBLISH',
),
'attr' => array(
'class' => 'form-control'
'class' => 'cs-select cs-skin-slide',
)
))
@@ -20,10 +20,12 @@ class AdType extends AbstractType
}
}
$contract_type = "";
$temps_type = "";
$extra = $options['data']->getExtra();
if ($extra != null) {
if(is_array($extra)){
$contract_type = $extra['contract_type'];
$temps_type = $extra['temps_type'];
}
}
@@ -87,13 +89,28 @@ class AdType extends AbstractType
'CDI' => 'CDI',
'CDD' => 'CDD',
'Apprentissage' => 'Apprentissage',
'Professionalisation' => 'Professionalisation',
'Contrat de professionnalisation' => 'professionnalisation',
'Stage' => 'Stage',
'Indépendant' => 'Indépendant',
'Interim' => 'Interim'
),
'attr' => array(
'class' => 'form-control'
'class' => 'cs-select cs-skin-slide',
)
))
->add('temps_type', ChoiceType::class, array(
'mapped' => false,
'label' => 'Type d emploi',
'data' => $temps_type,
'choices' => array(
'Temps plein ' => 'FULL_TIME',
'Temps partiel ' => 'PART_TIME',
'Temps plein ou temps partiel' => 'MIX_TIME',
),
'attr' => array(
'class' => 'cs-select cs-skin-slide',
)
))
->add('publicTag', TextType::class, array(
@@ -111,7 +128,7 @@ class AdType extends AbstractType
'A publier (Validation par Talents Tube)' => 'TO_PUBLISH',
),
'attr' => array(
'class' => 'form-control'
'class' => 'cs-select cs-skin-slide',
)
));
@@ -48,15 +48,16 @@ class TalentProfileType extends AbstractType
'data-toggle'=>"datepicker"
)
))
->add('gender', ChoiceType::class, array(
'expanded' => true,
'multiple' => false,
'choices' => array(
'Femme' => 'female',
'Homme' => 'male',
),
'label' => 'Sexe'
));
// ->add('gender', ChoiceType::class, array(
// 'expanded' => true,
// 'multiple' => false,
// 'choices' => array(
// 'Femme' => 'female',
// 'Homme' => 'male',
// ),
// 'label' => 'Sexe'
// ))
;
$builder->add('company', TalentProfileAddressType::class);
}
@@ -46,18 +46,19 @@ class UserType extends AbstractType
'class' => 'calendar'
)
))*/
->add('gender', ChoiceType::class, array(
'expanded' => true,
'multiple' => false,
'choices' => array(
'Femme' => 'female',
'Homme' => 'male',
),
'label' => 'Sexe',
'attr' => array(
'class' => 'form-control'
)
));
// ->add('gender', ChoiceType::class, array(
// 'expanded' => true,
// 'multiple' => false,
// 'choices' => array(
// 'Femme' => 'female',
// 'Homme' => 'male',
// ),
// 'label' => 'Sexe',
// 'attr' => array(
// 'class' => 'form-control'
// )
// ))
;
}
public function configureOptions(OptionsResolver $resolver)
@@ -56,18 +56,19 @@ class UserTypeCreate extends AbstractType
)
))
->add('gender', ChoiceType::class, array(
'expanded' => true,
'multiple' => false,
'choices' => array(
'Femme' => 'female',
'Homme' => 'male',
),
'label' => 'Sexe',
'attr' => array(
'class' => 'form-control'
)
));
// ->add('gender', ChoiceType::class, array(
// 'expanded' => true,
// 'multiple' => false,
// 'choices' => array(
// 'Femme' => 'female',
// 'Homme' => 'male',
// ),
// 'label' => 'Sexe',
// 'attr' => array(
// 'class' => 'form-control'
// )
// ))
;
if($user && (!$user->getEmail() || $user->getEmail()=="") ){
$builder->add('password', null, array(
'label' => 'Mot de passe',
@@ -47,7 +47,7 @@ class AnswerRepository extends AbstractRepository
}
// Query to find messages excluding Draft message and talent video for chat
// Rechercher si le user a postulé dans l'heure a une annonce donnée
public function findExistAdAnswer($user, $addId)
{
$hier = date('Y-m-d', time() - 3600 * 1);
@@ -70,7 +70,7 @@ class AnswerRepository extends AbstractRepository
->getResult();
}
// Query to find messages excluding Draft message and talent video for chat
// Rechercher si le user a postuler dans l'heure a une annonce d'une entreprise donnée
public function findExistEntrepriseAnswer($user, $entrepriseId)
{
$hier = date('Y-m-d', time() - 3600 * 1);
@@ -96,7 +96,7 @@ class MailManager
$email = \Swift_Message::newInstance()
->setSubject($subject)
->setFrom('noreply@talentstube.io')
->setTo('l.laniau@talentstube.com')
->setTo('c.leveque@talentstube.com')
->setBody($message, 'text/html')
;
if ($this->mailer->send($email)) {
+4 -1
View File
@@ -21215,14 +21215,17 @@ button:focus {
File for your custom SCSS style
------------------------------------*/
.statChiffre {
font-size: 4.5rem;
font-size: 4rem;
font-weight : 500;
color : #1E2327;
padding-left: 0px;
margin-left: -40px;
}
.statTexte {
font-size: 1.2rem;
font-weight: 200;
color: #1E2327;
margin-left: -40px;
}
/* Au niveau le plus haut du code */