Diplôme ordonnables

app/controllers/admin/administration/locations_controller.rb

@@ -27,7 +27,6 @@ def edit
   end
 
   def create
-    @location.language_id = current_language.id
     if @location.save
       redirect_to [:admin, @location],
                   notice: t('admin.successfully_created_html', model: @location.to_s_in(current_language))

app/controllers/admin/education/diplomas_controller.rb

@@ -4,6 +4,7 @@ class Admin::Education::DiplomasController < Admin::Education::ApplicationContro
 
   include Admin::HasStaticAction
   include Admin::Localizable
+  include Admin::Reorderable
 
   def index
     @diplomas = @diplomas.ordered

app/controllers/admin/education/schools_controller.rb

@@ -29,7 +29,6 @@ def edit
   end
 
   def create
-    @school.language_id = current_language.id
     if @school.save
       redirect_to [:admin, @school], notice: t('admin.successfully_created_html', model: @school.to_s_in(current_language))
     else

app/models/communication/block.rb

@@ -33,10 +33,10 @@
 #
 class Communication::Block < ApplicationRecord
   include AsIndirectObject
+  include Orderable
   include WithAccessibility
   include WithHeadingRanks
   include WithHtmlClass
-  include WithPosition
   include WithTemplate
   include WithUniversity
   include Sanitizable

app/models/communication/block/heading.rb

@@ -29,9 +29,9 @@
 #
 class Communication::Block::Heading < ApplicationRecord
   include AsIndirectObject
+  include Orderable
   include Sanitizable
   include Sluggable
-  include WithPosition
   include WithUniversity
 
   belongs_to  :university

app/models/communication/website/agenda/category.rb

@@ -29,9 +29,9 @@
 class Communication::Website::Agenda::Category < ApplicationRecord
   include AsDirectObject
   include Localizable
+  include Orderable
   include Sanitizable
   include WithMenuItemTarget
-  include WithPosition
   include WithTree
   include WithUniversity
 

app/models/communication/website/menu/item.rb

@@ -33,8 +33,8 @@
 #
 class Communication::Website::Menu::Item < ApplicationRecord
   include Initials
+  include Orderable
   include Sanitizable
-  include WithPosition
   include WithTree
   include WithUniversity
 

app/models/communication/website/page.rb

@@ -35,12 +35,12 @@ class Communication::Website::Page < ApplicationRecord
   include AsDirectObject
   include Duplicable
   include Filterable
-  include Sanitizable
   include Localizable
+  include Orderable
+  include Sanitizable
   include WithAutomaticMenus
   include WithMenuItemTarget
   include WithSpecialPage # WithSpecialPage can set default publication status, so must be included before WithPublication
-  include WithPosition # Scope :ordered must override WithPublication
   include WithTree
   include WithUniversity
 

app/models/communication/website/post/category.rb

@@ -28,10 +28,10 @@
 #
 class Communication::Website::Post::Category < ApplicationRecord
   include AsDirectObject
-  include Sanitizable
   include Localizable
+  include Orderable
+  include Sanitizable
   include WithMenuItemTarget
-  include WithPosition
   include WithTree
   include WithUniversity
 

app/models/concerns/as_category.rb

@@ -2,7 +2,7 @@ module AsCategory
   extend ActiveSupport::Concern
 
   included do
-    include WithPosition
+    include Orderable
     include WithTree
 
     belongs_to  :parent,

app/models/concerns/with_position.rb → app/models/concerns/orderable.rb

@@ -1,4 +1,4 @@
-module WithPosition
+module Orderable
   extend ActiveSupport::Concern
 
   included do

app/models/education/diploma.rb

@@ -6,6 +6,7 @@
 #  certification :string
 #  ects          :integer
 #  level         :integer          default("not_applicable")
+#  position      :integer          default(0)
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
 #  university_id :uuid             not null, indexed
@@ -22,8 +23,9 @@ class Education::Diploma < ApplicationRecord
   CERTIFICATIONS_DIRECTORY = "app/assets/images/education/diplomas/certifications"
 
   include AsIndirectObject
-  include Sanitizable
   include Localizable
+  include Orderable
+  include Sanitizable
   include WithUniversity
 
   enum level: {
@@ -43,7 +45,7 @@ class Education::Diploma < ApplicationRecord
 
   validates :certification, inclusion: { in: -> { certifications } }, allow_blank: true
 
-  scope :ordered, -> (language = nil) { order(:level) }
+  scope :ordered, -> (language = nil) { order(:position, :level) }
 
   def self.certifications
     Dir.children(CERTIFICATIONS_DIRECTORY).map { |filename|

app/models/education/program.rb

@@ -31,13 +31,13 @@ class Education::Program < ApplicationRecord
   include AsIndirectObject
   include Filterable
   include Localizable
+  include Orderable
   include Sanitizable
   include WebsitesLinkable
   include WithAlumni
   include WithDiploma
   include WithLocations
   include WithMenuItemTarget
-  include WithPosition
   include WithSchools
   include WithTeam
   include WithTree
@@ -60,7 +60,7 @@ class Education::Program < ApplicationRecord
 
   before_destroy :move_children
 
-  # can't use LocalizableOrderByNameScope because scope ordered is already defined by WithPosition
+  # can't use LocalizableOrderByNameScope because scope ordered is already defined by Orderable
   scope :ordered_by_name, -> (language) {
     localization_name_select = <<-SQL
       COALESCE(

app/models/research/journal/paper.rb

@@ -36,8 +36,8 @@
 class Research::Journal::Paper < ApplicationRecord
   include AsIndirectObject
   include Localizable
+  include Orderable
   include Sanitizable
-  include WithPosition
   include WithUniversity
 
   belongs_to  :journal,

app/models/research/laboratory/axis.rb

@@ -22,9 +22,9 @@
 class Research::Laboratory::Axis < ApplicationRecord
   include Localizable
   include LocalizableOrderByNameScope
+  include Orderable
   include Sanitizable
   include WithUniversity
-  include WithPosition
 
   belongs_to  :laboratory,
               foreign_key: :research_laboratory_id

app/models/university/organization/category.rb

@@ -22,7 +22,7 @@
 class University::Organization::Category < ApplicationRecord
   include AsIndirectObject
   include Localizable
-  include WithPosition
+  include Orderable
   include WithTree
   include WithUniversity
 

app/models/university/person/category.rb

@@ -22,7 +22,7 @@
 class University::Person::Category < ApplicationRecord
   include AsIndirectObject
   include Localizable
-  include WithPosition
+  include Orderable
   include WithTree
   include WithUniversity
 

app/models/university/person/involvement.rb

@@ -25,7 +25,7 @@
 #
 class University::Person::Involvement < ApplicationRecord
   include Localizable
-  include WithPosition
+  include Orderable
   include WithUniversity
 
   enum kind: {

app/models/university/person/localization.rb

@@ -3,7 +3,7 @@
 # Table name: university_person_localizations
 #
 #  id               :uuid             not null, primary key
-#  biography        :string
+#  biography        :text
 #  first_name       :string
 #  last_name        :string
 #  linkedin         :string

app/models/university/role.rb

@@ -21,7 +21,7 @@
 #
 class University::Role < ApplicationRecord
   include Localizable
-  include WithPosition
+  include Orderable
   include WithUniversity
 
   # Can be an Education::School or an Education::Program

app/views/admin/administration/locations/static.html.erb

@@ -34,7 +34,7 @@ location.programs.each do |program|
 <% end %>
 diplomas:
 <%
-location.diplomas.each do |diploma|
+location.diplomas.ordered.each do |diploma|
   diploma_l10n = diploma.best_localization_for(language)
   programs = location.education_programs.where(diploma: diploma).root.ordered
   next if programs.empty?

app/views/admin/education/diplomas/_list.html.erb

@@ -1,6 +1,8 @@
-<div class="row g-2">
+<div  class="row g-2"
+      data-sortable 
+      data-sort-url="<%= reorder_admin_education_diplomas_path %>">
   <% diplomas.ordered.each do |diploma| %>
-    <div>
+    <div data-id="<%= diploma.id %>" class="handle">
       <div class="<%= osuny_card_classes(horizontal: true) %>">
         <%= osuny_thumbnail_localized diploma %>
         <div class="card-body">

config/routes/admin/education.rb

@@ -2,6 +2,9 @@
   resources :academic_years
   resources :cohorts, only: [:index, :show]
   resources :diplomas do
+    collection do
+      post :reorder
+    end
     member do
       get :static
     end

db/migrate/20241016094257_add_position_to_education_diplomas.rb

@@ -0,0 +1,5 @@
+class AddPositionToEducationDiplomas < ActiveRecord::Migration[7.1]
+  def change
+    add_column :education_diplomas, :position, :integer, default: 0
+  end
+end