From 9da4dfbe42cc67f4d8c34e48f121ff8edd900600 Mon Sep 17 00:00:00 2001
From: Patrick vom Hagen <patrick.vomhagen@swhl.de>
Date: Wed, 6 Mar 2024 13:14:12 +0100
Subject: [PATCH] Updated Testuser Count

---
 Data/GKS/exportSuS.csv | 11 +++++------
 main.py                |  4 ++--
 src/step2.py           | 10 +++++-----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Data/GKS/exportSuS.csv b/Data/GKS/exportSuS.csv
index 6982ccf..22e72ee 100644
--- a/Data/GKS/exportSuS.csv
+++ b/Data/GKS/exportSuS.csv
@@ -85,7 +85,7 @@ Majid;Mussayev;DAZ S 2
 Abiba;Ninsaw Napor;DAZ S 2
 Uliana;Oleksyn;DAZ S 2
 Nasrin;Samiri;DAZ S 2
-Nazanin;Samiri;DAZ S 2
+Nasanin;Samiri;DAZ S 2
 Dymtro;Sheshenia;DAZ S 2
 Yehor;Synihovets;DAZ S 2
 Rasul;Torshkhaev;DAZ S 2
@@ -98,7 +98,7 @@ Damian Alexsander;Damczyk;6A
 Oussama;Eltaif;6A
 Solin;Fauzi Jamil;6A
 Kalin Rosenov;Georgiev;6A
-Salar;Hajir Mala;6A
+Salar;Hajr Mala;6A
 Ania;Jamal Kareem;6A
 Paul;Kamin;6A
 Egor;Lakman;6A
@@ -233,7 +233,7 @@ Justin;Cioch;8A
 Jolie Kristin;Dreier;8A
 Roman;Dzoba;8A
 Anthony Maik;Gädke;8A
-Sara;Hajir Mala;8A
+Sara;Hajr Mala;8A
 Mariam;Hamami;8A
 Odim- Samim Can;Ifegwu;8A
 Jason René;Knappe;8A
@@ -281,7 +281,7 @@ Dilay;Bolat;8C
 Irem Naz;Caglar;8C
 Chara;Chaimanatzis;8C
 Louis Arif;Duman;8C
-Medina;El Mohri;8C
+Medina;El-Mohri;8C
 Artem;Fleischhauer;8C
 Dario;Fuhrmann;8C
 Semih;Güvercin;8C
@@ -301,7 +301,6 @@ Mika;Schlesinger;8C
 Luna-Carolina;Trettow;8C
 Emir;Turan;8C
 Nicole;Twati Dungca;8C
-Keine Daten vorhanden.;;
 Mohamed;Akay;9A
 Samaa;Alan Farman;9A
 Anas;Almasalmeh;9A
@@ -370,7 +369,7 @@ Kai Morice;Riebe;9C
 Hosam;Sabra;9C
 Sedat;Schahin;9C
 Alexander;Schatz;9C
-Davit;Shahmuradyan;9C
+Davit;Shakhmuradyan;9C
 Leon;Stalla;9C
 Caprice-Veronique;Twiehaus;9C
 Tjark Ole;Benn;10A
diff --git a/main.py b/main.py
index a3d5173..a0ea529 100644
--- a/main.py
+++ b/main.py
@@ -88,9 +88,9 @@ if __name__ == "__main__":
     # Step 2 - auf name, vorname reduzieren und abgleichen #
 
     print("\n Lehrer:innen:")
-    lul_matched, new_lul = step2.compare_data(lul_new, lul_sys)
+    lul_matched, new_lul = step2.compare_data(lul_new, lul_sys, len(lul_testuser_df))
     print("\n Schüler:innen:")
-    sus_matched, new_sus = step2.compare_data(sus_new, sus_sys,)
+    sus_matched, new_sus = step2.compare_data(sus_new, sus_sys, len(sus_testuser_df))
 
     # ----------------------------------------------------------------------------------------#
     # Step 3 - Import Data generieren - klasse, uuids, weiteres in einer Liste zusammenführen #
diff --git a/src/step2.py b/src/step2.py
index b4772c0..74a3cdd 100644
--- a/src/step2.py
+++ b/src/step2.py
@@ -2,7 +2,7 @@ import pandas as pd
 from Levenshtein import distance
 
 
-def compare_data(new, sys):
+def compare_data(new, sys, count_test):
     print(f"\nEinträge in Import Liste: {len(new)}")
     print(f"Einträge in System Liste: {len(sys)}")
 
@@ -23,7 +23,7 @@ def compare_data(new, sys):
     only_new = merged_df[merged_df['_merge'] == 'left_only'].drop(columns=['_merge'])
     only_sys = merged_df[merged_df['_merge'] == 'right_only'].drop(columns=['_merge'])
 
-    print_status(matches, only_new, only_sys)
+    print_status(matches, only_new, only_sys, count_test)
     search_typos(only_new[['name', 'vorname']], only_sys[['name', 'vorname']])
 
     return matches, only_new
@@ -44,7 +44,7 @@ def search_typos(new, sys):
         print('Mögliche Tippfehler: keine Fehler gefunden!')
 
 
-def print_status(matches, new, old):
-    print("\nAnzahl Übereinstimmungen:", len(matches))
+def print_status(matches, new, old, count_test):
+    print("\nAnzahl Übereinstimmungen:", len(matches) + count_test)
     print("Anzahl neuer Nutzer:", len(new))
-    print("Anzahl veralteter Nutzer:", len(old))
+    print("Anzahl veralteter Nutzer:", len(old) - count_test)