Compare commits

...

15 Commits

Author SHA1 Message Date
Thomas MONCHICOURT d0fd19d760 Fix : style dashboard 2018-09-25 16:35:08 +02:00
Thomas MONCHICOURT 0bcd46fde8 Fix : correction affichage mediatheque 2018-09-25 16:11:29 +02:00
Thomas MONCHICOURT d301c3b029 Feat : Etat de visionnage d’une candidature par le talent #7229 @0h30 2018-09-25 15:33:24 +02:00
Thomas MONCHICOURT 441304c363 Fix : probleme save data 2018-09-24 17:22:51 +02:00
Thomas MONCHICOURT 3399a82379 Fix : Bouton lien page detail territoire 2018-09-24 17:02:25 +02:00
Thomas MONCHICOURT 4e111ae3cd Fix : re prestashop 2018-09-24 16:59:31 +02:00
Thomas MONCHICOURT ed669974a1 Fix : delete event for prestashop 2018-09-24 16:56:01 +02:00
Thomas MONCHICOURT 02c68a48c9 Fix : edition image progile 2018-09-24 16:12:54 +02:00
Thomas MONCHICOURT 0373f01013 Fix: remove utf8 encode for months 2018-09-20 16:49:19 +02:00
Thomas MONCHICOURT cbcf51f93d Fix : language mois 2018-09-20 16:44:41 +02:00
Thomas MONCHICOURT dffb439bb3 Fix : language date 2018-09-20 16:39:46 +02:00
Thomas MONCHICOURT 4b2c5fc222 Fix : bouton de lien page entreprise 2018-09-20 16:31:10 +02:00
Thomas MONCHICOURT 13073d59e4 Fix : set locales 2018-09-20 14:05:50 +02:00
Thomas MONCHICOURT 8e995cef82 Fix : modal picture profil 2018-09-20 12:23:10 +02:00
Thomas MONCHICOURT 349bc309bd Fix: lien pour voir plus de mots clefs 2018-09-20 11:46:33 +02:00
21 changed files with 208 additions and 63 deletions
@@ -68,11 +68,11 @@
- {{ company.addresses.billing.country|country }}</p>
{% endif %}
</div>
<div class="col s12 profil-links">
<div class="col s12 profil-links center-align">
{% if company.website %}
<a target="_blank" href="{{ company.website }}" class="td-none">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x z-depth-2"></i>
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-link fa-stack-1x fa-inverse"></i>
</span>
</a>
@@ -12,16 +12,18 @@
<div class="row">
<div class="col s12">
{#<a class="waves-effect waves-light btn btn-default modal-trigger left m-r-10" href="#addVideo">Créer une vidéo</a>#}
{% if medias|length > 0 %}
<a class="waves-effect waves-light btn btn-default modal-trigger left" href="#addVideo">Ajouter une vidéo</a>
<a class="btn btn-delete-video btn-round tooltipped red right" href="#!" data-position="top"
data-tooltip="Supprimer des vidéos"><i class="fa fa-trash" aria-hidden="true"></i>
</a>
{% endif %}
</div>
</div>
{% if medias|length == 0 %}
<div class="col s12 col-actions center-align">
<div class="col s12 col-actions center-align" id="no-video-talents">
<br/><br/>
<strong class="color-grey3">Vous ne possédez pas encore de CV vidéo!</strong><br/>
<span class="color-grey2">Cliquez sur le bouton pour ajouter votre première vidéo.</span>
@@ -38,11 +38,13 @@
<a href="{{ path('talent_answer_create',{id:a.ad.id}) }}">
<i class="fa fa-pencil-square-o" aria-hidden="true"></i>
</a>
{% elseif a.status == "DRAFT" and a.company != null %}
<a href="{{ path('talent_spontaneous_application_create',{id:a.company.id}) }}">
<i class="fa fa-pencil-square-o" aria-hidden="true"></i>
</a>
{% endif %}
{% if a.isViewed %}
{% if a.isViewed.status == "DRAFT" %}
{{ 'VIEWED'|trans }}
{% endif %}
{{ 'VIEWED'|trans }}
{% else %}
{{ a.status|trans }}
{% endif %}
@@ -80,4 +82,11 @@
var player_vimeo = new Vimeo.Player('player_vimeo');
});
</script>
<script type="text/javascript">
(function ($) {
$(function () {
$('.modal').modal();
});
})(jQuery);
</script>
{% endblock %}
@@ -25,29 +25,4 @@
output='assetic/main.dashboard.talent.js' filter='?uglifyjs2' %}
<script src="{{ asset_url }}"></script>
{% endjavascripts %}
<script type="text/javascript">
$.fn.datepicker.languages['fr-FR'] = {
format: 'dd/mm/yyyy',
days: ['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'],
daysShort: ['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'],
daysMin: ['Di', 'Lu', 'Ma', 'Me', 'Je', 'Ve', 'Sa'],
weekStart: 1,
months: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Aout', 'Septembre', 'Octobre', 'Novembre', 'Décembre'],
monthsShort: ['Jan', 'Fev', 'Mar', 'Avr', 'Mai', 'Jun', 'Jui', 'Aou', 'Sep', 'Oct', 'Nov', 'Dec']
};
$('.datepicker').datepicker({
language: 'fr-FR'
});
jQuery.extend(jQuery.validator.messages, {
required: "Ce champ est obligatoire"
});
$('form[name="talent"]').validate();
$('form[name="talent_profile"]').validate();
$('form[name="careers"]').validate();
$('form[name="formations"]').validate();
$('form[name="languages"]').validate();
</script>
{% endblock %}
@@ -7,19 +7,19 @@
<img src="{{ app.user.webPath | imagine_filter('profile_square') }}"
alt="{{ app.user.firstname }} {{ app.user.lastname|first|upper }}"
class="circle responsive-img"/>
<a href="#modalProfilePicture">
<a data-target="modalProfilePicture" class="modal-trigger" href="#modalProfilePicture">
<i class="fa fa-pencil" aria-hidden="true"></i>
</a>
{% elseif app.user.socialPicture is not null %}
<img src="{{ app.user.socialPicture }}"
alt="{{ app.user.firstname }} {{ app.user.lastname|first|upper }}"
class="circle responsive-img"/>
<a href="#modalProfilePicture">
<a data-target="modalProfilePicture" class="modal-trigger" href="#modalProfilePicture">
<i class="fa fa-pencil" aria-hidden="true"></i>
</a>
{% else %}
<div class="circle-letters font-2">{{ app.user.firstname|first|upper }}{{ app.user.lastname|first|upper }}</div>
<a href="#modalProfilePicture">
<a data-target="modalProfilePicture" class="modal-trigger" href="#modalProfilePicture">
<i class="fa fa-pencil" aria-hidden="true"></i>
</a>
{% endif %}
@@ -325,5 +325,12 @@
<script src="{{ asset('/js/dropzone.js') }}"></script>
{% endif %}
<script src="{{ asset('/js/profileTalent.js') }}"></script>
<script type="text/javascript">
(function ($) {
$(function () {
$('.modal').modal();
});
})(jQuery);
</script>
{% endblock %}
@@ -82,7 +82,9 @@
{% for tag in talent.publicTag if talent.publicTag[0] is not empty %}
<div class="chip {% if loop.index > 5 %}chip-invisible{% endif %}">{{ tag }}</div>
{% endfor %}
<div class="chip chip-more">+ {{ talent.publicTag|length - 5 }}</div>
{% if talent.publicTag|length > 5 %}
<div class="chip chip-more">+ {{ talent.publicTag|length - 5 }}</div>
{% endif %}
</div>
</div>
{% if user.company.extra.descriptionTalent %}
@@ -71,11 +71,11 @@
- {{ company.addresses.billing.country|country }}</p>
{% endif %}
</div>
<div class="col s12 profil-links">
<div class="col s12 profil-links center-align">
{% if company.website %}
<a target="_blank" href="{{ company.website }}" class="td-none">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x z-depth-2"></i>
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-link fa-stack-1x fa-inverse"></i>
</span>
</a>
@@ -41,6 +41,7 @@ assetic:
- 'js/vendors/tooltipster.bundle.min.js'
- 'js/vendors/datepicker.min.js'
- 'js/vendors/jquery.validate.min.js'
- 'js/talent.js'
admin:
inputs:
- 'admin/AdminLTE/plugins/jQuery/jquery-2.2.3.min.js'
@@ -63,7 +63,7 @@ class TalentController extends Controller
*/
public function talentProfileAction(Request $request)
{
setlocale(LC_TIME, "fr_FR");
setlocale(LC_TIME, 'fr_FR.UTF8', 'fr.UTF8', 'fr_FR.UTF-8', 'fr.UTF-8');
$em = $this->getDoctrine()->getManager();
$history = $this->get('edeclic.history.record');
$records = $history->recordShow($this->getUser()->getId(), "r", 'AppBundle\Entity\Ad', null);
@@ -93,8 +93,6 @@ class TalentController extends Controller
if ($formCompany->isSubmitted() && $formCompany->isValid()) {
$companyManager = $this->get('app.company_manager');
$companyManager->updateTalent($user);
$event = new UserEvent($user);
$this->get('event_dispatcher')->dispatch(PrestashopBridgeEvents::USER_PROFIL_EDIT_SUCCESS, $event);
$this->addFlash(
'notice',
$this->get('translator')->trans('company.profile.save.title')
@@ -109,8 +107,6 @@ class TalentController extends Controller
$user->setCareer($careers);
$em->persist($user);
$em->flush();
$event = new UserEvent($user);
$this->get('event_dispatcher')->dispatch(PrestashopBridgeEvents::USER_PROFIL_EDIT_SUCCESS, $event);
$this->addFlash(
'notice',
$this->get('translator')->trans('company.profile.save.title')
@@ -125,8 +121,6 @@ class TalentController extends Controller
$user->setFormation($formations);
$em->persist($user);
$em->flush();
$event = new UserEvent($user);
$this->get('event_dispatcher')->dispatch(PrestashopBridgeEvents::USER_PROFIL_EDIT_SUCCESS, $event);
$this->addFlash(
'notice',
$this->get('translator')->trans('company.profile.save.title')
@@ -140,8 +134,6 @@ class TalentController extends Controller
$user->setLanguage($languages);
$em->persist($user);
$em->flush();
$event = new UserEvent($user);
$this->get('event_dispatcher')->dispatch(PrestashopBridgeEvents::USER_PROFIL_EDIT_SUCCESS, $event);
$this->addFlash(
'notice',
$this->get('translator')->trans('company.profile.save.title')
@@ -140,7 +140,7 @@ class Answer
}
public function getIsViewed(){
if($this->messages->count() <= 1){
if($this->messages->count() >= 1){
return $this->messages->last();
} else {
@@ -95,10 +95,9 @@ class CareerType extends AbstractType
private function getMonths()
{
setlocale(LC_TIME, "fr_FR");
$months = array();
for ($m=1; $m<=12; $m++) {
$month = utf8_encode(strftime('%B', mktime(0,0,0,$m, 1, date('Y'))));
$month = strftime('%B', mktime(0,0,0,$m, 1, date('Y')));
$months[$month] = $m;
}
@@ -82,17 +82,17 @@ class CompanyManager
);
$addrs['billing'] = $billing;
$talent->setAddresses($addrs);
$publicTags = explode(',', $talent->getTagsComma());
$talent->setPublicTag($publicTags);
$extra = array(
'linkedin' => $talent->getLinkedin(),
'twitter' => $talent->getTwitter(),
'titleTalent' => $talent->getTitleTalent(),
'situationTalent' => $talent->getSituationTalent(),
'descriptionTalent' => $talent->getDescriptionTalent(),
);
$talent->setExtra($extra);
}
$publicTags = explode(',', $talent->getTagsComma());
$talent->setPublicTag($publicTags);
$extra = array(
'linkedin' => $talent->getLinkedin(),
'twitter' => $talent->getTwitter(),
'titleTalent' => $talent->getTitleTalent(),
'situationTalent' => $talent->getSituationTalent(),
'descriptionTalent' => $talent->getDescriptionTalent(),
);
$talent->setExtra($extra);
$this->em->persist($talent);
$this->em->persist($user);
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -13167,6 +13167,9 @@ coloring of icons.
.hover-none a:hover {
color: #ffffff; }
select {
display: block; }
.color-white {
color: #FFFFFF; }
@@ -16065,6 +16068,12 @@ span.titleVideo {
font-family: "Raleway", sans-serif;
font-size: 14px; }
#no-video-talents {
display: flex;
flex-direction: column;
justify-content: space-around;
height: 250px; }
.tooltip_templates {
display: none; }
File diff suppressed because one or more lines are too long
+66
View File
@@ -0,0 +1,66 @@
$.fn.datepicker.languages['fr-FR'] = {
format: 'dd/mm/yyyy',
days: ['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'],
daysShort: ['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'],
daysMin: ['Di', 'Lu', 'Ma', 'Me', 'Je', 'Ve', 'Sa'],
weekStart: 1,
months: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Aout', 'Septembre', 'Octobre', 'Novembre', 'Décembre'],
monthsShort: ['Jan', 'Fev', 'Mar', 'Avr', 'Mai', 'Jun', 'Jui', 'Aou', 'Sep', 'Oct', 'Nov', 'Dec']
};
$('.datepicker').datepicker({
language: 'fr-FR'
});
jQuery.extend(jQuery.validator.messages, {
required: "Ce champ est obligatoire"
});
$('form[name="talent"]').validate();
$('form[name="talent_profile"]').validate();
$('form[name="careers"]').validate();
$('form[name="formations"]').validate();
$('form[name="languages"]').validate();
window.URL = window.URL || window.webkitURL;
var useBlob = false && window.URL;
function readURL(file) {
var reader = new FileReader();
reader.addEventListener("load", function () {
var image = new Image();
image.addEventListener("load", function () {
if (Math.round(file.size / 1024) > 4000) {
$('#preview_profile_picture').html("");
$('.btn-save-profile-picture').addClass('hide');
$('#card-alert').slideDown();
$(".errors").html("L'image que vous tentez de charger est trop lourde.<br />Merci de choisir une autre photo ne dépassant pas les 4Mo.");
} else {
$('#card-alert').fadeOut();
$(".errors").html("");
$('#preview_profile_picture').html(this);
$('.btn-save-profile-picture').removeClass('hide');
}
});
image.src = useBlob ? window.URL.createObjectURL(file) : reader.result;
});
reader.readAsDataURL(file);
}
$("#profile_picture_file, #profile_logo_file").change(function () {
var files = this.files;
if (files && files[0]) {
for (var i = 0; i < files.length; i++) {
var file = files[i];
if ((/\.(png|jpeg|jpg|gif)$/i).test(file.name)) {
readURL(file);
} else {
var errors = file.name + "<br />Le format de l'image n'est pas supporté. Merci de charger une image de type png,jpeg,jpg ou gif.";
$('#preview_profile_picture').html("");
$('.btn-save-profile-picture').addClass('hide');
$('#card-alert').slideDown();
$(".errors").html(errors);
}
}
}
});
@@ -486,3 +486,7 @@
}
}
}
select{
display: block;
}
@@ -427,4 +427,11 @@
font-family: $font-1;
font-size: 14px;
}
}
#no-video-talents{
display: flex;
flex-direction: column;
justify-content: space-around;
height: 250px;
}