Skip to content
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

Jump to bottom

Update question routing for new survey #62

Merged
merged 28 commits into from
Nov 29, 2023
Merged

Update question routing for new survey #62

Changes from 2 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
dbd6af2
Update question routing for new survey
ldavies99 Oct 18, 2023
113c38a
Fix trailing commas
ldavies99 Oct 25, 2023
d0d616a
Update R/question-routing.R
ldavies99 Oct 25, 2023
de64848
Update R/question-routing.R
ldavies99 Oct 25, 2023
d3e9196
Merge branch 'main' into question-routing
ldavies99 Oct 26, 2023
7c9db07
Merge branch 'question-routing' of https://github.com/best-practice-a…
ldavies99 Oct 26, 2023
206e1e3
Fix routing logic error
ldavies99 Oct 31, 2023
2596c50
Merge branch 'main' into question-routing
ldavies99 Nov 14, 2023
eaf4744
Make condition logic more clear
ldavies99 Nov 14, 2023
dd31d2c
Change test to use dummy data files
ldavies99 Nov 14, 2023
6c0aeee
Merge branch 'main' into question-routing
ldavies99 Nov 15, 2023
547d008
Remove row names
ldavies99 Nov 15, 2023
55fc543
Updated basic rap score with new col name (#63)
CHCRowley Nov 15, 2023
1b2befc
Removed test from text cols
CHCRowley Nov 15, 2023
b98f966
Removed index col
CHCRowley Nov 15, 2023
079407c
Fix question routing error
ldavies99 Nov 15, 2023
5234abe
Removed test string from optional Qs
CHCRowley Nov 15, 2023
a91c0b4
Fix errors in the routing
ldavies99 Nov 17, 2023
1497a86
Fixed erroneous NAs
CHCRowley Nov 20, 2023
3d04b18
Add exceptions for test in data
ldavies99 Nov 23, 2023
876d768
Corrected RAP champ NA logic
CHCRowley Nov 23, 2023
b2d53a4
Removed NA from dummy data Q28 and Q29
CHCRowley Nov 28, 2023
1997ac5
Fix not reading in clean data in question routing test
ldavies99 Nov 28, 2023
2fc75bd
Update docs
ldavies99 Nov 28, 2023
d4e122b
Merge branch 'main' into question-routing
ldavies99 Nov 28, 2023
58bac0b
Add dummy data code to data-raw
CHCRowley Nov 29, 2023
b2cf4ad
Remove unnecessary scripts
ldavies99 Nov 29, 2023
f3d5589
Add data to package
ldavies99 Nov 29, 2023
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
41 changes: 34 additions & 7 deletions R/question-routing.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,48 @@

apply_skip_logic <- function(data) {

conditions <- list(data$workplace %in% c("Civil service, including devolved administations", "test"),
conditions <- list(data$workplace != "NHS or local healthcare service",
data$workplace %in%
ldavies99 marked this conversation as resolved.
Show resolved Hide resolved
c("Civil service, including devolved administations",
ldavies99 marked this conversation as resolved.
Show resolved Hide resolved
"NHS or local healthcare service",
"test"),
data$department != "Office for National Statistics",
data$department %in% c("Office for National Statistics", "test"),
!is.na(data$ONS_directorate),
data$pay_band != "Local Authority or NJC",
data$pay_band != "Other / Not sure",
!is.na(data$NHS_band),
data$primary_work_country != "Scotland",
data$primary_work_country != "Wales",
data$primary_work_country != "Notherin Ireland",
ldavies99 marked this conversation as resolved.
Show resolved Hide resolved
!is.na(data$England_NHS_organisation),
!is.na(data$Scotland_NHS_organisation),
!is.na(data$Wales_NHS_organisation),
data$highest_qualification != "Any other qualification",
data$code_freq != "Never",
data$other_coding_experience != "No",
data$prev_coding_experience != "No",
data$heard_of_RAP != "No")
data$heard_of_RAP != "No",
data$have_RAP_champ %in% c("Yes", "test"))

skipped_cols <- list(colnames(data)[which(colnames(data) == "CS_grade"):which(colnames(data) == "ONS_directorate")],
colnames(data)[which(colnames(data) == "ONS_directorate")],
colnames(data)[which(colnames(data) == "CS_grade"):which(colnames(data) == "Northern_Ireland_NHS_organisation")],
colnames(data)[which(colnames(data) == "prof_DE"):which(colnames(data) == "prof_CS_other")],
colnames(data)[which(colnames(data) == "prof_DE"):which(colnames(data) == "Northern_Ireland_NHS_organisation")],
colnames(data)[which(colnames(data) == "pay_band"):which(colnames(data) == "Northern_Ireland_NHS_organisation")],
colnames(data)[which(colnames(data) == "NHS_band")],
colnames(data)[which(colnames(data) == "NHS_band"):which(colnames(data) == "NJC_grade")],
colnames(data)[which(colnames(data) == "NJC_grade")],
colnames(data)[which(colnames(data) == "England_NHS_organisation")],
colnames(data)[which(colnames(data) == "England_NHS_organisation"):which(colnames(data) == "Scotland_NHS_organisation")],
colnames(data)[which(colnames(data) == "England_NHS_organisation"):which(colnames(data) == "Wales_NHS_organisation")],
colnames(data)[which(colnames(data) == "Scotland_NHS_organisation"):which(colnames(data) == "Northern_Ireland_NHS_organisation")],
colnames(data)[which(colnames(data) == "Wales_NHS_organisation"):which(colnames(data) == "Northern_Ireland_NHS_organisation")],
colnames(data)[which(colnames(data) == "Northern_Ireland_NHS_organisation")],
colnames(data)[which(colnames(data) == "qual_1_subject"):which(colnames(data) == "qual_3_learn_code")],
colnames(data)[which(colnames(data) == "prac_use_open_source"):which(colnames(data) == "misc_coding")],
colnames(data)[which(colnames(data) == "coding_ability_change"):which(colnames(data) == "first_learned")],
colnames(data)[which(colnames(data) == "line_manage"):which(colnames(data) == "reproducible_workflow")],
colnames(data)[which(colnames(data) == "first_learned")],
colnames(data)[which(colnames(data) == "know_RAP_champ"):which(colnames(data) == "RAP_comments")])
colnames(data)[which(colnames(data) == "have_RAP_champ"):which(colnames(data) == "RAP_comments")],
colnames(data)[which(colnames(data) == "know_RAP_champ")])

for(i in 1:length(conditions)){
data <- enforce_skip_logic(data, conditions[[i]], skipped_cols[[i]])
Expand Down
Loading