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

Add ability for NACCulator to process date and rater header info on individual forms #122

Draft
wants to merge 11 commits into
base: develop
Choose a base branch
from
Draft

Add ability for NACCulator to process date and rater header info on individual forms #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
96a3551
Add initial custom header logic to TFP v3.2 builder
s-emerson Mar 23, 2021
fe85a99
Make C2T optional on tfp builder to reflect nacc's ded
s-emerson Mar 23, 2021
d700ea0
Repair tfp unit test to account for now-optional c2t
s-emerson Mar 23, 2021
a6c5d2c
Add initial custom header logic to all multi-form builder files
s-emerson Mar 23, 2021
0e3b727
Add more options to LBD event detection
s-emerson May 13, 2021
ae78c32
Fix typo in milestone builder.py
s-emerson May 13, 2021
9a6524a
Fix formrater logic in builder files
s-emerson May 13, 2021
ca4d4a3
Fix blanking logic typos in uds3 fvp forms.py with help from Elijah R…
s-emerson May 13, 2021
4d2d72d
Update AUTHORS to include other contributors
s-emerson May 13, 2021
07efe32
Add LBD event detection logic to FVP events as well
s-emerson May 13, 2021
8f14dc0
Add NOGDS to set_to_zero_if_blank to acount for changed field on the …
s-emerson May 13, 2021
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
5 changes: 4 additions & 1 deletion AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,8 @@ Contributors at the University of Florida

Other Contributors

* Brook Hurd <[email protected]>
* L. D. Nicolas May <[email protected]>

* Elijah D. Rockers <[email protected]>
* Kathleen Bradbury <[email protected]>
* Stephanie Wenzlawsh <[email protected]>
67 changes: 63 additions & 4 deletions nacc/ftld/fvp/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,67 @@ def update_header(record, packet):
header.FORMVER = 3
header.ADCID = record['adcid']
header.PTID = record['ptid']
header.VISITMO = record['visitmo']
header.VISITDAY = record['visitday']
header.VISITYR = record['visityr']

# Custom header info
formdate = ''
formrater = ''
try:
if header.FORMID.value == "Z1X":
formdate = record['fu_z1x_date']
formrater = record['fu_z1x_rater']
elif header.FORMID.value == "A3A":
formdate = record['fu_a3a_date']
formrater = record['fu_a3a_rater']
elif header.FORMID.value == "B3F":
formdate = record['fu_b3f_date']
formrater = record['fu_b3f_rater']
elif header.FORMID.value == "B9F":
formdate = record['fu_b9f_date']
formrater = record['fu_b9f_rater']
elif header.FORMID.value == "C1F":
formdate = record['fu_c1f_date']
formrater = record['fu_c1f_rater']
elif header.FORMID.value == "C2F":
formdate = record['fu_c2f_date']
formrater = record['fu_c2f_rater']
elif header.FORMID.value == "C3F":
formdate = record['fu_c3f_date']
formrater = record['fu_c3f_rater']
elif header.FORMID.value == "C4F":
formdate = record['fu_c4f_date']
formrater = record['fu_c4f_rater']
elif header.FORMID.value == "C5F":
formdate = record['fu_c5f_date']
formrater = record['fu_c5f_rater']
elif header.FORMID.value == "C6F":
formdate = record['fu_c6f_date']
formrater = record['fu_c6f_rater']
elif header.FORMID.value == "E2F":
formdate = record['fu_e2f_date']
formrater = record['fu_e2f_rater']
elif header.FORMID.value == "E3F":
formdate = record['fu_e3f_date']
formrater = record['fu_e3f_rater']
# Date should be format of yyyy-mm-dd. If not,
# then use form header defaults.
if len(formdate.split("-")) == 3:
yyyy = formdate.split("-")[0]
mm = formdate.split("-")[1]
dd = formdate.split("-")[2]
else:
yyyy = record['visityr']
mm = record['visitmo']
dd = record['visitday']
header.VISITMO = mm
header.VISITDAY = dd
header.VISITYR = yyyy
except KeyError:
header.VISITMO = record['visitmo']
header.VISITDAY = record['visitday']
header.VISITYR = record['visityr']

header.VISITNUM = record['visitnum']
header.INITIALS = record['initials']
if formrater != '':
header.INITIALS = formrater
else:
header.INITIALS = record['initials']
67 changes: 63 additions & 4 deletions nacc/ftld/ivp/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,8 +478,67 @@ def update_header(record, packet):
header.FORMVER = 3
header.ADCID = record['adcid']
header.PTID = record['ptid']
header.VISITMO = record['visitmo']
header.VISITDAY = record['visitday']
header.VISITYR = record['visityr']

# Custom header info
formdate = ''
formrater = ''
try:
if header.FORMID.value == "Z1X":
formdate = record['z1x_date']
formrater = record['z1x_rater']
elif header.FORMID.value == "A3A":
formdate = record['a3a_date']
formrater = record['a3a_rater']
elif header.FORMID.value == "B3F":
formdate = record['b3f_date']
formrater = record['b3f_rater']
elif header.FORMID.value == "B9F":
formdate = record['b9f_date']
formrater = record['b9f_rater']
elif header.FORMID.value == "C1F":
formdate = record['c1f_date']
formrater = record['c1f_rater']
elif header.FORMID.value == "C2F":
formdate = record['c2f_date']
formrater = record['c2f_rater']
elif header.FORMID.value == "C3F":
formdate = record['c3f_date']
formrater = record['c3f_rater']
elif header.FORMID.value == "C4F":
formdate = record['c4f_date']
formrater = record['c4f_rater']
elif header.FORMID.value == "C5F":
formdate = record['c5f_date']
formrater = record['c5f_rater']
elif header.FORMID.value == "C6F":
formdate = record['c6f_date']
formrater = record['c6f_rater']
elif header.FORMID.value == "E2F":
formdate = record['e2f_date']
formrater = record['e2f_rater']
elif header.FORMID.value == "E3F":
formdate = record['e3f_date']
formrater = record['e3f_rater']
# Date should be format of yyyy-mm-dd. If not,
# then use form header defaults.
if len(formdate.split("-")) == 3:
yyyy = formdate.split("-")[0]
mm = formdate.split("-")[1]
dd = formdate.split("-")[2]
else:
yyyy = record['visityr']
mm = record['visitmo']
dd = record['visitday']
header.VISITMO = mm
header.VISITDAY = dd
header.VISITYR = yyyy
except KeyError:
header.VISITMO = record['visitmo']
header.VISITDAY = record['visitday']
header.VISITYR = record['visityr']

header.VISITNUM = record['visitnum']
header.INITIALS = record['initials']
if formrater != '':
header.INITIALS = formrater
else:
header.INITIALS = record['initials']
73 changes: 69 additions & 4 deletions nacc/lbd/fvp/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,73 @@ def update_header(record, packet):
header.FORMVER = 3
header.ADCID = record['adcid']
header.PTID = record['ptid']
header.VISITMO = record['visitmo']
header.VISITDAY = record['visitday']
header.VISITYR = record['visityr']

# Custom header info
formdate = ''
formrater = ''
try:
if header.FORMID.value == "B1L":
formdate = record['fu_b1l_date']
formrater = record['fu_b1l_rater']
elif header.FORMID.value == "B2L":
formdate = record['fu_b2l_date']
formrater = record['fu_b2l_rater']
elif header.FORMID.value == "B3L":
formdate = record['fu_b3l_date']
formrater = record['fu_b3l_rater']
elif header.FORMID.value == "B4L":
formdate = record['fu_b4l_date']
formrater = record['fu_b4l_rater']
elif header.FORMID.value == "B5L":
formdate = record['fu_b5l_date']
formrater = record['fu_b5l_rater']
elif header.FORMID.value == "B6L":
formdate = record['fu_b6l_date']
formrater = record['fu_b6l_rater']
elif header.FORMID.value == "B7L":
formdate = record['fu_b7l_date']
formrater = record['fu_b7l_rater']
elif header.FORMID.value == "B8L":
formdate = record['fu_b8l_date']
formrater = record['fu_b8l_rater']
elif header.FORMID.value == "B9L":
formdate = record['fu_b9l_date']
formrater = record['fu_b9l_rater']
elif header.FORMID.value == "C1L":
formdate = record['fu_c1l_date']
formrater = record['fu_c1l_rater']
elif header.FORMID.value == "D1L":
formdate = record['fu_d1l_date']
formrater = record['fu_d1l_rater']
elif header.FORMID.value == "E1L":
formdate = record['fu_e1l_date']
formrater = record['fu_e1l_rater']
elif header.FORMID.value == "E2L":
formdate = record['fu_e2l_date']
formrater = record['fu_e2l_rater']
elif header.FORMID.value == "E3L":
formdate = record['fu_e3l_date']
formrater = record['fu_e3l_rater']
# Date should be format of yyyy-mm-dd. If not,
# then use form header defaults.
if len(formdate.split("-")) == 3:
yyyy = formdate.split("-")[0]
mm = formdate.split("-")[1]
dd = formdate.split("-")[2]
else:
yyyy = record['visityr']
mm = record['visitmo']
dd = record['visitday']
header.VISITMO = mm
header.VISITDAY = dd
header.VISITYR = yyyy
except KeyError:
header.VISITMO = record['visitmo']
header.VISITDAY = record['visitday']
header.VISITYR = record['visityr']

header.VISITNUM = record['visitnum']
header.INITIALS = record['initials']
if formrater != '':
header.INITIALS = formrater
else:
header.INITIALS = record['initials']
73 changes: 69 additions & 4 deletions nacc/lbd/ivp/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,73 @@ def update_header(record, packet):
header.FORMVER = 3
header.ADCID = record['adcid']
header.PTID = record['ptid']
header.VISITMO = record['visitmo']
header.VISITDAY = record['visitday']
header.VISITYR = record['visityr']

# Custom header info
formdate = ''
formrater = ''
try:
if header.FORMID.value == "B1L":
formdate = record['b1l_date']
formrater = record['b1l_rater']
elif header.FORMID.value == "B2L":
formdate = record['b2l_date']
formrater = record['b2l_rater']
elif header.FORMID.value == "B3L":
formdate = record['b3l_date']
formrater = record['b3l_rater']
elif header.FORMID.value == "B4L":
formdate = record['b4l_date']
formrater = record['b4l_rater']
elif header.FORMID.value == "B5L":
formdate = record['b5l_date']
formrater = record['b5l_rater']
elif header.FORMID.value == "B6L":
formdate = record['b6l_date']
formrater = record['b6l_rater']
elif header.FORMID.value == "B7L":
formdate = record['b7l_date']
formrater = record['b7l_rater']
elif header.FORMID.value == "B8L":
formdate = record['b8l_date']
formrater = record['b8l_rater']
elif header.FORMID.value == "B9L":
formdate = record['b9l_date']
formrater = record['b9l_rater']
elif header.FORMID.value == "C1L":
formdate = record['c1l_date']
formrater = record['c1l_rater']
elif header.FORMID.value == "D1L":
formdate = record['d1l_date']
formrater = record['d1l_rater']
elif header.FORMID.value == "E1L":
formdate = record['e1l_date']
formrater = record['e1l_rater']
elif header.FORMID.value == "E2L":
formdate = record['e2l_date']
formrater = record['e2l_rater']
elif header.FORMID.value == "E3L":
formdate = record['e3l_date']
formrater = record['e3l_rater']
# Date should be format of yyyy-mm-dd. If not,
# then use form header defaults.
if len(formdate.split("-")) == 3:
yyyy = formdate.split("-")[0]
mm = formdate.split("-")[1]
dd = formdate.split("-")[2]
else:
yyyy = record['visityr']
mm = record['visitmo']
dd = record['visitday']
header.VISITMO = mm
header.VISITDAY = dd
header.VISITYR = yyyy
except KeyError:
header.VISITMO = record['visitmo']
header.VISITDAY = record['visitday']
header.VISITYR = record['visityr']

header.VISITNUM = record['visitnum']
header.INITIALS = record['initials']
if formrater != '':
header.INITIALS = formrater
else:
header.INITIALS = record['initials']
70 changes: 66 additions & 4 deletions nacc/lbd/v3_1/fvp/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,8 +389,70 @@ def update_header(record, packet):
header.FORMVER = 3.1
header.ADCID = record['adcid']
header.PTID = record['ptid']
header.VISITMO = record['visitmo']
header.VISITDAY = record['visitday']
header.VISITYR = record['visityr']

# Custom header info
formdate = ''
formrater = ''
try:
if header.FORMID.value == "B1L":
formdate = record['fu_b1l_date']
formrater = record['fu_b1l_rater']
elif header.FORMID.value == "B2L":
formdate = record['fu_b2l_date']
formrater = record['fu_b2l_rater']
elif header.FORMID.value == "B3L":
formdate = record['fu_b3l_date']
formrater = record['fu_b3l_rater']
elif header.FORMID.value == "B4L":
formdate = record['fu_b4l_date']
formrater = record['fu_b4l_rater']
elif header.FORMID.value == "B5L":
formdate = record['fu_b5l_date']
formrater = record['fu_b5l_rater']
elif header.FORMID.value == "B6L":
formdate = record['fu_b6l_date']
formrater = record['fu_b6l_rater']
elif header.FORMID.value == "B7L":
formdate = record['fu_b7l_date']
formrater = record['fu_b7l_rater']
elif header.FORMID.value == "B9L":
formdate = record['fu_b9l_date']
formrater = record['fu_b9l_rater']
elif header.FORMID.value == "C1L":
formdate = record['fu_c1l_date']
formrater = record['fu_c1l_rater']
elif header.FORMID.value == "D1L":
formdate = record['fu_d1l_date']
formrater = record['fu_d1l_rater']
elif header.FORMID.value == "E1L":
formdate = record['fu_e1l_date']
formrater = record['fu_e1l_rater']
elif header.FORMID.value == "E2L":
formdate = record['fu_e2l_date']
formrater = record['fu_e2l_rater']
elif header.FORMID.value == "E3L":
formdate = record['fu_e3l_date']
formrater = record['fu_e3l_rater']
# Date should be format of yyyy-mm-dd. If not,
# then use form header defaults.
if len(formdate.split("-")) == 3:
yyyy = formdate.split("-")[0]
mm = formdate.split("-")[1]
dd = formdate.split("-")[2]
else:
yyyy = record['visityr']
mm = record['visitmo']
dd = record['visitday']
header.VISITMO = mm
header.VISITDAY = dd
header.VISITYR = yyyy
except KeyError:
header.VISITMO = record['visitmo']
header.VISITDAY = record['visitday']
header.VISITYR = record['visityr']

header.VISITNUM = record['visitnum']
header.INITIALS = record['initials']
if formrater != '':
header.INITIALS = formrater
else:
header.INITIALS = record['initials']
Loading