Updated Syntax Major Change for Values

Nick-prog · Nick-prog · commit 4f8a70a14b90 · 2024-05-09T12:29:03.000-05:00
Simple updates to some syntax related questions. Major changes for values by changing the way information is passed to the methods and logically separated in the report structure. Was able to shorten the code by a little bit and make a cleaner way to update in the future. Added three new if statements to the third page generation for logically different questions than previously used too.
diff --git a/core/reportgen.py b/core/reportgen.py
@@ -368,6 +368,9 @@ def handle_third_page(self, canvas: object, select_app: int, last_idx: int) -> N
 
         #Increment
         yadd = 0
+        senior_found = 0
+        coll_found = 0
+        curr_found = 0
 
         current_idx = last_idx
 
@@ -377,23 +380,23 @@ def handle_third_page(self, canvas: object, select_app: int, last_idx: int) -> N
 
         paragraph_start = ['Faculty Mentor ?', 'Consultant/Agency', 'Text Messaging Option',
                            'Name Verification Notice', 'Conduct Question: Conviction', 'SSN Verification Notice',
-                           'Graduation Date', 'Consultant Agency ?', 'Alumni ?', 'Citzenship ?', "Post-Secondary Colleges/Universities",
+                           'Graduation Date', 'Consultant Agency ?', 'Alumni ?', 'Citzenship ?',
                            'Conduct Question: Expulsion', 'Conduct: Pending Action', 'Multi type question',
                            'End of App']
         
-        req_start = ['Request and/or Answer', 'Long REQ', 'Short REQ', 'Med REQ', "Post-Secondary Colleges/Universities"]
+        req_start = ['Request and/or Answer', 'Long REQ', 'Short REQ', 'Med REQ']
 
         _list = []
 
         for val in self.page_3:
             current_idx += 1
             _str = self.nested_list[select_app][current_idx]
             struct = core.ReportStructure(_str)
+            target = str(_str).split("!")
 
             if val in paragraph_start:
                 yadd -= 10
             elif val in req_start:
-                target = str(_str).split("!")
 
                 req_syntax = {
                         'PAYMENT RECONCILIATION': s.payment_syntax(target),
@@ -418,23 +421,37 @@ def handle_third_page(self, canvas: object, select_app: int, last_idx: int) -> N
                         'INT CURR RESIDE IN US': s.currently_reside_syntax(target),
                         'FAMILY OBLIGATION OTHER': s.family_obj_extra_syntax(target),
                         'FAMILY OBLIGATION CARE': s.family_obj_extra_syntax(target),
-                        'INT VISA STATUS CHANGE': s.int_visa_status_syntax(target),
+                        'INT VISA STATUS CHANGE': s.int_visa_status_syntax(target)
                         }
 
                 for key, value in req_syntax.items():
                     if target[3] == key:
                         _list = value
                         yadd -= 10
+            
+            elif val == 'Post-Secondary Colleges/Universities':
+                _list = s.post_coll_univ_syntax(target, coll_found)
+                coll_found += 1
 
-                if _list != None:
-                    for x in range(len(_list)):
-                        canvas.drawString(xstart, ystart+yadd, str(_list[x]))
-                        yadd -= 10
+            elif val == 'Senior Year Course(s)':
+                _list = s.senior_year_syntax(target, senior_found)
+                senior_found += 1
 
-                _list = []
+            elif val == 'Current enrolled course':
+                _list = s.current_course_syntax(target, curr_found)
+                curr_found += 1
+
+            
+            if _list != None:
+                for x in range(len(_list)):
+                    canvas.drawString(xstart, ystart+yadd, str(_list[x]))
+                    yadd -= 10
+
+            _list = []
 
             conv = struct.transform_page(val)
 
+
             if conv != "None":
                 canvas.drawString(xstart, ystart+yadd, str(conv)) # prints syntax values
                 # canvas.drawString(xstart, ystart+yadd, val + _str)
diff --git a/core/reportstructure.py b/core/reportstructure.py
@@ -183,7 +183,7 @@ def transform_page(self, val: str) -> str:
             'Long REQ': _list,
             'Short REQ': _list[-1],
             'Med REQ': _list,
-            "Senior Year Course(s)": _list,
+            "Senior Year Course(s)": None,
             "Issued Date": f"Issued: {_list[-1]}"
         }
 
@@ -210,7 +210,7 @@ def transform_page(self, val: str) -> str:
             "Question Answer": _list[-2:-1],
             "Graduation Date": f"Expected Graduation Date: {_list[-1][:-3]}-{_list[-1][-3:]}",
             "High School Info": None,
-            "Current enrolled course": _list,
+            "Current enrolled course": None,
             "Previous Applicant": f"Previous Applicant: Yes",
             "VISA Info": f"Visa: {_list[-1]}",
             "VISA end date": f"End date: {_list[-1][:4]}-{_list[-1][4:]}"
@@ -224,13 +224,13 @@ def transform_page(self, val: str) -> str:
             "Semester": f"Semester: {_list[-1]}",
             "Question statement": _list[-2:-1],
             "Grade level": None,
-            "Admissions Test": _list,
-            "Post-Secondary Colleges/Universities": f"Institution: {_list[-1]}",
+            "Admissions Test": None,
+            "Post-Secondary Colleges/Universities": None,
             "Hours Earned": f"Hours Earned: {_list[-1]}",
             "End of App": "End of App",
             "Degree Earned": f"Degree: {_list[-1]}",
-            "Skip": None,
-            'Transfer Information': _list,
+            "Skip": f'Expected Graduation Date: {_list[-1][:4]}-{_list[-1][4:]}',
+            'Transfer Information': None,
             "Language": _list,
             "Old Admission Test Score": _list,
             "Old Admission Test": _list,
@@ -246,30 +246,27 @@ def transform_page(self, val: str) -> str:
         for idx in range(len(dictionaries)):
             for key, value in dictionaries[idx].items():
                 if key == val:
-                    if key == "Med REQ" or key == "Long REQ":
-                        value = v.long_med_req_value(_list)
-                    elif key == "Request and/or Answer":
-                        value = v.req_and_or_answer_value(_list)
-                    elif key == 'Multi type question' or key == "Degree Earned" or key == 'Semester':
-                        value = v.additional_value(_list)
-                    elif key == 'Ethnicity/Race':
-                        value = v.ethnicity_race_value(_list)
-                    elif key == 'Address Two':
-                        value = v.address_value(_list)
-                    elif key == 'Student Gender':
-                        value = v.gender_value(_list)
-                    elif key == 'Start Extra Contact Info':
-                        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)
-                    elif key == 'High School Info':
-                        value = v.high_school_value(_list)
+                    req_start = {
+                        'Med REQ': v.long_med_req_value(_list, key),
+                        'Long REQ': v.long_med_req_value(_list, key),
+                        'Request and/or Answer': v.req_and_or_answer_value(_list, key),
+                        'Multi type question': v.additional_value(_list, key),
+                        'Degree Earned': v.additional_value(_list, key),
+                        'Semester': v.additional_value(_list, key),
+                        'Ethnicity/Race': v.ethnicity_race_value(_list, key),
+                        'Address Two': v.address_value(_list, key),
+                        'Student Gender': v.gender_value(_list, key),
+                        'Start Extra Contact Info': v.extra_value(_list, key),
+                        'App ID': v.app_value(_list, key),
+                        'SSN': v.ssn_value(_list, key),
+                        'Short MSG': v.short_msg_value(_list, key),
+                        'Grade level': v.grade_level_value(_list, key),
+                        'High School Info': v.high_school_value(_list, key),
+                        'Admissions Test': v.admissions_value(_list, key)
+                    }
+                    
+                    if key in req_start:
+                        value = req_start[key]
 
                     converted_mark = str(value).replace("\\", "")
                     break
diff --git a/core/syntax.py b/core/syntax.py
@@ -25,14 +25,14 @@ def payment_syntax(self, _list: list) -> list:
 
         target = _list[-1]
 
-        return [f"Transcation Time: {target[0:8]}",
+        return [f"Transcation Time: {target[0:4]}-{target[4:6]}-{target[6:8]} {target[8:10]}:{target[10:12]}:{target[12:14]}",
                 f"Payment Status: {target[15:19]}",
-                f"Payment Amount: {target[19:24]}",
+                f"Payment Amount: ${target[22:24]}",
                 f"Transcation Trace: {target[24:36]}",
                 f"Customer Reference: {target[36:48]}",
                 f"Card Type: {target[48]}",
                 f"Last 4 digit card number: {target[49:53]}",
-                f"Card Expiration Date: {target[53:57]}", '']
+                f"Card Expiration Date: {target[53:55]}/{target[55:57]}", '']
     
     def hs_diploma_syntax(self, _list: list) -> list:
         """Text fully listing the question given for HS Diploma information including
@@ -98,10 +98,12 @@ def hs_ged_syntax(self, _list: list) -> list:
 
         target = target.replace('N', "No").replace('Y', "Yes")
 
+        extra = str(_list[-1]).replace('\\', '')
+
 
         return ['3. If you did not graduate from high school, do you have a DEG or have you completed',
                 'another high school equivalency program?',
-                 f'{target}', '']
+                 f'{target}-{extra}', '']
     
     def prev_syntax(self, _list: list) -> list:
         """Text fully listing the question given from previous college information from
@@ -279,7 +281,7 @@ def country_syntax(self, _list: list) -> list:
         """Text fully listing the question given from country application information from
         students on ApplyTexas.
 
-        :param _list: lsit of designated markdown text
+        :param _list: list of designated markdown text
         :type _list: list
         :return: list of strings to display the proper output
         :rtype: list
@@ -326,6 +328,55 @@ def former_syntax(self, _list: list) -> list:
                 'Have you previously applied?',
                 f'{output[1]}']
     
+    def post_coll_univ_syntax(self, _list: list, found: int) -> list:
+
+        if _list[0] != 'PCL':
+            return
+        
+        institution = str(_list[-1]).replace('\\', '')
+        
+        if found == 0:
+            return ['','1. Please list ALL post-secondary colleges or universities you have previously attended or',
+                    'are presently attending, including for extension, correspondence, and distance learning',
+                    'credit, starting with the most recent. Failure to list all institutions will be considered',
+                    'an intentional omission an may lead to forced withdrawal.', '',
+                    f'Name of Insitition: {institution}', 
+                    f'Code: {_list[1]}/{_list[2]}', 
+                    f'Dates Attended: {_list[4][:4]}/{_list[4][4:6]}{_list[4][6]}{_list[4][7:11]}/{_list[4][11:14]}']
+        
+        return ["",f'Name of Insitition: {institution}', 
+                f'Code: {_list[1]}/{_list[2]}', 
+                f'Dates Attended: {_list[4][:4]}/{_list[4][4:6]}{_list[4][6]}{_list[4][7:11]}/{_list[4][11:14]}']
+    
+    def senior_year_syntax(self, _list: list, found: int) -> list:
+
+        if _list[0] != 'CRS':
+            return
+        
+        target = str(_list[-1]).replace('\\', '')
+        
+        if found == 0:
+            return ['', '4. Please list exact titles of courses to be completed your senior year and the number of',
+                    'credits you will earn for each. Include college coursework you will complete your senior year.', '',
+                    f'{target}', '']
+        
+        return [f'{target}', '']
+    
+    def current_course_syntax(self, _list: list, found: int) -> list:
+
+        if _list[0] != 'CRS':
+            return
+        
+        target = str(_list[-1]).replace('\\', '')
+        course = str(_list[-2]).strip()
+        
+        if found == 0:
+            return ['', '4. Please list the college or university courses you are currently enrolled in and courses',
+                    'you anticipate completing before you transfer', '',
+                    f'{_list[4]} {course}/{target}', '']
+        
+        return [ f'{_list[4]} {course}/{target}', '']
+    
     def family_obj_income_syntax(self, _list: list) -> list:
         """Text fully listing the question given from family obligation income information from
         students on ApplyTexas.
diff --git a/core/values.py b/core/values.py
