Updated Syntax

Changed the way the emergency contact information started. Accounted for child and spouse data inputs. Removed some commented out lines and tried to find a better way to inject list statements.

Author: Nick-prog

core/reportgen.py

@@ -426,13 +426,16 @@ def handle_third_page(self, canvas: object, select_app: int, last_idx: int) -> N
                         yadd -= 10
 
                 _list = []
-                # yadd -= 10
 
             conv = struct.transform_page(val)
-            # if val == 'Med REQ':
-            #     yadd -= 10
-     
+
             if conv != "None":
-                canvas.drawString(xstart, ystart+yadd, str(conv)) # prints syntax values
-                # canvas.drawString(xstart, ystart+yadd, val + _str)
-                yadd -= 10
+                print(type(conv))
+                if type(conv) == list:
+                    for x in range(len(conv)):
+                        canvas.drawString(xstart, ystart+yadd, str(conv[x]))
+                        yadd -= 10
+                else:
+                    canvas.drawString(xstart, ystart+yadd, str(conv)) # prints syntax values
+                    # canvas.drawString(xstart, ystart+yadd, val + _str)
+                    yadd -= 10

core/reportstructure.py

@@ -181,7 +181,7 @@ def transform_page(self, val: str) -> str:
         }
 
         three_mark_syntax  = {
-            "Start Extra Contact Info": "Emergency Contact Information:",
+            "Start Extra Contact Info": None,
             "Start Student Contact Info": "Student Information:",
             "Extra Curricular Activities": f"{_str[-5:-4]}",
             "Community or Volunteer Service": f"{_str[-4:-2]}",
@@ -221,7 +221,7 @@ def transform_page(self, val: str) -> str:
             "Graduation Date": f"Expected Graduation Date: {_str[-1]}",
             "High School Info": f"School Code: {_str[-1]}",
             "Current enrolled course": _str,
-            "Previous Applicant": f"Previous Applicant: {_str[-1]}",
+            "Previous Applicant": f"Previous Applicant: Yes",
             "VISA Info": f"Visa: {_str[-1]}",
             "VISA end date": f"End date: {_str[-1]}"
         }
@@ -266,6 +266,8 @@ def transform_page(self, val: str) -> str:
                         value = v.ethnicity_race_value(_str)
                     elif key == 'Student Gender':
                         value = v.gender_value(_str)
+                    elif key == 'Start Extra Contact Info':
+                        value = v.extra_value(_str)
 
                     converted_mark = str(value).replace("\\", "")
                     break

core/syntax.py

@@ -302,14 +302,29 @@ def former_syntax(self, _list: list) -> list:
 
         if _list[3] != 'FORMER STUDENT':
             return
+        
+        syntax = {
+            'Y': 'Yes',
+            'N': 'No',
+            'K': 'Not provided'
+        }
 
         target = "".join(_list[-1]).translate(str.maketrans("", "", "\\0"))
 
-        target = target.replace('NN', "No, No").replace('YY', "Yes, Yes").replace('YN', 'Yes, No').replace('NY', 'No, Yes')
+        if len(target) != 2:
+            target.append('K')
+
+        output = []
+
+        for idx in range(len(target)):
+            val = syntax.get(target[idx], target[idx])
+            output.append(val)
+
 
-        return ['Are you a former student of this institution?',
+        return ['Are you a former student of this institution?', 
+                f'{output[0]}', '',
                 'Have you previously applied?',
-                f'{target}']
+                f'{output[1]}']
 
     def family_obj_income_syntax(self, _list: list) -> list:
         """Text fully listing the question given from family obligation income information from

core/values.py

@@ -46,7 +46,7 @@ def long_med_req_value(self, _str: str) -> str:
             'GRADUATE AWARD': None, 
             'TEST1 SENT': None, 
             'TEST2 SENT': None, 
-            'CUR COLLEGE CRS': f"Present semester course to be completed: {output}",
+            'CUR COLLEGE CRS': f"Current college course: {output}",
             'CUR COLLEGE ATT': f"Current college attending code: {output}",
             'COLLEGE WORK IN CLASSROOM': None,
             'FAMILY OBLIGATIONS': None,
@@ -127,14 +127,14 @@ def req_and_or_answer_value(self, _str: str) -> str:
             'RES: COMMENTS\\': None,
             'FAMILY OBLIGATION INCOME\\': None,
             'FAMILY OBLIGATION CARE\\': None,
-            'FAMILY OBLIGATION OTHER\\': None, # f'{_str[-1]}',
-            'TREX TRANSCRIPT REQUESTED\\': None, # f'Transcript sharing consent: {_str[-1]}',
+            'FAMILY OBLIGATION OTHER\\': None,
+            'TREX TRANSCRIPT REQUESTED\\': None,
             'FUNDS SUPPORT\\': "Do you have a source of financial suppport if your are, or will be, in F-1 or J-1 status?",
             'CONTACT AT WORK\\': None,
             'RES: BASIS OF CLAIM\\': None,
             'REVERSE TRANSFER\\': None,
             'APPLICATION SHARING\\': None,
-            'FAMILY OBLIGATIONS\\': None, # f'Do you have family obligations that keep you from participating in extracurricular activities? {_str[-1]}',
+            'FAMILY OBLIGATIONS\\': None,
             'OTHER FIRST NAME1\\': None,
             'OTHER FIRST NAME2\\': None,
             'OTHER MIDDLE NAME1\\': None,
@@ -217,7 +217,7 @@ def ethnicity_race_value(self, _str: str) -> str:
         }
 
         not_hispanic_ = {
-            "Ethnicity=W\\": "Not Hispanic or Latino. N/A.",
+            "Ethnicity=W\\": "Not Hispanic or Latino. Ethnicity=N/A.",
             "Ethnicity=W;Race=S\\": "Not Hispanic or Latino. White.",
             "Ethnicity=W;Race=T\\": "Not Hispanic or Latino. American Indian or Alaska Native.",
             "Ethnicity=W;Race=Q\\": "Not Hispanic or Latino. Black or African American.",
@@ -232,8 +232,8 @@ def ethnicity_race_value(self, _str: str) -> str:
         }
 
         other_ = {
-            "Ethnicity=\\": "N/A. N/A.",
-            "Ethnicity=R\\": "Hispanic or Latino. N/A.",
+            "Ethnicity=\\": "Gender=N/A. Ethnicity=N/A.",
+            "Ethnicity=R\\": "Hispanic or Latino. Ethnicity=N/A.",
         }
 
         dictionaries = [hispanic_, not_hispanic_, other_]
@@ -266,4 +266,16 @@ def gender_value(self, _str: str) -> str:
 
         for key, value in gender_.items():
            if key == target:
-               return value
+               return value
+           
+    def extra_value(self, _str: str) -> str:
+
+        target = str(_str[-1]).replace('\\', '')
+
+        extra_ = {
+            '01': 'Spouse Contact Information:',
+            '02': 'Child Information:',
+            '51': 'Emergency Contact Information:'
+        }
+
+        return extra_[target]

main.py

@@ -159,9 +159,9 @@ def run(file: str, fileName: str) -> None:
     # file, fileName = find_spe_file()
     # run(file, fileName)
 
-    # file, fileName = find_spe_file()
-    # run_target(file, fileName, 'domestic', 10)
+    file, fileName = find_spe_file()
+    run_target(file, fileName, 'domestic', 4)
 
-    filePath_list, fileName_list = find_spe_folder_files()
-    for idx in range(len(filePath_list)):
-        run(filePath_list[idx], fileName_list[idx])
+    # filePath_list, fileName_list = find_spe_folder_files()
+    # for idx in range(len(filePath_list)):
+    #     run(filePath_list[idx], fileName_list[idx])