Skip to content

Add Config to have budget bar hard pledges use appointment date instead of pledge sent at #3348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Add Config to have budget bar hard pledges use appointment date instead of pledge sent at #3348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be1f257
add config option
colinxfleming Feb 4, 2025
0f4978d
add to model
colinxfleming Feb 4, 2025
07049b8
Merge branch 'main' of github.com:DARIAEngineering/dcaf_case_manageme…
colinxfleming Feb 6, 2025
79f9eba
further config work
colinxfleming Feb 6, 2025
114f09e
working test, though not sure it works
colinxfleming Feb 6, 2025
bd6d149
test fixes
colinxfleming Feb 14, 2025
213b264
Merge branch 'main' of github.com:DARIAEngineering/dcaf_case_manageme…
colinxfleming Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
258 changes: 132 additions & 126 deletions app/models/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,22 @@ class Config < ApplicationRecord
practical_support_guidance_url: 'A link to a Google Drive folder with Practical Support resources. ' \
'Ex: https://drive.google.com/drive/my-practical_support',
fax_service: 'A link to your fax service. ex: https://www.efax.com',
start_of_week: "How to render your budget bar. Default is weekly starting on Monday. Enter \"Sunday\" for weekly budget starting on Sunday, or \"Monthly\" for a calendar month based budget.",
budget_bar_max: "The maximum for the budget bar. Defaults to 1000 if not set. Enter as a number with no dollar sign or commas.",
start_of_week: 'How to render your budget bar. Default is weekly starting on Monday. Enter "Sunday" for weekly budget starting on Sunday, or "Monthly" for a calendar month based budget.',
budget_bar_max: 'The maximum for the budget bar. Defaults to 1000 if not set. Enter as a number with no dollar sign or commas.',
hide_practical_support: 'Enter "yes" to hide the Practical Support panel on patient pages. This will not remove any existing data.',
days_to_keep_fulfilled_patients: "Number of days (after initial entry) to keep identifying information for a patient whose pledge has been fulfilled and marked audited. Defaults to 90 days (3 months).",
days_to_keep_all_patients: "Number of days (after initial entry) to keep identifying information for any patient, regardless of pledge fulfillment. Defaults to 365 days (1 year).",
shared_reset: "Number of idle days until a patient is removed from the shared list. Defaults to 6 days, maximum 6 weeks.",
days_to_keep_fulfilled_patients: 'Number of days (after initial entry) to keep identifying information for a patient whose pledge has been fulfilled and marked audited. Defaults to 90 days (3 months).',
days_to_keep_all_patients: 'Number of days (after initial entry) to keep identifying information for any patient, regardless of pledge fulfillment. Defaults to 365 days (1 year).',
shared_reset: 'Number of idle days until a patient is removed from the shared list. Defaults to 6 days, maximum 6 weeks.',
hide_budget_bar: 'Enter "yes" to hide the budget bar display.',
aggregate_statistics: 'Enter "yes" to show aggregate statistics on the budget bar.',
hide_standard_dropdown_values: 'Enter "yes" to hide standard dropdown values. Only custom options (specified on this page) will be used.',
time_zone: "Time zone to use for displaying dates. Default is Eastern. Valid options are Eastern, Central, Mountain, Pacific, Alaska, Hawaii, Arizona, Indiana (East), or Puerto Rico.",
procedure_type: "Any kind of distinction in procedure your fund would like to track. Field hides if no options " \
"are added here. Please separate with commas.",
time_zone: 'Time zone to use for displaying dates. Default is Eastern. Valid options are Eastern, Central, Mountain, Pacific, Alaska, Hawaii, Arizona, Indiana (East), or Puerto Rico.',
procedure_type: 'Any kind of distinction in procedure your fund would like to track. Field hides if no options ' \
'are added here. Please separate with commas.',
show_patient_identifier: 'Enter "yes" to show the patient\' Daria Identifier on the patient information tab.',
display_practical_support_attachment_url: 'CAUTION: Whether or not to allow people to enter attachment URLs for practical support entries; for example, a link to a file in Google Drive. Please ensure that any system storing these is properly secured by your fund!',
display_practical_support_waiver: 'For funds that use waivers for practical support recipients. Enables the display of a checkbox for indicating if a patient has signed a practical support waiver. '
display_practical_support_waiver: 'For funds that use waivers for practical support recipients. Enables the display of a checkbox for indicating if a patient has signed a practical support waiver.',
use_appointment_date_for_budget_bar_hard_pledges: 'Enter "yes" to tie the hard pledges (in green) on the budget bar to an Appointment Date, rather than date a pledge was sent.'
}.freeze

# Whether a config should show a current options dropdown to the right
Expand All @@ -40,7 +41,7 @@ class Config < ApplicationRecord
:practical_support,
:procedure_type,
:referred_by,
:voicemail,
:voicemail
]

enum :config_key, {
Expand Down Expand Up @@ -69,6 +70,7 @@ class Config < ApplicationRecord
show_patient_identifier: 22,
display_practical_support_attachment_url: 23,
display_practical_support_waiver: 24,
use_appointment_date_for_budget_bar_hard_pledges: 25
}

# which fields are URLs (run special validation only on those)
Expand Down Expand Up @@ -102,7 +104,7 @@ class Config < ApplicationRecord

start_of_week:
[:validate_singleton, :validate_start_of_week],
time_zone:
time_zone:
[:validate_singleton, :validate_time_zone],

hide_practical_support:
Expand Down Expand Up @@ -137,6 +139,8 @@ class Config < ApplicationRecord
[:validate_singleton, :validate_yes_or_no],
show_patient_id:
[:validate_singleton, :validate_yes_or_no],
use_appointment_date_for_budget_bar_hard_pledges:
[:validate_singleton, :validate_yes_or_no]
}.freeze

before_validation :clean_config_value
Expand All @@ -159,9 +163,7 @@ def help_text

def self.autosetup
config_keys.keys.each do |field|
if Config.where(config_key: field).count != 1
Config.create config_key: field
end
Config.create config_key: field if Config.where(config_key: field).count != 1
end
end

Expand All @@ -181,13 +183,13 @@ def self.hide_practical_support?

def self.start_day
start = Config.find_or_create_by(config_key: 'start_of_week').options.try :last
start ||= "monday"
start ||= 'monday'
start.downcase.to_sym
end

def self.time_zone
tz = Config.find_or_create_by(config_key: 'time_zone').options.try :last
tz ||= "Eastern"
tz ||= 'Eastern'
ActiveSupport::TimeZone.new(TIME_ZONE[tz])
end

Expand Down Expand Up @@ -236,145 +238,149 @@ def self.display_practical_support_waiver?
config_to_bool('display_practical_support_waiver')
end

def self.use_appointment_date_for_budget_bar_hard_pledges?
config_to_bool('use_appointment_date_for_budget_bar_hard_pledges')
end

private
### Generic Functions

def clean_config_value
# do nothing if empty
return if config_key.nil? || options.last.nil?
### Generic Functions

cleaners = CLEAN_PRE_VALIDATION[config_key.to_sym]
def clean_config_value
# do nothing if empty
return if config_key.nil? || options.last.nil?

# no clean function, return
return if cleaners.blank?
cleaners = CLEAN_PRE_VALIDATION[config_key.to_sym]

# we need to use `method` because `cleaner` is a symbol... this converts
# the symbol into a Method object, which we can then `call`...
# See https://ruby-doc.org/core/Object.html#method-i-method
cleaners.each { |cleaner| method(cleaner).call }
end
# no clean function, return
return if cleaners.blank?

# parent function. will handle errors; child validators should return true
# if value is valid for key, and false otherwise.
def validate_config
# don't try to validate if no key or no value
return if config_key.nil? || options.last.nil?
# we need to use `method` because `cleaner` is a symbol... this converts
# the symbol into a Method object, which we can then `call`...
# See https://ruby-doc.org/core/Object.html#method-i-method
cleaners.each { |cleaner| method(cleaner).call }
end

validators = VALIDATIONS[config_key.to_sym]
# parent function. will handle errors; child validators should return true
# if value is valid for key, and false otherwise.
def validate_config
# don't try to validate if no key or no value
return if config_key.nil? || options.last.nil?

# no validation for this field, ignore
return if validators.blank?
validators = VALIDATIONS[config_key.to_sym]

# run the validators and get a boolean, exit if all are true
# (see comment above in `clean_config_value` for an explainer)
return if validators.all? { |validator| method(validator).call }
# no validation for this field, ignore
return if validators.blank?

errors.add(:invalid_value_for,
"#{config_key.humanize(capitalize: false)}: #{options.join(', ')}")
end
# run the validators and get a boolean, exit if all are true
# (see comment above in `clean_config_value` for an explainer)
return if validators.all? { |validator| method(validator).call }

# generic cleaner for words (so we have standardized capitalization)
def fix_capitalization
config_value['options'] = options.map(&:capitalize)
end
errors.add(:invalid_value_for,
"#{config_key.humanize(capitalize: false)}: #{options.join(', ')}")
end

# similar to fix_capitalization but when we need titleized text (e.g. time zones)
def titleize_capitalization
config_value['options'] = options.map(&:titleize)
end
# generic cleaner for words (so we have standardized capitalization)
def fix_capitalization
config_value['options'] = options.map(&:capitalize)
end

# generic validator for numerics
def validate_number
options.last =~ /\A\d+\z/
end
# similar to fix_capitalization but when we need titleized text (e.g. time zones)
def titleize_capitalization
config_value['options'] = options.map(&:titleize)
end

# validator for singletons (no lists allowed)
def validate_singleton
options.length == 1
end
# generic validator for numerics
def validate_number
options.last =~ /\A\d+\z/
end

### URL fields
# validator for singletons (no lists allowed)
def validate_singleton
options.length == 1
end

def validate_url
maybe_url = options.last
return if maybe_url.blank?
### URL fields

return false unless maybe_url.length <= 300
def validate_url
maybe_url = options.last
return if maybe_url.blank?

url = UriService.new(maybe_url).uri
return false unless maybe_url.length <= 300

# uriservice returns nil if there's a problem.
return false if !url
url = UriService.new(maybe_url).uri

# uriservice returns nil if there's a problem.
return false unless url

config_value['options'] = [url]
return true
end
config_value['options'] = [url]
true
end

### Start of Week

START_OF_WEEK = [
"Monday",
"Tuesday",
"Wednesday",
"Thursday",
"Friday",
"Saturday",
"Sunday",
"Monthly"
].freeze

def validate_start_of_week
START_OF_WEEK.include?(options.last.capitalize)
end
### Start of Week

START_OF_WEEK = %w[
Monday
Tuesday
Wednesday
Thursday
Friday
Saturday
Sunday
Monthly
].freeze

def validate_start_of_week
START_OF_WEEK.include?(options.last.capitalize)
end

### Time zone

TIME_ZONE = {
"Eastern": "Eastern Time (US & Canada)",
"Central": "Central Time (US & Canada)",
"Mountain": "Mountain Time (US & Canada)",
"Pacific": "Pacific Time (US & Canada)",
"Alaska": "Alaska",
"Hawaii": "Hawaii",
"Arizona": "Arizona",
"Indiana (East)": "Indiana (East)",
"Puerto Rico": "Puerto Rico"
}.stringify_keys!

def validate_time_zone
TIME_ZONE.keys.include?(options.last.titleize)
end
### Time zone

TIME_ZONE = {
"Eastern": 'Eastern Time (US & Canada)',
"Central": 'Central Time (US & Canada)',
"Mountain": 'Mountain Time (US & Canada)',
"Pacific": 'Pacific Time (US & Canada)',
"Alaska": 'Alaska',
"Hawaii": 'Hawaii',
"Arizona": 'Arizona',
"Indiana (East)": 'Indiana (East)',
"Puerto Rico": 'Puerto Rico'
}.stringify_keys!

def validate_time_zone
TIME_ZONE.keys.include?(options.last.titleize)
end

### Practical support
### Practical support

def validate_yes_or_no
# allow yes or no, to be nice (technically only yes is considered)
options.last =~ /\A(yes|no)\z/i
end
def validate_yes_or_no
# allow yes or no, to be nice (technically only yes is considered)
options.last =~ /\A(yes|no)\z/i
end

### Patient archive
ARCHIVE_MIN_DAYS = 60 # 2 months
ARCHIVE_MAX_DAYS = 550 # 1.5 years
### Patient archive
ARCHIVE_MIN_DAYS = 60 # 2 months
ARCHIVE_MAX_DAYS = 550 # 1.5 years

def validate_patient_archive
validate_number && options.last.to_i.between?(ARCHIVE_MIN_DAYS, ARCHIVE_MAX_DAYS)
end
def validate_patient_archive
validate_number && options.last.to_i.between?(ARCHIVE_MIN_DAYS, ARCHIVE_MAX_DAYS)
end

### shared reset
SHARED_MIN_DAYS = 2 # 2 days
SHARED_MAX_DAYS = 7 * 6 # 6 weeks
### shared reset
SHARED_MIN_DAYS = 2 # 2 days
SHARED_MAX_DAYS = 7 * 6 # 6 weeks

def validate_shared_reset
validate_number && options.last.to_i.between?(SHARED_MIN_DAYS, SHARED_MAX_DAYS)
end
def validate_shared_reset
validate_number && options.last.to_i.between?(SHARED_MIN_DAYS, SHARED_MAX_DAYS)
end

def validate_length
total_length = 0
options.each do |option|
total_length += option.length
return false if total_length > 4000
end
true
def validate_length
total_length = 0
options.each do |option|
total_length += option.length
return false if total_length > 4000
end
true
end
end
12 changes: 8 additions & 4 deletions app/models/patient.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,14 @@ def self.pledged_status_summary(line)
resolved_without_fund: [false, nil])
.where.not(fund_pledge: [0, nil])

patients = base.where(pledge_sent_at: start_of_period..)
.or(base.where(fund_pledged_at: start_of_period..))
.order(fund_pledged_at: :asc)
.select(*plucked_attrs)
if Config.use_appointment_date_for_budget_bar_hard_pledges?
patients = base.where(appointment_date: start_of_period..)
else
patients = base.where(pledge_sent_at: start_of_period..)
end
patients = patients.or(base.where(fund_pledged_at: start_of_period..))
Copy link
Member

@lomky lomky Mar 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this line will catch patients who are pledged this period with an appointment in later periods, so we need to add change the budget bar helper to mark them as soft pledged.

image

Actually as i'm thinking it over, how should we handle the soft pledges here? should soft pledges appear in the current period (when the pledge is created) or the one tied to the appointment date?

.order(fund_pledged_at: :asc)
.select(*plucked_attrs)

# Divide people up based on whether pledges have been sent or not
patients.each_with_object(sent: [], pledged: []) do |patient, summary|
Expand Down
19 changes: 19 additions & 0 deletions test/models/config_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,5 +362,24 @@ class ConfigTest < ActiveSupport::TestCase
end
end

describe '#use_appointment_date_for_budget_bar_hard_pledges?' do
it 'can return true' do
c = Config.find_or_create_by(config_key: 'use_appointment_date_for_budget_bar_hard_pledges')
c.config_value = { options: ["Yes"] }
c.save!
assert(Config.use_appointment_date_for_budget_bar_hard_pledges? == true)
end

it 'can return false' do
c = Config.find_or_create_by(config_key: 'use_appointment_date_for_budget_bar_hard_pledges')
c.config_value = { options: ["No"] }
c.save!
assert(Config.use_appointment_date_for_budget_bar_hard_pledges? == false)
end

it "returns false by default" do
assert(Config.use_appointment_date_for_budget_bar_hard_pledges? == false)
end
end
end
end
Loading