3 files changed, 46 insertions, 8 deletions
diff --git a/src/core/coreSearch.py b/src/core/coreSearch.py
new file mode 100644
index 0000000..47f2f69
--- /dev/null
+++ b/src/core/coreSearch.py
@@ -0,0 +1,43 @@
+
+from src.database import dbsearch
+from src.gui import windowRecherche
+from PyQt5.QtWidgets import QMessageBox
+
+
+def core_search_id(mainWindow: object, jobId: int) -> None:
+    search: object = dbsearch.DbSearch(mainWindow)
+    resRecherche: tuple = search.get_all_pro_by_jobid(jobId)
+    if resRecherche:
+        core_search_main(mainWindow, resRecherche)
+    else:
+        QMessageBox.information(
+            mainWindow,
+            "Résultat",
+            "Aucun résultat."
+        )
+
+def core_search_name(mainWindow: object, name: str) -> None:
+    search: object = dbsearch.DbSearch(mainWindow)
+    resRecherche: tuple = search.get_pro_info_by_lastname(name)
+    if resRecherche:
+        core_search_main(mainWindow, resRecherche)
+    else:
+        QMessageBox.information(
+            mainWindow,
+            "Résultat",
+            "Aucun résultat."
+        )
+
+def core_search_main(mainWindow: object, resRecherche: tuple) -> None:
+    search: object = dbsearch.DbSearch(mainWindow)
+    results: list = []
+    for i in resRecherche:
+        proInfo: dict = {}
+        proInfo["id"] = i[0]
+        resJobs = search.get_pro_job_by_proid(proInfo["id"])
+        proInfo["text"] = list(i[1:])
+        proInfo["text"].insert(2, ", ".join([j[2] for j in resJobs]))
+        proInfo["text"] = " - ".join(proInfo["text"])
+        results.append(proInfo)
+
+    windowRecherche.main(mainWindow, results)
diff --git a/src/core/funcUser.py b/src/core/coreUser.py
index 5b5ac2c..28476ad 100644
--- a/src/core/funcUser.py
+++ b/src/core/coreUser.py
@@ -5,7 +5,7 @@ from src.gui import pageHome
 from src.database import dbuser, dbsearch
 
 
-def login(mainWindow, email, password) -> None:
+def core_login(mainWindow, email, password) -> None:
     user = dbuser.DbUser(mainWindow)
     if user.check_exist_email(email):
         res = user.check_user_credential(email, password)
@@ -41,7 +41,7 @@ def login(mainWindow, email, password) -> None:
         )
 
 
-def register(mainWindow, email, password, userStatus) -> None:
+def core_register(mainWindow, email, password, userStatus) -> None:
     user = dbuser.DbUser(mainWindow)
     regNumb    = "[0-9]"
     regUpper   = "[A-Z]"
@@ -65,7 +65,7 @@ def register(mainWindow, email, password, userStatus) -> None:
         )
         return
 
-    if not userStatus:
+    if userStatus == None:
         QMessageBox.warning(                       
             mainWindow,
             "Mauvais rôle",
@@ -113,11 +113,9 @@ def register(mainWindow, email, password, userStatus) -> None:
             "Inscription",
             "Inscription réussie!"
         )
-        return
     else:
         QMessageBox.warning(                       
             mainWindow,
             "Erreur bdd",
             "Erreur lors de l'inscritpion"
         )
-        return
diff --git a/src/core/funcSearch.py b/src/core/funcSearch.py
deleted file mode 100644
index 664a24b..0000000
--- a/src/core/funcSearch.py
+++ /dev/null
@@ -1,3 +0,0 @@
-
-def search_by_job_id(mainWindow, jobId) -> None:
-    print(jobId)