SAW - Permissible Value Finishing Changes

app/models/available_status.rb

@@ -25,6 +25,4 @@ class AvailableStatus < ApplicationRecord
 
   attr_accessor :new
   attr_accessor :position
-
-  TYPES = PermissibleValue.get_hash('status')
 end

app/models/permissible_value.rb

@@ -5,11 +5,6 @@ def self.get_value(category, key)
     PermissibleValue.where(category: category, key: key).first.try(:value)
   end
 
-  # Get an array of PermissibleValue values with the given category
-  def self.get_value_list(category)
-    PermissibleValue.where(category: category).pluck(:value)
-  end
-
   # Get an array of PermissibleValue keys with the given category
   def self.get_key_list(category, default=nil)
     unless default.nil?

app/models/study.rb

@@ -55,7 +55,7 @@ def populate_for_edit
 
   def setup_study_types
     position = 1
-    obj_names = StudyType::TYPES.map{|k,v| k}
+    obj_names = PermissibleValue.get_key_list('study_type')
     obj_names.each do |obj_name|
       study_type = study_types.detect{|obj| obj.name == obj_name}
       study_type = study_types.build(:name => obj_name, :new => true) unless study_type
@@ -88,7 +88,7 @@ def setup_impact_areas
 
   def setup_affiliations
     position = 1
-    obj_names = Affiliation::TYPES.map{|k,v| k}
+    obj_names = PermissibleValue.get_key_list('affiliation_type')
     obj_names.each do |obj_name|
       affiliation = affiliations.detect{|obj| obj.name == obj_name}
       affiliation = affiliations.build(:name => obj_name, :new => true) unless affiliation

app/views/dashboard/protocols/form/study_form_sections/_affiliations.html.haml

@@ -28,7 +28,7 @@
     = form.fields_for :affiliations, protocol.affiliations.sort_by(&:position) do |affiliations_form|
       - checked = !affiliations_form.object.new && !affiliations_form.object.marked_for_destruction?
       .form-group.row{ class: affiliations_form.object.name }
-        = affiliations_form.label :name, "#{Affiliation::TYPES[affiliations_form.object.name]}:", class: 'col-lg-2 control-label'
+        = affiliations_form.label :name, "#{PermissibleValue.get_value('affiliation_type', affiliations_form.object.name)}:", class: 'col-lg-2 control-label'
         .col-lg-1
           = affiliations_form.check_box "_destroy", { checked: checked, class: 'form-control' }, false, true
           = affiliations_form.hidden_field :name, value: affiliations_form.object.name

app/views/dashboard/protocols/form/study_form_sections/_study_type.html.haml

@@ -28,7 +28,7 @@
     = form.fields_for :study_types, protocol.study_types.sort_by(&:position) do |st_form|
       - checked = !st_form.object.new && !st_form.object.marked_for_destruction?
       .form-group.row{ class: st_form.object.name }
-        = st_form.label :name, "#{StudyType::TYPES[st_form.object.name]}:", class: 'col-lg-2 control-label'
+        = st_form.label :name, "#{PermissibleValue.get_value('study_type', st_form.object.name)}:", class: 'col-lg-2 control-label'
         .col-lg-1
           = st_form.check_box "_destroy", { checked: checked, class: 'form-control' }, false, true
           = st_form.hidden_field :name, value: st_form.object.name

app/views/protocols/form/study_form_sections/_affiliations.html.haml

@@ -28,7 +28,7 @@
     = form.fields_for :affiliations, protocol.affiliations.sort_by(&:position) do |affiliations_form|
       - checked = !affiliations_form.object.new && !affiliations_form.object.marked_for_destruction?
       .form-group.row{ class: affiliations_form.object.name }
-        = affiliations_form.label :name, "#{Affiliation::TYPES[affiliations_form.object.name]}:", class: 'col-lg-2 control-label'
+        = affiliations_form.label :name, "#{PermissibleValue.get_value('affiliation_type', affiliations_form.object.name)}:", class: 'col-lg-2 control-label'
         .col-lg-1
           = affiliations_form.check_box "_destroy", { checked: checked, class: 'form-control' }, false, true
           = affiliations_form.hidden_field :name, value: affiliations_form.object.name

app/views/protocols/form/study_form_sections/_study_type.html.haml

@@ -28,7 +28,7 @@
     = form.fields_for :study_types, protocol.study_types.sort_by(&:position) do |st_form|
       - checked = !st_form.object.new && !st_form.object.marked_for_destruction?
       .form-group.row{ class: st_form.object.name }
-        = st_form.label :name, "#{StudyType::TYPES[st_form.object.name]}:", class: 'col-lg-2 control-label'
+        = st_form.label :name, "#{PermissibleValue.get_value('study_type', st_form.object.name)}:", class: 'col-lg-2 control-label'
         .col-lg-1
           = st_form.check_box "_destroy", { checked: checked, class: 'form-control' }, false, true
           = st_form.hidden_field :name, value: st_form.object.name

app/views/protocols/view_details/_affiliations.html.haml

@@ -29,7 +29,7 @@
           %tr.row
             %td
               .col-lg-12
-                = "- " + Affiliation::TYPES[affiliation.name]
+                = "- " + PermissibleValue.get_value('affiliation_type', affiliation.name)
   - else
     .panel-body
       = render partial: 'shared/alert', locals: { message: t(:protocols)[:studies][:affiliations][:none] }

app/views/protocols/view_details/_study_type.html.haml

@@ -29,7 +29,7 @@
           %tr.row
             %td
               .col-lg-12
-                = "- " + StudyType::TYPES[study_type.name]
+                = "- " + PermissibleValue.get_value('study_type', study_type.name)
   - else
     .panel-body
       = render partial: 'shared/alert', locals: { message: t(:protocols)[:studies][:study_type][:none] }