Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 llaniau
|
992f61867e | ||
|
llaniau
|
72b119ac0c | ||
|
llaniau
|
831f7696ac | ||
|
llaniau
|
5a44f7d6ec | ||
|
llaniau
|
ddbfcc8a69 |
@@ -0,0 +1,8 @@
|
||||
UPDATE ad SET competences = '{"competences" : [{ "id1" : "libelle 1"},{ "id2" : "libelle 2"},{ "id3" : "libelle 3" }]}' WHERE id =1;
|
||||
UPDATE ad SET competences = '{ "id1" : "libelle 1", "id2" : "libelle 2", "id3" : "libelle 3" }' WHERE id =1;
|
||||
UPDATE ad SET competences = '{ "id1" : "libelle 1" }' WHERE id =31;
|
||||
UPDATE ad SET competences = '{ "id2" : "libelle 2", "id3" : "libelle 3"}' WHERE id =29;
|
||||
SELECT id FROM "ad" WHERE competences::jsonb @> '{ "id1" : "libelle 1"}'::jsonb LIMIT 10;
|
||||
SELECT id FROM "ad" WHERE competences::jsonb ? 'id1' LIMIT 10;
|
||||
SELECT competences::jsonb @> '{ "id1" : "libelle 1"}'::jsonb FROM "ad" WHERE id=1 LIMIT 1;
|
||||
SELECT * FROM "ad" WHERE id = 1 or id=31 or id =29;
|
||||
@@ -49,6 +49,10 @@
|
||||
<a href="{{ path('company_profile') }}">à les remplir ici. <i class="fa fa-link" aria-hidden="true"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
document.location.href="/entreprise/me/profil";
|
||||
</script>
|
||||
{# {{ render("/entreprise/me/profil") }} #}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<header class="text-center mb-5">
|
||||
<h2 class="h4 mb-0">Connexion</h2>
|
||||
<p>Connectez-vous pour gérer votre compte </p>
|
||||
{% if erreur %}<p class="text-danger">Votre dernière tentative de connexion a échoué. Vérifiez votre email ou votre mot de passe</p>{% endif %}
|
||||
{% if erreur is defined and erreur %}<p class="text-danger">Votre dernière tentative de connexion a échoué. Vérifiez votre email ou votre mot de passe</p>{% endif %}
|
||||
</header>
|
||||
|
||||
|
||||
@@ -144,4 +144,4 @@
|
||||
<!-- End Content -->
|
||||
</div>
|
||||
<!-- End Signup Modal Window -->
|
||||
<!-- ========== END SECONDARY CONTENTS ========== -->
|
||||
<!-- ========== END SECONDARY CONTENTS ========== -->
|
||||
|
||||
@@ -80,7 +80,7 @@ twig:
|
||||
globals:
|
||||
push_public_key: "%push_params.public_key%"
|
||||
fairlane_cookie_consent: '@fairlane_cookie_consent.twig'
|
||||
version: 'V2.4.0.1'
|
||||
version: 'V2.4.2'
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -108,12 +108,16 @@ class UserController extends Controller
|
||||
}
|
||||
|
||||
\assert(!\is_null($user));
|
||||
// $company = $user->getCompany();
|
||||
$company = $user->getCompany();
|
||||
// if ($company) {
|
||||
// $company->setPresentationVideo(null);
|
||||
// $em->persist($company);
|
||||
// $em->flush();
|
||||
// $em->remove($company);
|
||||
// $em->flush();
|
||||
// }
|
||||
if ($company) {
|
||||
$company->setPresentationVideo(null);
|
||||
$em->persist($company);
|
||||
$em->flush();
|
||||
}
|
||||
$this->deleteRelation($user);
|
||||
$em->remove($user);
|
||||
$em->flush();
|
||||
@@ -125,7 +129,7 @@ class UserController extends Controller
|
||||
// if ($company) {
|
||||
// $em->remove($company);
|
||||
// }
|
||||
$em->flush();
|
||||
//$em->flush();
|
||||
|
||||
return $this->redirectToRoute('admin_config_others_user');
|
||||
}
|
||||
@@ -133,13 +137,14 @@ class UserController extends Controller
|
||||
public function deleteRelation($user)
|
||||
{
|
||||
$em = $this->getDoctrine()->getManager();
|
||||
|
||||
//$company = $em->getRepository('AppBundle:Company')->find($companyId);
|
||||
$sendMessage = $em->getRepository('AppBundle:Message')->findBy(array('sender' => $user));
|
||||
if ($sendMessage) {
|
||||
foreach ($sendMessage as $key => $message) {
|
||||
$message->setSender(null);
|
||||
$message->setAnswer(null);
|
||||
}
|
||||
|
||||
$em->flush();
|
||||
}
|
||||
|
||||
@@ -160,6 +165,14 @@ class UserController extends Controller
|
||||
$em->flush();
|
||||
}
|
||||
|
||||
$subscriptions = $em->getRepository('AppBundle:UserSubscription')->findBy(array('user' => $user));
|
||||
if ($subscriptions) {
|
||||
foreach ($subscriptions as $key => $subscription) {
|
||||
$em->remove($subscription);
|
||||
}
|
||||
$em->flush();
|
||||
}
|
||||
|
||||
$answers = $em->getRepository('AppBundle:Answer')->findBy(array('user' => $user));
|
||||
if ($answers) {
|
||||
foreach ($answers as $key => $answer) {
|
||||
@@ -194,6 +207,12 @@ class UserController extends Controller
|
||||
|
||||
$medias = $em->getRepository('AppBundle:Media')->findBy(array('creator' => $user));
|
||||
if ($medias) {
|
||||
// foreach ($medias as $key => $media) {
|
||||
// $media->setCompany(null);
|
||||
// $em->persist($media);
|
||||
// $em->flush();
|
||||
// }
|
||||
|
||||
foreach ($medias as $key => $media) {
|
||||
$em->remove($media);
|
||||
}
|
||||
|
||||
@@ -160,7 +160,7 @@ class AnswerController extends FOSRestController
|
||||
$message->setVideo($video);
|
||||
$em->persist($message);
|
||||
$em->flush();*/
|
||||
if ($this->container->get( 'kernel' )->getEnvironment() != "dev") {
|
||||
// if ($this->container->get( 'kernel' )->getEnvironment() != "dev") {
|
||||
$mailManager = $this->get('app.mail_manager');
|
||||
foreach ($usersCompany as $user){
|
||||
$link = $this->generateUrl('company_answer_show', array('id' => $answer->getId()), UrlGeneratorInterface::ABSOLUTE_URL);
|
||||
@@ -188,7 +188,7 @@ class AnswerController extends FOSRestController
|
||||
'contact_default'
|
||||
);
|
||||
}
|
||||
}
|
||||
// }
|
||||
$status = array('status' => "success", "idAnswer" => $answer->getId()/*, "idMessage" => $message->getId()*/);
|
||||
}
|
||||
} else {
|
||||
@@ -322,6 +322,7 @@ class AnswerController extends FOSRestController
|
||||
$status = array('status' => "success", "companyUpdated" => false);
|
||||
//dump($file);
|
||||
// If a file was uploaded
|
||||
//TODO Controle sur l'extension du fichier (pdf, word)
|
||||
if (!is_null($file)) {
|
||||
|
||||
$companyManager = $this->get('app.company_manager');
|
||||
|
||||
@@ -365,7 +365,8 @@ class DefaultController extends Controller
|
||||
//return $this->redirectToRoute('talent_dashboard');
|
||||
} elseif ($user->hasRole('ROLE_COMPANY')) {
|
||||
|
||||
return $this->redirectToRoute('company_profile');
|
||||
return $this->redirectToRoute('company_dashboard');
|
||||
// return $this->redirectToRoute('company_profile');
|
||||
}
|
||||
} else {
|
||||
|
||||
|
||||
@@ -377,7 +377,7 @@ class User extends BaseUser
|
||||
$zipCode = "";
|
||||
$city = "";
|
||||
$country = "";
|
||||
|
||||
$type=null;
|
||||
if($this->getCompany()->getPresentationVideo())
|
||||
{
|
||||
$pres= $this->getCompany()->getPresentationVideo()->getCdnUrl();
|
||||
@@ -424,7 +424,7 @@ class User extends BaseUser
|
||||
}
|
||||
}
|
||||
}
|
||||
$type=null;
|
||||
|
||||
if($this->getCompany()->getType()){
|
||||
$type=$this->getCompany()->getType();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user