Skip to content

Commit

Permalink
bs4 plan shopping family info & choose cov for HH pages (#3821)
Browse files Browse the repository at this point in the history
* create account page plus additional translations

* immigration doc partials

* translations for other clients

* don't touch FAA yet

* app scan warnings

* app scan warnings

* app scan issues

* starting to rubocop

* navigation helper rubocop

* fix brakeman, other text changes

* app scan flags

* sanitize links

* fix link

* devise translations

* fix devise translations

* devise translations

* devise translations

* devise translations

* devise translations

* devise translations

* reformat devide translations

* reformat devide translations

* reformat devide translations

* reformat devide translations

* redo devise translations

* id bad bullets

* id bad bullet

* id bad bullet

* id bad bullet text

* previous and continue buttons dryed out

* properly sanitize link

* fix for no ssn info text

* sign in text fix

* header contact number not clickable (#3812)

add missing href attribute to link

* fix personal info step 3 content (#3819)

* fix duplicate for, fix missing asterisk for home address fields with introduction of form builder helper that builds a text field which abstracts out setting required field and asterisk append

* update helper method to allow callers to not specify class param, fix contact_info_for in other translations

* remove unrelated changes

* update race legend subtitle to be inline (#3833)

move parenthetical to inline with legend title

* remove disagree placeholder text (#3831)

remove disagree_placeholder_text div

* fix auth and consent previous button layout (#3825)

* wrap progress button in vertically aligned flex box

* combines prev and continue link partial into one partial, updates consumers of the old partials to use the new one and keep functionality

* remove unneeded div

* remove unneeded argument

* ssn number mask format (#3824)

* add mask for ssn, add mask-ssn class on text field

* update class name to not be repetitive

* use preexisting input mask for ssn

* phone number mask format (#3823)

* add script tag for phone number mask, add phone_number class on text field, update placeholder to match expected format

* replace new mask with a call to inputMasks

* add missing underscore prefix to partial (#3840)

* right align header account links (#3832)

* add ml-auto class to link column

* remove unneeded span

* adds newline for each span

* remove ml-auto class from span and adds align-items-end to both columns

* unbold demo info questions (#3836)

* localize incarcerated and citizen strings, remove asterisk from tribe_member_2 to allow space and non-space cases, add new selector to allow for unbold form labels and legends

* remove asterisk from tribal_name translation

* use weight-n instead of new class for enforcing non-bold titles in form

* add class for immigrant doc labels

* replace header content (#3838)

add new devise entry for bs4 welcome message, update controller to drive the flash message using bs4 flag

* remove repeated header text (#3839)

add translations for user roles, remove fallback on role check in portal helper, use new translation keys in portal helper

* rubocop

* give continue buttons shared selectors

* resolve ticket 187618984 previous button underlined

* ridp agreement text bold

* disabled dob on more info

* session warning pop up

* privacy spacing

* add not sure for is applying coverage

* duplicated *s for aiant question

* load correct ridp partials

* show help shopping button

* progress nav buttons cleanup

* auto build feature branch on new changes

* fix failed validation page

* start fixing rspec failures

* continuing spec work

* continuing spec work

* more spec fixes

* ridp admin actions

* rubocop fixes

* fix warning

* make bs4 layout more conditional for dc

* bs4 flag for layouts already using bs4 layout

* wlecome controller

* rubocop

* fix address and contact row spacing (#3843)

* use margin bottom 2 for first address and contact rows, wrap address hidden fields in span to lose input + label styling

* remove span, update selector to disregard hidden inputs

* fix contact method alert (#3851)

* adds localized string for contact options, update checkbox setup to use unique ids for each option and localize the label, adds missing class on BS4 checkbox span

* adds check for non-person which crashed on null check and stopped further validations in the call

* remove checked call in combined get

* unbold personal info immigration fields (#3852)

add weight-n to other status questions legend and all missing immigration doc labels

* remove extra personal info contact text (#3850)

* fix fonts, more ridp work started

* remove unneeded please provide disclaimer label

* remove weird merge tag

---------

Co-authored-by: Kristin Merbach <[email protected]>

* hide id in pre login (#3849)

update translation to just be id, update account display to only show id substring when present

* fix label for verified state (#3865)

update new verification helper to return the string matching legacy for valid case

* remove personal info step in consumer signup (#3863)

cherry pick old changes

* use warning banner for no match (#3861)

* update content for bs4, use warning banner

* padding updates

* rename translation key

* add text for missing immigrant status labels (#3864)

* adds hardcoded text for missing localized keys

* add translations for content

* move not sure link below radios (#3870)

* use grid for is_applying_for_cov elements

* remove rows and reorganize classes

* add asterisk to address line 1 and zip in personal info (#3820)

* add builder to use for DRYing creation of required text fields with asterisks

* update address 1, address 2, city, and zip fields to use the new text_field builder, update zip field to have asterisk

* localize city

* makes placeholder a required keyword param

* rename to RequirableFormBuilder, update helper to maintain both the field/select element and its label, moves asterisk to label per specs

* fixe merge order so that params override options

* remove formbuilder and hardcode asterisks in markup

* fix trailing whitespace, remove county translation

* restore add 1 class

* use required class for required fields

* add required attr for city

* add disabled class to continue link (#3872)

* add disabled class to link, remove extraneous if in button

* restores disabled if for button case

* fix missing document faq button (#3877)

* 187579400 update flash (#3854)

* add BS4 view to flash partial

* updates flash partial for bs4, updates progress and bs4 layouts to render new flash

* fix underscore on close button

* close icon work

* white space fix

* map legacy alert type to bs4, update flash layout to work well with larger messages, accessibility updates

* add success case, more whitespace cleanup

* update alert-error to use correct border and add error icon

* move container out of layout, update padding on header to match footer

* update padding and margins on flash

* simplify flash in progress layout now that we have flash in its own container

* unrelated fix for failed validations, replace old alert style, add missing legacy style in BS4 flash style map, add new alert style, update flash margin,

* adds @bs4 arguments for render_flash calls and restores horizontal status in bs4 layout

* rename flash type helper method

* update info step 1 banner (#3860)

* adds warning option to DOB error, updates error_messages partial to handle error option and use new UI

* remove left padding for list in alert

* remove unneeded classes

* remove padding style

* updates classes for error banner to match mockups

* move flash into content column for progress layout, remove mt class from flash to allow layouts to drive top margin

* ridp default select agree (#3878)

add selected args for radio buttons

* resolve spacing issues (#3875)

* fix spacing, style the info to match other info boxes

* more spacing

* consolidate spacing classes

* session modal styling (#3874)

* session modal styling

* remove unnecessary span

* consolidate spacing classes

* ridp waiting

* update upload doc verify identity modal (#3886)

* split modal partial for bs4, finish header

* add radios and upload/close buttons

* padding update

* update radio text to be blocked and centered with radio

* more padding and margin fixes

* padding update for info label

* use for to render radios

* add id

* remove unneeded value attr

* remove unneeded classes on button row

* refactor radio value and id

* use element name for legend

* removes for from legend

* remove row

* move btn-file selector to forms

* start moving FAA to use bootstrap 4 (#3855)

* fix fonts, more ridp work started

* start faa

* fix resolve layout

* fix resolve layout

* fix rebase issues

* pr requests and translations

---------

Signed-off-by: kristinmerbach <[email protected]>

* improve ridp status badges (#3884)

* temp

* improve ridp status badges

* improve encapsulation

* rename of vars

* rename vars 2.0

* ridp fixes for previous and log out links (#3879)

* ridp link fixes

* button link hovers shouldn't have underline

* fix add mailing address functionality (#3876)

* fix mailing address js

* remove console log

* add button for existing mailing addresses

* help me sign up flow bs4 conversion started (#3887)

* help me sign up flow started

* translations and search input

* wave issues

* translations

---------

Signed-off-by: kristinmerbach <[email protected]>

* fix fonts, more ridp work started

* choose cov page wip

* plan shopping progress bars updated

* plan shopping nav refactoring

* remove debug line

* choose cov for hh progress, added pg nav buttons for first flow

* family information page progress

* family information conversion, fixed progress nav buttons

* translation fixes

* removed debugging code

* convert to html.erb

* rebase cleanup

* removed duped code  & unnecessary vars, erb convert for ps compare modal

* fix link_to CSS vunerabilities

* baseline post convrsion

* plan shopping progress refactor

* Bootstrap misc bugfixes (#3895)

fixes for 6 bug tickets

* pr feedback, small fixes

* upgrade to bs4 base

* revert temp changes for design review to trunk

* add feature flag and switch consumer role controler layout

* personal information page redo

* feature flags, faa layouts

* bs4 footer

* fix for dynamic footer

* header wip, stable

* header progress

* sticky footer fix

* header logo update, move styling to new file

* add bs4 upgrade icons, collapsed header tweaks

* started family information

* privacy page and personal information, button mixin

* registration process

* more work on consumer flow

* fix semicolon

* client specific files re-organized

* authorization & consent page

* footer updates

* footer phone # fix

* authority & consent ridp page

* progress nav accessibility

* fix fonts, more ridp work started

* added ME colors, revert app controller flag

* ridp flow

* add new progress layout

* create account page plus additional translations

* immigration doc partials

* translations for other clients

* don't touch FAA yet

* app scan warnings

* app scan warnings

* app scan issues

* starting to rubocop

* navigation helper rubocop

* fix brakeman, other text changes

* app scan flags

* sanitize links

* fix link

* devise translations

* fix devise translations

* devise translations

* devise translations

* devise translations

* devise translations

* devise translations

* reformat devide translations

* reformat devide translations

* reformat devide translations

* reformat devide translations

* redo devise translations

* id bad bullets

* id bad bullet

* id bad bullet

* id bad bullet text

* previous and continue buttons dryed out

* properly sanitize link

* fix for no ssn info text

* sign in text fix

* header contact number not clickable (#3812)

add missing href attribute to link

* fix personal info step 3 content (#3819)

* fix duplicate for, fix missing asterisk for home address fields with introduction of form builder helper that builds a text field which abstracts out setting required field and asterisk append

* update helper method to allow callers to not specify class param, fix contact_info_for in other translations

* remove unrelated changes

* update race legend subtitle to be inline (#3833)

move parenthetical to inline with legend title

* remove disagree placeholder text (#3831)

remove disagree_placeholder_text div

* fix auth and consent previous button layout (#3825)

* wrap progress button in vertically aligned flex box

* combines prev and continue link partial into one partial, updates consumers of the old partials to use the new one and keep functionality

* remove unneeded div

* remove unneeded argument

* ssn number mask format (#3824)

* add mask for ssn, add mask-ssn class on text field

* update class name to not be repetitive

* use preexisting input mask for ssn

* phone number mask format (#3823)

* add script tag for phone number mask, add phone_number class on text field, update placeholder to match expected format

* replace new mask with a call to inputMasks

* add missing underscore prefix to partial (#3840)

* right align header account links (#3832)

* add ml-auto class to link column

* remove unneeded span

* adds newline for each span

* remove ml-auto class from span and adds align-items-end to both columns

* unbold demo info questions (#3836)

* localize incarcerated and citizen strings, remove asterisk from tribe_member_2 to allow space and non-space cases, add new selector to allow for unbold form labels and legends

* remove asterisk from tribal_name translation

* use weight-n instead of new class for enforcing non-bold titles in form

* add class for immigrant doc labels

* replace header content (#3838)

add new devise entry for bs4 welcome message, update controller to drive the flash message using bs4 flag

* remove repeated header text (#3839)

add translations for user roles, remove fallback on role check in portal helper, use new translation keys in portal helper

* rubocop

* give continue buttons shared selectors

* resolve ticket 187618984 previous button underlined

* ridp agreement text bold

* disabled dob on more info

* session warning pop up

* privacy spacing

* add not sure for is applying coverage

* duplicated *s for aiant question

* load correct ridp partials

* show help shopping button

* progress nav buttons cleanup

* auto build feature branch on new changes

* fix failed validation page

* start fixing rspec failures

* continuing spec work

* continuing spec work

* more spec fixes

* ridp admin actions

* rubocop fixes

* fix warning

* make bs4 layout more conditional for dc

* bs4 flag for layouts already using bs4 layout

* wlecome controller

* rubocop

* fix address and contact row spacing (#3843)

* use margin bottom 2 for first address and contact rows, wrap address hidden fields in span to lose input + label styling

* remove span, update selector to disregard hidden inputs

* fix contact method alert (#3851)

* adds localized string for contact options, update checkbox setup to use unique ids for each option and localize the label, adds missing class on BS4 checkbox span

* adds check for non-person which crashed on null check and stopped further validations in the call

* remove checked call in combined get

* unbold personal info immigration fields (#3852)

add weight-n to other status questions legend and all missing immigration doc labels

* remove extra personal info contact text (#3850)

* fix fonts, more ridp work started

* remove unneeded please provide disclaimer label

* remove weird merge tag

---------

Co-authored-by: Kristin Merbach <[email protected]>

* hide id in pre login (#3849)

update translation to just be id, update account display to only show id substring when present

* fix label for verified state (#3865)

update new verification helper to return the string matching legacy for valid case

* remove personal info step in consumer signup (#3863)

cherry pick old changes

* use warning banner for no match (#3861)

* update content for bs4, use warning banner

* padding updates

* rename translation key

* add text for missing immigrant status labels (#3864)

* adds hardcoded text for missing localized keys

* add translations for content

* move not sure link below radios (#3870)

* use grid for is_applying_for_cov elements

* remove rows and reorganize classes

* add asterisk to address line 1 and zip in personal info (#3820)

* add builder to use for DRYing creation of required text fields with asterisks

* update address 1, address 2, city, and zip fields to use the new text_field builder, update zip field to have asterisk

* localize city

* makes placeholder a required keyword param

* rename to RequirableFormBuilder, update helper to maintain both the field/select element and its label, moves asterisk to label per specs

* fixe merge order so that params override options

* remove formbuilder and hardcode asterisks in markup

* fix trailing whitespace, remove county translation

* restore add 1 class

* use required class for required fields

* add required attr for city

* add disabled class to continue link (#3872)

* add disabled class to link, remove extraneous if in button

* restores disabled if for button case

* fix missing document faq button (#3877)

* 187579400 update flash (#3854)

* add BS4 view to flash partial

* updates flash partial for bs4, updates progress and bs4 layouts to render new flash

* fix underscore on close button

* close icon work

* white space fix

* map legacy alert type to bs4, update flash layout to work well with larger messages, accessibility updates

* add success case, more whitespace cleanup

* update alert-error to use correct border and add error icon

* move container out of layout, update padding on header to match footer

* update padding and margins on flash

* simplify flash in progress layout now that we have flash in its own container

* unrelated fix for failed validations, replace old alert style, add missing legacy style in BS4 flash style map, add new alert style, update flash margin,

* adds @bs4 arguments for render_flash calls and restores horizontal status in bs4 layout

* rename flash type helper method

* update info step 1 banner (#3860)

* adds warning option to DOB error, updates error_messages partial to handle error option and use new UI

* remove left padding for list in alert

* remove unneeded classes

* remove padding style

* updates classes for error banner to match mockups

* move flash into content column for progress layout, remove mt class from flash to allow layouts to drive top margin

* ridp default select agree (#3878)

add selected args for radio buttons

* resolve spacing issues (#3875)

* fix spacing, style the info to match other info boxes

* more spacing

* consolidate spacing classes

* session modal styling (#3874)

* session modal styling

* remove unnecessary span

* consolidate spacing classes

* ridp waiting

* update upload doc verify identity modal (#3886)

* split modal partial for bs4, finish header

* add radios and upload/close buttons

* padding update

* update radio text to be blocked and centered with radio

* more padding and margin fixes

* padding update for info label

* use for to render radios

* add id

* remove unneeded value attr

* remove unneeded classes on button row

* refactor radio value and id

* use element name for legend

* removes for from legend

* remove row

* move btn-file selector to forms

* start moving FAA to use bootstrap 4 (#3855)

* fix fonts, more ridp work started

* start faa

* fix resolve layout

* fix resolve layout

* fix rebase issues

* pr requests and translations

---------

Signed-off-by: kristinmerbach <[email protected]>

* improve ridp status badges (#3884)

* temp

* improve ridp status badges

* improve encapsulation

* rename of vars

* rename vars 2.0

* ridp fixes for previous and log out links (#3879)

* ridp link fixes

* button link hovers shouldn't have underline

* fix add mailing address functionality (#3876)

* fix mailing address js

* remove console log

* add button for existing mailing addresses

* help me sign up flow bs4 conversion started (#3887)

* help me sign up flow started

* translations and search input

* wave issues

* translations

---------

Signed-off-by: kristinmerbach <[email protected]>

* Bootstrap misc bugfixes (#3895)

fixes for 6 bug tickets

* update bs4 content for dob personal info banner (#3883)

* update corner radius for bs4 alerts, localize dob error, switch on message when validating dob for bs4 flag

* use existing continue strings as substring in dob error

* add document list to verify identity (#3890)

* cleanup, move old list to bs4

* more list work

* layout cleanup

* more list work

* adds trash style

* destroy icon update

* adds js handling for delete

* add new js destroy

* indentation fixes

* adds aria

* use h6 for type

* fix header span

* indentation fixes, update fdish page with list changes as well

* add missing change from merge

* remove class

* refactor row classes to support mobile

* alpha tweak

* remove float-end

* remove align

* fix unmatched span

* remove align

* remove d-flex

* puts label and badge in col

* button refactor

* remove unneeded icon

* add remove padding

* margin fixes

* more layout fixes

* restore fdsh modal

* use insured modal for insured

* cleanup

* FAA eligibility results to bs4 (#3894)

* eligibility results

* waiting for eligibility

* wait for results

---------

Signed-off-by: kristinmerbach <[email protected]>

* add member to family fix

* main.scss brace fix, cleanup

* webpacker depreciation warning cleanup

* fix build error with calc

* revert sass depreciation fix attempt

* small transation & inline style fixes

* XSS fixes

---------

Signed-off-by: kristinmerbach <[email protected]>
Signed-off-by: Sarah Austin <[email protected]>
Co-authored-by: Kristin Merbach <[email protected]>
Co-authored-by: Charlie Parker <[email protected]>
Co-authored-by: kvootla <[email protected]>
Co-authored-by: Alec Turnbull <[email protected]>
Co-authored-by: kristinmerbach <[email protected]>
Co-authored-by: Alec Turnbull <[email protected]>
  • Loading branch information
7 people authored Jun 3, 2024
1 parent daa0a07 commit ced8d27
Show file tree
Hide file tree
Showing 52 changed files with 2,829 additions and 1,814 deletions.
7 changes: 3 additions & 4 deletions app/assets/javascripts/demographics_fields.js
Original file line number Diff line number Diff line change
Expand Up @@ -431,10 +431,9 @@ var PersonValidations = (function (window, undefined) {
var naturalized_citizen = document.getElementById('person_naturalized_citizen_true') || document.getElementById('naturalized_citizen_true');
return ( us_citizen.checked || naturalized_citizen.checked );
} else if (immigration_field) {
return (
document.getElementById('dependent_us_citizen_false').checked ||
document.getElementById('dependent_naturalized_citizen_true').checked
);
var us_citizen = document.getElementById('dependent_us_citizen_false') || document.getElementById('us_citizen_false');
var naturalized_citizen = document.getElementById('dependent_naturalized_citizen_true') || document.getElementById('naturalized_citizen_true');
return ( us_citizen.checked || naturalized_citizen.checked );
}
}

Expand Down
2 changes: 2 additions & 0 deletions app/controllers/insured/families_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ def personal
@person.consumer_role.build_nested_models_for_person if @person.is_consumer_role_active?
@person.resident_role.build_nested_models_for_person if @person.is_resident_role_active?
@resident = @person.is_resident_role_active?

@bs4 = true if params[:bs4] == "true"
respond_to do |format|
format.html
format.js
Expand Down
16 changes: 16 additions & 0 deletions app/controllers/insured/family_members_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ class Insured::FamilyMembersController < ApplicationController
include ApplicationHelper
include ::L10nHelper

layout 'progress', only: [:index] if EnrollRegistry.feature_enabled?(:bs4_consumer_flow)
before_action :enable_bs4_layout, only: [:index] if EnrollRegistry.feature_enabled?(:bs4_consumer_flow)

before_action :dependent_person_params, only: [:create, :update]
before_action :set_current_person
before_action :set_dependent_and_family, only: [:destroy, :show, :edit, :update]
Expand Down Expand Up @@ -59,6 +62,8 @@ def new

@dependent = ::Forms::FamilyMember.new(:family_id => family_id)
set_view_person

@bs4 = true if params[:bs4] == "true"
respond_to do |format|
format.html
format.js
Expand Down Expand Up @@ -97,6 +102,7 @@ def create
@created = true
consumer_role = @dependent.family_member.try(:person).try(:consumer_role)
fire_consumer_roles_create_for_vlp_docs(consumer_role) if consumer_role
@bs4 = true if params[:bs4] == "true"
respond_to do |format|
format.html { render 'show' }
format.js { render 'show' }
Expand Down Expand Up @@ -130,6 +136,8 @@ def show
authorize @family, :show?

set_view_person

@bs4 = true if params[:bs4] == "true"
respond_to do |format|
format.html
format.js
Expand All @@ -142,6 +150,8 @@ def edit
consumer_role = @dependent.family_member.try(:person).try(:consumer_role)
@vlp_doc_subject = get_vlp_doc_subject_by_consumer_role(consumer_role) if consumer_role.present?
set_view_person

@bs4 = true if params[:bs4] == "true"
respond_to do |format|
format.html
format.js
Expand All @@ -154,6 +164,8 @@ def update
@dependent.skip_consumer_role_callbacks = true
@address_errors = validate_address_params(params)

@bs4 = true if params[:bs4] == "true"

if @dependent.family_member.try(:person).present? && @dependent.family_member.try(:person).is_resident_role_active?
if @address_errors.blank? && @dependent.update_attributes(params[:dependent])
respond_to do |format|
Expand Down Expand Up @@ -373,4 +385,8 @@ def set_view_person

@person = @family.primary_person if @person != @family.primary_person
end

def enable_bs4_layout
@bs4 = true
end
end
8 changes: 8 additions & 0 deletions app/controllers/insured/group_selection_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ class Insured::GroupSelectionController < ApplicationController
include L10nHelper
include Insured::FamiliesHelper


layout 'progress', only: [:new] if EnrollRegistry.feature_enabled?(:bs4_consumer_flow)
before_action :enable_bs4_layout, only: [:new] if EnrollRegistry.feature_enabled?(:bs4_consumer_flow)

before_action :initialize_common_vars, only: [:new, :create, :terminate_selection]
before_action :validate_rating_address, only: [:create]
before_action :set_cache_headers, only: [:new, :edit_plan]
Expand Down Expand Up @@ -509,4 +513,8 @@ def update_tobacco_field(members)
member.update_attributes(tobacco_use: params["is_tobacco_user_#{id}"])
end
end

def enable_bs4_layout
@bs4 = true
end
end
4 changes: 2 additions & 2 deletions app/helpers/insured/family_members_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ def employee_dependent_form_id(model)

def employee_dependent_submission_options_for(model)
if model.try(:persisted?)
{ :remote => true, method: :put, :url => insured_family_member_path(id: model.id), :as => :dependent }
{ :remote => true, method: :put, :url => insured_family_member_path(id: model.id, bs4: @bs4), :as => :dependent }
else
{ :remote => true, method: :post, :url => insured_family_members_path, :as => :dependent }
{ :remote => true, method: :post, :url => insured_family_members_path(bs4: @bs4), :as => :dependent }
end
end

Expand Down
81 changes: 79 additions & 2 deletions app/helpers/navigation_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,87 @@ def local_assigned_boolean(local, default)
local == "true"
end

def family_info_progress_hash
if @change_plan.present?
qle_nav_options
elsif @type == "employee"
sep_nav_options
else
individual_nav_options
end
end

def plan_shopping_progress_hash
if @change_plan.blank? && @market_kind == "individual"
if @enrollment_kind.blank? && is_under_open_enrollment?
individual_nav_options
else
sep_nav_options
end
elsif @change_plan == "change_by_qle"
qle_nav_options
elsif @change_plan == "change_plan"
if (@market_kind == "individual" && !is_under_open_enrollment?) || @enrollment_kind == 'sep'
sep_shop_for_plans_nav_options
else
shop_for_plans_nav_options
end
end
end

def sign_up_nav_options
[
{step: 1, label: l10n('tell_us_about_yourself')},
{step: 2, label: l10n('family_info')}
{step: 1, page_key: :personal_info, display_label: l10n('tell_us_about_yourself')},
{step: 2, page_key: :family_info, display_label: l10n('family_info')}
]
end

def individual_nav_options
[
{step: 1, page_key: :personal_info, display_label: l10n('personal_information')},
{step: 2, page_key: :verify_identity, display_label: l10n('insured.consumer_roles.upload_ridp_documents.header')},
{step: 3, page_key: :household_info, display_label: l10n('household_info')},
{step: 4, page_key: :choose_plan, display_label: l10n('choose_plan')},
{step: 5, page_key: :review, display_label: l10n('confirm_selection')},
{step: 6, page_key: :complete, display_label: l10n('complete')}
]
end

def sep_nav_options
[
{step: 1, page_key: :personal_info, display_label: l10n('personal_information')},
{step: 2, page_key: :verify_identity, display_label: l10n('verify_identity')},
{step: 3, page_key: :household_info, display_label: l10n('household_info')},
{step: 4, page_key: :sep, display_label: l10n('insured.families.special_enrollment_period')},
{step: 5, page_key: :choose_plan, display_label: l10n('choose_plan')},
{step: 6, page_key: :review, display_label: l10n('confirm_selection')},
{step: 7, page_key: :complete, display_label: l10n('complete')}
]
end

def qle_nav_options
[
{step: 1, page_key: :household_info, display_label: l10n('household_info')},
{step: 2, page_key: :choose_plan, display_label: l10n('plan_selection')},
{step: 3, page_key: :review, display_label: l10n('review')},
{step: 4, page_key: :complete, display_label: l10n('complete')}
]
end

def sep_shop_for_plans_nav_options
[
{step: 1, page_key: :sep, display_label: l10n('insured.families.special_enrollment_period')},
{step: 2, page_key: :choose_plan, display_label: l10n('plan_selection')},
{step: 3, page_key: :review, display_label: l10n('review')},
{step: 4, page_key: :complete, display_label: l10n('complete')}
]
end

def shop_for_plans_nav_options
[
{step: 1, page_key: :choose_plan, display_label: l10n('plan_selection')},
{step: 2, page_key: :review, display_label: l10n('review')},
{step: 3, page_key: :complete, display_label: l10n('complete')}
]
end
end
7 changes: 2 additions & 5 deletions app/javascript/css/_buttons.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@

@mixin solid-button($button-color: var(--button-primary-color), $color: var(--grey-000), $hover: var(--button-primary-hover-color),
$active: var(--button-primary-active-color)) {
@mixin solid-button($button-color: var(--button-primary-color), $color: var(--grey-000), $hover: var(--button-primary-hover-color), $active: var(--button-primary-active-color)) {
background-color: $button-color;
font-weight: 600;
line-height: 20px;
Expand Down Expand Up @@ -33,8 +31,7 @@
}
}

@mixin ghost-button($button-color: var(--button-primary-color), $hover: var(--button-primary-hover-color),
$active: var(--button-primary-active-color)) {
@mixin ghost-button($button-color: var(--button-primary-color), $hover: var(--button-primary-hover-color), $active: var(--button-primary-active-color)) {
background-color: transparent;
font-weight: 600;
padding: 8px 12px;
Expand Down
4 changes: 3 additions & 1 deletion app/views/insured/families/_personal.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@
<% end %>
<script>
Freebies.floatlabels();
$('select').not('.no-selectric').selectric();
if (!disableSelectric) {
$("select[multiple!='multiple']").not('[name*="dataTable_length"], .chosen-select, .no-selectric').selectric();
}
</script>
28 changes: 20 additions & 8 deletions app/views/insured/families/personal.js.erb
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
$(".append_consumer_info").html("<%= escape_javascript(render partial: "personal")%>")
$("#jq_datepicker_ignore_person_dob").closest(".floatlabel-wrapper").hide();
$(".save_member").addClass('pull-right');
$('select').not('.no-selectric').selectric();
//$(".faa-row").addClass('hide');
// Had to extensively call this function because this is being called only on Document load.
// FAA specific case For Primary Demographic fields conditional edit.
demographicValidations();
<% if @bs4 %>
$(".append_consumer_info").html("<%= escape_javascript(render partial: "personal")%>");

$("#edit-primary-person").hide();
$("#primary-info-display").addClass('hidden');

// Had to extensively call this function because this is being called only on Document load.
// FAA specific case For Primary Demographic fields conditional edit.
demographicValidations();

<% else %>
$(".append_consumer_info").html("<%= escape_javascript(render partial: "personal")%>");
$("#jq_datepicker_ignore_person_dob").closest(".floatlabel-wrapper").hide();
$(".save_member").addClass('pull-right');
$('select').not('.no-selectric').selectric();
//$(".faa-row").addClass('hide');
// Had to extensively call this function because this is being called only on Document load.
// FAA specific case For Primary Demographic fields conditional edit.
demographicValidations();
<% end %>
99 changes: 65 additions & 34 deletions app/views/insured/family_members/_dependent.html.erb
Original file line number Diff line number Diff line change
@@ -1,44 +1,75 @@
<li id="add_member_list_<%= dependent.id %>" class="dependent_list">
<div id="add_info_<%= dependent.id %>">
<div class="dependent_notice_div_<%= dependent.id%>"></div>
<div class="row row-form-wrapper no-buffer">
<div class="col-md-4 col-sm-4 no-pd">
<div class="form-group form-group-lg">
<label class="static_label label-floatlabel">NAME</label>
<span class="field_value floatlabel form-control active-floatlabel"><%= "#{dependent.first_name} #{dependent.middle_name} #{dependent.last_name}"%></span>
<% if @bs4 %>
<div id="add_member_list_<%= dependent.id %>" class="dependent_list">
<h2><%= l10n('member') %> <%= local_assigns[:member_number] ? member_number : "" %></h2>
<div id="add_info_<%= dependent.id %>">
<div class="dependent_notice_div_<%= dependent.id%>"></div>

<div class="d-flex flex-row flex-wrap justify-content-between">
<div>
<label for="name"><%= l10n("name")%></label>
<input id="name" type="text" value="<%= "#{dependent.first_name} #{dependent.middle_name} #{dependent.last_name}"%>" disabled >
</div>
</div>
<div class="col-md-2 col-sm-4 no-pd">
<div class="form-group form-group-lg">
<label class="static_label label-floatlabel">AGE</label>
<span class="field_value floatlabel form-control active-floatlabel"><%= dependent.age_on(TimeKeeper.date_of_record) %></span>
<div>
<label for="age"><%= l10n("age")%></label>
<input id="age" type="text" value="<%= dependent.age_on(TimeKeeper.date_of_record) %>" disabled >
</div>
<div>
<label for="gender"><%= l10n("gender")%></label>
<input id="gender" type="text" value="<%= "#{dependent.gender.humanize}" %>" disabled >
</div>
<div>
<label for="relation"><%= l10n("relationship")%></label>
<input id="relation" type="text" value="<%= dependent.relationship.try(:humanize) %>" disabled >
</div>
</div>
<div class="col-md-3 col-sm-4 no-pd">
<div class="form-group form-group-lg">
<label class="static_label label-floatlabel"><%= l10n("gender").to_s.upcase %></label>
<span class="field_value floatlabel form-control active-floatlabel"><%= dependent.gender.try(:humanize) %></span>

<%= h(link_to l10n("edit_member"), main_app.edit_insured_family_member_path(dependent, {bs4: @bs4}), id: 'edit-dependent-person', remote: true, class: 'btn button outline close-2 my-3') %>

</div>
</div>
<% else %>
<li id="add_member_list_<%= dependent.id %>" class="dependent_list">
<div id="add_info_<%= dependent.id %>">
<div class="dependent_notice_div_<%= dependent.id%>"></div>
<div class="row row-form-wrapper no-buffer">
<div class="col-md-4 col-sm-4 no-pd">
<div class="form-group form-group-lg">
<label class="static_label label-floatlabel">NAME</label>
<span class="field_value floatlabel form-control active-floatlabel"><%= "#{dependent.first_name} #{dependent.middle_name} #{dependent.last_name}"%></span>
</div>
</div>
<div class="col-md-2 col-sm-4 no-pd">
<div class="form-group form-group-lg">
<label class="static_label label-floatlabel">AGE</label>
<span class="field_value floatlabel form-control active-floatlabel"><%= dependent.age_on(TimeKeeper.date_of_record) %></span>
</div>
</div>
<div class="col-md-3 col-sm-4 no-pd">
<div class="form-group form-group-lg">
<label class="static_label label-floatlabel"><%= l10n("gender").to_s.upcase %></label>
<span class="field_value floatlabel form-control active-floatlabel"><%= dependent.gender.try(:humanize) %></span>

</div>
</div>
</div>

<div class="col-md-3 col-sm-4 no-pd">
<div class="form-group form-group-lg">
<label class="static_label label-floatlabel"><%= l10n("relationship").to_s.upcase %></label>
<span class="field_value floatlabel form-control active-floatlabel"> <%= dependent.relationship.try(:humanize) %> </span>
<div class="text-right">
<a href="<%= main_app.edit_insured_family_member_path(dependent) %>" data-remote="true" class="close close-2">
<i class="fas fa-pencil-alt"><span class="hide"><%= l10n("edit") %></span></i>
</a>
<div class="col-md-3 col-sm-4 no-pd">
<div class="form-group form-group-lg">
<label class="static_label label-floatlabel"><%= l10n("relationship").to_s.upcase %></label>
<span class="field_value floatlabel form-control active-floatlabel"> <%= dependent.relationship.try(:humanize) %> </span>
<div class="text-right">
<a href="<%= main_app.edit_insured_family_member_path(dependent) %>" data-remote="true" class="close close-2">
<i class="fas fa-pencil-alt"><span class="hide"><%= l10n("edit") %></span></i>
</a>
</div>
</div>
</div>
</div>
</div>
<%#= yield "person_#{dependent&.person&.id}" %>
<%#= yield "person_#{dependent&.person&.id}" %>

<div class="clearfix"></div>
</div>
<script>
Freebies.floatlabels();
</script>
</li>
<div class="clearfix"></div>
</div>
<script>
Freebies.floatlabels();
</script>
</li>
<% end %>
Loading

0 comments on commit ced8d27

Please sign in to comment.