diff --git a/app/models/education/program.rb b/app/models/education/program.rb index f2f771577e3e500c5b8b1bd2c0ffb29984a7f1f6..e87a3218d44a5d4754076b0cbe69ed3195fa07cc 100644 --- a/app/models/education/program.rb +++ b/app/models/education/program.rb @@ -48,7 +48,9 @@ class Education::Program < ApplicationRecord :pedagogy, :prerequisites, :pricing, - :registration + :registration, + :content, + :results attr_accessor :skip_websites_categories_callback @@ -132,6 +134,6 @@ class Education::Program < ApplicationRecord protected def last_ordered_element - university.programs.where(parent_id: parent_id).ordered.last + university.education_programs.where(parent_id: parent_id).ordered.last end end diff --git a/app/views/admin/administration/qualiopi/evaluations/_criterion_1.html.erb b/app/views/admin/administration/qualiopi/evaluations/_criterion_1.html.erb index 97ba1632fc42fa7567ed7c57c49163c612e34742..5095560bb72ee7afada6c33154a0eeeff847b149 100644 --- a/app/views/admin/administration/qualiopi/evaluations/_criterion_1.html.erb +++ b/app/views/admin/administration/qualiopi/evaluations/_criterion_1.html.erb @@ -1,5 +1,5 @@ <% -@programs = current_university.education_programs +@programs = current_university.education_programs.ordered @checks = [ :prerequisites, :objectives, diff --git a/app/views/admin/administration/qualiopi/evaluations/_criterion_2.html.erb b/app/views/admin/administration/qualiopi/evaluations/_criterion_2.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..dbda36c8d624842f42365d46337ef7bf06304ca3 --- /dev/null +++ b/app/views/admin/administration/qualiopi/evaluations/_criterion_2.html.erb @@ -0,0 +1,38 @@ +<% +@programs = current_university.education_programs.ordered +@checks = [ + :results +] +%> +<table class="table mt-5"> + <thead> + <tr> + <th><%= Education::Program.model_name.human %></th> + <% @checks.each do |check| %> + <th><%= Education::Program.human_attribute_name(check) %></th> + <% end %> + </tr> + </thead> + <tbody> + <% @programs.each do |program| %> + <tr> + <td> + <% if program.ancestors.any? %> + <small><% program.ancestors.each do |program| %><%= program %> / </small><br><% end %> + <% end %> + <%= link_to program, [:admin, program] %> + </td> + <% @checks.each do |check| %> + <% valid = !program.public_send("best_#{check}").blank? %> + <th> + <% if valid %> + <span class="fas fa-check text-success"></span> + <% else %> + <span class="fas fa-times text-danger"></span> + <% end %> + </th> + <% end %> + </tr> + <% end %> + </tbody> +</table> diff --git a/app/views/admin/education/programs/_form.html.erb b/app/views/admin/education/programs/_form.html.erb index d04a9ed2e9d5560ba7ef20ea070f7f363b542ba3..c690d61aa254f1f82b03300ab8dc3cb6b1caf051 100644 --- a/app/views/admin/education/programs/_form.html.erb +++ b/app/views/admin/education/programs/_form.html.erb @@ -77,13 +77,15 @@ <div class="row"> <div class="col-md-4"> <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :objectives %> + <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :content %> </div> <div class="col-md-4"> <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :opportunities %> <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :prerequisites %> - <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :evaluation %> + <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :results %> </div> <div class="col-md-4"> + <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :evaluation %> <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :pedagogy %> </div> </div> diff --git a/config/locales/education/fr.yml b/config/locales/education/fr.yml index dd27c981a4268c0e46e646bea0c38c16c2eaf05f..7efba94a1882acb64df05104f79392bbfec10302 100644 --- a/config/locales/education/fr.yml +++ b/config/locales/education/fr.yml @@ -38,6 +38,8 @@ fr: schools: Écoles proposant cette formation teachers: Enseignants·es team: Équipe + content: Contenus de la formation + results: Indicateurs de résultats education/program/teacher: description: Description person: Personne @@ -81,6 +83,6 @@ fr: registration: "Délai d’accès : durée estimée entre la demande du bénéficiaire et le début de la prestation." pricing: Prix de la prestation ou conditions tarifaires. pedagogy: Modalités pédagogiques et/ou moyens et/ou outils utilisés pour mener à bien la prestation dispensée. - evaluation: Moyens mobilisés pour me- surer à l'aide de critères objectifs les acquis du bénéficiaire en cours et/ou à la fin de la prestation. + evaluation: Moyens mobilisés pour mesurer à l'aide de critères objectifs les acquis du bénéficiaire en cours et/ou à la fin de la prestation. accessibility: Conditions d'accueil et d’accès des publics en situation de handicap (locaux, adaptation des moyens de la prestation). description: Texte simple, sans HTML, pour le SEO