Issue #448

Gemfile.lock

@@ -469,6 +469,7 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.6.8)
       mini_portile2 (~> 2.8.0)
+    sqlite3 (1.6.8-x86_64-linux)
     ssrf_filter (1.1.2)
     stringio (3.1.1)
     thor (1.3.1)
@@ -503,6 +504,7 @@ GEM
 PLATFORMS
   ruby
   x86-mingw32
+  x86_64-linux
 
 DEPENDENCIES
   active_scaffold!

app/controllers/affiliation_controller.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AffiliationController < ApplicationController
+  authorize_resource
+
+  active_scaffold :affiliation do |config|
+    columns = [:professor, :institution, :start_date, :end_date]
+
+    config.list.columns = columns
+    config.create.columns = columns
+    config.update.columns = columns
+    config.show.columns = columns
+
+    config.columns[:professor].form_ui = :record_select
+    config.columns[:institution].form_ui = :record_select
+    config.columns[:start_date].form_ui = :date_picker
+    config.columns[:end_date].form_ui = :date_picker
+  end
+  record_select(
+    per_page: 10,
+    search_on: [:name],
+    order_by: "name",
+    full_text_search: true
+  )
+end

app/controllers/concerns/shared_pdf_concern.rb

@@ -41,7 +41,7 @@ def render_enrollments_academic_transcript_pdf(enrollment, filename = "transcrip
       .order("course_classes.year", "course_classes.semester")
 
     accomplished_phases = enrollment.accomplishments.order(:conclusion_date)
-
+    program_level = ProgramLevel.on_date(enrollment.thesis_defense_date)&.last&.level || ""
     render_to_string(
       template: "enrollments/academic_transcript_pdf",
       type: "application/pdf",
@@ -51,6 +51,7 @@ def render_enrollments_academic_transcript_pdf(enrollment, filename = "transcrip
         enrollment: enrollment,
         class_enrollments: class_enrollments,
         accomplished_phases: accomplished_phases,
+        program_level: program_level
       }
     )
   end

app/controllers/enrollments_controller.rb

@@ -215,6 +215,7 @@ def to_pdf
 
   def academic_transcript_pdf
     enrollment = Enrollment.find(params[:id])
+
     respond_to do |format|
       format.pdf do
         title = I18n.t("pdf_content.enrollment.academic_transcript.title")

app/controllers/professors_controller.rb

@@ -29,7 +29,6 @@ class ProfessorsController < ApplicationController
     config.columns[:civil_status].options = {
       options: [["Solteiro(a)", "solteiro"], ["Casado(a)", "casado"]]
     }
-    config.columns[:institution].form_ui = :record_select
     config.columns[:sex].form_ui = :select
     config.columns[:sex].options = { options: [["Masculino", "M"],
                                                ["Feminino", "F"]] }
@@ -53,9 +52,9 @@ class ProfessorsController < ApplicationController
       :address, :zip_code, :telephone1, :telephone2, :cpf,
       :identity_expedition_date, :identity_issuing_body,
       :identity_issuing_place, :identity_number, :enrollment_number,
-      :siape, :institution, :scholarships, :academic_title_level,
+      :siape, :scholarships, :academic_title_level,
       :academic_title_institution, :academic_title_country,
-      :academic_title_date, :obs, :professor_research_areas,
+      :academic_title_date, :obs, :professor_research_areas, :affiliations
     ]
 
     config.create.columns = form_columns
@@ -64,7 +63,7 @@ class ProfessorsController < ApplicationController
     config.show.columns = [
       :name, :email, :cpf, :birthdate, :address, :birthdate, :civil_status,
       :identity_expedition_date, :identity_issuing_body, :identity_number,
-      :neighborhood, :sex, :enrollment_number, :siape,
+      :neighborhood, :sex, :enrollment_number, :siape, :institutions,
       :telephone1, :telephone2, :zip_code, :scholarships,
       :advisement_authorizations, :advisements_with_points,
       :academic_title_level, :academic_title_institution,

app/controllers/program_levels_controller.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class ProgramLevelsController < ApplicationController
+  authorize_resource
+
+  active_scaffold :program_level do |config|
+    config.create.columns = [:level, :start_date, :end_date]
+    config.update.columns = [:level, :start_date, :end_date]
+    config.show.columns = [:level, :start_date, :end_date]
+    config.list.columns = [:level, :start_date, :end_date]
+
+    config.actions.swap :search, :field_search
+    config.columns.add :active
+    config.field_search.columns = [:active]
+    config.columns[:active].form_ui = :select
+
+    config.actions.exclude :deleted_records
+  end
+
+end

app/helpers/enrollments_helper.rb

@@ -261,8 +261,9 @@ def enrollment_thesis_defense_committee_participations_show_column(
     render(
       partial: "enrollments/show_defense_committee_table",
       locals: {
-        thesis_defense_committee_professors:
-          record.thesis_defense_committee_professors
+        thesis_defense_committee_professors: record.thesis_defense_committee_professors,
+        thesis_defense_date: record.thesis_defense_date,
+        dismissal_date: record.dismissal.date
       }
     )
   end

app/helpers/enrollments_pdf_helper.rb

@@ -132,12 +132,12 @@ def grades_report_header(pdf, options = {})
 
   def enrollment_header(pdf, options = {})
     enrollment ||= options[:enrollment]
+    program_level ||= options[:program_level]
     pdf.bounding_box([0, pdf.cursor - 3], width: 560) do
       pdf.font("FreeMono", size: 8) do
         pdf.line_width 0.5
-
         common_header_part1(pdf, enrollment, [
-          "#{i18n_eht(:program_level)} <b>#{CustomVariable.program_level} </b>"
+          "#{i18n_eht(:program_level)} <b>#{program_level}</b>"
         ])
 
         common_header_part(pdf) do
@@ -615,9 +615,12 @@ def thesis_table(curr_pdf, options = {})
             "#{I18n.t("pdf_content.enrollment.thesis.defense_committee")} "
           ]]
           thesis_desense_committee.each do |professor|
+            dismissal_date =  enrollment.dismissal.date
+            date = thesis_defense_date || dismissal_date
+            affiliation = Affiliation.professor_date(professor, date&.to_date)&.last
             data_table_rows_defense_committee += [[
               "<b>#{professor.name} / #{rescue_blank_text(
-                professor.institution, method_call: :name
+                affiliation&.institution, method_call: :name
               )}</b>"
             ]]
           end

app/helpers/professors_helper.rb

@@ -62,6 +62,38 @@ def professor_advisements_with_points_show_column(record, options)
     resp.html_safe
   end
 
+  def professor_institutions_show_column(record, options)
+    affiliations = record.affiliations
+    return "-" if affiliations.empty?
+
+    body = ""
+    count = 0
+    affiliations.each do |affiliation|
+      count += 1
+      tr_class = count.even? ? "even-record" : ""
+      body += "<tr class=\"record #{tr_class}\">
+                <td>#{affiliation.institution.name}</td>
+                <td>#{affiliation.start_date}</td>
+                <td>#{affiliation.end_date}</td>
+              </tr>"
+    end
+
+    resp =
+      "<table class=\"showtable listed-records-table\">
+        <thead>
+          <tr>
+            <th>#{I18n.t("activerecord.attributes.institution.name")}</th>
+            <th>#{I18n.t("activerecord.attributes.affiliation.start_date")}</th>
+            <th>#{I18n.t("activerecord.attributes.affiliation.end_date")}</th>
+          </tr>
+        </thead>
+        <tboby class=\"records\">
+        #{body}
+        </tbody>
+      </table>"
+    resp.html_safe
+  end
+
   def permit_rs_browse_params
     [:page, :update, :utf8]
   end

app/models/ability.rb

@@ -50,7 +50,7 @@ class Ability
   CONFIGURATION_MODELS = [
     User, Role, Version, Notification, EmailTemplate, Query, NotificationLog,
     CustomVariable, ReportConfiguration,
-    YearSemester
+    YearSemester, ProgramLevel
   ]
 
   def initialize(user)

app/models/affiliation.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Affiliation < ApplicationRecord
+  has_paper_trail
+
+  belongs_to :institution
+  belongs_to :professor
+
+  validates :start_date, presence: true
+  validates :end_date, presence: false
+  validates_uniqueness_of :start_date, scope: [:professor_id],
+                          allow_nil: true, allow_blank: true,
+                          message: "A afiliação só pode ser iniciada em uma data por professor"
+  validate :uniqueness_end_date
+
+  scope :on_date, ->(date) { where("DATE(start_date) <= ? AND (DATE(end_date) > ? OR end_date IS null)", date, date) }
+  scope :of_professor, ->(professor) { where(professor_id: professor.id) }
+  scope :professor_date, ->(professor, date) { of_professor(professor).on_date(date) }
+  scope :active, -> { where(end_date: nil) }
+
+  private
+    def uniqueness_end_date
+      exists = Affiliation.where(professor_id: professor_id, end_date: end_date).where.not(id: id).exists?
+      if exists
+        errors.add(:end_date,"Apenas uma afiliação pode estar ativa por professor e só pode ter uma data de fim por professor")
+      end
+      exists
+    end
+
+end

app/models/custom_variable.rb

@@ -12,7 +12,6 @@ class CustomVariable < ApplicationRecord
   VARIABLES = {
     "single_advisor_points" => :text,
     "multiple_advisor_points" => :text,
-    "program_level" => :text,
     "identity_issuing_country" => :text,
     "class_schedule_text" => :text,
     "redirect_email" => :text,
@@ -43,11 +42,6 @@ def self.multiple_advisor_points
     config.blank? ? 0.5 : config.value.to_f
   end
 
-  def self.program_level
-    config = CustomVariable.find_by_variable(:program_level)
-    config.blank? ? nil : config.value.to_i
-  end
-
   def self.identity_issuing_country
     config = CustomVariable.find_by_variable(:identity_issuing_country)
     config.blank? ? "" : config.value

app/models/institution.rb

@@ -8,7 +8,9 @@ class Institution < ApplicationRecord
   has_paper_trail
 
   has_many :majors, dependent: :restrict_with_exception
-  has_many :professors, dependent: :restrict_with_exception
+  has_many :affiliations
+  has_many :professors, through: :affiliations
+
 
   validates :name, presence: true, uniqueness: true
 

app/models/professor.rb

@@ -18,9 +18,11 @@ class Professor < ApplicationRecord
     dependent: :restrict_with_exception
   has_many :thesis_defense_committee_enrollments,
     source: :enrollment, through: :thesis_defense_committee_participations
+  has_many :affiliations, dependent: :destroy
+  has_many :institutions, through: :affiliations
+  accepts_nested_attributes_for :affiliations, allow_destroy: false, reject_if: :all_blank
 
   belongs_to :city, optional: true
-  belongs_to :institution, optional: true
   belongs_to :academic_title_country,
     optional: true,
     class_name: "Country",

app/models/program_level.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class ProgramLevel < ApplicationRecord
+  has_paper_trail
+
+  validates :level, presence: true, on: [:create, :update]
+  validates :start_date, presence: true, on: [:create, :update]
+  validates :end_date, presence: false
+
+  scope :active, -> { where(end_date: nil) }
+  scope :on_date, -> (date) { where("program_levels.start_date <= ? AND (program_levels.end_date > ? OR program_levels.end_date is null)", date, date)}
+
+end

app/views/enrollments/_show_defense_committee_table.html.erb

@@ -2,17 +2,18 @@
   <thead>
     <tr>
       <th><%= I18n.t("activerecord.attributes.professor.name") %></th>
-      <th><%= I18n.t("activerecord.attributes.professor.institution") %></th>
+      <th><%= I18n.t("activerecord.attributes.professor.institution.one") %></th>
     </tr>
   </thead>
   <tbody class="records">
     <% count = 0 %>
     <% thesis_defense_committee_professors.each do |professor| %>
       <% count += 1 %>
       <% tr_class = count.even? ? "even-record" : "" %>
+      <% date =  thesis_defense_date || dismissal_date %>
       <tr class="record <%= tr_class %>">
         <td><%= professor.name %></td>
-        <td><%= rescue_blank_text(professor.institution, method_call: :name) %></td>
+        <td><%= rescue_blank_text(Affiliation.professor_date(professor, date&.to_date)&.last&.institution, method_call: :name) %></td>
       </tr>
     <% end %>
   </tbody>

app/views/enrollments/academic_transcript_pdf.pdf.prawn

@@ -15,7 +15,7 @@ new_document(
 ) do |pdf|
   enrollment_student_header(pdf, enrollment: @enrollment)
 
-  enrollment_header(pdf, enrollment: @enrollment)
+  enrollment_header(pdf, enrollment: @enrollment, program_level: @program_level)
 
   transcript_table(pdf, class_enrollments: @class_enrollments)
 

app/views/student_enrollment/_show_dismissal.html.erb

@@ -34,7 +34,8 @@
     <% unless thesis_defense_committee_professors.empty? %>
       <h4><%= t "activerecord.attributes.enrollment.thesis_defense_committee_professors" %></h4>
       <%= render partial: "enrollments/show_defense_committee_table", locals: {
-        thesis_defense_committee_professors: thesis_defense_committee_professors
+        thesis_defense_committee_professors: thesis_defense_committee_professors,
+        thesis_defense_date: enrollment.thesis_defense_date,
       } %>
     <% end %>
   </details>

config/application.rb

@@ -35,9 +35,11 @@ class Application < Rails::Application
     # config.autoload_paths += %W(#{config.root}/extras)
     config.autoload_paths << "#{config.root}/lib"
 
+
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
     # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+    config.active_record.yaml_column_permitted_classes = [Symbol, Date, Time]
 
     # Activate observers that should always be running.
     # config.active_record.observers = :cacher, :garbage_collector, :forum_observer

config/locales/affiliation.pt-BR.yml

@@ -0,0 +1,17 @@
+# Copyright (c) Universidade Federal Fluminense (UFF).
+# This file is part of SAPOS. Please, consult the license terms in the LICENSE file.
+
+pt-BR:
+  activerecord:
+    attributes:
+      affiliation:
+        institution: "Instituição"
+        professor: "Professor"
+        start_date: "Data de início"
+        end_date: "Data de fim"
+        active: "Ativo"
+
+    models:
+      affiliation:
+        one: "Afiliação"
+        other: "Afiliações"

config/locales/institution.pt-BR.yml

@@ -8,6 +8,7 @@ pt-BR:
         code: "Sigla"
         majors: "Cursos"
         name: "Nome"
+        affiliations: "Afiliações"
 
     models:
       institution:

config/locales/navigation.pt-BR.yml

@@ -87,6 +87,7 @@ pt-BR:
       notification_log: Notificações Enviadas
       custom_variable: Variáveis
       report_configuration: Configurações de Relatório
+      program_level: Conceito CAPES
 
     logout:
       label: 'Logout'

config/locales/professor.pt-BR.yml

@@ -21,7 +21,11 @@ pt-BR:
         identity_issuing_body: "Órgão Expeditor"
         identity_issuing_place: "Local de Expedição"
         identity_number: "Número da identidade"
-        institution: "Instituição"
+        affiliations: "Afiliações"
+        institution:
+          one: "Instituição"
+          other: "Instituições"
+        institutions: "Instituições"
         name: "Nome"
         neighborhood: "Bairro"
         professor_research_areas: "Áreas de Pesquisa"