Compare commits

...

4 Commits

Author SHA1 Message Date
llaniau 52ec51b973 Fix : dashboard entreprise - ajout ad 2020-09-01 14:24:44 +02:00
llaniau 1b5a4ff368 Dashboard / gestion annonce 2020-09-01 13:03:27 +02:00
llaniau b9b93ee8f1 modif user dashboard entreprise 2020-09-01 12:04:04 +02:00
llaniau 5bcc995f81 Modif inscription 2020-09-01 11:33:16 +02:00
17 changed files with 108 additions and 56 deletions
@@ -46,6 +46,12 @@
</main>
{% endblock %}
{% block metarobot %}
<meta name="robots" content="noindex,nofollow">
{% block javascripts %}
{% javascripts
'@vendors'
'@global'
output='assetic/main.js' filter='?uglifyjs2' %}
<script src="{{ asset_url }}"></script>
{% endjavascripts %}
{% endblock %}
@@ -14,23 +14,14 @@
<div class="dropdown pull-right d-lg-block d-none">
<button class="profile-dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="profile dropdown">
<span class="thumbnail-wrapper d32 circular inline">
<img src="{{ asset('dashboard/img/profiles/avatar.jpg') }}" alt="" data-src="{{ asset('dashboard/img/profiles/avatar.jpg') }}"
data-src-retina="{{ asset('dashboard/img/profiles/avatar_small2x.jpg') }}" width="32" height="32">
<img src="{{ asset('dashboard/img/profiles/account-avatar-default.svg') }}" alt="" data-src="{{ asset('dashboard/img/profiles/account-avatar-default.svg') }}"
data-src-retina="{{ asset('dashboard/img/profiles/account-avatar-default.svg') }}" width="32" height="32">
</span>
</button>
<div class="dropdown-menu dropdown-menu-right profile-dropdown" role="menu">
<a href="#" class="dropdown-item"><span>Signed in as <br /><b>David Aunsberg</b></span></a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">Your Profile</a>
<a href="#" class="dropdown-item">Your Activity</a>
<a href="#" class="dropdown-item">Your Archive</a>
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item">Features</a>
<a href="#" class="dropdown-item">Help</a>
<a href="#" class="dropdown-item">Settings</a>
<a href="#" class="dropdown-item">Logout</a>
<div class="dropdown-divider"></div>
<span class="dropdown-item fs-12 hint-text">Last edited by David<br />on Friday at 5:27PM</span>
<a href="/logout" class="dropdown-item">Se déconnecter</a>
</div>
</div>
<!-- END User Info-->
@@ -22,7 +22,7 @@
<link rel="stylesheet" href="{{ asset('v2/vendor/slick-carousel/slick/slick.css') }}">
<link rel="stylesheet" href="{{ asset('v2/vendor/cubeportfolio/css/cubeportfolio.min.css') }}">
<link rel="stylesheet" href="{{ asset('v2/vendor/fancybox/jquery.fancybox.css') }}">
<!-- CSS Space Template -->
<link rel="stylesheet" href="{{ asset('v2/css/theme.css') }}">
<script type="text/javascript"> window.$crisp=[];window.CRISP_WEBSITE_ID="78ec5756-1cd5-4f3f-b0db-cb408c8171da";(function(){ d=document;s=d.createElement("script"); s.src="https://client.crisp.chat/l.js"; s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})(); </script>
@@ -39,6 +39,9 @@
{% include 'defaultv2/header.html.twig' %}
{#{% include 'defaultv2/props_settings.html.twig' %} #}
{% block content %}
{% endblock %}
{% block javascripts %}
{% endblock %}
{# {% include 'defaultv2/footer.html.twig' %} #}
{{ include('FairlaneCookieConsentBundle::cookie-info.html.twig') }}
@@ -27,11 +27,8 @@
{% include 'company/ad_stepsV2.html.twig' with {'tab':1} %}
{% endif %}
<div class="tab-content">
{{ form_start(form, {'attr': {'class': 'form-horizontal'}}) }}
{{ form_start(form, {'attr': {'class': ''}}) }}
<div class="tab-pane padding-20 sm-no-padding active slide-left" id="tab1">
<div class="row row-same-height">
@@ -49,7 +46,7 @@
<div class="col-md-7">
<div class="padding-30 sm-padding-5">
<table class="table table-condensed form-horizontal">
<table class="table table-condensed ">
<tr>
<td class="col-lg-12 col-md-12 col-sm-12 ">
{% if form_errors(form) %}
@@ -50,12 +50,16 @@
</tr>
<tr>
<td class="col-lg-12 col-md-12 col-sm-12 ">
{% if form.reference is defined%}
{{ form_row(form.reference) }}
{% endif %}
</td>
</tr>
<tr>
<td class="col-lg-12 col-md-12 col-sm-12 ">
{{ form_row(form.title) }}
{% if form.title is defined%}
{{ form_row(form.title) }}
{% endif %}
</td>
</tr>
<tr>
@@ -14,14 +14,14 @@
<div>Je <b>télécharge</b> ma vidéo</div>
</a>
</div>
<div class="tab col s4">
{# <div class="tab col s4">
<a {% if tab == 3 %}class="active"{% endif %} href="#!">
<div class="btn btn-circle">3</div>
<div>
Je <b>planifie</b> et <b>commande</b> mon annonce
</div>
</a>
</div>
</div> #}
</div>
</div>
</div>
@@ -11,9 +11,9 @@
data-target="#tab2" role="tab"><i class="material-icons fs-14 tab-icon">local_shipping</i> <span>Je
<b>télécharge</b> ma vidéo</span></a>
</li>
<li class="nav-item">
{# <li class="nav-item">
<a class="{% if tab == 3 %}active {% else %}disabled {% endif %} d-flex align-items-center" data-toggle="tab" href="#tab3"
data-target="#tab3" role="tab"><i class="material-icons fs-14 tab-icon">payment</i> <span>Je <b>planifie</b>
et <b>commande</b> mon annonce</span></a>
</li>
</li> #}
</ul>
@@ -79,11 +79,11 @@
Two-step verification, which we encourage all our customers to use.</p>
<p class="small hint-text">Below is a sample page for your cart , Created using pages design
UI Elementes</p>
<ul id="tabs-video" class="tabs">
{# <ul id="tabs-video" class="tabs">
<li class="tab col s4"><a class="active" href="#tab-video-new">Ajouter une nouvelle vidéo</a>
</li>
<li class="tab col s4"><a href="#tab-video-select">Utiliser une vidéo existante</a></li>
</ul>
</ul> #}
</div>
</div>
<div class="col-md-7">
@@ -39,7 +39,7 @@ class AdController extends Controller
$dateArray = null;
$records = $stats->getCompanyDashboard($this->getUser()->getCompany()->getId(), $dateArray);
$ads = $em->getRepository('AppBundle:Ad')->findBy(array('creator' => $this->getUser()));
$ads = $em->getRepository('AppBundle:Ad')->findBy(array('company' => $this->getUser()->getCompany()));
return $this->render('company/ad_list.html.twig', array(
'ads' => $ads,
'arrayByAds' => $records['arrayByAds']
@@ -28,7 +28,7 @@ class CompanyController extends Controller
setlocale(LC_ALL, 'fr_FR.utf-8');
$stats = $this->get("app.stats_manager");
$em = $this->getDoctrine()->getManager();
$ads = $em->getRepository('AppBundle:Ad')->findBy(array('creator' => $this->getUser()));
$ads = $em->getRepository('AppBundle:Ad')->findBy(array('company' => $this->getUser()->getCompany()));
$records = $stats->getCompanyDashboard($this->getUser()->getCompany()->getId(), null);
return $this->render('company/dashboard.html.twig', [
'ads' => $ads,
@@ -182,7 +182,13 @@ class MediaController extends Controller
$mediaManager = $this->get('media_manager');
$message = $mediaManager->upload($ad, $uploadedFile, $ad->getCreator());
}
$em = $this->getDoctrine()->getManager();
$ad->setIsVerified(true);
$ad->setPrivate(false);
$ad->setPromoted(true);
$em->persist($ad);
dump($ad);
$em->flush();
return new JsonResponse($message);
}
@@ -42,23 +42,30 @@ class AdSoftType extends AbstractType
'mapped' => false,
'label' => 'Localisation de l\'annonce',
'attr' => array(
'value' => $location_gmap
'value' => $location_gmap,
'class' => 'form-control'
)
))
->add('location', HiddenType::class, array(
'data' => $location,
'attr' => array(
'class' => 'form-control'
)
))
->add('description', TextareaType::class, array(
'label' => 'Description de l\'annonce',
'attr' => array(
'class' => 'materialize-textarea',
'placeholder' => 'Décrire votre annonce'
'placeholder' => 'Décrire votre annonce',
'class' => 'form-control'
)
))
->add('beneficiaire', TextType::class, array(
'label' => 'Bénéficiaire (En cas de gestion multi entreprise)',
'label' => 'Client ',
'required' => false,
'attr' => array(
'placeholder' => 'Indiquer un bénéficiaire'
'placeholder' => 'Indiquer un client',
'class' => 'form-control'
)
))
->add('contract_type', ChoiceType::class, array(
@@ -72,11 +79,17 @@ class AdSoftType extends AbstractType
'Professionalisation' => 'Professionalisation',
'Stage' => 'Stage',
'Indépendant' => 'Indépendant'
),
'attr' => array(
'class' => 'form-control'
)
))
->add('publicTag', TextType::class, array(
'label' => 'profile.company.tags',
'data' => $publicTags,
'attr' => array(
'class' => 'form-control'
)
));
}
}
@@ -53,9 +53,10 @@ class AdType extends AbstractType
)
))
->add('beneficiaire', TextType::class, array(
'label' => 'Bénéficiaire (En cas de gestion multi entreprise)',
'label' => 'Client',
'required' => false,
'attr' => array(
'placeholder' => 'Indiquer un bénéficiaire',
'placeholder' => 'Indiquer un client',
'class' => 'form-control'
)
))
@@ -34,34 +34,44 @@ class AdType extends AbstractType
->add('reference', TextType::class, array(
'label' => 'Référence de l\'annonce',
'attr' => array(
'placeholder' => 'Indiquer une référence'
'placeholder' => 'Indiquer une référence',
'class' => 'form-control'
)
))
->add('title', TextType::class, array(
'label' => 'Titre de l\'annonce',
'attr' => array(
'placeholder' => 'Indiquer un titre'
'placeholder' => 'Indiquer un titre',
'class' => 'form-control'
)
))
->add('location_gmap', TextType::class, array(
'mapped' => false,
'label' => 'Localisation de l\'annonce',
'attr' => array(
'value' => $location_gmap
'value' => $location_gmap,
'class' => 'form-control'
)
))
->add('location', HiddenType::class, array(
'data' => $location,
'attr' => array(
'class' => 'form-control'
)
))
->add('description', TextareaType::class, array(
'label' => 'Description de l\'annonce',
'attr' => array(
'placeholder' => 'Décrire votre annonce'
'placeholder' => 'Décrire votre annonce',
'class' => 'form-control'
)
))
->add('publicTag', TextType::class, array(
'label' => 'Tags de l\'annonce (séparés par une virgules)',
'data' => $publicTags,
'attr' => array(
'class' => 'form-control'
)
))
->add('status', ChoiceType::class, array(
'label' =>'Status',
@@ -72,31 +82,49 @@ class AdType extends AbstractType
'Publiée' => 'PUBLISHED',
'Fermée' => 'CLOSED',
'Expirée' => 'EXPIRED',
),
'attr' => array(
'class' => 'form-control'
)
))
->add('isPromoted', CheckboxType::class, array(
'label' => 'Offre pourvue',
'required' => false
'required' => false,
'attr' => array(
'class' => 'form-control'
)
))
->add('isVerified', CheckboxType::class, array(
'label' => 'Vérifiée',
'required' => false
'required' => false,
'attr' => array(
'class' => 'form-control'
)
))
->add('isPrivate', CheckboxType::class, array(
'label' => 'Annonce privé ( non listée en front )',
'required' => false
'required' => false,
'attr' => array(
'class' => 'form-control'
)
));
// Emphasis
$builder
->add('emphasis', CheckboxType::class, array(
'label' => 'A la une',
'required' => false
'required' => false,
'attr' => array(
'class' => 'form-control'
)
))
->add('emphasisOrder', IntegerType::class, array(
'label' => 'Ordre',
'required' => false
'required' => false,
'attr' => array(
'class' => 'form-control'
)
));
}
}
@@ -187,6 +187,7 @@ class MediaManager
} elseif ($entity instanceof Ad) {
$media->setTitle("Video annonce de : " . $entity->getTitle());
$entity->setVideo($media);
$entity->setStatus("PUBLISHED");
$this->em->persist($entity);
} elseif ($entity instanceof User) {
$media->setTitle("Video générique");
File diff suppressed because one or more lines are too long
+9 -8
View File
@@ -1,8 +1,9 @@
$('.roleUser').click(function(){
$('.roleUser').removeClass('btn-default');
$('.roleUser').addClass('btn-dark');
var valueData = $(this).data('value');
$('#fos_user_registration_form_role').val(valueData);
$(this).removeClass('btn-dark');
$(this).addClass('btn-default');
});
// $('.roleUser').click(function(){
// $('.roleUser').removeClass('btn-default');
// $('.roleUser').addClass('btn-dark');
// var valueData = $(this).data('value');
// $('#fos_user_registration_form_role').val(valueData);
// $(this).removeClass('btn-dark');
// $(this).addClass('btn-default');
// });
$('#fos_user_registration_form_role').val("COMPANY");