From 55f48d577341649d986f32a3a55358175af20142 Mon Sep 17 00:00:00 2001 From: Arnaud Levy <contact@arnaudlevy.com> Date: Fri, 26 Aug 2022 11:16:53 +0200 Subject: [PATCH] edition wip --- app/views/extranet/account/show.html.erb | 13 ++--- .../extranet/persons/_experience.html.erb | 50 +++++++++++-------- app/views/extranet/persons/show.html.erb | 2 +- 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/app/views/extranet/account/show.html.erb b/app/views/extranet/account/show.html.erb index dde3ac4d0..b0e49e832 100644 --- a/app/views/extranet/account/show.html.erb +++ b/app/views/extranet/account/show.html.erb @@ -10,16 +10,17 @@ <div class="biography"> <p><%= @person.biography %></p> </div> - <% if @person.experiences.any? %> - <div class="experiences"> - <p class="mb-4">Parcours professionel</p> + <div class="experiences"> + <p class="mb-4">Parcours professionel</p> + <%= link_to 'Ajouter une expérience', '', class: 'btn btn-sm btn-primary mb-4' %> + <% if @person.experiences.any? %> <ul> <% @person.experiences.ordered.each do |experience| %> - <li><%= render 'extranet/persons/experience', experience: experience %></li> + <%= render 'extranet/persons/experience', experience: experience, edit: true %> <% end %> </ul> - </div> - <% end %> + <% end %> + </div> </div> <div class="col-md-3"> <%= render 'extranet/persons/details', person: @person unless @person.nil? %> diff --git a/app/views/extranet/persons/_experience.html.erb b/app/views/extranet/persons/_experience.html.erb index 4b8839d94..f5c49059a 100644 --- a/app/views/extranet/persons/_experience.html.erb +++ b/app/views/extranet/persons/_experience.html.erb @@ -1,24 +1,30 @@ -<div> - <p><b><%= experience.description %></b></p> - <p class="mb-0"> - <%= "#{experience.from_year} —" if experience.from_year %> - <%= experience.to_year || t('today') %> - </p> -</div> -<div> - <% if experience.organization.present? %> - <p><%= link_to experience.organization, experience.organization %></p> - <% if experience.organization.url %> - <p class="mb-0"><small><%= link_to experience.organization.url, experience.organization.url %></small></p> +<% +edit ||= false +%> +<li> + <div> + <p><b><%= experience.description %></b></p> + <p class="mb-0"> + <%= "#{experience.from_year} —" if experience.from_year %> + <%= experience.to_year || t('today') %> + </p> + <%= link_to 'Modifier cette expérience', '', class: 'btn btn-sm btn-primary mt-2' if edit %> + </div> + <div> + <% if experience.organization.present? %> + <p><%= link_to experience.organization, experience.organization %></p> + <% if experience.organization.url %> + <p class="mb-0"><small><%= link_to experience.organization.url, experience.organization.url %></small></p> + <% end %> <% end %> - <% end %> -</div> -<div> - <% if experience.organization.present? %> - <% if experience.organization.logo.attached? %> - <%= link_to experience.organization do %> - <%= kamifusen_tag experience.organization.logo, height: 80, class: 'img-fluid' %> - <% end %> + </div> + <div> + <% if experience.organization.present? %> + <% if experience.organization.logo.attached? %> + <%= link_to experience.organization do %> + <%= kamifusen_tag experience.organization.logo, height: 80, class: 'img-fluid' %> + <% end %> + <% end %> <% end %> - <% end %> -</div> + </div> +</li> diff --git a/app/views/extranet/persons/show.html.erb b/app/views/extranet/persons/show.html.erb index 46d6642a6..426038b11 100644 --- a/app/views/extranet/persons/show.html.erb +++ b/app/views/extranet/persons/show.html.erb @@ -12,7 +12,7 @@ <p class="mb-4">Parcours professionel</p> <ul> <% @person.experiences.ordered.each do |experience| %> - <li><%= render 'extranet/persons/experience', experience: experience %></li> + <%= render 'extranet/persons/experience', experience: experience %> <% end %> </ul> </div> -- GitLab