diff --git a/app/controllers/admin/education/programs_controller.rb b/app/controllers/admin/education/programs_controller.rb index 32ef3f170647e60d18a2e2a7c341e1c444c49a9d..87a98de74d1aaaf6b5d392c1a208477dadd22c09 100644 --- a/app/controllers/admin/education/programs_controller.rb +++ b/app/controllers/admin/education/programs_controller.rb @@ -78,9 +78,11 @@ class Admin::Education::ProgramsController < Admin::Education::ApplicationContro end def program_params - params.require(:education_program) - .permit(:name, :slug, :level, :capacity, :ects, :continuing, - :prerequisites, :objectives, :duration, :registration, :pedagogy, - :evaluation, :accessibility, :pricing, :contacts, :opportunities, :other, :parent_id, school_ids: [], teacher_ids: []) + params.require(:education_program).permit( + :name, :slug, :level, :capacity, :ects, :continuing, :description, + :prerequisites, :objectives, :duration, :registration, :pedagogy, + :evaluation, :accessibility, :pricing, :contacts, :opportunities, :other, + :parent_id, school_ids: [], teacher_ids: [] + ) end end diff --git a/app/models/education/program.rb b/app/models/education/program.rb index 6f8ddcbb26013813c62769aa0fd76dab4e61d012..9aaf187e9eee0e54220c5064bc55bbe285601959 100644 --- a/app/models/education/program.rb +++ b/app/models/education/program.rb @@ -5,6 +5,7 @@ # id :uuid not null, primary key # capacity :integer # continuing :boolean +# description :text # ects :integer # level :integer # name :string diff --git a/app/views/admin/education/programs/_form.html.erb b/app/views/admin/education/programs/_form.html.erb index d52e8ae27b73d47a30a58c482cfb9b8e106f62fd..710b7caab2828dfc31c3002fb74d16d32b32b9d3 100644 --- a/app/views/admin/education/programs/_form.html.erb +++ b/app/views/admin/education/programs/_form.html.erb @@ -30,6 +30,7 @@ <h5 class="card-title mb-0"><%= t('education.program.useful_informations') %></h5> </div> <div class="card-body"> + <%= f.input :description %> <%= f.input :registration, as: :rich_text_area %> <%= f.input :pricing, as: :rich_text_area %> <%= f.input :duration, as: :rich_text_area %> diff --git a/app/views/admin/education/programs/show.html.erb b/app/views/admin/education/programs/show.html.erb index 8c1d71ce979e651548c80ec910bfdea9a160f017..bf7ad5710665b4c916e9a6fc217f40414709fd74 100644 --- a/app/views/admin/education/programs/show.html.erb +++ b/app/views/admin/education/programs/show.html.erb @@ -36,7 +36,7 @@ </div> <div class="card-body"> <% i = 0 %> - <% ['registration', 'pricing', 'duration', 'contacts', 'accessibility', 'other'].each do |prop| %> + <% ['description', 'registration', 'pricing', 'duration', 'contacts', 'accessibility', 'other'].each do |prop| %> <% next if @program.public_send(prop).blank? %> <h3 class="h5 <%= 'mt-4' if i > 0 %>"><%= Education::Program.human_attribute_name(prop) %></h3> <%= @program.public_send prop %> diff --git a/config/locales/education/en.yml b/config/locales/education/en.yml index 375f0b15167ab86051b660f30f0291e8fdc16c69..1d8bf68c39cc8a243cf0c75d35f03e3d224bfbbf 100644 --- a/config/locales/education/en.yml +++ b/config/locales/education/en.yml @@ -16,6 +16,7 @@ en: capacity: Capacity contacts: Contacts continuing: Formation continue + description: Description duration: Durée ects: Crédits ECTS evaluation: Modalités d’évaluation diff --git a/config/locales/education/fr.yml b/config/locales/education/fr.yml index edf5d22d099581f1792be1ba007ff54131a1ca28..4e29fb32802cdc56a21ce6a5d5a5f9edced1641e 100644 --- a/config/locales/education/fr.yml +++ b/config/locales/education/fr.yml @@ -16,6 +16,7 @@ fr: capacity: Capacité contacts: Contacts continuing: Formation continue + description: Description duration: Durée ects: Crédits ECTS evaluation: Modalités d’évaluation diff --git a/db/migrate/20211217115125_add_description_to_education_programs.rb b/db/migrate/20211217115125_add_description_to_education_programs.rb new file mode 100644 index 0000000000000000000000000000000000000000..1c388041d4ec893eb9af6d24765e24bc469d9216 --- /dev/null +++ b/db/migrate/20211217115125_add_description_to_education_programs.rb @@ -0,0 +1,5 @@ +class AddDescriptionToEducationPrograms < ActiveRecord::Migration[6.1] + def change + add_column :education_programs, :description, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index 603e000544757b57b39695983baeb3312859eef9..69304184bb6f69a644bf5513f4b8f59360379f3f 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: 2021_12_17_112923) do +ActiveRecord::Schema.define(version: 2021_12_17_115125) do # These are extensions that must be enabled in order to support this database enable_extension "pgcrypto" @@ -373,6 +373,7 @@ ActiveRecord::Schema.define(version: 2021_12_17_112923) do t.integer "position", default: 0 t.string "slug" t.string "path" + t.text "description" t.index ["parent_id"], name: "index_education_programs_on_parent_id" t.index ["university_id"], name: "index_education_programs_on_university_id" end