issue #477 - Update Skin color at student forms and exclude the Skin …

…color model
gems-uff · Aug 15, 2024 · 427783f · 427783f
1 parent 6b08f20
commit 427783f
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 108 deletions.
diff --git a/app/controllers/skin_colors_controller.rb b/app/controllers/skin_colors_controller.rb
diff --git a/app/controllers/students_controller.rb b/app/controllers/students_controller.rb
@@ -9,7 +9,7 @@ class StudentsController < ApplicationController
   helper :student_majors
 
   UPDATE_FIELDS = [
-    :name, :photo, :sex, :civil_status, :birthdate, :city, :neighborhood,
+    :name, :photo, :sex, :civil_status, :skin_color, :birthdate, :city, :neighborhood,
     :address, :zip_code, :telephone1, :telephone2, :email, :employer,
     :job_position, :cpf, :identity_number, :identity_issuing_body,
     :identity_issuing_place, :identity_expedition_date, :birth_country,
@@ -44,6 +44,10 @@ class StudentsController < ApplicationController
     config.columns[:civil_status].options = {
       options: ["Solteiro(a)", "Casado(a)"]
     }
+    config.columns[:skin_color].form_ui = :select
+    config.columns[:skin_color].options = {
+      options: ["Não declarado", "Branca", "Preta",  "Parda", "Amarela", "Indígena"]
+    }
 
     config.columns[:student_majors].includes = [:majors, :student_majors]
 

diff --git a/app/models/skin_color.rb b/app/models/skin_color.rb
diff --git a/app/models/student.rb b/app/models/student.rb
@@ -23,7 +23,6 @@ class Student < ApplicationRecord
     class_name: "Country",
     foreign_key: "birth_country_id"
   belongs_to :user, optional: true
-  belongs_to :skin_color, optional: true
 
   has_many :student_majors, dependent: :destroy
   has_many :majors, through: :student_majors

diff --git a/config/locales/navigation.pt-BR.yml b/config/locales/navigation.pt-BR.yml
@@ -82,7 +82,6 @@ pt-BR:
       notification_log: Notificações Enviadas
       custom_variable: Variáveis
       report_configuration: Configurações de Relatório
-      skin_color: Cor de pele
 
     logout:
       label: 'Logout'
diff --git a/config/navigation.rb b/config/navigation.rb
@@ -231,7 +231,7 @@ def can_read?(*args)
 
     config_models = [
       User, Role, CustomVariable, Version, Notification,
-      NotificationLog, ReportConfiguration, EmailTemplate, SkinColor
+      NotificationLog, ReportConfiguration, EmailTemplate
     ]
     mainhelper.listitem :configurations, config_models do |submenu|
       submenu.modelitem User
@@ -243,7 +243,6 @@ def can_read?(*args)
       submenu.modelitem NotificationLog
       submenu.modelitem CustomVariable
       submenu.modelitem ReportConfiguration
-      submenu.modelitem SkinColor
     end
 
     mainhelper.item :logout, destroy_user_session_path

diff --git a/db/migrate/20240609002506_add_skin_color_to_student.rb b/db/migrate/20240609002506_add_skin_color_to_student.rb
@@ -0,0 +1,10 @@
+class AddSkinColorToStudent < ActiveRecord::Migration[7.0]
+  def up
+    add_column :students, :skin_color, :string
+    add_column :students, :pcd, :boolean
+  end
+  def down
+    remove_column :students, :skin_color
+    remove_column :students, :pcd
+  end
+end
diff --git a/db/migrate/20240609002506_create_skin_color.rb b/db/migrate/20240609002506_create_skin_color.rb
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -13269,11 +13269,4 @@
   { name: "Venus", state: State.find_by_code("TO") },
   { name: "Wanderlandia", state: State.find_by_code("TO") },
   { name: "Xambioa", state: State.find_by_code("TO") },
-])
-SkinColor.create([
-                   {name: "Preta"},
-                   {name: "Branco"},
-                   {name: "Pardo"},
-                   {name: "Indígena"},
-                   {name: "Não declarado"},
-                 ])
+])
diff --git a/spec/factories/factory_skin_color.rb b/spec/factories/factory_skin_color.rb