Skip to content

Commit 324aa70

Browse files
committed
Major refactoring to come
Adding the logic need to display app information in the current ApplyTexas App format. Including none answered questions based on app type.
1 parent 993c284 commit 324aa70

File tree

4 files changed

+76
-11
lines changed

4 files changed

+76
-11
lines changed

core/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
from .structure import *
44
from .process import *
55
from .syntax import *
6-
from .test import *
76

87
__author__ = 'Nickolas Rodriguez'

core/process.py

+58
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,61 @@ def create_uniform_items(self, _list: list, max_char: list) -> list:
9898
_list[idx] = self.create_uniform_item(item, max_char[idx])
9999

100100
return _list
101+
102+
def filter_markdown_text(self, _list: list) -> list:
103+
104+
output = []
105+
106+
for apps in _list:
107+
current = []
108+
for items in apps:
109+
markdown = str(items).split('!')
110+
current.append("!".join(markdown[:-1]))
111+
output.append(current)
112+
113+
return output
114+
115+
def rearrange_markdown_list(self, _list: list) -> list:
116+
117+
example = [
118+
'BGN!00!',
119+
'N1!TM!!ZZ!TXAPP',
120+
'RQS!AQ!ZZ!APP SUBMIT/TRANSMIT!!',
121+
'REF!48!',
122+
'REF!SY!',
123+
'SSE!',
124+
'FOS!',
125+
'RQS!AQ!ZZ!FORMER STUDENT!',
126+
'N1!HS!', 'HIGH SCHOOL LOCATION SKIP',
127+
128+
129+
]
130+
131+
insert_no_matter_what = [
132+
'RQS!AQ!ZZ!FORMER STUDENT!'
133+
]
134+
135+
output = _list.copy()
136+
137+
for apps in output:
138+
for idx, item in enumerate(apps):
139+
for e_idx, e_item in enumerate(example):
140+
# if e_item not in apps and e_item in insert_no_matter_what:
141+
# print(f'Item {item} was not found!, inserting at index {e_idx} anyways.')
142+
# apps.insert(e_idx, e_item)
143+
if str(item).startswith(e_item):
144+
145+
if e_item == 'N1!HS!':
146+
hs_name = apps.pop(idx)
147+
hs_loc = apps.pop(idx)
148+
apps.insert(e_idx, hs_name)
149+
apps.insert(e_idx+1, hs_loc)
150+
151+
else:
152+
# print(f'\n{item} found in example list, {e_item}')
153+
# print(f'Popping item idx {idx} from apps list')
154+
apps.pop(idx) # Remove from list before moving
155+
# print(f'Inserting {item} at index {e_idx} for apps list')
156+
apps.insert(e_idx, item) # Move removed item to correct spot in list
157+
158+
return output

core/structure.py

+12-9
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def translate(self) -> list:
6969

7070
_translate = {
7171
'ATV': None,
72-
'BGN': "********** START OF APPLICATION **********",
72+
'BGN': None,
7373
'COM': self.translate_COM(),
7474
'CRS': self.translate_CRS(),
7575
'DEG': self.translate_DEG(),
@@ -88,7 +88,7 @@ def translate(self) -> list:
8888
'REF': self.translate_REF(),
8989
'RQS': self.translate_RQS(),
9090
'MSG': self.translate_MSG(),
91-
'SE': "********** END OF APPLICATION **********",
91+
'SE': None,
9292
'SES': self.translate_SES(),
9393
'SSE': self.translate_SSE(),
9494
'SST': self.translate_SST(),
@@ -325,7 +325,8 @@ def translate_FOS(self) -> str:
325325
self.error_handler('FOS', sep)
326326

327327
if sep == 'Major':
328-
return self.output.insert(self.student_idx+2, f'{sep}: [{self.target[3]}] {self.target[-1]}')
328+
return f'{sep}: [{self.target[3]}] {self.target[-1]}'
329+
# return self.output.insert(self.student_idx+2, f'{sep}: [{self.target[3]}] {self.target[-1]}')
329330
else:
330331
return f'{sep}: {self.target[-1]}'
331332

@@ -473,10 +474,11 @@ def translate_N3_N4(self) -> str:
473474
if address == '':
474475
return
475476

476-
if self.target[0] == 'N4':
477-
return f'Primary Address: {address}'
478-
else:
479-
return f'Secondary Address: {address}'
477+
return address
478+
# if self.target[0] == 'N4':
479+
# return [address, '']
480+
# else:
481+
# return ['', address]
480482

481483
def translate_NTE(self) -> list:
482484
"""Method for NTE markdown text: Ethnicity and Race information.
@@ -617,6 +619,7 @@ def translate_RQS(self) -> list:
617619
return s.OTHER_NAME()
618620

619621
if self.target[3] == 'APP SUBMIT/TRANSMIT':
622+
return ['', self.target[-1], '']
620623
return self.output.insert(2, ['', self.target[-1], ''])
621624

622625
if self.target[3] == 'CUR COLLEGE CRS':
@@ -825,8 +828,8 @@ def translate_SSE(self) -> str:
825828
sep = _translate.get(self.target[-1][4:], self.target[-1][4:])
826829
if self.semester_check == 0:
827830
self.semester_check = 1
828-
self.output.insert(self.student_idx, f'{sep} {self.target[-1][:4]}')
829-
return self.output.insert(self.student_idx, '')
831+
# self.output.insert(self.student_idx, f'{sep} {self.target[-1][:4]}')
832+
# return self.output.insert(self.student_idx, '')
830833
return f'{sep} {self.target[-1][:4]}'
831834
elif self.target[-1] == 'ZZZ':
832835
return f'(Attendance dates: {self.target[1][4:6]}/{self.target[1][:4]} - {self.target[2][4:6]}/{self.target[2][:4]})'

main.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,12 @@ def run(file_path: str, filename: str) -> None:
6767
translated_spe = []
6868
markdown_spe = []
6969

70-
for idx, item in enumerate(spe_list):
70+
new_list = p.rearrange_markdown_list(spe_list)
71+
72+
from pprint import pprint
73+
pprint(new_list)
74+
75+
for idx, item in enumerate(new_list):
7176
s = core.Structure(item, idx)
7277
translated_spe.append(s.translate())
7378
markdown_spe.append(s.markdown)

0 commit comments

Comments
 (0)