From 509c6174eb4eb241850749d81c5b132d81a2cec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Thu, 28 Apr 2022 19:25:09 +0200
Subject: [PATCH] #255
---
.../admin/education/programs_controller.rb | 2 +-
app/models/education/program.rb | 4 +++-
.../admin/education/programs/_form.html.erb | 1 +
.../admin/education/programs/show.html.erb | 20 ++++++++++---------
.../admin/education/programs/static.html.erb | 1 +
config/locales/education/en.yml | 1 +
config/locales/education/fr.yml | 1 +
..._main_information_to_education_programs.rb | 5 +++++
db/schema.rb | 3 ++-
9 files changed, 26 insertions(+), 12 deletions(-)
create mode 100644 db/migrate/20220428171541_add_main_information_to_education_programs.rb
diff --git a/app/controllers/admin/education/programs_controller.rb b/app/controllers/admin/education/programs_controller.rb
index 5b7fecc43..393d6158a 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 ef9465eac..7ae3b751c 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 50138adea..9b3469db1 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 906b1a681..eaa6bd153 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 f3375da17..b8cc5b821 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 dfec60525..1767dbce5 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 5a6c9dbbd..263d93218 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 000000000..22aa1bfee
--- /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 651bf52d9..6ee0922f1 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
--
GitLab