anpassungen und verbesserungen

main.py

@@ -38,9 +38,11 @@ ox_quota_sus = 5120         # oxUserQuota LuL
 
 if __name__ == "__main__":
 
+    school_folder = "7114SadW"
+
     # Erstellt oder löscht Inhalte vorhandener Logdatei und loggt Konsolenausgaben
-    log_file_path = 'output/log.txt'
-    import_command_path = 'output/import_command.txt'
+    log_file_path = f'./Data/{school_folder}/gen_log.txt'
+    import_command_path = f'./Data/{school_folder}/gen_importCommand.txt'
     if os.path.exists(log_file_path):
         open(log_file_path, 'w').close()
     sys.stdout = Logger.Logger(log_file_path)
@@ -53,14 +55,14 @@ if __name__ == "__main__":
 
     # ToDo Daten mit UI einlesen
     # lehrer_liste_neu = "./Data/SaM/export_lehrer_SaM.csv"
-    school_folder = "johanneum"
+
     lehrer_liste_neu = f"./Data/{school_folder}/export_lul.csv"
-    lehrer_liste_system = f"./Data//{school_folder}/sys_lul.csv"
-    lul_out_path = 'output/outputLehrer.csv'
+    lehrer_liste_system = f"./Data/{school_folder}/sys_lul.csv"
+    lul_out_path = f'./Data/{school_folder}/gen_Lehrer.csv'
 
     schueler_liste_neu = f"./Data/{school_folder}/export_sus.csv"
     schueler_liste_system = f"./Data/{school_folder}/sys_sus.csv"
-    sus_out_path = 'output/outputSchueler.csv'
+    sus_out_path = f'./Data/{school_folder}/gen_Schueler.csv'
 
     # Variablen füllen:
     if not dev:
@@ -76,9 +78,11 @@ if __name__ == "__main__":
 
     lul_new = step1.check_export_file(lehrer_liste_neu)
     lul_sys = step1.create_dataframe_system(lehrer_liste_system)
+    step1.check_quotas(lul_sys, mail_quota_lul, ox_quota_lul)
 
     sus_new = step1.check_export_file(schueler_liste_neu)
     sus_sys = step1.create_dataframe_system(schueler_liste_system)
+    step1.check_quotas(sus_sys, mail_quota_sus, ox_quota_lul)
 
     # Test- und Funktionsuser auslagern
     keywords = ['Test', 'test', 'Raum', 'raum', 'User', 'user', 'Tafel', 'tafel', 'Admin', 'admin']
@@ -91,23 +95,20 @@ if __name__ == "__main__":
     # Step 2 - auf name, vorname reduzieren und abgleichen #
 
     # Klassen Übersicht leeren
-    with open('./output/klassen.txt', 'w') as file:
+    with open(f'./Data/{school_folder}/gen_klassen.txt', 'w') as file:
         file.write('')
 
-    lul_exel_path = 'output/stats_lul.xlsx'
-    sus_exel_path = 'output/stats_sus.xlsx'
+    lul_exel_path = f'./Data/{school_folder}/gen_stats_lul.xlsx'
+    sus_exel_path = f'./Data/{school_folder}/gen_stats_sus.xlsx'
 
     print("\n Lehrer:innen:")
-    lul_matched, new_lul = step2.compare_data(lul_new, lul_sys, len(lul_testuser_df), lul_exel_path)
+    lul_matched, new_lul = step2.compare_data(lul_new, lul_sys, len(lul_testuser_df), lul_exel_path, school_folder)
     print("\n Schüler:innen:")
-    sus_matched, new_sus = step2.compare_data(sus_new, sus_sys, len(sus_testuser_df), sus_exel_path)
+    sus_matched, new_sus = step2.compare_data(sus_new, sus_sys, len(sus_testuser_df), sus_exel_path, school_folder)
 
     # ----------------------------------------------------------------------------------------#
     # Step 3 - Import Data generieren - klasse, uuids, weiteres in einer Liste zusammenführen #
 
-    # ToDo verfügbare Klassen listen und abgleichen
-    # ToDo Quota Abweichungen ermitteln und übernehmen
-
     # Lul: Namen + UUIDs + Testuser
     step3.create_output_list('LuL', new_lul, lul_matched, dev, school_id, ox_context,
                              mail_quota_lul, ox_quota_lul, lul_testuser_df, lul_out_path)