diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 795d08d17..aa0ea322f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.17 +current_version = 0.2.18 commit = True message = chore: bump covidcast-indicators to {new_version} tag = False diff --git a/ansible/templates/sir_complainsalot-params-prod.json.j2 b/ansible/templates/sir_complainsalot-params-prod.json.j2 index 032c5a78e..7a4dfae7b 100644 --- a/ansible/templates/sir_complainsalot-params-prod.json.j2 +++ b/ansible/templates/sir_complainsalot-params-prod.json.j2 @@ -67,6 +67,10 @@ "smoothed_felt_isolated_7d", "smoothed_wfelt_isolated_7d", "smoothed_worried_become_ill", "smoothed_wworried_become_ill", "smoothed_received_2_vaccine_doses", "smoothed_wreceived_2_vaccine_doses", + "smoothed_hesitancy_reason_dislike_vaccines", "smoothed_whesitancy_reason_dislike_vaccines", + "smoothed_inperson_school_fulltime", "smoothed_winperson_school_fulltime", + "smoothed_inperson_school_parttime", "smoothed_winperson_school_parttime", + "smoothed_vaccinate_children", "smoothed_wvaccinate_children", ["smoothed_vaccine_barrier_appointment_time_tried", "msa"], ["smoothed_wvaccine_barrier_appointment_time_tried", "msa"], ["smoothed_vaccine_barrier_childcare_tried", "msa"], ["smoothed_wvaccine_barrier_childcare_tried", "msa"], ["smoothed_vaccine_barrier_document_tried", "msa"], ["smoothed_wvaccine_barrier_document_tried", "msa"], diff --git a/facebook/delphiFacebook/R/variables.R b/facebook/delphiFacebook/R/variables.R index 0fb47e755..6baa4ca39 100644 --- a/facebook/delphiFacebook/R/variables.R +++ b/facebook/delphiFacebook/R/variables.R @@ -639,6 +639,12 @@ code_vaccines <- function(input_data, wave) { input_data$v_worried_vaccine_side_effects <- NA_real_ } + + # Wave V15a V15b V15c + # 11 Yes Yes No + # 12 No Yes Yes + # + # V15c replaces V15a as of Wave 12 if ( all(c("V15a", "V15b") %in% names(input_data)) ) { # introduced in Wave 11 vaccine_barriers <- coalesce(input_data$V15a, input_data$V15b) @@ -665,22 +671,10 @@ code_vaccines <- function(input_data, wave) { input_data$v_vaccine_barrier_time <- is_selected(vaccine_barriers, "10") input_data$v_vaccine_barrier_type <- is_selected(vaccine_barriers, "12") input_data$v_vaccine_barrier_none <- is_selected(vaccine_barriers, "11") - } else { - input_data$v_vaccine_barrier_eligible <- NA - input_data$v_vaccine_barrier_no_appointments <- NA - input_data$v_vaccine_barrier_appointment_time <- NA - input_data$v_vaccine_barrier_technical_difficulties <- NA - input_data$v_vaccine_barrier_document <- NA - input_data$v_vaccine_barrier_technology_access <- NA - input_data$v_vaccine_barrier_travel <- NA - input_data$v_vaccine_barrier_language <- NA - input_data$v_vaccine_barrier_childcare <- NA - input_data$v_vaccine_barrier_time <- NA - input_data$v_vaccine_barrier_type <- NA - input_data$v_vaccine_barrier_none <- NA - } - - if ( all(c("V15c", "V15b") %in% names(input_data)) ) { + + input_data$v_vaccine_barrier_appointment_location <- NA + input_data$v_vaccine_barrier_other <- NA + } else if ( all(c("V15c", "V15b") %in% names(input_data)) ) { # V15c introduced in Wave 12, replacing V15a with clarified wording. vaccine_barriers <- coalesce(input_data$V15c, input_data$V15b) vaccine_barriers <- ifelse(vaccine_barriers == "13", NA, vaccine_barriers) @@ -713,6 +707,7 @@ code_vaccines <- function(input_data, wave) { input_data$v_vaccine_barrier_time <- NA input_data$v_vaccine_barrier_type <- NA input_data$v_vaccine_barrier_none <- NA + input_data$v_vaccine_barrier_appointment_location <- NA input_data$v_vaccine_barrier_other <- NA } @@ -733,22 +728,10 @@ code_vaccines <- function(input_data, wave) { input_data$v_vaccine_barrier_time_has <- is_selected(vaccine_barriers, "10") input_data$v_vaccine_barrier_type_has <- is_selected(vaccine_barriers, "12") input_data$v_vaccine_barrier_none_has <- is_selected(vaccine_barriers, "11") - } else { - input_data$v_vaccine_barrier_eligible_has <- NA - input_data$v_vaccine_barrier_no_appointments_has <- NA - input_data$v_vaccine_barrier_appointment_time_has <- NA - input_data$v_vaccine_barrier_technical_difficulties_has <- NA - input_data$v_vaccine_barrier_document_has <- NA - input_data$v_vaccine_barrier_technology_access_has <- NA - input_data$v_vaccine_barrier_travel_has <- NA - input_data$v_vaccine_barrier_language_has <- NA - input_data$v_vaccine_barrier_childcare_has <- NA - input_data$v_vaccine_barrier_time_has <- NA - input_data$v_vaccine_barrier_type_has <- NA - input_data$v_vaccine_barrier_none_has <- NA - } - - if ( "V15c" %in% names(input_data) ) { + + input_data$v_vaccine_barrier_appointment_location_has <- NA + input_data$v_vaccine_barrier_other_has <- NA + } else if ( "V15c" %in% names(input_data) ) { # V15c introduced in Wave 12, replacing V15a with clarified wording. vaccine_barriers <- split_options(input_data$V15c) @@ -779,6 +762,7 @@ code_vaccines <- function(input_data, wave) { input_data$v_vaccine_barrier_time_has <- NA input_data$v_vaccine_barrier_type_has <- NA input_data$v_vaccine_barrier_none_has <- NA + input_data$v_vaccine_barrier_appointment_location_has <- NA input_data$v_vaccine_barrier_other_has <- NA } diff --git a/sir_complainsalot/params.json.template b/sir_complainsalot/params.json.template index fd1d7ab46..a09254f7f 100644 --- a/sir_complainsalot/params.json.template +++ b/sir_complainsalot/params.json.template @@ -67,6 +67,10 @@ "smoothed_felt_isolated_7d", "smoothed_wfelt_isolated_7d", "smoothed_worried_become_ill", "smoothed_wworried_become_ill", "smoothed_received_2_vaccine_doses", "smoothed_wreceived_2_vaccine_doses", + "smoothed_hesitancy_reason_dislike_vaccines", "smoothed_whesitancy_reason_dislike_vaccines", + "smoothed_inperson_school_fulltime", "smoothed_winperson_school_fulltime", + "smoothed_inperson_school_parttime", "smoothed_winperson_school_parttime", + "smoothed_vaccinate_children", "smoothed_wvaccinate_children", ["smoothed_vaccine_barrier_appointment_time_tried", "msa"], ["smoothed_wvaccine_barrier_appointment_time_tried", "msa"], ["smoothed_vaccine_barrier_childcare_tried", "msa"], ["smoothed_wvaccine_barrier_childcare_tried", "msa"], ["smoothed_vaccine_barrier_document_tried", "msa"], ["smoothed_wvaccine_barrier_document_tried", "msa"],