diff --git a/Gemfile.lock b/Gemfile.lock
index 945f4dcf00ec6b00b07fdc50ceaf89010334b44b..4cb778cacf9877c83c73d854e9c51b05f8897961 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -103,7 +103,7 @@ GEM
autoprefixer-rails (10.4.13.0)
execjs (~> 2)
aws-eventstream (1.2.0)
- aws-partitions (1.786.0)
+ aws-partitions (1.788.0)
aws-sdk-core (3.178.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
@@ -336,7 +336,7 @@ GEM
mini_magick (4.12.0)
mini_mime (1.1.2)
minitest (5.18.1)
- msgpack (1.7.1)
+ msgpack (1.7.2)
multi_xml (0.6.0)
multipart-post (2.3.0)
mustermann (3.0.0)
diff --git a/app/assets/images/admin/osuny-thumb.jpg b/app/assets/images/admin/osuny-thumb.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e5e4e452e2b39e86d620166c7c7337586f0f4124
Binary files /dev/null and b/app/assets/images/admin/osuny-thumb.jpg differ
diff --git a/app/controllers/admin/communication/application_controller.rb b/app/controllers/admin/communication/application_controller.rb
index d077f67100283dad25c338e23f5388c366c81388..a5d2bb2dd5cd435776336cb0a6cea38db594e470 100644
--- a/app/controllers/admin/communication/application_controller.rb
+++ b/app/controllers/admin/communication/application_controller.rb
@@ -4,7 +4,7 @@ class Admin::Communication::ApplicationController < Admin::ApplicationController
def breadcrumb
super
- add_breadcrumb Communication.model_name.human, admin_communication_root_path
+ add_breadcrumb Communication.model_name.human, admin_communication_root_path if current_university.is_really_a_university
@menu_collapsed = true if @website
end
end
diff --git a/app/controllers/admin/university/application_controller.rb b/app/controllers/admin/university/application_controller.rb
index 157451d1625655809be9f316629bbe3e892c8824..67e9473db6f98a7aef2a02a9f14fb89536bfd629 100644
--- a/app/controllers/admin/university/application_controller.rb
+++ b/app/controllers/admin/university/application_controller.rb
@@ -4,6 +4,6 @@ class Admin::University::ApplicationController < Admin::ApplicationController
def breadcrumb
super
- add_breadcrumb University.model_name.human, admin_university_root_path
+ add_breadcrumb University.model_name.human, admin_university_root_path if current_university.is_really_a_university
end
end
diff --git a/app/controllers/application_controller/with_features.rb b/app/controllers/application_controller/with_features.rb
index 435911e40ed51f1cfc1bfe32430bef9cd7a723b8..65558824358f3b744b588946ca1fa01d4f5cb6bd 100644
--- a/app/controllers/application_controller/with_features.rb
+++ b/app/controllers/application_controller/with_features.rb
@@ -4,13 +4,13 @@ module ApplicationController::WithFeatures
included do
def feature_education?
- current_university.feature_education &&
+ current_university.is_really_a_university &&
can?(:read, Education::Program)
end
helper_method :feature_education?
def feature_research?
- current_university.feature_research && (
+ current_university.is_really_a_university && (
can?(:read, Research::Journal) ||
can?(:read, Research::Hal::Publication) ||
can?(:read, Research::Laboratory)
@@ -19,13 +19,12 @@ module ApplicationController::WithFeatures
helper_method :feature_research?
def feature_communication?
- current_university.feature_communication &&
can?(:read, Communication::Website)
end
helper_method :feature_communication?
def feature_administration?
- current_university.feature_administration &&
+ current_university.is_really_a_university &&
can?(:read, Administration::Qualiopi::Criterion)
end
helper_method :feature_administration?
diff --git a/app/controllers/server/universities_controller.rb b/app/controllers/server/universities_controller.rb
index 17abd7f602fbdc5df67842b8dd5073ea01e472b6..5bb1935a023c8324cf56b58c950cf31b33b99b26 100644
--- a/app/controllers/server/universities_controller.rb
+++ b/app/controllers/server/universities_controller.rb
@@ -64,7 +64,7 @@ class Server::UniversitiesController < Server::ApplicationController
:private, :identifier, :logo, :logo_delete, :sms_sender_name,
:has_sso, :sso_target_url, :sso_cert, :sso_name_identifier_format, :sso_mapping, :sso_button_label,
:invoice_date, :invoice_amount,
- :feature_administration, :feature_communication, :feature_education, :feature_research
+ :is_really_a_university
)
end
end
diff --git a/app/models/communication/extranet.rb b/app/models/communication/extranet.rb
index 1a4615b3d6c6865f180dd318b43f9c1268235907..0dc31636314ab864924471003317609996665e7c 100644
--- a/app/models/communication/extranet.rb
+++ b/app/models/communication/extranet.rb
@@ -2,35 +2,34 @@
#
# Table name: communication_extranets
#
-# id :uuid not null, primary key
-# about_type :string indexed => [about_id]
-# allow_experiences_modification :boolean default(TRUE)
-# color :string
-# cookies_policy :text
-# css :text
-# feature_alumni :boolean default(FALSE)
-# feature_contacts :boolean default(FALSE)
-# feature_jobs :boolean default(FALSE)
-# feature_library :boolean default(FALSE)
-# feature_posts :boolean default(FALSE)
-# has_sso :boolean default(FALSE)
-# home_sentence :text
-# host :string
-# name :string
-# privacy_policy :text
-# registration_contact :string
-# sass :text
-# sso_button_label :string
-# sso_cert :text
-# sso_mapping :jsonb
-# sso_name_identifier_format :string
-# sso_provider :integer default("saml")
-# sso_target_url :string
-# terms :text
-# created_at :datetime not null
-# updated_at :datetime not null
-# about_id :uuid indexed => [about_type]
-# university_id :uuid not null, indexed
+# id :uuid not null, primary key
+# about_type :string indexed => [about_id]
+# color :string
+# cookies_policy :text
+# css :text
+# feature_alumni :boolean default(FALSE)
+# feature_contacts :boolean default(FALSE)
+# feature_jobs :boolean default(FALSE)
+# feature_library :boolean default(FALSE)
+# feature_posts :boolean default(FALSE)
+# has_sso :boolean default(FALSE)
+# home_sentence :text
+# host :string
+# name :string
+# privacy_policy :text
+# registration_contact :string
+# sass :text
+# sso_button_label :string
+# sso_cert :text
+# sso_mapping :jsonb
+# sso_name_identifier_format :string
+# sso_provider :integer default("saml")
+# sso_target_url :string
+# terms :text
+# created_at :datetime not null
+# updated_at :datetime not null
+# about_id :uuid indexed => [about_type]
+# university_id :uuid not null, indexed
#
# Indexes
#
diff --git a/app/models/university.rb b/app/models/university.rb
index c72f3ef0203c5be6d654d31733d672902b45f8ca..2a98d386da18fd905cc73ae127b2f56b88d46c40 100644
--- a/app/models/university.rb
+++ b/app/models/university.rb
@@ -6,15 +6,12 @@
# address :string
# city :string
# country :string
-# feature_administration :boolean default(TRUE)
-# feature_communication :boolean default(TRUE)
-# feature_education :boolean default(TRUE)
-# feature_research :boolean default(TRUE)
# has_sso :boolean default(FALSE)
# identifier :string
# invoice_amount :string
# invoice_date :date
# invoice_date_yday :integer
+# is_really_a_university :boolean default(TRUE)
# mail_from_address :string
# mail_from_name :string
# name :string
diff --git a/app/views/admin/dashboard/_not_a_university.html.erb b/app/views/admin/dashboard/_not_a_university.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..c9d478dda5ef51eca66a396648fb8a39484e9217
--- /dev/null
+++ b/app/views/admin/dashboard/_not_a_university.html.erb
@@ -0,0 +1,37 @@
+<div class="row mt-5 pt-5">
+ <% Communication.parts.each do |part| %>
+ <%
+ next unless can? :read, part.first
+ class_name = part.first
+ path = send part.last
+ title = class_name.model_name.human(count: 2)
+ key = "communication.description.parts.#{class_name.to_s.demodulize.downcase}.description_non_university"
+ description = t key
+ %>
+ <div class="col-lg-4">
+ <%= osuny_panel title do %>
+ <p><%= description.truncate 180 %></p>
+ <%= link_to t('show'), path, class: 'stretched-link' %>
+ <% end %>
+ </div>
+ <% end %>
+</div>
+
+<div class="row mt-5 pt-5">
+ <% University.parts.each do |part| %>
+ <%
+ next unless can? :read, part.first
+ class_name = part.first
+ path = send part.last
+ title = class_name.model_name.human(count: 2)
+ key = "university.description.parts.#{class_name.to_s.demodulize.downcase}.description_non_university"
+ description = t key
+ %>
+ <div class="col-lg-4">
+ <%= osuny_panel title do %>
+ <p><%= description.truncate 180 %></p>
+ <%= link_to t('show'), path, class: 'stretched-link' %>
+ <% end %>
+ </div>
+ <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/dashboard/_really_a_university.html.erb b/app/views/admin/dashboard/_really_a_university.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..f97242700125737db66550315bf0ee1b3b9f4c59
--- /dev/null
+++ b/app/views/admin/dashboard/_really_a_university.html.erb
@@ -0,0 +1,44 @@
+<div class="row mt-5 pt-5">
+ <% @namespaces.each do |namespace| %>
+ <%
+ path = send "admin_#{namespace.to_s.underscore}_root_path"
+ description = t "#{namespace.to_s.underscore}.description.text"
+ %>
+ <div class="col-lg-3">
+ <%= osuny_panel namespace.model_name.human, image: "admin/#{namespace.to_s.underscore}.jpg" do %>
+ <p><%= description.truncate 180 %></p>
+ <%= link_to t('show'), path, class: 'stretched-link' %>
+ <% end %>
+ </div>
+<% end %>
+</div>
+
+<% if current_admin_theme == 'pure' && feature_settings? %>
+ <div class="row mt-5 pt-5">
+ <div class="col-lg-2">
+ <%= link_to admin_university_root_path do %>
+ <%= image_tag "admin/university.jpg", class: 'img-fluid'%>
+ <% end %>
+ </div>
+ <div class="col-lg-4">
+ <%= osuny_panel University.model_name.human do %>
+ <p><%= t('university.description.text') %></p>
+ <%= link_to t('show'), admin_university_root_path, class: 'stretched-link' %>
+ <% end %>
+ </div>
+ <div class="col-lg-4">
+ <ul class="list-unstyled mt-4">
+ <% University.parts.each do |part| %>
+ <%
+ next unless can? :read, part.first
+ class_name = part.first
+ path = send part.last
+ title = class_name.model_name.human(count: 2)
+ %>
+ <li>
+ <%= link_to title, path, class: 'btn btn-sm btn-light mt-3' %>
+ </li>
+ <% end %>
+ </div>
+ </div>
+<% end %>
diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb
index f978f2bba4ef602bc61a39f804bcee931c808d8a..a9f13d01b85de32da2c1946ea6d3ecbf4d7dc901 100644
--- a/app/views/admin/dashboard/index.html.erb
+++ b/app/views/admin/dashboard/index.html.erb
@@ -25,49 +25,10 @@
<%= render 'admin/application/favorites/show' %>
-<div class="row mt-5 pt-5">
- <% @namespaces.each do |namespace| %>
- <%
- path = send "admin_#{namespace.to_s.underscore}_root_path"
- description = t "#{namespace.to_s.underscore}.description.text"
- %>
- <div class="col-lg-3">
- <%= osuny_panel namespace.model_name.human, image: "admin/#{namespace.to_s.underscore}.jpg" do %>
- <p><%= description.truncate 180 %></p>
- <%= link_to t('show'), path, class: 'stretched-link' %>
- <% end %>
- </div>
-<% end %>
-</div>
-
-<% if current_admin_theme == 'pure' && feature_settings? %>
- <div class="row mt-5 pt-5">
- <div class="col-lg-2">
- <%= link_to admin_university_root_path do %>
- <%= image_tag "admin/university.jpg", class: 'img-fluid'%>
- <% end %>
- </div>
- <div class="col-lg-4">
- <%= osuny_panel University.model_name.human do %>
- <p><%= t('university.description.text') %></p>
- <%= link_to t('show'), admin_university_root_path, class: 'stretched-link' %>
- <% end %>
- </div>
- <div class="col-lg-4">
- <ul class="list-unstyled mt-4">
- <% University.parts.each do |part| %>
- <%
- next unless can? :read, part.first
- class_name = part.first
- path = send part.last
- title = class_name.model_name.human(count: 2)
- %>
- <li>
- <%= link_to title, path, class: 'btn btn-sm btn-light mt-3' %>
- </li>
- <% end %>
- </div>
- </div>
+<% if current_university.is_really_a_university %>
+ <%= render 'admin/dashboard/really_a_university' %>
+<% else %>
+ <%= render 'admin/dashboard/not_a_university' %>
<% end %>
<% if current_admin_theme == 'appstack' %>
diff --git a/app/views/admin/university/people/_form.html.erb b/app/views/admin/university/people/_form.html.erb
index 2529377e411943daeaa297f12fe2b3e541faeb7e..8a25e4c8e840ca54b1cedc0e23507a00a4e30e4e 100644
--- a/app/views/admin/university/people/_form.html.erb
+++ b/app/views/admin/university/people/_form.html.erb
@@ -87,7 +87,7 @@
<%= f.input :habilitation %>
</div>
</div>
- <% end %>
+ <% end if current_university.is_really_a_university %>
</div>
<div class="col-lg-4">
<%= osuny_panel t('metadata') do %>
diff --git a/app/views/server/universities/_form.html.erb b/app/views/server/universities/_form.html.erb
index a1bb265e1e510644c8bf9736041e5127fc15b70d..6e1dadb3545ba8752634aa267aebcc0ff3951c76 100644
--- a/app/views/server/universities/_form.html.erb
+++ b/app/views/server/universities/_form.html.erb
@@ -7,6 +7,7 @@
<%= f.input :name %>
<%= f.input :identifier %>
<%= f.association :default_language, include_blank: false %>
+ <%= f.input :is_really_a_university %>
<%= f.input :private %>
<%= f.input :sms_sender_name,
maxlength: 11 %>
@@ -29,10 +30,6 @@
input_html: { accept: '.jpg,.jpeg,.png,.svg' },
preview: false,
direct_upload: true %>
- <%= f.input :feature_education %>
- <%= f.input :feature_research %>
- <%= f.input :feature_communication %>
- <%= f.input :feature_administration %>
</div>
</div>
diff --git a/app/views/server/universities/index.html.erb b/app/views/server/universities/index.html.erb
index 17c0ece0150f8fc9304043592a16a3678cdd0a87..8b925101097531c57989f2583dd3e4b13d366365 100644
--- a/app/views/server/universities/index.html.erb
+++ b/app/views/server/universities/index.html.erb
@@ -6,6 +6,7 @@
<tr>
<th><%= University.human_attribute_name('name') %></th>
<th><%= University.human_attribute_name('url') %></th>
+ <th><%= University.human_attribute_name('is_really_a_university') %></th>
<th><%= University.human_attribute_name('public_or_private') %></th>
<th><%= University.human_attribute_name('invoice_date') %></th>
<th><%= University.human_attribute_name('invoice_amount') %></th>
@@ -17,6 +18,7 @@
<tr>
<td><%= link_to university, [:server, university] %></td>
<td><%= link_to university.url, university.url, target: :_blank %></td>
+ <td><%= t university.is_really_a_university %></td>
<td><%= university.private ? University.human_attribute_name('private') : University.human_attribute_name('public') %></td>
<% if university.invoice_amount.blank? %>
<td></td>
diff --git a/app/views/server/universities/show.html.erb b/app/views/server/universities/show.html.erb
index e4c0548dcd86f9b91bc84d4d1bd3ff25d321b25f..0c11c8912864b82b96174c82650545e782355af9 100644
--- a/app/views/server/universities/show.html.erb
+++ b/app/views/server/universities/show.html.erb
@@ -1,33 +1,42 @@
<% content_for :title, @university %>
+<% content_for :title_right do %>
+ <%= link_to @university.url, @university.url, target: :_blank %>
+<% end %>
<div class="row">
- <div class="col-xl-8">
- <%= osuny_panel t('admin.infos') do %>
- <div class="table-responsive">
- <table class="<%= table_classes %>">
+ <div class="col-xl-6">
+ <div class="table-responsive">
+ <table class="<%= table_classes %>">
+ <% ['private', 'is_really_a_university'].each do |attribute| %>
+ <tr>
+ <td><%= University.human_attribute_name(attribute) %></td>
+ <td class="text-end"><%= t @university.public_send attribute %></td>
+ </tr>
+ <% end %>
+ <% unless @university.invoice_amount.blank? %>
+ <tr class="<%= @university.invoice_proximity.blank? ? '' : "table-#{@university.invoice_proximity}" %>">
+ <td><%= t('activerecord.attributes.university.invoice_date') %></td>
+ <td class="text-end"><%= l @university.invoice_date, format: "%d %B" %></td>
+ </tr>
+ <tr class="<%= @university.invoice_proximity.blank? ? '' : "table-#{@university.invoice_proximity}" %>">
+ <td><%= t('activerecord.attributes.university.invoice_amount') %></td>
+ <td class="text-end"><%= @university.invoice_amount %>€</td>
+ </tr>
+ <% end %>
+ </table>
+ </div>
+ </div>
+ <div class="col-xl-6">
+ <div class="table-responsive">
+ <table class="<%= table_classes %>">
+ <% ['address', 'zipcode', 'city', 'country'].each do |attribute| %>
<tr>
- <td><%= t('activerecord.attributes.university.url') %></td>
- <td class="text-end"><%= link_to @university.url, @university.url, target: :_blank %></td>
+ <td><%= University.human_attribute_name(attribute) %></td>
+ <td class="text-end"><%= @university.public_send attribute %></td>
</tr>
- <% ['address', 'zipcode', 'city', 'country', 'private'].each do |attribute| %>
- <tr>
- <td><%= University.human_attribute_name(attribute) %></td>
- <td class="text-end"><%= @university.public_send attribute %></td>
- </tr>
- <% end %>
- <% unless @university.invoice_amount.blank? %>
- <tr class="<%= @university.invoice_proximity.blank? ? '' : "table-#{@university.invoice_proximity}" %>">
- <td><%= t('activerecord.attributes.university.invoice_date') %></td>
- <td class="text-end"><%= l @university.invoice_date, format: "%d %B" %></td>
- </tr>
- <tr class="<%= @university.invoice_proximity.blank? ? '' : "table-#{@university.invoice_proximity}" %>">
- <td><%= t('activerecord.attributes.university.invoice_amount') %></td>
- <td class="text-end"><%= @university.invoice_amount %>€</td>
- </tr>
- <% end %>
- </table>
- </div>
- <% end %>
+ <% end %>
+ </table>
+ </div>
</div>
</div>
diff --git a/config/admin_navigation.rb b/config/admin_navigation.rb
index 133f5808f2bf89d8a040571ad99bef7a8f69d72f..80e6adff0f47e400554c4296282797b335a405ab 100644
--- a/config/admin_navigation.rb
+++ b/config/admin_navigation.rb
@@ -15,43 +15,52 @@ SimpleNavigation::Configuration.run do |navigation|
end
end
- navigation.items do |primary|
- if current_admin_theme == 'appstack'
- primary.item :dashboard, t('admin.dashboard'), admin_root_path, { icon: Icon::DASHBOARD, highlights_on: /admin$/ }
- end
+ if current_university.is_really_a_university
+ navigation.items do |primary|
+ if current_admin_theme == 'appstack'
+ primary.item :dashboard, t('admin.dashboard'), admin_root_path, { icon: Icon::DASHBOARD, highlights_on: /admin$/ }
+ end
- if feature_education?
- primary.item :education, Education.model_name.human, admin_education_root_path, { kind: :header, image: 'admin/education-thumb.jpg' }
- load_from_parts Education, primary
- primary.item :education, 'Ressources éducatives', nil, { icon: Icon::EDUCATION_RESOURCES }
- primary.item :education, 'Feedbacks', nil, { icon: Icon::EDUCATION_FEEDBACKS }
- end
+ if feature_education?
+ primary.item :education, Education.model_name.human, admin_education_root_path, { kind: :header, image: 'admin/education-thumb.jpg' }
+ load_from_parts Education, primary
+ primary.item :education, 'Ressources éducatives', nil, { icon: Icon::EDUCATION_RESOURCES }
+ primary.item :education, 'Feedbacks', nil, { icon: Icon::EDUCATION_FEEDBACKS }
+ end
- if feature_research?
- primary.item :research, Research.model_name.human, admin_research_root_path, { kind: :header, image: 'admin/research-thumb.jpg' }
- load_from_parts Research, primary
- primary.item :research_watch, 'Veille', nil, { icon: Icon::RESEARCH_WATCH }
- end
+ if feature_research?
+ primary.item :research, Research.model_name.human, admin_research_root_path, { kind: :header, image: 'admin/research-thumb.jpg' }
+ load_from_parts Research, primary
+ primary.item :research_watch, 'Veille', nil, { icon: Icon::RESEARCH_WATCH }
+ end
- if feature_communication?
- primary.item :communication, Communication.model_name.human, admin_communication_root_path, { kind: :header, image: 'admin/communication-thumb.jpg' }
- load_from_parts Communication, primary
- primary.item :communication_newsletters, 'Lettres d\'information', nil, { icon: Icon::COMMUNICATION_NEWSLETTERS }
- end
+ if feature_communication?
+ primary.item :communication, Communication.model_name.human, admin_communication_root_path, { kind: :header, image: 'admin/communication-thumb.jpg' }
+ load_from_parts Communication, primary
+ primary.item :communication_newsletters, 'Lettres d\'information', nil, { icon: Icon::COMMUNICATION_NEWSLETTERS }
+ end
- if feature_administration?
- primary.item :administration, Administration.model_name.human, admin_administration_root_path, { kind: :header, image: 'admin/administration-thumb.jpg' }
- load_from_parts Administration, primary
- primary.item :administration_campus, 'Campus', nil, { icon: Icon::ADMINISTRATION_CAMPUS }
- primary.item :administration_admissions, 'Admissions', nil, { icon: Icon::ADMINISTRATION_ADMISSIONS }
- primary.item :administration_internship, 'Stages', nil, { icon: Icon::ADMINISTRATION_INTERNSHIPS }
- primary.item :administration_statistics, 'Statistiques', nil, { icon: Icon::ADMINISTRATION_STATISTICS }
- end
+ if feature_administration?
+ primary.item :administration, Administration.model_name.human, admin_administration_root_path, { kind: :header, image: 'admin/administration-thumb.jpg' }
+ load_from_parts Administration, primary
+ primary.item :administration_campus, 'Campus', nil, { icon: Icon::ADMINISTRATION_CAMPUS }
+ primary.item :administration_admissions, 'Admissions', nil, { icon: Icon::ADMINISTRATION_ADMISSIONS }
+ primary.item :administration_internship, 'Stages', nil, { icon: Icon::ADMINISTRATION_INTERNSHIPS }
+ primary.item :administration_statistics, 'Statistiques', nil, { icon: Icon::ADMINISTRATION_STATISTICS }
+ end
+
+ if can?(:read, University::Person) || can?(:read, University::Organization)
+ primary.item :university, University.model_name.human, admin_university_root_path, { kind: :header, image: 'admin/university-thumb.jpg' }
+ load_from_parts University, primary
+ end
- if can?(:read, University::Person) || can?(:read, University::Organization)
- primary.item :university, University.model_name.human, admin_university_root_path, { kind: :header, image: 'admin/university-thumb.jpg' }
+ end
+ else
+ navigation.items do |primary|
+ primary.item :communication, t('admin.dashboard'), admin_root_path, { kind: :header, image: 'admin/osuny-thumb.jpg' }
+ load_from_parts Communication, primary
+ primary.item :communication_newsletters, 'Lettres d\'information', nil, { icon: Icon::COMMUNICATION_NEWSLETTERS }
load_from_parts University, primary
end
-
end
end
diff --git a/config/locales/administration/en.yml b/config/locales/administration/en.yml
index e0c0b5c419908f895e6f36d91d8f7e4decff4fcd..f5aa929946ff61ac08de19de285d41ea7db6af2a 100644
--- a/config/locales/administration/en.yml
+++ b/config/locales/administration/en.yml
@@ -27,7 +27,7 @@ en:
glossary: Glossary
administration:
description:
- text: L'administration, sous ses multiples formes, se définit principalement par ses activités au service de l'intérêt général. L'administration agit dans l'intérêt général et respecte le principe de légalité. Elle est tenue à l'obligation de neutralité et au respect du principe de laïcité. Elle se conforme au principe d'égalité et garantit à chacun un traitement impartial.
+ text: Administration, in its many forms, is defined primarily by its activities in the service of the general interest. It acts in the general interest and respects the principle of legality. It is bound by the obligation of neutrality and respect for the principle of secularism. It complies with the principle of equality and guarantees everyone impartial treatment.
source: Code des relations entre le public et l'administration
parts:
qualiopi:
diff --git a/config/locales/communication/en.yml b/config/locales/communication/en.yml
index 51b3bda961fa49a051f7601554c4dd059b8226b3..ce3ed16af992f6c863f5f0950e9b1755e5aa7070 100644
--- a/config/locales/communication/en.yml
+++ b/config/locales/communication/en.yml
@@ -680,13 +680,15 @@ en:
choose_template: Choose the kind of block to add
choose: Choose
description:
- text: Communiquer, c'est mettre en commun; et mettre en commun, c'est l'acte qui nous constitue. Si l'on estime que cet acte est impossible, on refuse tout projet humain.
+ text: To communicate is to share; and sharing is the act that constitutes us. If we believe that this act is impossible, we reject any human project.
source: Albert Jacquard, Petite philosophie à l'usage des non-philosophes, 1997
parts:
website:
- description: Espaces publics de diffusion d'information, sobre sur le plan écologique et accessible aux personnes en situation de handicap
+ description: Public spaces for the dissemination of information, ecologically sober and accessible to people with disabilities
+ description_non_university: Public spaces for the dissemination of information, ecologically sober and accessible to people with disabilities
extranet:
- description: Espaces d'échanges sécurisés dédiés aux personnes authentifiées
+ description: Secure exchange areas dedicated to authenticated users
+ description_non_university: Secure exchange areas dedicated to authenticated users
extranet:
post:
metadata:
diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml
index 9fd44afcb0068ff6c68e3e106eaa9a75046d428e..4d269ddf2be87b72b67fac9e324ed34dec066df7 100644
--- a/config/locales/communication/fr.yml
+++ b/config/locales/communication/fr.yml
@@ -682,8 +682,10 @@ fr:
parts:
website:
description: Espaces publics de diffusion d'information, sobre sur le plan écologique et accessible aux personnes en situation de handicap
+ description_non_university: Espaces publics de diffusion d'information, sobre sur le plan écologique et accessible aux personnes en situation de handicap
extranet:
- description: Espaces d'échanges sécurisés dédiés aux personnes authentifiées
+ description: Espaces d'échanges sécurisés dédiés aux utilisateur·rice·s authentifié·e·s
+ description_non_university: Espaces d'échanges sécurisés dédiés aux utilisateur·rice·s authentifié·e·s
extranet:
post:
metadata:
diff --git a/config/locales/education/en.yml b/config/locales/education/en.yml
index b0f2fe1b8e1111c117bda91fed844b58c5eaa395..666ecca9e662489f5defb90971d4a32d16b037d7 100644
--- a/config/locales/education/en.yml
+++ b/config/locales/education/en.yml
@@ -94,19 +94,19 @@ en:
title: Programs treeview
education:
description:
- text: L’éducation est l’ensemble des processus et des procédés qui permettent à tout enfant humain d’accéder progressivement à la culture, l’accès à la culture étant ce qui distingue l’homme de l’animal.
+ text: Education is the set of processes and procedures that enable every human child to gradually gain access to culture, access to culture being what distinguishes man from animals.
source: Olivier Reboul, La philosophie de l'éducation, 2018
parts:
diploma:
- description: Présentation des diplômes et de leurs caractéristiques
+ description: Presentation of diplomas and their characteristics
program:
- description: Présentation exhaustive des formations, de leurs contenus, modalités pédagogiques et perspectives
+ description: Comprehensive presentation of the courses, their content, teaching methods and prospects
teacher:
- description: Présentation des enseignants et enseignantes, avec leur biographie et leurs enseignements dans les différentes formations
+ description: Presentation of the teachers, with their biographies and their teaching in the various courses
school:
- description: Présentation des écoles, de leurs coordonnées, enseignements, équipes et informations administratives
+ description: Presentation of the schools, their contact details, courses, teams and administrative information
alumnus:
- description: Présentation des étudiants et étudiantes ayant étudié dans les différentes formations
+ description: Presentation of the students who have studied in the various courses.
manage_programs: Manage programs
manage_roles: Manage roles
number_of_programs: Number of programs
diff --git a/config/locales/research/en.yml b/config/locales/research/en.yml
index bd114710f352cd54406fc1779941860ba7ed47d0..8d19acee493cd0da411c8df079b516d3ed55d1d0 100644
--- a/config/locales/research/en.yml
+++ b/config/locales/research/en.yml
@@ -103,26 +103,26 @@ en:
source: HAL.science
research:
description:
- text: La recherche scientifique est, à la fois, une démarche créatrice de connaissances motivée par la curiosité pure et une activité génératrice d’innovations qui augmentent les moyens d’action et de diagnostic sur la nature, l’homme et la société. Ces deux aspects de la recherche, le fondamental et l’appliqué, loin de s’opposer, sont complémentaires l’un de l’autre. La recherche fondamentale crée le socle de connaissances à partir duquel naissent les applications et, inversement, les avancées technologiques procurent les outils d’investigation de plus en plus perfectionnés qui conduisent à approfondir nos connaissances fondamentales.
+ text: Scientific research is both an approach that creates knowledge motivated by pure curiosity and an activity that generates innovations that increase the means of action and diagnosis on nature, man and society. These two aspects of research, fundamental and applied, far from opposing each other, complement each other. Fundamental research creates the knowledge base from which applications are born and, conversely, technological advances provide the increasingly sophisticated investigative tools that lead to a deepening of our fundamental knowledge.
source: Serge Haroche, Prix Nobel de physique 2012
parts:
hal:
- description: Publications et auteur·e·s dans la base de données HAL
+ description: Publications and authors in the HAL database
journal:
- description: Journaux en accès ouvert (open access) permettant aux chercheur·e·s de contribuer à la recherche
+ description: Open access journals allowing researchers to contribute to research
laboratory:
- description: Structure de recherche hébergeant le travail des chercheur·e·s
+ description: Research structure hosting the work of researchers
researcher:
- description: Personne physique liée à une université, une composante, un laboratoire, etc.
+ description: Individual linked to a university, department, laboratory, etc.
thesis:
- description: Production scientifique permettant d'obtenir le titre de Docteur·e
+ description: Scientific production leading to the title of Doctor
hal:
description:
parts:
author:
- description: Profils des chercheur·e·s dans la base de données HAL
+ description: Profiles of researchers in the HAL database
publication:
- description: Publications scientifiques importées automatiquement de HAL
+ description: Scientific publications automatically imported from HAL
title: HAL
select_identifier: Select all the HAL authors that correspond to this researcher. Use the publications to be sure it's the same person.
sync: Synchronize HAL publications
diff --git a/config/locales/university/en.yml b/config/locales/university/en.yml
index 0cb624698f6dd81cfecfcaaa59e91571d88686d2..681a74a3b6b6b7583931ecc18e4937dd05dfc1f9 100644
--- a/config/locales/university/en.yml
+++ b/config/locales/university/en.yml
@@ -7,10 +7,7 @@ en:
country: Country
default_language: Default language
has_sso: Has SSO?
- feature_administration: Administration
- feature_communication: Communication
- feature_education: Education
- feature_research: Research
+ is_really_a_university: Is really a university
identifier: Identifier
invoice_amount: Invoice amount
invoice_date: Invoice date
@@ -34,7 +31,6 @@ en:
categories: Categories
city: City
country: Country
- description: Personne morale liée à une université, une composante, un laboratoire, etc.
digital: Digital contact
email: Email
geolocation: Geographical coordinates
@@ -158,6 +154,7 @@ en:
simple_form:
hints:
university:
+ is_really_a_university: Uncheck this to hide the 5 realms.
sms_sender_name: "11 characters max. Only alphanumeric chars ([A-Z][a-z][0-9])."
sso_button_label: "Default: Sign in via SSO"
university_organization:
@@ -205,15 +202,18 @@ en:
import_hint_html: "Possible values for <i>gender</i> are: m (male), f (female) and n (non binary).<br><i>Phone_professional</i>, <i>phone_personal</i>, <i>mobile</i> and <i>zipcode</i> fields must have a text format, not numbers.<br><i>Country</i> field must contain the ISO 3166 code of the country, so 2 upcase characters (<a href=\"https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes\" target=\_blank\">list</a>).<br><i>Social_twitter</i> field should have no @.<br><i>School</i> field should contain the internal school id.<br><i>Program</i> field should contain the internal program id."
title: Cohorts imports
description:
- text: Une université est une institution d'enseignement supérieur, d'étude et de recherche, constituée par la réunion de divers établissements nommés suivant les traditions “collègesâ€, “facultésâ€, “institutsâ€, “départementsâ€, “centresâ€, “sectionsâ€, “unités†ou écoles spécifiques, mais aussi bibliothèque ou atelier, médiathèque ou musée, etc. formant un ensemble administratif cohérent avec un statut de droit défini, public, privé ou éventuellement mixte.
+ text: A university is an institution of higher education, study and research, made up of various establishments called, depending on the tradition, "colleges", "faculties", "institutes", "departments", "centres", "sections", "units" or specific schools, but also a library or workshop, media library or museum, etc. forming a coherent administrative whole with a defined legal status, whether public, private or possibly mixed.
source: Wikipedia
parts:
person:
- description: Personne physique liée à une université, une composante, un laboratoire, etc.
+ description: Physical person linked to a university, component, laboratory, etc.
+ description_non_university: Person, not necessarily linked to an Osuny user account
organization:
- description: Personne morale liée à une université, une composante, un laboratoire, etc.
+ description: Legal entity linked to a university, component, laboratory, etc.
+ description_non_university: Legal entity, whether a public organisation, a non-governmental organisation (e.g. an association) or a company
user:
- description: Personne utilisant Osuny, dotée d'un compte authentifié
+ description: Person using Osuny, with an authenticated account
+ description_non_university: Person using Osuny, with an authenticated account
internal_key: Internal Key
invoice_informations: Invoice informations
manage_cohorts: Manage cohorts
diff --git a/config/locales/university/fr.yml b/config/locales/university/fr.yml
index e9bd820ac986eac8c9f4a60513505cf595479735..7f9cab9dbabf810e34d14eb4a0e2a58c2aba110f 100644
--- a/config/locales/university/fr.yml
+++ b/config/locales/university/fr.yml
@@ -7,10 +7,7 @@ fr:
country: Pays
default_language: Langue par défaut
has_sso: A un SSO ?
- feature_administration: Administration
- feature_communication: Communication
- feature_education: Enseignement
- feature_research: Recherche
+ is_really_a_university: Réellement une université
identifier: Identifiant
invoice_amount: Montant de facturation
invoice_date: Date de facturation
@@ -157,6 +154,7 @@ fr:
simple_form:
hints:
university:
+ is_really_a_university: Décocher cette case masque les 5 royaumes.
sms_sender_name: "11 caractères maximum. Que des caractères alphadécimaux ([A-Z][a-z][0-9])."
sso_button_label: "Par défaut : Se connecter en SSO"
university_organization:
@@ -209,10 +207,13 @@ fr:
parts:
person:
description: Personne physique liée à une université, une composante, un laboratoire, etc.
+ description_non_university: Personne physique, pas nécessairement liée à un compte utilisateur d'Osuny
organization:
description: Personne morale liée à une université, une composante, un laboratoire, etc.
+ description_non_university: Personne morale, qu'il s'agisse d'une organisation publique, d'une organisation non gouvernementale (association par exemple) ou d'une entreprise
user:
description: Personne utilisant Osuny, dotée d'un compte authentifié
+ description_non_university: Personne utilisant Osuny, dotée d'un compte authentifié
internal_key: Clé interne
invoice_informations: Données de facturation
manage_cohorts: Gérer les promotions
diff --git a/db/migrate/20230719073528_add_real_university_to_university.rb b/db/migrate/20230719073528_add_real_university_to_university.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6197fd776d23f617e2d6307c12a7031a759476bc
--- /dev/null
+++ b/db/migrate/20230719073528_add_real_university_to_university.rb
@@ -0,0 +1,9 @@
+class AddRealUniversityToUniversity < ActiveRecord::Migration[7.0]
+ def change
+ add_column :universities, :is_really_a_university, :boolean, default: true
+ remove_column :universities, :feature_education, :boolean, default: true
+ remove_column :universities, :feature_research, :boolean, default: true
+ remove_column :universities, :feature_communication, :boolean, default: true
+ remove_column :universities, :feature_administration, :boolean, default: true
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8cb44ac9cc9fde2d53143caa86f90101fff6efee..b324b8ece93dd1ae14b34034e8b19c16a3333ac6 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[7.0].define(version: 2023_07_17_160238) do
+ActiveRecord::Schema[7.0].define(version: 2023_07_19_073528) do
# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
enable_extension "plpgsql"
@@ -918,10 +918,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_07_17_160238) do
t.jsonb "sso_mapping"
t.string "sso_button_label"
t.uuid "default_language_id", null: false
- t.boolean "feature_education", default: true
- t.boolean "feature_research", default: true
- t.boolean "feature_communication", default: true
- t.boolean "feature_administration", default: true
+ t.boolean "is_really_a_university", default: true
t.index ["default_language_id"], name: "index_universities_on_default_language_id"
end
diff --git a/test/fixtures/communication/extranets.yml b/test/fixtures/communication/extranets.yml
index 5b00f559b78ac19b9a3871e2736923e92e325c4b..c4a72564511a4905256b44eff1b90d9ad95d76db 100644
--- a/test/fixtures/communication/extranets.yml
+++ b/test/fixtures/communication/extranets.yml
@@ -2,35 +2,34 @@
#
# Table name: communication_extranets
#
-# id :uuid not null, primary key
-# about_type :string indexed => [about_id]
-# allow_experiences_modification :boolean default(TRUE)
-# color :string
-# cookies_policy :text
-# css :text
-# feature_alumni :boolean default(FALSE)
-# feature_contacts :boolean default(FALSE)
-# feature_jobs :boolean default(FALSE)
-# feature_library :boolean default(FALSE)
-# feature_posts :boolean default(FALSE)
-# has_sso :boolean default(FALSE)
-# home_sentence :text
-# host :string
-# name :string
-# privacy_policy :text
-# registration_contact :string
-# sass :text
-# sso_button_label :string
-# sso_cert :text
-# sso_mapping :jsonb
-# sso_name_identifier_format :string
-# sso_provider :integer default("saml")
-# sso_target_url :string
-# terms :text
-# created_at :datetime not null
-# updated_at :datetime not null
-# about_id :uuid indexed => [about_type]
-# university_id :uuid not null, indexed
+# id :uuid not null, primary key
+# about_type :string indexed => [about_id]
+# color :string
+# cookies_policy :text
+# css :text
+# feature_alumni :boolean default(FALSE)
+# feature_contacts :boolean default(FALSE)
+# feature_jobs :boolean default(FALSE)
+# feature_library :boolean default(FALSE)
+# feature_posts :boolean default(FALSE)
+# has_sso :boolean default(FALSE)
+# home_sentence :text
+# host :string
+# name :string
+# privacy_policy :text
+# registration_contact :string
+# sass :text
+# sso_button_label :string
+# sso_cert :text
+# sso_mapping :jsonb
+# sso_name_identifier_format :string
+# sso_provider :integer default("saml")
+# sso_target_url :string
+# terms :text
+# created_at :datetime not null
+# updated_at :datetime not null
+# about_id :uuid indexed => [about_type]
+# university_id :uuid not null, indexed
#
# Indexes
#
diff --git a/test/fixtures/universities.yml b/test/fixtures/universities.yml
index c0db070bd79537a465e28e0451abc25287636f19..ec52403353d318f2d921e09d1ecfacf78daee855 100644
--- a/test/fixtures/universities.yml
+++ b/test/fixtures/universities.yml
@@ -6,15 +6,12 @@
# address :string
# city :string
# country :string
-# feature_administration :boolean default(TRUE)
-# feature_communication :boolean default(TRUE)
-# feature_education :boolean default(TRUE)
-# feature_research :boolean default(TRUE)
# has_sso :boolean default(FALSE)
# identifier :string
# invoice_amount :string
# invoice_date :date
# invoice_date_yday :integer
+# is_really_a_university :boolean default(TRUE)
# mail_from_address :string
# mail_from_name :string
# name :string
@@ -44,9 +41,11 @@ default_university:
identifier: my-university
sms_sender_name: "unitest"
default_language: fr
+ is_really_a_university: true
stale_university:
name: Université obsolète
identifier: stale-university
sms_sender_name: "unistale"
default_language: fr
+ is_really_a_university: false