Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Sébastien
|
47d571baae | ||
|
Sébastien
|
f5f0c39dd7 | ||
 Grégoire
|
c83b71853b | ||
|
Grégoire
|
8bc3165995 | ||
|
Grégoire
|
dffcf66ce3 | ||
|
Grégoire
|
41c046392e | ||
|
Grégoire
|
e81e2dce9d |
@@ -24,7 +24,7 @@
|
||||
<div class="col-content bg-arrow z-depth-2 p-20">
|
||||
<div class="row">
|
||||
<div class="col s12">
|
||||
<h4 class="color-blue1 p-0"><span class="title-bubble">1</span> Enregistrez votre cv vidéo</h4>
|
||||
<h4 class="color-blue1 p-0"><span class="title-bubble">1/3</span> Enregistrez votre cv vidéo</h4>
|
||||
</div>
|
||||
<div class="col m4 offset-m1 s12">
|
||||
<video id="myCvVideo" class="video-js vjs-default-skin"></video>
|
||||
@@ -60,7 +60,7 @@
|
||||
<div class="col-content bg-arrow z-depth-2 p-20">
|
||||
<div class="row">
|
||||
<div class="col s12">
|
||||
<h4 class="color-blue1 p-0"><span class="title-bubble">2</span> Importez votre CV Vidéo</h4>
|
||||
<h4 class="color-blue1 p-0"><span class="title-bubble">2/3</span> Importez votre CV Vidéo</h4>
|
||||
</div>
|
||||
<div class="col s10 offset-s1 answer-dropzone">
|
||||
{% include 'media/dropzone.html.twig' with {'deleting': true } %}
|
||||
@@ -72,7 +72,7 @@
|
||||
{{ form_row(form.status) }}
|
||||
<div class="row">
|
||||
<div class="col s12">
|
||||
<h4 class="color-blue1 p-0"><span class="title-bubble">3</span> Ajoutez votre commentaire</h4>
|
||||
<h4 class="color-blue1 p-0"><span class="title-bubble">3/3</span> Ajoutez votre commentaire</h4>
|
||||
</div>
|
||||
<div class="col s10 offset-s1">
|
||||
<div class="row">
|
||||
|
||||
@@ -226,7 +226,7 @@ class AnswerController extends FOSRestController
|
||||
throw new ResourceValidationException($message, $status);
|
||||
}
|
||||
|
||||
if (!isset($messageText)) {
|
||||
if (empty($messageText)) {
|
||||
$message = 'Le message est vide.';
|
||||
$status = 'failure';
|
||||
throw new ResourceValidationException($message, $status);
|
||||
@@ -235,7 +235,7 @@ class AnswerController extends FOSRestController
|
||||
$answerReceipiant = $existAnswer->getAd() !== null ? $existAnswer->getAd()->getCreator()
|
||||
: $existAnswer->getCompany()->getUsers(){ 0 };
|
||||
|
||||
$message = new message('Chat', $messageText, $this->getUser(), $answerReceipiant, 'CHAT', $existAnswer);
|
||||
$message = new message('Chat', $messageText, $this->getUser(), $answerReceipiant, 'Message du talent', $existAnswer);
|
||||
$em->persist($message);
|
||||
$em->flush();
|
||||
|
||||
|
||||
@@ -187,7 +187,13 @@ class CompanyController extends Controller
|
||||
$history->recordIt("Anonymous", "r", 'AppBundle\Entity\Company', $company->getId(), serialize($company));
|
||||
}
|
||||
|
||||
return new JsonResponse(array('code' => "ok", "user" => $this->getUser()->getUsername()));
|
||||
|
||||
if(!$this->getUser() == null){
|
||||
return new JsonResponse(array('code' => "ok", "user" => $this->getUser()->getUsername()));
|
||||
} else{
|
||||
return new JsonResponse(array('code' => "ok"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/***********************
|
||||
|
||||
@@ -177,7 +177,7 @@ class Answer
|
||||
$criteria = Criteria::create()
|
||||
->where(Criteria::expr()->neq('status', "DRAFT"));
|
||||
|
||||
return $this->messages->matching($criteria)->last();
|
||||
return $this->messages->matching($criteria)->first();
|
||||
}
|
||||
|
||||
public function getIsViewed(){
|
||||
|
||||
@@ -16,7 +16,7 @@ use Symfony\Component\Form\AbstractType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
|
||||
|
||||
use Symfony\Component\Form\Extension\Core\Type\DateType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
|
||||
@@ -33,13 +33,13 @@ class UserType extends AbstractType
|
||||
'label' => 'Nom',
|
||||
'required' => true,
|
||||
))
|
||||
->add('birthday', DateType::class, array(
|
||||
/*->add('birthday', DateTimeType::class, array(
|
||||
'widget' => 'single_text',
|
||||
'label' => 'Date de naissance',
|
||||
'attr' => array(
|
||||
'class' => 'calendar'
|
||||
)
|
||||
))
|
||||
))*/
|
||||
->add('gender', ChoiceType::class, array(
|
||||
'expanded' => true,
|
||||
'multiple' => false,
|
||||
|
||||
@@ -16539,7 +16539,7 @@ tbody td {
|
||||
#answerPage #modal-tuto ul li:before {
|
||||
content: '- '; }
|
||||
#answerPage .col-content {
|
||||
margin-bottom: 100px;
|
||||
margin-bottom: 50px;
|
||||
background: #FFFFFF; }
|
||||
#answerPage h4 {
|
||||
margin: 20px 0 40px 20px; }
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -4,8 +4,8 @@
|
||||
<title>Step_arrow</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Interactions" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="square">
|
||||
<g id="Réponse-offre-d'emploi-:-module_camera" transform="translate(-179.000000, -491.000000)" stroke="#E3E3E3">
|
||||
<g id="Interactions" stroke="none" stroke-width="3" fill="none" fill-rule="evenodd" stroke-linecap="square">
|
||||
<g id="Réponse-offre-d'emploi-:-module_camera" transform="translate(-179.000000, -491.000000)" stroke="#D7D7D7">
|
||||
<g id="Réponse-offre" transform="translate(80.000000, 176.000000)">
|
||||
<g id="001-camera" transform="translate(30.200000, 21.700000)">
|
||||
<g id="Group-4">
|
||||
|
||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
@@ -127,7 +127,7 @@
|
||||
}
|
||||
}
|
||||
.col-content{
|
||||
margin-bottom: 100px;
|
||||
margin-bottom: 50px;
|
||||
background: $white;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user