diff --git a/Gemfile b/Gemfile
index b2bea4e6b13109568039410b6e5863f48a4da884..e9a3e9d08c682fd80d70743c5bb69052af08320a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,49 +3,55 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '2.7.5'
-gem 'angularjs-rails'
+# Infrastructure
gem 'aws-sdk-s3'
+gem 'bugsnag'
+gem 'gitlab'
+gem 'image_processing'
+gem 'mini_magick'
+gem 'octokit'
+gem 'pg', '~> 1.1'
+gem 'puma'
+
+# Back-end
+gem 'cancancan'
gem 'bootsnap', '>= 1.4.4', require: false
+gem 'curation'#, path: '../../arnaudlevy/curation'
+gem 'delayed_job_active_record'
+gem 'delayed_job_web'
+gem 'faceted_search'
+gem 'has_scope', '~> 0.8.0'
+gem 'hash_dot'
+gem 'rails', '~> 6.1'
+gem 'rails-i18n'
+gem 'sanitize'
+gem 'sib-api-v3-sdk'
+gem 'two_factor_authentication', git: 'https://github.com/noesya/two_factor_authentication.git'
+# gem 'two_factor_authentication', path: '../two_factor_authentication'
+
+# Front-end
+gem 'angularjs-rails'
gem 'bootstrap'
gem 'bootstrap5-kaminari-views'
gem 'breadcrumbs_on_rails'
-gem 'bugsnag'
-gem 'cancancan'
gem 'cocoon', '~> 1.2'
gem 'country_select'
-gem 'curation'#, path: '../../arnaudlevy/curation'
-gem 'delayed_job_active_record'
-gem 'delayed_job_web'
gem 'devise'
gem 'devise-i18n'
gem 'enum_help'
gem 'front_matter_parser'
gem 'gdpr'
-gem 'gitlab'
-gem 'has_scope', '~> 0.8.0'
-gem 'hash_dot'
-gem 'image_processing'
gem 'jbuilder'
gem 'jquery-rails'
gem 'kamifusen'#, path: '../kamifusen'
gem 'kaminari'
-gem 'mini_magick'
-gem 'octokit'
-gem 'pg', '~> 1.1'
-gem 'puma'
-gem 'rails', '~> 6.1'
-gem 'rails-i18n'
-gem 'sanitize'
gem 'sassc-rails'
-gem 'sib-api-v3-sdk'
gem 'simple_form'
gem 'simple_form_bs5_file_input'#, path: '../simple_form_bs5_file_input'
gem 'simple_form_password_with_hints'#, path: '../simple_form_password_with_hints'
gem 'simple-navigation'
gem 'summernote-rails', git: 'https://github.com/noesya/summernote-rails.git', branch: 'activestorage'
# gem 'summernote-rails', path: '../summernote-rails'
-gem 'two_factor_authentication', git: 'https://github.com/noesya/two_factor_authentication.git'
-# gem 'two_factor_authentication', path: '../two_factor_authentication'
group :development, :test do
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
diff --git a/Gemfile.lock b/Gemfile.lock
index a1cbe2c603b75fd3c9aab9f6f94cb99720852fb2..7c67efbadce67ca42440a938fc10a2854c533788 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,6 +172,9 @@ GEM
ethon (0.15.0)
ffi (>= 1.15.0)
execjs (2.8.1)
+ faceted_search (3.5.11)
+ font-awesome-sass
+ rails (>= 5.2.0, < 7)
faraday (1.10.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
@@ -208,6 +211,8 @@ GEM
ffi (1.15.5)
figaro (1.2.0)
thor (>= 0.14.0, < 2)
+ font-awesome-sass (6.1.1)
+ sassc (~> 2.0)
front_matter_parser (1.0.1)
gdpr (1.2.3)
js_cookie_rails
@@ -469,6 +474,7 @@ DEPENDENCIES
devise
devise-i18n
enum_help
+ faceted_search
figaro
front_matter_parser
gdpr
diff --git a/app/controllers/admin/application_controller.rb b/app/controllers/admin/application_controller.rb
index 921a46d7ae157ee5413edfc7767c95ae8065efa0..084644e1d0aac2dc59bcc6cd28a4eac79cfcb840 100644
--- a/app/controllers/admin/application_controller.rb
+++ b/app/controllers/admin/application_controller.rb
@@ -1,6 +1,8 @@
class Admin::ApplicationController < ApplicationController
layout 'admin/layouts/application'
+ before_action :load_filters, only: :index
+
around_action :switch_locale
protected
@@ -25,4 +27,12 @@ class Admin::ApplicationController < ApplicationController
locale = LocaleService.locale(current_user, request.env['HTTP_ACCEPT_LANGUAGE'])
I18n.with_locale(locale, &action)
end
+
+ def load_filters
+ @filters = []
+ filter_class_name = "::Filters::#{self.class.to_s.gsub('Controller', '')}"
+ # filter_class will be nil if filter does not exist
+ filter_class = filter_class_name.safe_constantize
+ @filters = filter_class.new(current_user).list unless filter_class.nil?
+ end
end
diff --git a/app/controllers/admin/communication/extranets_controller.rb b/app/controllers/admin/communication/extranets_controller.rb
index 0cfc44d68431688b8ccd159d35f342cf2cdb369f..6cd178308d3b24fc6208e2454e2cabfce2a9ba4b 100644
--- a/app/controllers/admin/communication/extranets_controller.rb
+++ b/app/controllers/admin/communication/extranets_controller.rb
@@ -8,9 +8,11 @@ class Admin::Communication::ExtranetsController < Admin::Communication::Applicat
end
def show
- @alumni = @extranet.about&.alumni
- @cohorts = @extranet.about&.cohorts
- @years = @extranet.about&.academic_years
+ @about = @extranet.about
+ @alumni = @about&.alumni
+ @cohorts = @about&.cohorts
+ @years = @about&.academic_years
+ @organizations = @about&.alumni_organizations
breadcrumb
end
diff --git a/app/controllers/admin/university/people_controller.rb b/app/controllers/admin/university/people_controller.rb
index 73b048763c7f2422e60ada101928405974cedd30..bdc9ee2d24cb6797568ca27be11c62683b902ccf 100644
--- a/app/controllers/admin/university/people_controller.rb
+++ b/app/controllers/admin/university/people_controller.rb
@@ -3,8 +3,12 @@ class Admin::University::PeopleController < Admin::University::ApplicationContro
through: :current_university,
through_association: :people
+
+ has_scope :for_search_term
+ has_scope :for_role
+
def index
- @people = @people.ordered.page(params[:page])
+ @people = apply_scopes(@people).ordered.page(params[:page])
breadcrumb
end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 1cdadc2ae8ac07723f3ae7f42c6a330b06c38052..ddb1f9b14892952864005cc7807c0495be6273cc 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -5,7 +5,6 @@ class Admin::UsersController < Admin::ApplicationController
has_scope :for_search_term
def index
- @filters = ::Filters::User.new(current_user).list
@users = apply_scopes(@users).ordered.page(params[:page])
breadcrumb
end
diff --git a/app/controllers/extranet/organizations_controller.rb b/app/controllers/extranet/organizations_controller.rb
index d91329fb8279c04f91c6a3b8cbc040e21114cb7b..ee06ab51e823f369a0a2571ea27bb2839b246edb 100644
--- a/app/controllers/extranet/organizations_controller.rb
+++ b/app/controllers/extranet/organizations_controller.rb
@@ -4,7 +4,9 @@ class Extranet::OrganizationsController < Extranet::ApplicationController
through_association: :organizations
def index
+ @organizations = current_extranet.about&.alumni_organizations || @organizations
@organizations = @organizations.ordered.page(params[:page])
+ @count = @organizations.total_count
breadcrumb
end
diff --git a/app/controllers/extranet/persons_controller.rb b/app/controllers/extranet/persons_controller.rb
index 172fc4473cb9dcea27c733b9b95c8d3c81b44b4a..977822b952ee1ffafc832be937586bb7e6a607f4 100644
--- a/app/controllers/extranet/persons_controller.rb
+++ b/app/controllers/extranet/persons_controller.rb
@@ -4,7 +4,15 @@ class Extranet::PersonsController < Extranet::ApplicationController
through_association: :people
def index
- @people = current_extranet.about&.alumni || @people.alumni
+ alumni = current_extranet.about&.alumni || @people.alumni
+ @facets = University::Person::Alumnus::Facets.new params[:facets], {
+ model: alumni,
+ about: current_extranet.about
+ }
+ @people = @facets.results
+ .ordered
+ .page params[:page]
+ @count = @people.total_count
breadcrumb
end
diff --git a/app/models/communication/website/post.rb b/app/models/communication/website/post.rb
index 71ca1ad6ee362b58d6d0744b936b825bbb9c8a3e..14cda1e87c58e99446f1e9268fecb73820bcf977 100644
--- a/app/models/communication/website/post.rb
+++ b/app/models/communication/website/post.rb
@@ -63,6 +63,7 @@ class Communication::Website::Post < ApplicationRecord
validates :title, presence: true
before_validation :set_published_at, if: :published_changed?
+ after_save_commit :update_authors_statuses!, if: :saved_change_to_author_id?
scope :published, -> { where(published: true) }
scope :ordered, -> { order(published_at: :desc, created_at: :desc) }
@@ -123,4 +124,12 @@ class Communication::Website::Post < ApplicationRecord
def inherited_blob_ids
[best_featured_image&.blob_id]
end
+
+ def update_authors_statuses!
+ old_author = University::Person.find_by(id: author_id_before_last_save)
+ if old_author && old_author.communication_website_posts.none?
+ old_author.update_and_sync(is_author: false)
+ end
+ author.update_and_sync(is_author: true) if author_id
+ end
end
diff --git a/app/models/education/program.rb b/app/models/education/program.rb
index 77e3ae32d26ff26481939a0dae5cdb59d3f3d4bb..f1829148334801bb7a90187e875f41c2eb9c1451 100644
--- a/app/models/education/program.rb
+++ b/app/models/education/program.rb
@@ -114,6 +114,16 @@ class Education::Program < ApplicationRecord
has_many :alumni,
through: :cohorts,
source: :people
+ has_many :alumni_experiences,
+ -> { distinct },
+ class_name: 'University::Person::Experience',
+ through: :alumni,
+ source: :experiences
+ has_many :alumni_organizations,
+ -> { distinct },
+ class_name: 'University::Organization',
+ through: :alumni_experiences,
+ source: :organization
has_many :academic_years,
through: :cohorts
diff --git a/app/models/education/school.rb b/app/models/education/school.rb
index b5150fba513b7feeb0d2a5f36f469faa8f38cb7f..714451661a315ad2be2f6b37dfc7df7ee0f451d3 100644
--- a/app/models/education/school.rb
+++ b/app/models/education/school.rb
@@ -69,6 +69,16 @@ class Education::School < ApplicationRecord
has_many :alumni,
-> { distinct },
through: :programs
+ has_many :alumni_experiences,
+ -> { distinct },
+ class_name: 'University::Person::Experience',
+ through: :alumni,
+ source: :experiences
+ has_many :alumni_organizations,
+ -> { distinct },
+ class_name: 'University::Organization',
+ through: :alumni_experiences,
+ source: :organization
has_many :academic_years,
-> { distinct },
through: :programs
diff --git a/app/models/university/person.rb b/app/models/university/person.rb
index 5020468f0063412416994c72a9cccfb68d6ac081..242b23a70ce295607b4075ee8c35815767300701 100644
--- a/app/models/university/person.rb
+++ b/app/models/university/person.rb
@@ -11,10 +11,12 @@
# habilitation :boolean default(FALSE)
# is_administration :boolean
# is_alumnus :boolean default(FALSE)
+# is_author :boolean
# is_researcher :boolean
# is_teacher :boolean
# last_name :string
# linkedin :string
+# name :string
# phone :string
# slug :string
# tenure :boolean default(FALSE)
@@ -44,6 +46,8 @@ class University::Person < ApplicationRecord
include WithPicture
include WithEducation
+ LIST_OF_ROLES = [:administration, :teacher, :researcher, :alumnus, :author].freeze
+
has_summernote :biography
belongs_to :user, optional: true
@@ -101,29 +105,41 @@ class University::Person < ApplicationRecord
allow_blank: true,
if: :will_save_change_to_email?
- before_validation :sanitize_email
+ before_validation :sanitize_email, :prepare_name
scope :ordered, -> { order(:last_name, :first_name) }
scope :administration, -> { where(is_administration: true) }
scope :teachers, -> { where(is_teacher: true) }
scope :researchers, -> { where(is_researcher: true) }
scope :alumni, -> { where(is_alumnus: true) }
+ scope :for_role, -> (role) { where("is_#{role}": true) }
+
+ scope :for_search_term, -> (term) {
+ where("
+ unaccent(concat(university_people.first_name, ' ', university_people.last_name)) ILIKE unaccent(:term) OR
+ unaccent(concat(university_people.last_name, ' ', university_people.first_name)) ILIKE unaccent(:term) OR
+ unaccent(university_people.first_name) ILIKE unaccent(:term) OR
+ unaccent(university_people.last_name) ILIKE unaccent(:term) OR
+ unaccent(university_people.email) ILIKE unaccent(:term) OR
+ unaccent(university_people.phone) ILIKE unaccent(:term) OR
+ unaccent(university_people.biography) ILIKE unaccent(:term) OR
+ unaccent(university_people.description) ILIKE unaccent(:term) OR
+ unaccent(university_people.description_short) ILIKE unaccent(:term) OR
+ unaccent(university_people.twitter) ILIKE unaccent(:term) OR
+ unaccent(university_people.url) ILIKE unaccent(:term)
+ ", term: "%#{sanitize_sql_like(term)}%")
+ }
def to_s
"#{first_name} #{last_name}"
end
def roles
- [:administration, :teacher, :researcher, :alumnus, :author].reject do |role|
+ LIST_OF_ROLES.reject do |role|
! send "is_#{role}"
end
end
- # TODO denormalize
- def is_author
- communication_website_posts.any?
- end
-
def websites
university.communication_websites
end
@@ -183,4 +199,8 @@ class University::Person < ApplicationRecord
def sanitize_email
self.email = self.email.to_s.downcase.strip
end
+
+ def prepare_name
+ self.name = to_s
+ end
end
diff --git a/app/models/university/person/administrator.rb b/app/models/university/person/administrator.rb
index f5fda080ad57e31d179660161ba2567f1bf4b526..387c93a640f1446247ac545493cbc6ab290b2d42 100644
--- a/app/models/university/person/administrator.rb
+++ b/app/models/university/person/administrator.rb
@@ -11,10 +11,12 @@
# habilitation :boolean default(FALSE)
# is_administration :boolean
# is_alumnus :boolean default(FALSE)
+# is_author :boolean
# is_researcher :boolean
# is_teacher :boolean
# last_name :string
# linkedin :string
+# name :string
# phone :string
# slug :string
# tenure :boolean default(FALSE)
diff --git a/app/models/university/person/alumnus.rb b/app/models/university/person/alumnus.rb
index 06c70f24cd3fd7a02f2ecd63a47a35dd48ed660a..2e140c8c5a3c4c64f2172aea733483431d94cc74 100644
--- a/app/models/university/person/alumnus.rb
+++ b/app/models/university/person/alumnus.rb
@@ -11,10 +11,12 @@
# habilitation :boolean default(FALSE)
# is_administration :boolean
# is_alumnus :boolean default(FALSE)
+# is_author :boolean
# is_researcher :boolean
# is_teacher :boolean
# last_name :string
# linkedin :string
+# name :string
# phone :string
# slug :string
# tenure :boolean default(FALSE)
diff --git a/app/models/university/person/alumnus/facets.rb b/app/models/university/person/alumnus/facets.rb
new file mode 100644
index 0000000000000000000000000000000000000000..5cc231c589b36592225e9da3205ecf377f1eb44e
--- /dev/null
+++ b/app/models/university/person/alumnus/facets.rb
@@ -0,0 +1,18 @@
+class University::Person::Alumnus::Facets < FacetedSearch::Facets
+ def initialize(params, options)
+ super params
+
+ @model = options[:model]
+ @about = options[:about]
+
+ filter_with_text :name
+
+ # TODO année de diplôme
+
+ # TODO liste des formations (si about ≠formation)
+ # filter_with_list :program, {
+ # source: @about.programs,
+ # habtm: true
+ # }
+ end
+end
diff --git a/app/models/university/person/author.rb b/app/models/university/person/author.rb
index 67dda6a6e289d65603bd5184ad345b06e76283db..a51eadb10d87ba126e899071f130495f7b315e13 100644
--- a/app/models/university/person/author.rb
+++ b/app/models/university/person/author.rb
@@ -11,10 +11,12 @@
# habilitation :boolean default(FALSE)
# is_administration :boolean
# is_alumnus :boolean default(FALSE)
+# is_author :boolean
# is_researcher :boolean
# is_teacher :boolean
# last_name :string
# linkedin :string
+# name :string
# phone :string
# slug :string
# tenure :boolean default(FALSE)
diff --git a/app/models/university/person/researcher.rb b/app/models/university/person/researcher.rb
index 8fffe668f473cf48fa7237a2d68500b78c507ec1..44616e8492facc2bcb1908e8519bdcccff2d8bac 100644
--- a/app/models/university/person/researcher.rb
+++ b/app/models/university/person/researcher.rb
@@ -11,10 +11,12 @@
# habilitation :boolean default(FALSE)
# is_administration :boolean
# is_alumnus :boolean default(FALSE)
+# is_author :boolean
# is_researcher :boolean
# is_teacher :boolean
# last_name :string
# linkedin :string
+# name :string
# phone :string
# slug :string
# tenure :boolean default(FALSE)
diff --git a/app/models/university/person/teacher.rb b/app/models/university/person/teacher.rb
index df1e88803e668e76624ea44562d02825c1e7ccad..37140ba7b1d670cda457627f9b6feeccffbceb18 100644
--- a/app/models/university/person/teacher.rb
+++ b/app/models/university/person/teacher.rb
@@ -11,10 +11,12 @@
# habilitation :boolean default(FALSE)
# is_administration :boolean
# is_alumnus :boolean default(FALSE)
+# is_author :boolean
# is_researcher :boolean
# is_teacher :boolean
# last_name :string
# linkedin :string
+# name :string
# phone :string
# slug :string
# tenure :boolean default(FALSE)
diff --git a/app/services/filters/admin/university/people.rb b/app/services/filters/admin/university/people.rb
new file mode 100644
index 0000000000000000000000000000000000000000..515697eafa3b0dc4ec161cd5d6715c283f5d9e02
--- /dev/null
+++ b/app/services/filters/admin/university/people.rb
@@ -0,0 +1,9 @@
+module Filters
+ class Admin::University::People < Filters::Base
+ def initialize(user)
+ super
+ add_search
+ add :for_role, ::University::Person::LIST_OF_ROLES.map { |r| { to_s: I18n.t("activerecord.attributes.university/person.#{r}"), id: r } }, I18n.t('filters.attributes.role')
+ end
+ end
+end
diff --git a/app/services/filters/admin/users.rb b/app/services/filters/admin/users.rb
new file mode 100644
index 0000000000000000000000000000000000000000..bc431fa8eccedc0ecb727251214081bd884eeb65
--- /dev/null
+++ b/app/services/filters/admin/users.rb
@@ -0,0 +1,9 @@
+module Filters
+ class Admin::Users < Filters::Base
+ def initialize(user)
+ super
+ add_search
+ add :for_role, ::User.roles.keys.map { |r| { to_s: I18n.t("activerecord.attributes.user.roles.#{r}"), id: r } }, I18n.t('filters.attributes.role')
+ end
+ end
+end
diff --git a/app/services/filters/user.rb b/app/services/filters/user.rb
deleted file mode 100644
index a71e11effad3718dc0f3e890188e92e6ec83c9e1..0000000000000000000000000000000000000000
--- a/app/services/filters/user.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Filters
- class User < Base
- def initialize(user)
- super
- add_search
- add :for_role, ::User.roles.keys.map { |r| { to_s: r.humanize, id: r } }, I18n.t('filters.attributes.role')
- end
- end
-end
diff --git a/app/views/admin/communication/extranets/show.html.erb b/app/views/admin/communication/extranets/show.html.erb
index 23351aae9e712411b746a634e6a4ca210a92f79d..1a270a1963698411e4cee1326a69b7202cba0cf3 100644
--- a/app/views/admin/communication/extranets/show.html.erb
+++ b/app/views/admin/communication/extranets/show.html.erb
@@ -28,6 +28,12 @@
<%= Education::AcademicYear.model_name.human(count: @years.count).downcase %>
</p>
<% end %>
+<% if @organizations %>
+ <p>
+ <%= @organizations.count %>
+ <%= University::Organization.model_name.human(count: @organizations.count).downcase %>
+ </p>
+<% end %>
<% content_for :action_bar_right do %>
<%= edit_link @extranet %>
diff --git a/app/views/admin/communication/website/posts/index.html.erb b/app/views/admin/communication/website/posts/index.html.erb
index 51b31b48864c64137ad52ee6d21b65743f937b15..7b70ee606cf1881796fadd9d3dadcde245614b32 100644
--- a/app/views/admin/communication/website/posts/index.html.erb
+++ b/app/views/admin/communication/website/posts/index.html.erb
@@ -4,7 +4,7 @@
<div class="card">
<%= form_tag publish_admin_communication_website_posts_path do %>
<input type="hidden" name="ids[]" value="">
- <%= render 'admin/communication/website/posts/list', posts: @posts, hide_author: true, selectable: true %>
+ <%= render 'admin/communication/website/posts/list', posts: @posts, selectable: true %>
<div class="card-footer">
<% if @posts.total_pages > 1 %>
<div class="float-end">
diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb
index 4df287ce4de9a1685862a8367b2e03b4cc29e664..3ce8510ebcbc25717e780df003f37052023eb669 100644
--- a/app/views/admin/dashboard/index.html.erb
+++ b/app/views/admin/dashboard/index.html.erb
@@ -52,3 +52,22 @@
<% end %>
</div>
<% end %>
+
+<% if current_university.communication_extranets.any? && can?(:read, Communication::Extranet) %>
+ <h2 class="h4 my-4"><%= Communication::Extranet.model_name.human(count: 2) %></h2>
+ <div class="row">
+ <% current_university.communication_extranets.each do |extranet| %>
+ <% next unless can?(:read, extranet) %>
+ <div class="col-md-4">
+ <div class="card">
+ <div class="card-body">
+ <span class="float-end"><i class="fas fa-project-diagram fa-2x"></i></span>
+ <h4><%= extranet %></h4>
+ <p class="small"><%= extranet.url %></p>
+ <%= link_to t('show'), [:admin, extranet], class: button_classes('stretched-link') %>
+ </div>
+ </div>
+ </div>
+ <% end %>
+ </div>
+<% end %>
diff --git a/app/views/admin/university/people/index.html.erb b/app/views/admin/university/people/index.html.erb
index b95e8aa322d9c79d5f98203b273e6acaa580aea7..df601c13f7ed7424fe37ef9a2f4e46cd067630ee 100644
--- a/app/views/admin/university/people/index.html.erb
+++ b/app/views/admin/university/people/index.html.erb
@@ -1,5 +1,7 @@
<% content_for :title, "#{University::Person.model_name.human(count: 2)} (#{@people.total_count})" %>
+<%= render 'filters', current_path: admin_university_people_path, filters: @filters if @filters.any? %>
+
<%= render 'admin/university/people/list', people: @people %>
<%= paginate @people, theme: 'bootstrap-5' %>
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
index af80ff5b3d6d1520db414931e45d74790689756d..1e1ee9d58e0331d332c45fd08d547ff9c80ddef1 100644
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -21,7 +21,7 @@
<td><%= link_to user.email, [:admin, user] %></td>
<td><%= user.first_name %></td>
<td><%= user.last_name %></td>
- <td><%= user.role.humanize %></td>
+ <td><%= t("activerecord.attributes.user.roles.#{user.role}") %></td>
<td><%= user.language %></td>
<td class="text-end">
<div class="btn-group" role="group">
diff --git a/app/views/extranet/organizations/index.html.erb b/app/views/extranet/organizations/index.html.erb
index 5796718de6abe4e3aee343cff839fdb3ac81f74a..b1229875b7627de2122e7d4ec855f4e31c3bd2b2 100644
--- a/app/views/extranet/organizations/index.html.erb
+++ b/app/views/extranet/organizations/index.html.erb
@@ -2,6 +2,10 @@
<header class="mb-5">
<h1><%= University::Organization.model_name.human(count: 2) %></h1>
+ <p>
+ <%= @count %>
+ <%= University::Organization.model_name.human(count: @count).downcase %>
+ </p>
</header>
<table class="<%= table_classes %>">
diff --git a/app/views/extranet/persons/_list.html.erb b/app/views/extranet/persons/_list.html.erb
index 7922cd391743569fccc61271a420850d8171c7c8..064c370335f8f7eb06794db58c6ebe770b772ba0 100644
--- a/app/views/extranet/persons/_list.html.erb
+++ b/app/views/extranet/persons/_list.html.erb
@@ -2,19 +2,7 @@
<div class="row">
<% people_paged.each do |person| %>
<div class="col-xxl-2 col-md-3">
- <article class="mb-4 position-relative">
- <% if person.picture.attached? %>
- <%= kamifusen_tag person.picture, width: 400, class: 'img-fluid' %>
- <% else %>
- <%= image_tag 'extranet/avatar.png', width: 400, class: 'img-fluid' %>
- <% end %>
- <%= link_to person, class: 'stretched-link' do %>
- <%= person.first_name %>
- <b>
- <%= person.last_name %>
- </b>
- <% end %>
- </article>
+ <%= render 'extranet/persons/person', person: person %>
</div>
<% end %>
</div>
diff --git a/app/views/extranet/persons/_person.html.erb b/app/views/extranet/persons/_person.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..f8151bdac4973a6d5355874e2e713a73ded36928
--- /dev/null
+++ b/app/views/extranet/persons/_person.html.erb
@@ -0,0 +1,11 @@
+<article class="mb-4 position-relative">
+ <% if person.picture.attached? %>
+ <%= kamifusen_tag person.picture, width: 400, class: 'img-fluid' %>
+ <% else %>
+ <%= image_tag 'extranet/avatar.png', width: 400, class: 'img-fluid' %>
+ <% end %>
+ <%= link_to person, class: 'stretched-link' do %>
+ <%= person.first_name %>
+ <b><%= person.last_name %></b>
+ <% end %>
+</article>
diff --git a/app/views/extranet/persons/index.html.erb b/app/views/extranet/persons/index.html.erb
index f12ba91324d414923362034d30c58f500749eb0c..11b59fcc05a3b300839db66b7ab245544a15c998 100644
--- a/app/views/extranet/persons/index.html.erb
+++ b/app/views/extranet/persons/index.html.erb
@@ -7,11 +7,26 @@
</div>
<div class="col-md-3 text-end">
<p>
- <%= @people.count %>
- <%= University::Person::Alumnus.model_name.human(count: @people.count).downcase %>
+ <%= @count %>
+ <%= University::Person::Alumnus.model_name.human(count: @count).downcase %>
</p>
</div>
</div>
</header>
-<%= render 'extranet/persons/list', people: @people %>
+<div class="row">
+ <div class="col-lg-3">
+ <%= render 'faceted_search/facets', facets: @facets %>
+ </div>
+ <div class="offset-lg-1 col-lg-8">
+ <div class="row">
+ <% @people.each do |person| %>
+ <div class="col-xxl-3 col-md-4 col-sm-6">
+ <%= render 'extranet/persons/person', person: person %>
+ </div>
+ <% end %>
+ </div>
+ <%= paginate @people, theme: 'bootstrap-5' %>
+
+ </div>
+</div>
diff --git a/config/locales/university/en.yml b/config/locales/university/en.yml
index d72d2e360f64007bf74fc5c3a436882e144b2f26..dcd43222b31c92c6049f9ab1ea77c12c41bc0948 100644
--- a/config/locales/university/en.yml
+++ b/config/locales/university/en.yml
@@ -88,8 +88,8 @@ en:
one: Alumnus
other: Alumni
university/organization:
- one: Third party
- other: Third parties
+ one: Organization
+ other: Organizations
university/organization/import:
one: Import
other: Imports
diff --git a/config/locales/university/fr.yml b/config/locales/university/fr.yml
index 6bf97587cc43b5b0e9d659e6d594b27594f8ddd1..a401225ae0a8c5cf267e499a01385dd8b14804fe 100644
--- a/config/locales/university/fr.yml
+++ b/config/locales/university/fr.yml
@@ -88,8 +88,8 @@ fr:
one: Alumnus
other: Alumni
university/organization:
- one: Tierce partie
- other: Tierces parties
+ one: Organisation
+ other: Organisations
university/organization/import:
one: Import
other: Imports
diff --git a/db/migrate/20220425150705_add_is_author_to_university_people.rb b/db/migrate/20220425150705_add_is_author_to_university_people.rb
new file mode 100644
index 0000000000000000000000000000000000000000..287c2cb05772e3445ca8518061f49dc0e35df04b
--- /dev/null
+++ b/db/migrate/20220425150705_add_is_author_to_university_people.rb
@@ -0,0 +1,5 @@
+class AddIsAuthorToUniversityPeople < ActiveRecord::Migration[6.1]
+ def change
+ add_column :university_people, :is_author, :boolean
+ end
+end
diff --git a/db/migrate/20220425152944_add_name_to_university_persons.rb b/db/migrate/20220425152944_add_name_to_university_persons.rb
new file mode 100644
index 0000000000000000000000000000000000000000..dbe49902d68fc647fa56e3e8243f834f6b5e7917
--- /dev/null
+++ b/db/migrate/20220425152944_add_name_to_university_persons.rb
@@ -0,0 +1,5 @@
+class AddNameToUniversityPersons < ActiveRecord::Migration[6.1]
+ def change
+ add_column :university_people, :name, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9344a9d833e29ce473f3c4cb2a46179b8a9ef262..bf0583b11350e281eb844e4e6968bde0c0af469d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2022_04_21_093107) do
+ActiveRecord::Schema.define(version: 2022_04_25_152944) do
# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
@@ -488,6 +488,23 @@ ActiveRecord::Schema.define(version: 2022_04_21_093107) do
t.index ["university_id"], name: "index_education_schools_on_university_id"
end
+ create_table "external_organizations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ t.string "title"
+ t.text "description"
+ t.string "address"
+ t.string "zipcode"
+ t.string "city"
+ t.string "country"
+ t.string "website"
+ t.string "phone"
+ t.string "mail"
+ t.boolean "active"
+ t.string "sirene"
+ t.integer "kind"
+ t.datetime "created_at", precision: 6, null: false
+ t.datetime "updated_at", precision: 6, null: false
+ end
+
create_table "languages", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
t.string "name"
t.string "iso_code"
@@ -671,6 +688,8 @@ ActiveRecord::Schema.define(version: 2022_04_21_093107) do
t.string "linkedin"
t.boolean "is_alumnus", default: false
t.text "description_short"
+ t.string "name"
+ t.boolean "is_author"
t.index ["university_id"], name: "index_university_people_on_university_id"
t.index ["user_id"], name: "index_university_people_on_user_id"
end
diff --git a/lib/tasks/app.rake b/lib/tasks/app.rake
index 616dfe0f4cbf34b41bc0261d9369ef8b0d4bf344..c83caba11e229f3bca805868771096e0cbde6865 100644
--- a/lib/tasks/app.rake
+++ b/lib/tasks/app.rake
@@ -8,17 +8,9 @@ namespace :app do
desc 'Fix things'
task fix: :environment do
- Communication::Block.where(template: 'partners').find_each do |partner|
- next if partner.data.nil?
- data = partner.data
- next unless data.has_key? 'elements'
- elements = data['elements']
- next if elements.none?
- first = elements.first
- next unless first.has_key? 'partners'
- partner.title = first['title']
- partner.data['elements'] = first['partners']
- partner.save
+ University::Person.find_each do |person|
+ person.is_author = person.communication_website_posts.any?
+ person.save
end
end