#1785 - admins can add/edit phone numbers for all users

app/controllers/casa_admins_controller.rb

@@ -123,6 +123,6 @@ def set_admin
   end
 
   def update_casa_admin_params
-    CasaAdminParameters.new(params).with_only(:email, :display_name)
+    CasaAdminParameters.new(params).with_only(:email, :display_name, :phone_number)
   end
 end

app/controllers/users_controller.rb

@@ -60,9 +60,9 @@ def update_user_password
 
   def user_params
     if current_user.casa_admin?
-      params.require(:user).permit(:email, :display_name, :receive_sms_notifications, :receive_email_notifications)
+      params.require(:user).permit(:email, :display_name, :phone_number, :receive_sms_notifications, :receive_email_notifications)
     else
-      params.require(:user).permit(:display_name, :receive_sms_notifications, :receive_email_notifications)
+      params.require(:user).permit(:display_name, :phone_number, :receive_sms_notifications, :receive_email_notifications)
     end
   end
 

app/models/casa_admin.rb

@@ -46,7 +46,7 @@ def change_to_supervisor!
 #  created_at                  :datetime         not null
 #  updated_at                  :datetime         not null
 #  casa_org_id                 :bigint           not null
-#  invited_by_id               :bigint
+#  invited_by_id               :integer
 #
 # Indexes
 #

app/models/casa_case_contact_type.rb

@@ -13,8 +13,8 @@ class CasaCaseContactType < ApplicationRecord
 #  id              :bigint           not null, primary key
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
-#  casa_case_id    :bigint           not null
-#  contact_type_id :bigint           not null
+#  casa_case_id    :integer          not null
+#  contact_type_id :integer          not null
 #
 # Indexes
 #

app/models/case_assignment.rb

@@ -37,8 +37,8 @@ def casa_case_and_volunteer_must_belong_to_same_casa_org
 #  active       :boolean          default(TRUE), not null
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
-#  casa_case_id :bigint           not null
-#  volunteer_id :bigint           not null
+#  casa_case_id :integer          not null
+#  volunteer_id :integer          not null
 #
 # Indexes
 #

app/models/case_contact.rb

@@ -215,8 +215,8 @@ def self.options_for_sorted_by
 #  want_driving_reimbursement :boolean          default(FALSE)
 #  created_at                 :datetime         not null
 #  updated_at                 :datetime         not null
-#  casa_case_id               :bigint           not null
-#  creator_id                 :bigint           not null
+#  casa_case_id               :integer          not null
+#  creator_id                 :integer          not null
 #
 # Indexes
 #

app/models/case_contact_contact_type.rb

@@ -13,8 +13,8 @@ class CaseContactContactType < ApplicationRecord
 #  id              :bigint           not null, primary key
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
-#  case_contact_id :bigint           not null
-#  contact_type_id :bigint           not null
+#  case_contact_id :integer          not null
+#  contact_type_id :integer          not null
 #
 # Indexes
 #

app/models/contact_type.rb

@@ -22,7 +22,7 @@ class ContactType < ApplicationRecord
 #  name                  :string           not null
 #  created_at            :datetime         not null
 #  updated_at            :datetime         not null
-#  contact_type_group_id :bigint           not null
+#  contact_type_group_id :integer          not null
 #
 # Indexes
 #

app/models/contact_type_group.rb

@@ -22,7 +22,7 @@ class ContactTypeGroup < ApplicationRecord
 #  name        :string           not null
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
-#  casa_org_id :bigint           not null
+#  casa_org_id :integer          not null
 #
 # Indexes
 #

app/models/court_date.rb

@@ -73,7 +73,7 @@ def case_court_orders_context_hash
 #  date            :datetime         not null
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
-#  casa_case_id    :bigint           not null
+#  casa_case_id    :integer          not null
 #  hearing_type_id :bigint
 #  judge_id        :bigint
 #

app/models/emancipation_option.rb

@@ -24,7 +24,7 @@ class EmancipationOption < ApplicationRecord
 #  name                     :string           not null
 #  created_at               :datetime         not null
 #  updated_at               :datetime         not null
-#  emancipation_category_id :bigint           not null
+#  emancipation_category_id :integer          not null
 #
 # Indexes
 #

app/models/hearing_type.rb

@@ -17,7 +17,7 @@ class HearingType < ApplicationRecord
 #  id          :bigint           not null, primary key
 #  active      :boolean          default(TRUE), not null
 #  name        :string           not null
-#  casa_org_id :bigint           not null
+#  casa_org_id :integer          not null
 #
 # Indexes
 #

app/models/judge.rb

@@ -18,7 +18,7 @@ class Judge < ApplicationRecord
 #  name        :string
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
-#  casa_org_id :bigint           not null
+#  casa_org_id :integer          not null
 #
 # Indexes
 #

app/models/supervisor.rb

@@ -73,7 +73,7 @@ def recently_unassigned_volunteers
 #  created_at                  :datetime         not null
 #  updated_at                  :datetime         not null
 #  casa_org_id                 :bigint           not null
-#  invited_by_id               :bigint
+#  invited_by_id               :integer
 #
 # Indexes
 #

app/models/supervisor_volunteer.rb

@@ -25,8 +25,8 @@ def ensure_supervisor_and_volunteer_belong_to_same_casa_org
 #  is_active     :boolean          default(TRUE)
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
-#  supervisor_id :bigint           not null
-#  volunteer_id  :bigint           not null
+#  supervisor_id :integer          not null
+#  volunteer_id  :integer          not null
 #
 # Indexes
 #

app/models/user.rb

@@ -12,6 +12,8 @@ class User < ApplicationRecord
 
   validates :email, presence: true
   validates :display_name, presence: true
+
+  validates_with UserValidator
   validate :at_least_one_communication_preference_selected
 
   belongs_to :casa_org
@@ -192,7 +194,7 @@ def last_deactivated_by
 #  created_at                  :datetime         not null
 #  updated_at                  :datetime         not null
 #  casa_org_id                 :bigint           not null
-#  invited_by_id               :bigint
+#  invited_by_id               :integer
 #
 # Indexes
 #

app/models/volunteer.rb

@@ -153,7 +153,7 @@ def cases_where_contact_made_in_days(num_days = CONTACT_MADE_IN_DAYS_NUM)
 #  created_at                  :datetime         not null
 #  updated_at                  :datetime         not null
 #  casa_org_id                 :bigint           not null
-#  invited_by_id               :bigint
+#  invited_by_id               :integer
 #
 # Indexes
 #

app/policies/user_policy.rb

@@ -25,6 +25,14 @@ def update_supervisor_name?
     update_supervisor_email?
   end
 
+  def update_user_setting?
+    if is_supervisor_same_org?
+      # allow access to own record or volunteer record
+      return record == user || record.volunteer?
+    end
+    is_admin?
+  end
+
   def edit_name?(viewed_user)
     is_admin? || viewed_user == user
   end

app/validators/user_validator.rb

@@ -1,29 +1,33 @@
 class UserValidator < ActiveModel::Validator
   VALID_PHONE_NUMBER_LENGTH = 12
   VALID_COUNTRY_CODE = "+1"
-  PHONE_NUMBER_ERROR = "Phone number is not in correct format: 1XXXXXXXXXX"
 
   def validate(record)
-    if !valid_phone_number_contents(record.phone_number)
-      record.errors.add(:phone_number, PHONE_NUMBER_ERROR)
-    end
+    valid_phone_number_contents(record.phone_number, record)
   end
 
   private
 
-  def valid_phone_number_contents(number)
+  def valid_phone_number_contents(number, record)
     if number.empty?
       return true
     end
 
     if number.length != VALID_PHONE_NUMBER_LENGTH
+      record.errors.add(:phone_number, " must be 12 digits including country code (+1)")
       return false
     end
 
     country_code = number[0..1]
     phone_number = number[2..number.length]
 
-    if country_code != VALID_COUNTRY_CODE || !phone_number.scan(/\D/).empty?
+    if country_code != VALID_COUNTRY_CODE
+      record.errors.add(:phone_number, " must have a valid country code (+1)")
+      return false
+    end
+
+    if !phone_number.scan(/\D/).empty?
+      record.errors.add(:phone_number, " must have correct format")
       return false
     end
 

app/values/user_parameters.rb

@@ -5,6 +5,7 @@ def initialize(params, key = :user)
         :email,
         :casa_org_id,
         :display_name,
+        :phone_number,
         :password,
         :active,
         :type

app/views/casa_admins/_form.html.erb

@@ -5,15 +5,7 @@
     <%= form_with(model: casa_admin, local: true) do |form| %>
       <%= render "/shared/error_messages", resource: casa_admin %>
 
-      <div class="field form-group">
-        <%= form.label :email, t("common.email") %>
-        <%= form.text_field :email, class: "form-control" %>
-      </div>
-
-      <div class="field form-group">
-        <%= form.label :display_name, t("common.display_name") %>
-        <%= form.text_field :display_name, class: "form-control" %>
-      </div>
+      <%= render "/shared/edit_form", resource: casa_admin, f: form %>
 
       <%= render "/shared/invite_login", resource: casa_admin %>
 

app/views/shared/_edit_form.html.erb

@@ -0,0 +1,26 @@
+<div class="field form-group">
+  <%= f.label :email, t("common.email") %>
+  <% if policy(resource).update_user_setting? %>
+    <%= f.text_field :email, class: "form-control" %>
+  <% else %>
+    <input class="form-control" type="text" placeholder="<%= resource.email %>" autocomplete="off" readonly>
+  <% end %>
+</div>
+
+<div class="field form-group">
+  <%= f.label :display_name, t("common.display_name") %>
+  <% if policy(resource).update_user_setting? %>
+    <%= f.text_field :display_name, class: "form-control" %>
+  <% else %>
+    <input class="form-control" type="text" placeholder="<%= resource.display_name %>" autocomplete="off" readonly>
+  <% end %>
+</div>
+
+<div class="field form-group">
+  <%= f.label :phone_number, t("common.phone_number") %>
+  <% if policy(resource).update_user_setting? %>
+    <%= f.text_field :phone_number, class: "form-control" %>
+  <% else %>
+    <input class="form-control" type="text" placeholder="<%= resource.phone_number %>" autocomplete="off" readonly>
+  <% end %>
+</div>

app/views/supervisors/edit.html.erb

@@ -5,23 +5,7 @@
     <%= form_for @supervisor, as: :supervisor, url: supervisor_path(@supervisor) do |form| %>
       <%= render "/shared/error_messages", resource: @supervisor %>
 
-      <div class="field form-group">
-        <%= form.label :email, t("common.email") %>
-        <% if policy(@supervisor).update_supervisor_email? %>
-          <%= form.text_field :email, class: "form-control" %>
-        <% else %>
-          <input class="form-control" type="text" placeholder="<%= @supervisor.email %>" autocomplete="off" readonly>
-        <% end %>
-      </div>
-
-      <div class="field form-group">
-        <%= form.label :display_name, t("common.display_name") %>
-        <% if policy(@supervisor).update_supervisor_name? %>
-          <%= form.text_field :display_name, class: "form-control" %>
-        <% else %>
-          <input class="form-control" type="text" placeholder="<%= @supervisor.display_name %>" autocomplete="off" readonly>
-        <% end %>
-      </div>
+      <%= render "/shared/edit_form", resource: @supervisor, f: form %>
 
       <p>
         <%= render "/shared/invite_login", resource: @supervisor %>

app/views/users/edit.html.erb

@@ -13,6 +13,11 @@
         <%= form.text_field :display_name, class: "form-control" %>
       </div>
 
+      <div class="field form-group">
+        <%= form.label :phone_number, t("common.phone_number") %>
+        <%= form.text_field :phone_number, class: "form-control" %>
+      </div>
+
       <%= form.hidden_field :casa_org_id, value: current_user.casa_org_id %>
 
       <%= render "/shared/invite_login", resource: current_user %>

app/views/volunteers/edit.html.erb

@@ -15,19 +15,7 @@
     <%= form_for @volunteer, url: volunteer_path(@volunteer) do |form| %>
       <%= render "/shared/error_messages", resource: @volunteer %>
 
-      <div class="field form-group">
-        <%= form.label :email, t("common.email") %>
-        <% if policy(:volunteer).update_volunteer_email? %>
-          <%= form.text_field :email, class: "form-control" %>
-        <% else %>
-          <input class="form-control" type="text" placeholder="<%= @volunteer.email %>" autocomplete="off" readonly>
-        <% end %>
-      </div>
-
-      <div class="field form-group">
-        <%= form.label :display_name, t("common.display_name") %>
-        <%= form.text_field :display_name, class: "form-control" %>
-      </div>
+      <%= render "/shared/edit_form", resource: @volunteer, f: form %>
 
       <%= render "/shared/invite_login", resource: @volunteer %>
 

config/locales/en.yml

@@ -94,6 +94,7 @@ en:
     email: Email
     name: Name
     display_name: Display name
+    phone_number: Phone number
     address: Address
   date:
     formats:

db/schema.rb

@@ -127,7 +127,6 @@
     t.string "footer_links", default: [], array: true
     t.string "slug"
     t.boolean "show_driving_reimbursement", default: true
-    t.boolean "show_fund_request", default: false
     t.index ["slug"], name: "index_casa_orgs_on_slug", unique: true
   end