diff --git a/app/views/servers/_draw_server.html.erb b/app/views/servers/_draw_server.html.erb deleted file mode 100644 index 7467185f9..000000000 --- a/app/views/servers/_draw_server.html.erb +++ /dev/null @@ -1,42 +0,0 @@ -<% if server.modele.present? %> -
- <% slots_sur_modele = server.modele.composants.ordered.slots %> - - - <% slots_sur_modele.each do |slot| %> - - <% end %> - - - - <% slots_sur_modele.each do |slot| %> - - <% end %> - - -
<%= "Slot #{slot.position}" %>
- <% server.cards.where(composant_id: slot.id).each do |card| %> - <%= ports_by_card(port_type: card.card_type.port_type, - port_quantity: card.card_type.port_quantity, - ports_data: Port.where(card: card), - card_id: card.id) %> - <% end %> -
-
-<% end %> - - <%= link_to h(server.name), - server_path(server, view: params[:view]), - class: "fw-bold", - { data: { controller: "tooltip", bs_placement: "top" }, title: server.numero } %> - -<% if server.modele.present? %> -
- <%= link_to server.modele.try(:name), modele_path(server.modele) %> -
- <% alims_sur_modele = server.modele.composants.ordered.where(type_composant_id: 1) %> - <% alims_sur_modele.each_with_index do |composant_alim, i| %> - ALIM <%= i+1 %> - <% end %> -
-<% end %> diff --git a/db/migrate/20250305152636_drop_type_composants.rb b/db/migrate/20250305152636_drop_type_composants.rb index 63418e9ba..32e23a7c2 100644 --- a/db/migrate/20250305152636_drop_type_composants.rb +++ b/db/migrate/20250305152636_drop_type_composants.rb @@ -13,15 +13,15 @@ class MigrationComposant < ActiveRecord::Base class DropTypeComposants < ActiveRecord::Migration[8.0] def change up_only do - MigrationComposant.where(type_composant: MigrationTypeComposant.find_by(name: "SLOT")) + MigrationComposant.where(type_composant: MigrationTypeComposant.find_by(name: "SLOT")).destroy_all end revert do - add_reference :composants, :type_composants, foreign_key: true - create_table :type_composants do |t| # rubocop:disable Rails/CreateTableWithTimestamps t.string :name end + + add_reference :composants, :type_composant, foreign_key: true end end end diff --git a/db/schema.rb b/db/schema.rb index fd251eaae..ce9200d98 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[8.0].define(version: 2025_02_20_164333) do +ActiveRecord::Schema[8.0].define(version: 2025_03_05_152636) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" @@ -173,14 +173,12 @@ end create_table "composants", id: :serial, force: :cascade do |t| - t.integer "type_composant_id", null: false t.integer "position" t.datetime "created_at", precision: nil, null: false t.datetime "updated_at", precision: nil, null: false t.string "name" t.integer "enclosure_id" t.index ["enclosure_id"], name: "index_composants_on_enclosure_id" - t.index ["type_composant_id"], name: "index_composants_on_type_composant_id" end create_table "connections", id: :serial, force: :cascade do |t| @@ -481,10 +479,6 @@ t.integer "servers_count", default: 0, null: false end - create_table "type_composants", id: :serial, force: :cascade do |t| - t.string "name" - end - create_table "users", id: :serial, force: :cascade do |t| t.string "email", default: "", null: false t.string "encrypted_password", default: "", null: false @@ -534,7 +528,6 @@ add_foreign_key "bays", "manufacturers" add_foreign_key "card_types", "port_types" add_foreign_key "cards", "card_types" - add_foreign_key "composants", "type_composants" add_foreign_key "connections", "cables" add_foreign_key "contact_assignments", "contact_roles" add_foreign_key "contact_assignments", "contacts"