Promotions: navigation & exports

app/controllers/admin/education/academic_years_controller.rb → app/controllers/admin/administration/academic_years_controller.rb

@@ -1,5 +1,5 @@
-class Admin::Education::AcademicYearsController < Admin::Education::ApplicationController
-  load_and_authorize_resource class: Education::AcademicYear,
+class Admin::Administration::AcademicYearsController < Admin::Administration::ApplicationController
+  load_and_authorize_resource class: Administration::AcademicYear,
                               through: :current_university,
                               through_association: :academic_years
   include Admin::HasStaticAction
@@ -44,20 +44,20 @@ def update
 
   def destroy
     @academic_year.destroy
-    redirect_to education_academic_years_url,
+    redirect_to administration_academic_years_url,
                 notice: t('admin.successfully_destroyed_html', model: @academic_year.to_s)
   end
 
   protected
 
   def breadcrumb
     super
-    add_breadcrumb Education::AcademicYear.model_name.human(count: 2), admin_education_academic_years_path
+    add_breadcrumb Administration::AcademicYear.model_name.human(count: 2), admin_administration_academic_years_path
     breadcrumb_for @academic_year
   end
 
   def academic_year_params
-    params.require(:education_academic_year)
+    params.require(:administration_academic_year)
           .permit(:year)
           .merge(
             university_id: current_university.id

app/controllers/admin/administration/alumni/cohorts_controller.rb

@@ -24,7 +24,7 @@ def breadcrumb
     super
     add_breadcrumb University::Person::Alumnus.model_name.human(count: 2), admin_administration_alumni_path
     add_breadcrumb @alumnus.to_s_in(current_language), admin_administration_alumnus_path(@alumnus)
-    add_breadcrumb Education::Cohort.model_name.human(count: 2)
+    add_breadcrumb Administration::Cohort.model_name.human(count: 2)
   end
 
   def cohorts_params

app/controllers/admin/administration/alumni_controller.rb

@@ -9,8 +9,17 @@ def index
     @alumni = @alumni.filter_by(params[:filters], current_language)
                      .alumni
                      .ordered(current_language)
-                     .page(params[:page])
-    breadcrumb
+    respond_to do |format|
+      format.html {
+        @alumni = @alumni.page(params[:page])
+        breadcrumb
+      }
+      format.xlsx {
+        @alumni = @alumni.includes(:cohorts)
+        filename = "alumni-#{Time.now.strftime("%Y%m%d%H%M%S")}.xlsx"
+        response.headers['Content-Disposition'] = "attachment; filename=#{filename}"
+      }
+    end
   end
 
   def show

app/controllers/admin/administration/cohorts_controller.rb

@@ -0,0 +1,59 @@
+class Admin::Administration::CohortsController < Admin::Administration::ApplicationController
+  load_and_authorize_resource class: Administration::Cohort,
+                              through: :current_university,
+                              through_association: :administration_cohorts,
+                              except: :restore
+
+  include Admin::HasStaticAction
+  include Admin::Localizable
+
+  def index
+    @filtered = @cohorts.filter_by(params[:filters], current_language)
+    @cohorts = @filtered.at_lifecycle(params[:lifecycle], current_language)
+                        .ordered
+
+    respond_to do |format|
+      format.html {
+        @cohorts = @cohorts.page(params[:page])
+        breadcrumb
+      }
+      format.xlsx {
+        filename = "cohorts-#{Time.now.strftime("%Y%m%d%H%M%S")}.xlsx"
+        response.headers['Content-Disposition'] = "attachment; filename=#{filename}"
+      }
+    end
+  end
+
+  def show
+    breadcrumb
+  end
+
+  def destroy
+    program = @cohort.program
+    label = @cohort.to_s_in(current_language)
+    @cohort.destroy
+    redirect_back fallback_location: admin_administration_program_cohorts_path(program),
+                  notice: t('admin.successfully_destroyed_html', model: label)
+  end
+
+  def restore
+    @cohort = current_university.administration_cohorts.only_deleted.find(params[:id])
+    authorize!(:restore, @cohort)
+    @cohort.restore(recursive: true)
+    redirect_to admin_administration_cohort_path(@cohort),
+                notice: t('admin.successfully_restored_html', model: @cohort.to_s_in(current_language))
+  end
+
+  protected
+
+  def breadcrumb
+    super
+    add_breadcrumb Administration::Cohort.model_name.human(count: 2), admin_administration_cohorts_path
+    breadcrumb_for @cohort
+  end
+
+  def cohort_params
+    params.require(:administration_cohort)
+          .permit(:program_id, :academic_year_id, :name)
+  end
+end

app/controllers/admin/education/programs/cohorts_controller.rb

@@ -0,0 +1,31 @@
+class Admin::Education::Programs::CohortsController < Admin::Education::Programs::ApplicationController
+  load_and_authorize_resource class: Administration::Cohort, through: :program, through_association: :administration_cohorts
+
+  include Admin::Localizable
+
+  def index
+    @filtered = @cohorts.filter_by(params[:filters], current_language)
+    @cohorts = @filtered.at_lifecycle(params[:lifecycle], current_language)
+                        .ordered
+
+    respond_to do |format|
+      format.html {
+        @cohorts = @cohorts.page(params[:page])
+        breadcrumb
+      }
+      format.xlsx {
+        filename = "cohorts-#{Time.now.strftime("%Y%m%d%H%M%S")}.xlsx"
+        response.headers['Content-Disposition'] = "attachment; filename=#{filename}"
+        render "admin/administration/cohorts/index"
+      }
+    end
+  end
+
+  protected
+
+  def breadcrumb
+    super
+    add_breadcrumb Administration::Cohort.model_name.human(count: 2)
+  end
+
+end

app/controllers/admin/education/programs/parts_controller.rb

@@ -47,12 +47,6 @@ def certification_edit
     add_breadcrumb t('edit')
   end
 
-  def alumni
-    @cohorts = @program.cohorts.ordered
-    breadcrumb
-    add_breadcrumb University::Person::Alumnus.model_name.human(count: 2)
-  end
-
   protected
 
   def authorize_resource

app/controllers/admin/education/schools/cohorts_controller.rb

@@ -0,0 +1,31 @@
+class Admin::Education::Schools::CohortsController < Admin::Education::Schools::ApplicationController
+  load_and_authorize_resource class: Administration::Cohort, through: :school, through_association: :administration_cohorts
+
+  include Admin::Localizable
+
+  def index
+    @filtered = @cohorts.filter_by(params[:filters], current_language)
+    @cohorts = @filtered.at_lifecycle(params[:lifecycle], current_language)
+                        .ordered
+
+    respond_to do |format|
+      format.html {
+        @cohorts = @cohorts.page(params[:page])
+        breadcrumb
+      }
+      format.xlsx {
+        filename = "cohorts-#{Time.now.strftime("%Y%m%d%H%M%S")}.xlsx"
+        response.headers['Content-Disposition'] = "attachment; filename=#{filename}"
+        render "admin/administration/cohorts/index"
+      }
+    end
+  end
+
+  protected
+
+  def breadcrumb
+    super
+    add_breadcrumb Administration::Cohort.model_name.human(count: 2)
+  end
+
+end

app/controllers/admin/education/schools_controller.rb

@@ -20,6 +20,8 @@ def show
     @roles = @school.university_roles.ordered(current_language)
     @websites = @school.websites.ordered(current_language)
     @locations = @school.locations.ordered(current_language)
+    @cohorts = @school.cohorts.ordered(current_language)
+                              .page(params[:cohorts_page]).per(5)
     breadcrumb
   end
 

app/controllers/extranet/alumni/academic_years_controller.rb

@@ -1,14 +1,14 @@
 class Extranet::Alumni::AcademicYearsController < Extranet::Alumni::ApplicationController
   def index
-    @academic_years = current_extranet.about.education_academic_years
+    @academic_years = current_extranet.about.administration_academic_years
                                             .ordered(current_language)
                                             .page(params[:page])
     @count = @academic_years.total_count
     breadcrumb
   end
 
   def show
-    @academic_year =  current_extranet.about.education_academic_years
+    @academic_year =  current_extranet.about.administration_academic_years
                                             .find(params[:id])
     @cohorts =  @academic_year.cohorts_in_context(current_extranet.about)
                               .ordered(current_language)
@@ -24,6 +24,6 @@ def show
 
   def breadcrumb
     super
-    add_breadcrumb Education::AcademicYear.model_name.human(count: 2), alumni_education_academic_years_path
+    add_breadcrumb Administration::AcademicYear.model_name.human(count: 2), alumni_administration_academic_years_path
   end
 end

app/controllers/extranet/alumni/cohorts_controller.rb

@@ -1,7 +1,7 @@
 class Extranet::Alumni::CohortsController < Extranet::Alumni::ApplicationController
   def index
-    @facets = Education::Cohort::Facets.new params[:facets], {
-      model: current_extranet.about.education_cohorts,
+    @facets = Administration::Cohort::Facets.new params[:facets], {
+      model: current_extranet.about.administration_cohorts,
       about: current_extranet.about,
       language: current_language
     }
@@ -14,7 +14,7 @@ def index
   end
 
   def show
-    @cohort = current_extranet.about.education_cohorts
+    @cohort = current_extranet.about.administration_cohorts
                                     .find(params[:id])
     @l10n = @cohort.best_localization_for(current_language)
     @people =  @cohort.people
@@ -29,6 +29,6 @@ def show
 
   def breadcrumb
     super
-    add_breadcrumb Education::Cohort.model_name.human(count: 2), alumni_education_cohorts_path
+    add_breadcrumb Administration::Cohort.model_name.human(count: 2), alumni_administration_cohorts_path
   end
 end

app/controllers/extranet/home_controller.rb

@@ -20,7 +20,7 @@ def load_posts_variables
   end
 
   def load_alumni_variables
-    @cohorts =  current_extranet.about.education_cohorts
+    @cohorts =  current_extranet.about.administration_cohorts
                                       .ordered(current_language)
                                       .limit(5)
     @experiences =  current_extranet.about.university_person_experiences

app/controllers/extranet/pages_controller.rb

@@ -22,8 +22,8 @@ def data
     if current_extranet.has_feature?(:alumni)
       @metrics.concat [
         { value: current_extranet.alumni.count, name: University::Person::Alumnus.model_name.human(count: 2) },
-        { value: current_extranet.academic_years.count, name: Education::AcademicYear.model_name.human(count: 2) },
-        { value: current_extranet.cohorts.count, name: Education::Cohort.model_name.human(count: 2) },
+        { value: current_extranet.academic_years.count, name: Administration::AcademicYear.model_name.human(count: 2) },
+        { value: current_extranet.cohorts.count, name: Administration::Cohort.model_name.human(count: 2) },
         { value: current_extranet.about.university_person_alumni_organizations.count, name: University::Organization.model_name.human(count: 2) }
       ]
     end

app/jobs/truly_destroy_soft_deleted_records_job.rb

@@ -22,13 +22,13 @@ class TrulyDestroySoftDeletedRecordsJob < ApplicationJob
     Communication::Website::Portfolio::Project,
     Communication::Website::Portfolio::Project::Localization,
     Communication::Website::Post::Localization,
-    Education::AcademicYear,
-    Education::Cohort,
+    Administration::AcademicYear,
+    Administration::Cohort,
     Education::Diploma,
     Education::Program,
     Education::School,
-    Education::AcademicYear::Localization,
-    Education::Cohort::Localization,
+    Administration::AcademicYear::Localization,
+    Administration::Cohort::Localization,
     Education::Diploma::Localization,
     Education::Program::Localization,
     Education::School::Localization,

app/models/ability/admin.rb

@@ -30,8 +30,6 @@ def admin_education
     # Necessaire pour l'affichage des tableaux de bord
     # https://github.com/osunyorg/admin/pull/2491
     can :manage, University::Person::Localization::Teacher
-    can :manage, Education::AcademicYear, university_id: @user.university_id
-    can :manage, Education::Cohort, university_id: @user.university_id
     can :manage, Education::Diploma, university_id: @user.university_id
     can :manage, Education::Program, university_id: @user.university_id
     can :manage, Education::Program::Category, university_id: @user.university_id
@@ -99,8 +97,10 @@ def admin_communication_extranet
   def admin_administration
     # Necessaire pour l'affichage des tableaux de bord
     # https://github.com/osunyorg/admin/pull/2491
-    can :manage, University::Person::Alumnus
-    can :manage, Administration::Location
+    can :manage, University::Person::Alumnus, university_id: @user.university_id
+    can :manage, Administration::Location, university_id: @user.university_id
+    can :manage, Administration::AcademicYear, university_id: @user.university_id
+    can :manage, Administration::Cohort, university_id: @user.university_id
     can :read, Administration::Qualiopi
     can :read, Administration::Qualiopi::Criterion
     can :read, Administration::Qualiopi::Indicator

app/models/ability/alumni_manager.rb

@@ -12,8 +12,8 @@ def initialize(user)
     can :manage, Education::Program, university_id: @user.university_id
     can :manage, Education::Program::Category, university_id: @user.university_id
     can :manage, Education::School, university_id: @user.university_id
-    can :manage, Education::AcademicYear, university_id: @user.university_id
-    can :manage, Education::Cohort, university_id: @user.university_id
+    can :manage, Administration::AcademicYear, university_id: @user.university_id
+    can :manage, Administration::Cohort, university_id: @user.university_id
   end
 
   protected

app/models/administration.rb

@@ -9,7 +9,9 @@ def self.table_name_prefix
   def self.parts
     [
       [University::Person::Alumnus, :admin_administration_alumni_path],
+      [Administration::Cohort, :admin_administration_cohorts_path],
       [Administration::Location, :admin_administration_locations_path],
+      [Administration::AcademicYear, :admin_administration_academic_years_path],
       [Administration::Qualiopi, :admin_administration_qualiopi_criterions_path],
     ]
   end