diff --git a/app/controllers/admin/education/programs_controller.rb b/app/controllers/admin/education/programs_controller.rb index 5b7fecc4382b55ebe866ff1bdfb44aaa1fd53add..393d6158a1efd57de6d9fcfbedf9dd6c51a3d317 100644 --- a/app/controllers/admin/education/programs_controller.rb +++ b/app/controllers/admin/education/programs_controller.rb @@ -90,7 +90,7 @@ class Admin::Education::ProgramsController < Admin::Education::ApplicationContro :name, :slug, :level, :capacity, :ects, :continuing, :description, :published, :featured_image, :featured_image_delete, :featured_image_infos, :featured_image_alt, :prerequisites, :objectives, :duration, :presentation, :registration, :pedagogy, :content, - :evaluation, :accessibility, :pricing, :contacts, :opportunities, :results, :other, + :evaluation, :accessibility, :pricing, :contacts, :opportunities, :results, :other, :main_information, :parent_id, school_ids: [], university_person_involvements_attributes: [:id, :person_id, :description, :position, :_destroy] ) diff --git a/app/models/education/program.rb b/app/models/education/program.rb index ef9465eacc3b327140cc2a88e74bc047f0d8cd9f..7ae3b751c4b5a2fa1bbec8f4ea91c47baf3547a1 100644 --- a/app/models/education/program.rb +++ b/app/models/education/program.rb @@ -14,6 +14,7 @@ # evaluation :text # featured_image_alt :string # level :integer +# main_information :text # name :string # objectives :text # opportunities :text @@ -57,7 +58,8 @@ class Education::Program < ApplicationRecord include WithPosition include WithBlocks - rich_text_areas_with_inheritance :accessibility, + rich_text_areas_with_inheritance :main_information, + :accessibility, :contacts, :duration, :evaluation, diff --git a/app/views/admin/education/programs/_form.html.erb b/app/views/admin/education/programs/_form.html.erb index 50138adea6e35c294c1a15f9fa8a32c7a55cbf07..9b3469db1a03326873a21fdca15621b59f159403 100644 --- a/app/views/admin/education/programs/_form.html.erb +++ b/app/views/admin/education/programs/_form.html.erb @@ -57,6 +57,7 @@ <h5 class="card-title mb-0"><%= t('education.program.useful_informations') %></h5> </div> <div class="card-body"> + <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :main_information %> <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :presentation %> <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :objectives %> <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :opportunities %> diff --git a/app/views/admin/education/programs/show.html.erb b/app/views/admin/education/programs/show.html.erb index 906b1a681597d70ac49514cf43195e2d143ca60f..eaa6bd15373ed2fa49c50d2ebc02332e74965d50 100644 --- a/app/views/admin/education/programs/show.html.erb +++ b/app/views/admin/education/programs/show.html.erb @@ -57,6 +57,7 @@ </div> <div class="card-body"> <% [ + :main_information, :presentation, :objectives, :opportunities, @@ -105,20 +106,21 @@ <% content_for :preview do %> <% [ + :main_information, :presentation, - :registration, - :pricing, - :duration, - :contacts, - :accessibility, - :other, :objectives, + :opportunities, + :results, + :accessibility, + :duration, + :pricing, :content, - :prerequisites, :pedagogy, :evaluation, - :opportunities, - :results + :prerequisites, + :registration, + :other, + :contacts ].each do |property| %> <%= @program.send(property).to_s %> <% end %> diff --git a/app/views/admin/education/programs/static.html.erb b/app/views/admin/education/programs/static.html.erb index f3375da1798af2e65b8a571df8f9965f3661ac06..b8cc5b8211d9d5c76252c356f682d63374020a8c 100644 --- a/app/views/admin/education/programs/static.html.erb +++ b/app/views/admin/education/programs/static.html.erb @@ -48,6 +48,7 @@ level: <%= @about.level %> ects: <%= @about.ects %> <% [ + :main_information, :accessibility, :contacts, :duration, diff --git a/config/locales/education/en.yml b/config/locales/education/en.yml index dfec60525b22dab4ca8942bf1f184356b38d2541..1767dbce544f55209b78740385e9024d6a07581c 100644 --- a/config/locales/education/en.yml +++ b/config/locales/education/en.yml @@ -32,6 +32,7 @@ en: featured_image: Featured image featured_image_alt: Alt text level: Level + main_information: Main information name: Name objectives: Objectifs opportunities: Opportunities diff --git a/config/locales/education/fr.yml b/config/locales/education/fr.yml index 5a6c9dbbd3a1bb2275cd04437155f128002b7509..263d93218ce6d4eec895215963e8215190a1abc1 100644 --- a/config/locales/education/fr.yml +++ b/config/locales/education/fr.yml @@ -32,6 +32,7 @@ fr: featured_image: Image à la une featured_image_alt: Texte alternatif level: Niveau + main_information: Informations essentielles name: Nom objectives: Objectifs opportunities: Débouchés diff --git a/db/migrate/20220428171541_add_main_information_to_education_programs.rb b/db/migrate/20220428171541_add_main_information_to_education_programs.rb new file mode 100644 index 0000000000000000000000000000000000000000..22aa1bfeeebe270b63ae7bf69316a59b863787ed --- /dev/null +++ b/db/migrate/20220428171541_add_main_information_to_education_programs.rb @@ -0,0 +1,5 @@ +class AddMainInformationToEducationPrograms < ActiveRecord::Migration[6.1] + def change + add_column :education_programs, :main_information, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index 651bf52d95e45dac88f192bdb7e51890ab5cdef4..6ee0922f1926973e5077de47fb68c3e289d2734e 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_28_151735) do +ActiveRecord::Schema.define(version: 2022_04_28_171541) do # These are extensions that must be enabled in order to support this database enable_extension "pgcrypto" @@ -463,6 +463,7 @@ ActiveRecord::Schema.define(version: 2022_04_28_151735) do t.text "content" t.text "results" t.text "presentation" + t.text "main_information" t.index ["parent_id"], name: "index_education_programs_on_parent_id" t.index ["university_id"], name: "index_education_programs_on_university_id" end