Updated Syntax and Values

Updated more of the syntax related questions to bring a more readable structure to the apps. Added more explanation in the values related questions and adjusted all of the inputs to reflect the proper typing.

Author: Nick-prog

core/process.py

@@ -100,7 +100,7 @@ def create_data_list(self, input: list) -> Union[list, list]:
         return foreign, domestic
 
     def uniform_data_list(self, input: list) -> list:
-        """NOT USED, attempt at making all data list uniform for better
+        """NOT USED, atcurrent_strt at making all data list uniform for better
         manipulations.
 
         :param input: nested list of rows found
@@ -109,8 +109,8 @@ def uniform_data_list(self, input: list) -> list:
         :rtype: list
         """
 
-        template_char = self.find_largest_char(input)
-        template_list = input[template_char]
+        current_strlate_char = self.find_largest_char(input)
+        current_strlate_list = input[current_strlate_char]
 
         # Initialize an empty result list
         result_nested_list = []
@@ -120,22 +120,22 @@ def uniform_data_list(self, input: list) -> list:
             # Create a set to store the prefixes of matched items in the given sublist
             matched_prefixes = set()
             result_list = []
-            # Iterate through the template list for each sublist
-            for template_item in template_list:
-                # Extract the prefix from the template item
-                template_prefix = template_item.split('!')[0]
+            # Iterate through the current_strlate list for each sublist
+            for current_strlate_item in current_strlate_list:
+                # Extract the prefix from the current_strlate item
+                current_strlate_prefix = current_strlate_item.split('!')[0]
 
-                # Check if the template prefix has already been matched
-                if template_prefix in matched_prefixes:
+                # Check if the current_strlate prefix has already been matched
+                if current_strlate_prefix in matched_prefixes:
                     result_list.append("")  # Append a blank string if the prefix has been matched before
                 else:
                     # Iterate through the given sublist to find a match
                     found = False
                     for given_item in given_sublist:
                         given_prefix = given_item.split('!')[0]
-                        if given_prefix == template_prefix:
+                        if given_prefix == current_strlate_prefix:
                             result_list.append(given_item)
-                            matched_prefixes.add(template_prefix)  # Add the matched prefix to the set
+                            matched_prefixes.add(current_strlate_prefix)  # Add the matched prefix to the set
                             found = True
                             break
 
@@ -189,34 +189,34 @@ def discover_dual_unique_markdown(self, input: list) -> set:
         return unique_values
 
     def uniform_data_list_2(self, input: list) -> list:
-        """NOT USED, attempt at making all data list uniform for better
+        """NOT USED, atcurrent_strt at making all data list uniform for better
         manipulations.
 
         :param input: nested list of rows found
         :type input: list
         :return: updated nested list of same length
         :rtype: list
         """
-        template_idx = self.find_largest_char(input)
-        template_list = input[template_idx]
-        template_markdown = []
+        current_strlate_idx = self.find_largest_char(input)
+        current_strlate_list = input[current_strlate_idx]
+        current_strlate_markdown = []
 
-        for idx in template_list:
-            template_markdown.append(str(idx).split('!')[0])
+        for idx in current_strlate_list:
+            current_strlate_markdown.append(str(idx).split('!')[0])
 
         data = input[0:5]
 
         for sublist in range(len(data)):
             insert = 0
-            for idx in range(len(template_markdown)):
+            for idx in range(len(current_strlate_markdown)):
                 val = str(data[sublist][idx+insert]).split('!')[0]
 
-                if val != template_markdown[idx]:
-                    print("No MATCH", val, template_markdown[idx])
+                if val != current_strlate_markdown[idx]:
+                    print("No MATCH", val, current_strlate_markdown[idx])
                     data[sublist].insert(idx, "")
                     insert += 1
                 else:
-                    print("\nMATCH!", val, template_markdown[idx])
+                    print("\nMATCH!", val, current_strlate_markdown[idx])
 
 
         return data
@@ -279,6 +279,34 @@ def process_str(self, _str: str) -> list:
 
         return [x for x in result if x]
 
+    def process_str_2(self, _str: str) -> list:
+
+        result = []
+        formatted_list = []
+        current_str = ''
+
+        for idx in range(len(_str)):
+
+            current_str += _str[idx]
+            
+            if _str[idx] == " ":
+                result.append(current_str)
+                current_str = ''
+
+        for item in result:
+            item = item.strip()
+            if item:
+                current_str += item + ' '
+            else:
+                if current_str:
+                    formatted_list.append(current_str.strip())
+                    current_str = ''
+
+        if current_str:
+            formatted_list.append(current_str.strip())
+
+        return "-".join(formatted_list)
+    
     def process_guar(self, _list: list) -> list:
 
         syntax = {
@@ -301,7 +329,7 @@ def process_guar(self, _list: list) -> list:
             _list.insert(2, ' '.join(_list[2:6]))
             del(_list[3:7])
         elif len(_list) == 9:
-            if _list[2] == 'TEMPORARY':
+            if _list[2] == 'current_strORARY':
                 _list.insert(2, ' '.join(_list[2:5]))
                 del(_list[3:6])
             else:

core/reportgen.py

@@ -193,13 +193,13 @@ def handle_first_page(self, canvas: object, select_app: int) -> int:
             current_idx += 1
 
             if val == "App ID":
-                xstart, ystart, yadd = self.generate_new_points(350, 0, 0)
+                xstart, ystart, yadd = self.generate_new_points(320, 0, 0)
             elif val == "Start Student Contact Info":
                 xstart, ystart, yadd = self.generate_new_points(0, -100, 0)
             elif val == "Start Extra Contact Info":
                 if extra_found == 0:
                     extra_found = 1
-                    xstart, ystart, yadd = self.generate_new_points(350, -100, 0)
+                    xstart, ystart, yadd = self.generate_new_points(320, -100, 0)
                 else:
                     yadd -= 10
             elif val == "Start Parent 1 Contact Info" or val == "Start Parent 2 Contact Info" :
@@ -315,7 +315,8 @@ def handle_second_page(self, canvas: list, select_app: int, last_idx: int) -> in
                         'HS GED TYPE': s.hs_ged_syntax(target),
                         'DUAL CREDIT': s.dual_syntax(target),
                         'CONSERVATORSHIP SWITCHES': s.conservator_syntax(target),
-                        'FORMER STUDENT': s.former_syntax(target)
+                        'FORMER STUDENT': s.former_syntax(target),
+                        'INTL EXIT US': s.exit_us_syntax(target)
                         }
 
                 for key, value in req_dict.items():
@@ -363,20 +364,20 @@ def handle_third_page(self, canvas: object, select_app: int, last_idx: int) -> N
 
         # Starting points
         xstart = self.xstart
-        ystart = self.ystart+500
+        ystart = self.ystart+720 # Increase by 80 every 1 inch height
 
         #Increment
         yadd = 0
 
         current_idx = last_idx
 
         canvas.setFont("Courier", 7)
-        canvas.setPageSize((8.5*inch, 25*inch))
+        canvas.setPageSize((8.5*inch, 28*inch))
         # canvas.setFillColor(HexColor('#FFFFFF'))
 
-        paragraph_start = ['Faculty Mentor ?', 'Consultant/Agency', 
+        paragraph_start = ['Faculty Mentor ?', 'Consultant/Agency', 'Text Messaging Option',
                            'Name Verification Notice', 'Conduct Question: Conviction',
-                           'Graduation Date', 'Consultant Agency ?', 'Alumni ?', 'Citzenship ?',
+                           'Graduation Date', 'Consultant Agency ?', 'Alumni ?', 'Citzenship ?', "Post-Secondary Colleges/Universities",
                            'Conduct Question: Expulsion', 'Conduct: Pending Action', 'Multi type question',
                            'End of App']
 
@@ -413,7 +414,8 @@ def handle_third_page(self, canvas: object, select_app: int, last_idx: int) -> N
                         'RES: DETERM': s.residency_determ_syntax(target),
                         'FAMILY OBLIGATIONS': s.family_obj_syntax(target),
                         'APPLICATION SHARING': s.app_share_syntax(target),
-                        'PHI THETA KAPPA': s.phi_theta_kappa_syntax(target)
+                        'PHI THETA KAPPA': s.phi_theta_kappa_syntax(target),
+                        'INT CURR RESIDE IN US': s.currently_reside_syntax(target),
                         }
 
                 for key, value in req_syntax.items():

core/reportstructure.py

@@ -150,17 +150,7 @@ def transform_page(self, val: str) -> str:
         :rtype: str
         """
 
-        _str = str(self._str).split("!")
-
-        transform_dict = {
-            'Y': 'Yes',
-            'N': 'No',
-            'Y\\': 'Yes',
-            'N\\': 'No',
-            'NO RESIDENCY COMMENTS INCLUDED\\': None
-        }
-
-        output = transform_dict.get(_str[-1], _str[-1])
+        _list = str(self._str).split("!")
 
         four_mark_syntax = {
             "Start Parent 1 Contact Info": "First Guardian/Parent Information:",
@@ -177,74 +167,74 @@ def transform_page(self, val: str) -> str:
             'Conduct Question: Expulsion':'Conduct Question: Expulsion',
             'Conduct: Pending Action': 'Conduct: Pending Action',
             'Consultant/Agency': 'Consultant/Agency',
-            'Submit/Transmit': {_str[-1]}
+            'Submit/Transmit': {_list[-1]}
         }
 
         three_mark_syntax  = {
             "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]}",
-            "Award/Acheivement": f"{_str[-5:-4]}",
-            "Employment/Internships/Summer Activities":f"{_str[-4:-3]}",
-            'Major': f"Major: {_str[-1]}",
-            "Area of Interest": f"Area of Interest: {_str[-1]}",
-            'Request and/or Answer': _str[-1],
-            'Long REQ': _str,
-            'Short REQ': _str[-1],
-            'Med REQ': _str,
-            "Senior Year Course(s)": _str,
-            "Issued Date": f"Issued: {_str[-1]}"
+            "Extra Curricular Activities": f"{_list[-5:-4]}",
+            "Community or Volunteer Service": f"{_list[-4:-2]}",
+            "Award/Acheivement": f"{_list[-5:-4]}",
+            "Employment/Internships/Summer Activities":f"{_list[-4:-3]}",
+            'Major': f"Major: {_list[-1]}",
+            "Area of Interest": f"Area of Interest: {_list[-1]}",
+            'Request and/or Answer': _list[-1],
+            'Long REQ': _list,
+            'Short REQ': _list[-1],
+            'Med REQ': _list,
+            "Senior Year Course(s)": _list,
+            "Issued Date": f"Issued: {_list[-1]}"
         }
 
         two_mark_syntax  = {
             "Start App": "Start of App",
             "TXAPP": "ApplyTexas Application",
             "AT": None,
-            "App ID": _str[-1],
-            "Date Start": f"Date Start: {_str[-1]}",
-            "Data End": f"Date End: {_str[-1]}",
-            "SSN": _str[-2:],
-            "Premanent Residence status": _str[-1],
-            "Sir Name": _str[-1],
-            "Last Name": f"Last: {_str[-1]}",
-            "First Name": f"First: {_str[-1]}",
-            "Middle Name": f"Middle: {_str[-1]}",
-            "Middle Initial": f"MIddle Initial: {_str[-1]}",
-            "Suffix": f"Suffix: {_str[-1]}",
-            "Representative Name": f"Rep Name: {_str[-1]}",
-            "Preferred Name": f"Preferred: {_str[-1]}",
+            "App ID": None,
+            "Date Start": f"Date Start: {_list[-1]}",
+            "Data End": f"Date End: {_list[-1]}",
+            "SSN": None,
+            "Premanent Residence status": _list[-1],
+            "Sir Name": _list[-1],
+            "Last Name": f"Last: {_list[-1]}",
+            "First Name": f"First: {_list[-1]}",
+            "Middle Name": f"Middle: {_list[-1]}",
+            "Middle Initial": f"MIddle Initial: {_list[-1]}",
+            "Suffix": f"Suffix: {_list[-1]}",
+            "Representative Name": f"Rep Name: {_list[-1]}",
+            "Preferred Name": f"Preferred: {_list[-1]}",
             "Student Gender": None,
-            "Phone": f"Phone: {_str[-1]}",
-            "Email": f"Email: {_str[-1]}",
-            "Question Answer": _str[-2:-1],
-            "Graduation Date": f"Expected Graduation Date: {_str[-1]}",
-            "High School Info": f"School Code: {_str[-1]}",
-            "Current enrolled course": _str,
+            "Phone": f"Phone: {_list[-1]}",
+            "Email": f"Email: {_list[-1]}",
+            "Question Answer": _list[-2:-1],
+            "Graduation Date": f"Expected Graduation Date: {_list[-1][:-3]}-{_list[-1][-3:]}",
+            "High School Info": f"School Code: {_list[-1]}",
+            "Current enrolled course": _list,
             "Previous Applicant": f"Previous Applicant: Yes",
-            "VISA Info": f"Visa: {_str[-1]}",
-            "VISA end date": f"End date: {_str[-1]}"
+            "VISA Info": f"Visa: {_list[-1]}",
+            "VISA end date": f"End date: {_list[-1]}"
         }
 
         one_mark_syntax  = {
-            "Place of Birth": f"Place of Birth: {_str[-3:]}",
-            "Ethnicity/Race": _str[-1],
-            "Address One": f"Address: {_str[-1]}",
-            "Address Two": f"{_str[1:]}",
-            "Semester": f"Semester: {_str[-1]}",
-            "Question statement": _str[-2:-1],
-            "Grade level": f"Date: {_str[1]}",
-            "Admissions Test": _str,
-            "Post-Secondary Colleges/Universities": f"Institution: {_str[-1]}",
-            "Hours Earned": f"Hours Earned: {_str[-1]}",
+            "Place of Birth": f"Place of Birth: {_list[-3:]}",
+            "Ethnicity/Race": _list[-1],
+            "Address One": f"Address: {_list[-1]}",
+            "Address Two": None,
+            "Semester": f"Semester: {_list[-1]}",
+            "Question statement": _list[-2:-1],
+            "Grade level": None, # f"Date: {_list[1]}",
+            "Admissions Test": _list,
+            "Post-Secondary Colleges/Universities": f"Institution: {_list[-1]}",
+            "Hours Earned": f"Hours Earned: {_list[-1]}",
             "End of App": "End of App",
-            "Degree Earned": f"Degree: {_str[-1]}",
+            "Degree Earned": f"Degree: {_list[-1]}",
             "Skip": None,
-            'Transfer Information': _str,
-            "Language": _str,
-            "Old Admission Test Score": _str,
-            "Old Admission Test": _str,
-            "Short MSG": output
+            'Transfer Information': _list,
+            "Language": _list,
+            "Old Admission Test Score": _list,
+            "Old Admission Test": _list,
+            "Short MSG": None
         }
 
         converted_mark = ""
@@ -257,17 +247,27 @@ def transform_page(self, val: str) -> str:
             for key, value in dictionaries[idx].items():
                 if key == val:
                     if key == "Med REQ" or key == "Long REQ":
-                        value = v.long_med_req_value(_str)
+                        value = v.long_med_req_value(_list)
                     elif key == "Request and/or Answer":
-                        value = v.req_and_or_answer_value(_str)
+                        value = v.req_and_or_answer_value(_list)
                     elif key == 'Multi type question' or key == "Degree Earned" or key == 'Semester':
-                        value = v.additional_value(_str)
+                        value = v.additional_value(_list)
                     elif key == 'Ethnicity/Race':
-                        value = v.ethnicity_race_value(_str)
+                        value = v.ethnicity_race_value(_list)
+                    elif key == 'Address Two':
+                        value = v.address_value(_list)
                     elif key == 'Student Gender':
-                        value = v.gender_value(_str)
+                        value = v.gender_value(_list)
                     elif key == 'Start Extra Contact Info':
-                        value = v.extra_value(_str)
+                        value = v.extra_value(_list)
+                    elif key == 'App ID':
+                        value = v.app_value(_list)
+                    elif key == 'SSN':
+                        value = v.ssn_value(_list)
+                    elif key == 'Short MSG':
+                        value = v.short_msg_value(_list)
+                    elif key == 'Grade level':
+                        value = v.grade_level_value(_list)
 
                     converted_mark = str(value).replace("\\", "")
                     break