Added Ignore and Invoicing Options to payments

Author: DanielCortild

functions/FunctionsCurriculum/Attestations/Attestations_A_Create.py

@@ -56,7 +56,8 @@ def attestations_a_create(data):
     # Create the timesheets, send the emails and add the document to Firestore
     for teacher_email in teacher_dict:
         teacher = teacher_dict.get(teacher_email)
-        generate_timesheet(google, sf, teacher, year, month)
+        if teacher.get("Contract_Type__c") != "Ignore":
+            generate_timesheet(google, sf, teacher, year, month)
 
     # Send the confirmation email to the admin
     send_attestation_admin(return_string, year, month)

functions/Google/Document.py

@@ -3,6 +3,8 @@
 
 ATTESTATION_TEMPLATE_ID = os.getenv('ATTESTATION_TEMPLATE_ID')
 PRESTATION_TEMPLATE_ID = os.getenv('PRESTATION_TEMPLATE_ID')
+INVOICING_TEMPLATE_ID = os.getenv('INVOICING_TEMPLATE_ID')
+
 CONVENTION_TEMPLATE_ID = os.getenv('CONVENTION_TEMPLATE_ID')
 DOCUMENTS_BY_BOT_ID = os.getenv('DOCUMENTS_BY_BOT_ID')
 PAYMENTS_TEMPLATE_ID = os.getenv('PAYMENTS_TEMPLATE_ID')
@@ -58,8 +60,13 @@ def __init__(self, google, teacher, year, month):
         self.year = year
         self.month = month
 
-        file_id = PRESTATION_TEMPLATE_ID if teacher.get('contract') else ATTESTATION_TEMPLATE_ID
-        name = f"{year}-{month} {'Prestations' if teacher.get('contract') else 'Attestation'} {teacher.get('name')}"
+        if teacher.get("Contract_Type__c") == "Volunteering":
+            file_id = ATTESTATION_TEMPLATE_ID
+        elif teacher.get("Contract_Type__c") == "Article 17" or teacher.get("Contract_Type__c") == "Student Contract":
+            file_id = PRESTATION_TEMPLATE_ID
+        elif teacher.get("Contract_Type__c") == "Invoicing":
+            file_id = INVOICING_TEMPLATE_ID
+        name = f"{year}-{month} Prestations {teacher.get('name')}"
         log_details = teacher.get('name')
         self.log_details = log_details
         self.document_id = self._Document__copy_document(file_id, name, log_details)
@@ -76,7 +83,7 @@ def fill(self):
                 {'replaceAllText': {'containsText': {'text': '{ADDRESS}'}, 'replaceText': self.teacher.get('address')}},
                 {'replaceAllText': {'containsText': {'text': '{TOTAL_HOURS}'}, 'replaceText': f"{self.teacher.get('hours')}h{self.teacher.get('minutes')}"}},
                 {'replaceAllText': {'containsText': {'text': '{TOTAL_AMOUNT}'}, 'replaceText': str(self.teacher.get('total_amount'))}},
-                {'replaceAllText': {'containsText': {'text': '{DESCRIPTIONS_FR}'}, 'replaceText': '\n'.join(list(map(lambda x: x.get('nice_name'), self.teacher.get('events'))))}},
+                {'replaceAllText': {'containsText': {'text': '{DESCRIPTIONS_FR}'}, 'replaceText': '\n'.join(list(map(lambda x: x.get('nice_name')[4:], self.teacher.get('events'))))}},
                 {'replaceAllText': {'containsText': {'text': '{TOTAL_HOURS_SECOND_HOURS}'}, 'replaceText': str(round(self.teacher.get('total_amount') / self.teacher.get('contract'))) if self.teacher.get('contract') > 0 else "0"}},
                 {'replaceAllText': {'containsText': {'text': '{TOTAL_HOURS_SECOND_MIN}'}, 'replaceText': str(round(((self.teacher.get('total_amount') / self.teacher.get('contract')) % 1) * 60)) if self.teacher.get('contract') > 0 else "0"}},
                 {'replaceAllText': {'containsText': {'text': '{SALARY}'}, 'replaceText': str(self.teacher.get('contract'))}}

functions/Google/Events.py

@@ -72,7 +72,7 @@ def __process_google_events(self, events):
                 title.pop(0)
                 title = '-'.join(title)
                 amount = round(self.__calculate_amount(code, minutes), 2)
-                nice_name = f"    [{code}] {title} ({start}, {minutes}min, {amount}€)"
+                nice_name = f"    [{code}] {start} - {title.split('[')[0]}({minutes}min, {amount}€)"
                 processed_events.append({
                     'teachers': teachers,
                     'held': held,

functions/config.env

@@ -1,6 +1,7 @@
 # Attestation Document Template IDs
 ATTESTATION_TEMPLATE_ID=1DiT2wj3ZpaZzzX1ACT1igQdqhyfebl_7lbKQw1Ubego
 PRESTATION_TEMPLATE_ID=1guzoO5hwGgqpphVp-i9dGAAiM8wojnzpe4Qlk9-yZY4
+INVOICING_TEMPLATE_ID=15sw-eqmtZQ7y5xK5b3au1qGvARkSjaAa1wOQNRO_wi4
 
 # Contract Document Template IDs
 CONVENTION_TEMPLATE_ID=108r2FThPRfhT_MlrZApP1I8V-Oqf7gADnfg5BCSFUcY