Updated Syntax and Values

Changed the way phi theta kappa question was formed. Updated syntax for vet status for a cleaner output.

Author: Nick-prog

core/reportgen.py

@@ -412,7 +412,8 @@ def handle_third_page(self, canvas: object, select_app: int, last_idx: int) -> N
                         'RES: RESIDENCY CLAIM': s.residency_claim_syntax(target),
                         'RES: DETERM': s.residency_determ_syntax(target),
                         'FAMILY OBLIGATIONS': s.family_obj_syntax(target),
-                        'APPLICATION SHARING': s.app_share_syntax(target)
+                        'APPLICATION SHARING': s.app_share_syntax(target),
+                        'PHI THETA KAPPA': s.phi_theta_kappa_syntax(target)
                         }
 
                 for key, value in req_syntax.items():
@@ -430,12 +431,6 @@ def handle_third_page(self, canvas: object, select_app: int, last_idx: int) -> N
             conv = struct.transform_page(val)
 
             if conv != "None":
-                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
+                canvas.drawString(xstart, ystart+yadd, str(conv)) # prints syntax values
+                # canvas.drawString(xstart, ystart+yadd, val + _str)
+                yadd -= 10

core/syntax.py

@@ -380,37 +380,28 @@ def vet_syntax(self, _list: list) -> list:
             return
 
         syntax = {
-            '1': '\nVeteran',
-            '2': '\nCurrent US Miliary Service Member',
-            '3': '\nSpouse or Dependen of Veteran or Current Service Member',
-            '4': '\nSpouce or dependent of, or a veteran or current U.S. military servicemember with injury or illness',
+            '1': 'Veteran',
+            '2': 'Current US Miliary Service Member',
+            '3': 'Spouse or Dependen of Veteran or Current Service Member',
+            '4': 'Spouce or dependent of, or a veteran or current U.S. military servicemember with injury or illness',
             '4+': 'resulting from military service (service-connected injury/illness)',
-            '5': '\nSpouse or dependent of deceased US servicemember'
+            '5': 'Spouse or dependent of deceased US servicemember'
         }
 
-        target = str(_list[-1]).replace("\\", "")
-
-        output = [str(val) for val in target]
+        output = [str(val) for val in str(_list[-1]).replace("\\", "")]
+        output.insert(0, 'U.S. Military-Veteran Status?')
+        output.append(" ")
 
         for idx in range(len(output)):
             if output[idx] == '4':
                 output.insert(idx+1, '4+')
 
-
         for idx in range(len(output)):
             for key, value in syntax.items():
                 if key == output[idx]:
                     output[idx] = value
 
-        if len(output) == 1:
-            return ['U.S. Military-Veteran Status?', 
-                    f'{output}']
-        elif len(output) == 2:
-            return ['U.S. Military-Veteran Status?', 
-                    f'{output[0]}', f'{output[1]}']
-        elif len(output) == 3:
-            return ['U.S. Military-Veteran Status?', 
-                    f'{output[0]}', f'{output[1]}', f'{output[2]}']
+        return output
 
     def home_syntax(self, _list: list) -> list:
 
@@ -505,7 +496,22 @@ def app_share_syntax(self, _list: list) -> list:
                 target = value
 
         return ['Application sharing on denied admission?',
-                f'{target}']
+                f'{target}', '']
+    
+    def phi_theta_kappa_syntax(self, _list: list) -> list:
+
+        if _list[3] != 'PHI THETA KAPPA':
+            return
+        
+        syntax = {
+            'N\\': 'No',
+            'Y\\': 'Yes'
+        }
+
+        output = syntax.get(_list[-1], _list[-1])
+
+        return ['Are you a Phi Theta Kappa?', 
+                f'{output}', '']
 
     def residency_determ_syntax(self, _list: list) -> list:
 

core/values.py

@@ -39,7 +39,7 @@ def long_med_req_value(self, _str: str) -> str:
             'REVERSE TRANSFER': None,
             'APPLICATION SHARING': None,
             'FORMER STUDENT': None,
-            'PHI THETA KAPPA': f'Are you a Phi Theta Kappa? {output}',
+            'PHI THETA KAPPA': None, # f'Are you a Phi Theta Kappa? {output}',
             'INT CURR RESIDE IN US': f'Are you currently residing in the U.S.? {output}',
             'ULTIMATE DEGREE SOUGHT': f'Ultimate degree you wish to seek in this major from this institution? ',
             'PAYMENT RECONCILIATION': "Billing Information:", 
@@ -105,9 +105,9 @@ def long_med_req_value(self, _str: str) -> str:
                 if key == target:
                     if target == 'ULTIMATE DEGREE SOUGHT':
                         return value + self.additional_value(_str)
-                    
+            
                     return value
-                
+
         return _str
 
     def req_and_or_answer_value(self, _str: str) -> str:

main.py

@@ -160,7 +160,7 @@ def run(file: str, fileName: str) -> None:
     # run(file, fileName)
 
     file, fileName = find_spe_file()
-    run_target(file, fileName, 'domestic', 4)
+    run_target(file, fileName, 'domestic', 3)
 
     # filePath_list, fileName_list = find_spe_folder_files()
     # for idx in range(len(filePath_list)):