talents-tube/website
6
0
Fork 0
Code Issues Pull Requests Releases 103 Wiki Activity

Merge branch 'master' of https://git.e-declic.net/talents-tube/website

Browse Source
This commit is contained in:
Thomas Berrod
2019-10-10 14:49:02 +02:00
parent 98545707b3 52d105efb4
commit 278c558c9e
5 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
volume/www/website/www/src/AppBundle/Controller/Api/SecurityController.php
+10 -16
View File
@@ -110,10 +110,11 @@ class SecurityController extends FOSRestController
$userManager = $this->get('fos_user.user_manager');
$companyManager = $this->get('app.company_manager');
$usr = $this->getUser();
$talent = $usr->getCompany();
$talent = $usr->getCompany();var_dump($talent);
if ($usr !== null){
$newLastName = htmlspecialchars($request->request->get('lastname'));
$newFirstName = htmlspecialchars($request->request->get('firstname'));
$phoneTalent = htmlspecialchars($request->request->get('phone'));
$titleTalent = htmlspecialchars($request->request->get('currentJob'));
$newLinkedin = htmlspecialchars($request->request->get('linkedin'));
$newTwitter = htmlspecialchars($request->request->get('twitter'));
@@ -123,26 +124,19 @@ class SecurityController extends FOSRestController
$message = 'Vous devez rentrer votre nom et votre prénom pour continuer';
throw new ResourceValidationException($message,'');
} else {
$file = $request->files->get('file');
$usr->setLastName($newLastName);
$usr->setFirstName($newFirstName);
$usr->setFile($file);
$usr->upload();
$talent->setWebsite($newWebsite);
$talent->setLinkedin($newLinkedin);
$talent->setTwitter($newTwitter);
$talent->setTitleTalent($titleTalent);
$talent->setPhoneTalent($phoneTalent);
$companyManager->updateTalent($usr);
$extra = array(
'linkedin' => $talent->setLinkedin($newLinkedin),
'twitter' => $talent->setTwitter($newTwitter),
'titleTalent' => $talent->setTitleTalent($titleTalent),
);
$talent->setExtra($extra);
$userManager->updateUser($usr);
$companyManager->updateTalent($talent);
$status = array('status' => "success", 'file' => $usr->getFile(), 'id' => $usr->getId());
$status = array('status' => "success");
}
} else {
$status = array('status' => "failure", 'message' => "Vous n'êtes pas connecté.");
volume/www/website/www/src/AppBundle/Entity/Ad.php
+1 -1
View File
@@ -160,7 +160,7 @@ class Ad
*
* @ORM\Column(name="public_tag", type="json_document", nullable=true, options={"jsonb":true})
*
* @Groups({"ad_detail"})
* @Groups({"ad_detail", "answer_detail"})
*/
private $publicTag;
volume/www/website/www/src/AppBundle/Entity/Company.php
+1 -1
View File
@@ -351,7 +351,7 @@ class Company
if (empty($this->publicTag))
$empty++;
if ($this->presentation_video === null)
if ($this->presentationVideo == null)
$empty++;
if (is_array($this->ad) && empty($this->ad))
volume/www/website/www/src/AppBundle/Utils/Services/CompanyManager.php
+1
View File
@@ -91,6 +91,7 @@ class CompanyManager
'titleTalent' => $talent->getTitleTalent(),
'situationTalent' => $talent->getSituationTalent(),
'descriptionTalent' => $talent->getDescriptionTalent(),
'phoneTalent' => $talent->getPhoneTalent(),
);
$talent->setExtra($extra);
volume/www/website/www/src/AppBundle/Utils/Traits/ExtraJsonTrait.php
+14
View File
@@ -24,6 +24,7 @@ trait ExtraJsonTrait
private $size;
private $siren;
private $phoneTalent;
private $titleTalent;
private $situationTalent;
private $descriptionTalent;
@@ -41,6 +42,7 @@ trait ExtraJsonTrait
isset($extra['linkedin']) ? $this->linkedin = $extra['linkedin'] : null;
isset($extra['size']) ? $this->size = $extra['size'] : null;
isset($extra['siren']) ? $this->siren = $extra['siren'] : null;
isset($extra['phoneTalent']) ? $this->phoneTalent = $extra['phoneTalent'] : null;
isset($extra['titleTalent']) ? $this->titleTalent = $extra['titleTalent'] : null;
isset($extra['situationTalent']) ? $this->situationTalent = $extra['situationTalent'] : null;
isset($extra['descriptionTalent']) ? $this->descriptionTalent = $extra['descriptionTalent'] : null;
@@ -115,6 +117,18 @@ trait ExtraJsonTrait
return $this->siren;
}
public function setPhoneTalent($phoneTalent)
{
$this->phoneTalent = $phoneTalent;
return $this;
}
public function getPhoneTalent()
{
return $this->phoneTalent;
}
public function setTitleTalent($titleTalent)
{
$this->titleTalent = $titleTalent;