From e0f17d2ba8cbf8303c333210374bb1055637d7e0 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Fri, 15 Apr 2022 20:44:26 +0200
Subject: [PATCH] years
---
.../extranet/academic_years_controller.rb | 2 +-
.../extranet/academic_years/_list.html.erb | 22 +++++++++++++++++++
.../extranet/academic_years/index.html.erb | 21 +-----------------
app/views/extranet/persons/_list.html.erb | 4 +---
4 files changed, 25 insertions(+), 24 deletions(-)
create mode 100644 app/views/extranet/academic_years/_list.html.erb
diff --git a/app/controllers/extranet/academic_years_controller.rb b/app/controllers/extranet/academic_years_controller.rb
index a8439fd6e..bdae2dcb1 100644
--- a/app/controllers/extranet/academic_years_controller.rb
+++ b/app/controllers/extranet/academic_years_controller.rb
@@ -4,7 +4,7 @@ class Extranet::AcademicYearsController < Extranet::ApplicationController
through_association: :academic_years
def index
- @academic_years = @academic_years.ordered.page(params[:page])
+ @academic_years = current_context.about&.academic_years || @academic_years
breadcrumb
end
diff --git a/app/views/extranet/academic_years/_list.html.erb b/app/views/extranet/academic_years/_list.html.erb
new file mode 100644
index 000000000..54b14810d
--- /dev/null
+++ b/app/views/extranet/academic_years/_list.html.erb
@@ -0,0 +1,22 @@
+<% academic_years_paged = academic_years.ordered.page(params[:page]).per(60) %>
+<div class="row">
+ <% academic_years_paged.each do |year| %>
+ <div class="col-md-3">
+ <article class="card mb-4">
+ <div class="card-body">
+ <h2 class="mb-5">
+ <%= link_to year, year, class: 'stretched-link' %>
+ </h2>
+ <p class="text-end mb-0">
+ <%= year.cohorts.count %>
+ <%= Education::Cohort.model_name.human(count: year.cohorts.count).downcase %>
+ <br>
+ <%= year.people.count %>
+ <%= University::Person::Alumnus.model_name.human(count: year.people.count).downcase %>
+ </p>
+ </div>
+ </article>
+ </div>
+ <% end %>
+</div>
+<%= paginate academic_years_paged, theme: 'bootstrap-5' %>
diff --git a/app/views/extranet/academic_years/index.html.erb b/app/views/extranet/academic_years/index.html.erb
index 6c079cc94..b524bf9aa 100644
--- a/app/views/extranet/academic_years/index.html.erb
+++ b/app/views/extranet/academic_years/index.html.erb
@@ -4,23 +4,4 @@
<h1><%= Education::AcademicYear.model_name.human(count: 2) %></h1>
</header>
-<div class="row">
- <% @academic_years.each do |year| %>
- <div class="col-md-3">
- <article class="card mb-4">
- <div class="card-body">
- <h2 class="mb-5">
- <%= link_to year, year, class: 'stretched-link' %>
- </h2>
- <p class="text-end mb-0">
- <%= year.cohorts.count %>
- <%= Education::Cohort.model_name.human(count: year.cohorts.count).downcase %>
- <br>
- <%= year.people.count %>
- <%= University::Person::Alumnus.model_name.human(count: year.people.count).downcase %>
- </p>
- </div>
- </article>
- </div>
- <% end %>
-</div>
+<%= render 'extranet/academic_years/list', academic_years: @academic_years %>
diff --git a/app/views/extranet/persons/_list.html.erb b/app/views/extranet/persons/_list.html.erb
index 577ec80f7..7922cd391 100644
--- a/app/views/extranet/persons/_list.html.erb
+++ b/app/views/extranet/persons/_list.html.erb
@@ -1,6 +1,4 @@
-<%
-people_paged = people.ordered.page(params[:page]).per(60)
-%>
+<% people_paged = people.ordered.page(params[:page]).per(60) %>
<div class="row">
<% people_paged.each do |person| %>
<div class="col-xxl-2 col-md-3">
--
GitLab