Skip to content

Commit 291d744

Browse files
committed
Updated Syntax and Values
Updated slight changes to the way certain data is presented for a clearer view. Introduced more clarification into areas such as standardized info and varies syntax methods. Added family obj other syntax question method. Fixed issue with SELF process method not converting properly.
1 parent 352493b commit 291d744

File tree

6 files changed

+71
-30
lines changed

6 files changed

+71
-30
lines changed

core/process.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,6 @@ def process_self(self, _list: list) -> list:
577577
for idx in range(len(new_list)):
578578
for key, value in syntax.items():
579579
if key == new_list[idx]:
580-
new_list[idx] == value
580+
new_list[idx] = value
581581

582582
return new_list

core/reportgen.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ def handle_third_page(self, canvas: object, select_app: int, last_idx: int) -> N
416416
'APPLICATION SHARING': s.app_share_syntax(target),
417417
'PHI THETA KAPPA': s.phi_theta_kappa_syntax(target),
418418
'INT CURR RESIDE IN US': s.currently_reside_syntax(target),
419+
'FAMILY OBLIGATION OTHER': s.family_obj_other_syntax(target)
419420
}
420421

421422
for key, value in req_syntax.items():

core/reportstructure.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,12 @@ def transform_page(self, val: str) -> str:
162162
'Citzenship ?': 'Citzenship ?',
163163
'Text Messaging Option': 'Text Messaging Option',
164164
'SSN Verification Notice': 'SSN Verification Notice',
165-
'Name Verification Notice': 'Name Verification Notice',
166-
'Conduct Question: Conviction': 'Conduct Question: Conviction',
165+
'Name Verification Notice': f'{_list[-1]}',
166+
'Conduct Question: Conviction': f'{_list[-1]}',
167167
'Conduct Question: Expulsion':'Conduct Question: Expulsion',
168168
'Conduct: Pending Action': 'Conduct: Pending Action',
169169
'Consultant/Agency': 'Consultant/Agency',
170-
'Submit/Transmit': {_list[-1]}
170+
'Submit/Transmit': _list[-1]
171171
}
172172

173173
three_mark_syntax = {
@@ -192,8 +192,8 @@ def transform_page(self, val: str) -> str:
192192
"TXAPP": "ApplyTexas Application",
193193
"AT": None,
194194
"App ID": None,
195-
"Date Start": f"Date Start: {_list[-1]}",
196-
"Data End": f"Date End: {_list[-1]}",
195+
"Date Start": f"Date Start: {_list[-1][:4]}-{_list[-1][4:]}",
196+
"Data End": f"Date End: {_list[-1][:4]}-{_list[-1][4:]}",
197197
"SSN": None,
198198
"Premanent Residence status": _list[-1],
199199
"Sir Name": _list[-1],
@@ -213,7 +213,7 @@ def transform_page(self, val: str) -> str:
213213
"Current enrolled course": _list,
214214
"Previous Applicant": f"Previous Applicant: Yes",
215215
"VISA Info": f"Visa: {_list[-1]}",
216-
"VISA end date": f"End date: {_list[-1]}"
216+
"VISA end date": f"End date: {_list[-1][:4]}-{_list[-1][4:]}"
217217
}
218218

219219
one_mark_syntax = {
@@ -223,7 +223,7 @@ def transform_page(self, val: str) -> str:
223223
"Address Two": None,
224224
"Semester": f"Semester: {_list[-1]}",
225225
"Question statement": _list[-2:-1],
226-
"Grade level": None, # f"Date: {_list[1]}",
226+
"Grade level": None,
227227
"Admissions Test": _list,
228228
"Post-Secondary Colleges/Universities": f"Institution: {_list[-1]}",
229229
"Hours Earned": f"Hours Earned: {_list[-1]}",

core/syntax.py

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,15 @@ def prev_syntax(self, _list: list) -> list:
147147
enrolled_q = f'{sem_start} {output[-1][:4]} - {sem_end}'
148148

149149
resident_q_1 = str(output[-1][-2]).replace('R', 'Resident (In-state)').replace('U', 'Not provided')
150-
resident_q_2 = str(output[-1][-1]).replace('R', 'Resident (In-state)').replace('U', 'Not provided')
150+
resident_q_2 = str(output[-1][-1]).replace('R', 'Resident (In-state)').replace('U', 'Not provided').replace('N', "Didn't pay in-state tution.")
151151

152152
return ['Residency Information', '', '1. Residency Information', '',
153153
'During the 12 months prior to you applying, did you register',
154154
'for a public college or university in Texas?', f'{months_q}', '',
155155
'What Texas public college or university did you last attend?',
156156
f'{attend_q}', '',
157157
'In which terms were you last enrolled?', f'{enrolled_q}', '',
158-
'During you last seemster at a Texa public institution, did you pay resident (in-state)',
158+
'During you last seemster at a Texas public institution, did you pay resident (in-state)',
159159
'or nonresident (out-of-state) tution?', f'{resident_q_1}', '',
160160
'If you paid in-state tution at your last institution, was it because you were classified',
161161
'as a resdient or because you were non-resident who received a wavier?', f'{resident_q_2}']
@@ -374,6 +374,27 @@ def family_care_syntax(self, _list: list) -> list:
374374
'(include brothers and sisiters attending college):',
375375
f'{target}']
376376

377+
def family_obj_other_syntax(self, _list: list) -> list:
378+
379+
if _list[3] != 'FAMILY OBLIGATION OTHER':
380+
return
381+
382+
syntax = {
383+
'N': 'No',
384+
'Y': 'Yes'
385+
}
386+
387+
target = syntax.get(_list[-2], _list[-2])
388+
last = str(_list[-1]).replace('\\', '')
389+
390+
if target != 'No':
391+
return ['Do you have family obligations that keep you from participating in extracurricular',
392+
'activities?', f'{target}',
393+
'Please Explain:',f'{last}','']
394+
395+
return ['Do you have family obligations that keep you from participating in extracurricular',
396+
'activities?', f'{target}', '']
397+
377398
def currently_reside_syntax(self, _list: list) -> list:
378399

379400
if _list[3] != 'INT CURR RESIDE IN US':
@@ -456,26 +477,38 @@ def suspension_syntax(self, _list: list) -> list:
456477
target = value
457478

458479
return ['5. Are you currently on academic suspension from the last college or univeristy attended?',
459-
f'{target}']
480+
f'{target}', '']
460481

461482
def college_work_syntax(self, _list: list) -> list:
462483

463484
if _list[3] != 'COLLEGE WORK':
464485
return
465486

466-
target = str(_list[-1]).replace("\\", "")
487+
target = _list[-2:]
467488

468489
syntax = {
469-
'N': 'No',
470-
'Y': 'Yes'
490+
'N\\': 'No',
491+
'Y\\': 'Yes',
492+
'Y': 'Yes, some or all of my college credit hours have been earned through classwork',
493+
'N': 'No'
471494
}
472495

473-
for key, value in syntax.items():
474-
if key == target:
475-
target = value
476-
477-
return ['Will you have college credit hours by high school graduation date, if so how many?',
478-
f'{target}']
496+
for idx in range(len(target)):
497+
for key, value in syntax.items():
498+
if key == target[idx]:
499+
target[idx] = value
500+
501+
temp = str(target[1]).replace('\\', '')
502+
503+
if temp == 'No':
504+
return ['Will you have college credit hours by high school graduation date, if so how many?',
505+
f'{temp}',]
506+
else:
507+
return ['Will you have college credit hours by high school graduation date, if so how many?',
508+
f'{temp}','',
509+
'Are your college credit hours earned (or being earned) through dual credit, concurrent',
510+
'enrollment, or an early college high school?',
511+
f'{target[0]}']
479512

480513
def family_obj_syntax(self, _list: list) -> list:
481514

@@ -554,7 +587,9 @@ def residency_determ_syntax(self, _list: list) -> list:
554587
target = str(_list[-1]).replace("\\", "")
555588

556589
syntax = {
557-
'Y' : 'Y - Texas Resident'
590+
'Y' : 'Y - Texas Resident',
591+
'N' : 'N - Non-Texas Resident',
592+
'A' : 'Needs Affidavit'
558593
}
559594

560595
target = syntax.get(target, target)
@@ -570,7 +605,7 @@ def residency_determ_syntax(self, _list: list) -> list:
570605
'provided for applicants with Texas resident status, if the applicant needs to provide more',
571606
'information or verification of status. It is recommended that institutions verify this information.', '',
572607
'Note: The residency determination is not visible to the applicant.', '',
573-
f'Applytexas Residency Determination: {target}']
608+
f'Applytexas Residency Determination: {target}', '']
574609

575610
def residency_claim_syntax(self, _list: list) -> list:
576611

core/values.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ def long_med_req_value(self, _list: list) -> str:
4040
'N': 'No',
4141
'Y\\': 'Yes',
4242
'N\\': 'No',
43+
'S\\': 'Applicant indicates address is correct as entered',
44+
'I\\': 'International address (not standardized)'
4345
}
4446

4547
output = transform_dict.get(_list[-1], _list[-1])
@@ -75,15 +77,15 @@ def long_med_req_value(self, _list: list) -> str:
7577

7678
long_value = {
7779
'COUNSELOR OPT IN': f'Opt-In for Counselor? {output}',
78-
'PERM COUNTY INFO' : f'Permanent County Info--{output}',
80+
'PERM COUNTY INFO' : f'Permanent County Info--{output[3:]} (Country code = {output[:3]})',
7981
'PERM COUNTRY INFO' : f'Permanent Country Info--{output}',
8082
'PERM ADDR STND' : f'Mailing/Permanent Address Standardized: {output}',
8183
'CURR COUNTY INFO' : f'Current County CODE Info--{output}',
8284
'CURR COUNTRY INFO' : f'Current Country Info--{output}',
8385
'PHYS ADDR STND' : f'Physical Address Standardized: {output}',
84-
'FERPA CERT SWITCH' : f'FERPA Certification box checked on: {output}',
85-
'MENINGITIS CERT SWITCH' : f'MENINGITIS Certification box checked on: {output}',
86-
'TRUTH CERT SWITCH' : f'TRUTH Certification box checked on: {output}',
86+
'FERPA CERT SWITCH' : f'FERPA Certification box checked on: {output[:4]}-{output[4:6]}-{output[6:]}',
87+
'MENINGITIS CERT SWITCH' : f'MENINGITIS Certification box checked on: {output[:4]}-{output[4:6]}-{output[6:]}',
88+
'TRUTH CERT SWITCH' : f'TRUTH Certification box checked on: {output[:4]}-{output[4:6]}-{output[6:]}',
8789
'CONSERVATORSHIP SWITCHES' : None,
8890
'TEACHING CERTIFICATE TYPE' : f'Will you seek Teacher Certification? Yes--{output}',
8991
'HS GED TYPE': None,
@@ -101,20 +103,22 @@ def long_med_req_value(self, _list: list) -> str:
101103
'RES: GUAR': None,
102104
'SPOKEN LANGUAGES': None,
103105
'PRE-PROFESSIONAL PGMZ': f'Do you plan to pursue a preprofessional program? {output}--Others',
104-
'PRE-PROFESSIONAL PGMC': f'Do you plan to pursue a preprofessional program? {output}',
106+
'PRE-PROFESSIONAL PGMC': f'Do you plan to pursue a preprofessional program? NURSING--{output}',
105107
'PRE-PROFESSIONAL PGMN': f'Do you plan to pursue a preprofessional program? {output}',
106108
'PRE-PROFESSIONAL PGMD': f'Do you plan to pursue a preprofessional program? {output}',
107109
'PRE-PROFESSIONAL PGMF': f'Do you plan to pursue a preprofessional program? PHARMACY--{output}',
108110
'PRE-PROFESSIONAL PGMB': f'Do you plan to pursue a preprofessional program? MEDICINE--{output}',
109111
'PRE-PROFESSIONAL PGME': f'Do you plan to pursue a preprofessional program? PHYSICAL THERAPY--{output}',
110112
'PRE-PROFESSIONAL PGMA': f'Do you plan to pursue a preprofessional program? PRELAW--{output}',
111-
'APP TYPE INFO': f'You are applying as a/an TRANSFER. Total hours earned: {output[10:14]}',
113+
'APP TYPE INFO': f'You are applying as a/an TRANSFER. Total hours earned: {output[8:11]}',
112114
'AUTO TRANSFER ADM': f'Automatic Admission for Transfer Applicants Based on Texas Law: {output}',
113115
'OTHER FIRST NAME1': f"Other first name: {output}",
114116
'OTHER MIDDLE NAME1': f"Other middle name: {output}",
115117
'OTHER LAST NAME1': f"Other last name: {output}",
118+
'OTHER LAST NAME2': f"Other last name: {output}",
116119
'OTHER SUFFIX NAME1': f"Other suffix: {output}",
117120
'FAMILY OBLIGATION INCOME': None,
121+
'FAMILY OBLIGATION OTHER': None,
118122
'ALIEN APP/INT': None,
119123
'VET STATUS': None,
120124
}
@@ -320,7 +324,8 @@ def app_value(self, _list: list) -> str:
320324
'IFOREIGN GRAD APPLICATION ID': 'Interanational Graduate Admission',
321325
'CREENTRY UNDERGRAD APPLICATION ID': 'U.S. Re-Entry Admission',
322326
'GUS GRAD APPLICATION ID': 'U.S. Graduate Admission',
323-
'TUS TRANSFER APPLICATION ID': 'U.S. Transfer Admission'
327+
'TUS TRANSFER APPLICATION ID': 'U.S. Transfer Admission',
328+
'AFOREIGN TRANSFER APPLICATION ID': 'International Transfer Admission'
324329
}
325330

326331
return f'App ID: {_list[-2]}|{app_[target]}'

main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def run(file: str, fileName: str) -> None:
160160
run(file, fileName)
161161

162162
# file, fileName = find_spe_file()
163-
# run_target(file, fileName, 'domestic', 12)
163+
# run_target(file, fileName, 'foreign', 2)
164164

165165
# filePath_list, fileName_list = find_spe_folder_files()
166166
# for idx in range(len(filePath_list)):

0 commit comments

Comments
 (0)