From 4254dd544280f30dc04a5b3f51a3ba722cef303b Mon Sep 17 00:00:00 2001
From: "jade.van_brabandt" <jade.van_brabandt@etu.uca.fr>
Date: Tue, 10 Jan 2023 11:47:17 +0100
Subject: [PATCH] Affiche Liste Ajout

---
 SAE                  | Bin 30784 -> 30824 bytes
 src/partie2/Makefile |   2 +-
 src/partie2/saeP2.c  |  57 +++++++++++++++++++++++++++++++++++++++----
 src/partie2/saeP2.h  |   3 ++-
 4 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/SAE b/SAE
index 195723858d8435f7c63443c4b9c14383c8ac525d..8630ca6d9377105e3fe8d260a2fc6c49eb36f787 100755
GIT binary patch
delta 5499
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
RQ*Iy^myYGXBKl=<{|8N5$%Fs^

delta 4399
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

diff --git a/src/partie2/Makefile b/src/partie2/Makefile
index 7ded601..f0f54bb 100644
--- a/src/partie2/Makefile
+++ b/src/partie2/Makefile
@@ -7,4 +7,4 @@ doc : saeP2.h
 	doxygen
 
 clean :
-	rm -f saeP2.o
\ No newline at end of file
+	rm -f saeP2.o
diff --git a/src/partie2/saeP2.c b/src/partie2/saeP2.c
index 88d526a..6ad1d7f 100644
--- a/src/partie2/saeP2.c
+++ b/src/partie2/saeP2.c
@@ -46,7 +46,7 @@ candidat* LoadCandid(void)
     return Tabcandidat;
 }
 
-void RechercheCandidat(int ID, int nbcandidat, int tmax,candidat *tcandidat)
+void RechercheCandidat(int ID, int nbcandidat,candidat *tcandidat)
 {
     for(int i=0;i<nbcandidat;++i)
     {
@@ -70,16 +70,19 @@ void RechercheCandidat(int ID, int nbcandidat, int tmax,candidat *tcandidat)
                 Departement : %s\n\
                 Décision département : ",tcandidat[i].TabVoeu[y]->ville,tcandidat[i].TabVoeu[y]->dep);
                 if(tcandidat[i].TabVoeu[y]->ddep==0) printf("Dossier non traité\n");
-                else {
+                else
+                {
                     if(tcandidat[i].TabVoeu[y]->ddep==1) printf("Admis\n");
-                    else {
+                    else
+                    {
                         if (tcandidat[i].TabVoeu[y]->ddep==2) printf("Liste d'attente\n");
                         else printf("Refusé\n");
                     }
                 }
                 printf("Décision du candidat : ");
                 if(tcandidat[i].TabVoeu[y]->vcand==0) printf("Décision non rendu\n");
-                else {
+                else
+                {
                     if(tcandidat[i].TabVoeu[y]->vcand==1) printf("Accepté\n");
                     else printf("Refusé");
                 }
@@ -88,7 +91,51 @@ void RechercheCandidat(int ID, int nbcandidat, int tmax,candidat *tcandidat)
         }
     }
     printf("Candidat non trouvé");
-    return;
+}
+
+void ListeCandidat(int nbcandidat,candidat *tcandidat)
+{
+    for(int i=0;i<nbcandidat;++i)
+    {
+        printf("Candidat n°%d :\n\
+        Numéro : %d\n\
+        Nom : %s\n\
+        Prenom : %s\n\
+        Note de mathématique : %f\n\
+        Note de français : %f\n\
+        Note d'anglais : %f\n\
+        Note de spécialité : %f\n\
+        Nombre de voeu : %d\n\
+        Voeu :\n",i,tcandidat[i].numcandid,tcandidat[i].surname,tcandidat[i].name,\
+        tcandidat[i].note[0],tcandidat[i].note[1],tcandidat[i].note[2],\
+        tcandidat[i].note[3],tcandidat[i].nbchoix);
+        for(int y=0;y<tcandidat[i].nbchoix;++y)
+        {
+            printf("Ville : %s\n\
+            Departement : %s\n\
+            Décision département : ",tcandidat[i].TabVoeu[y]->ville,tcandidat[i].TabVoeu[y]->dep);
+            if(tcandidat[i].TabVoeu[y]->ddep==0) printf("Dossier non traité\n");
+            else
+            {
+                if(tcandidat[i].TabVoeu[y]->ddep==1) printf("Admis\n");
+                else
+                {
+                    if (tcandidat[i].TabVoeu[y]->ddep==2) printf("Liste d'attente\n");
+                    else printf("Refusé\n");
+                }
+            }
+            printf("Décision du candidat : ");
+            if(tcandidat[i].TabVoeu[y]->vcand==0) printf("Décision non rendu\n");
+            else 
+            {
+                if(tcandidat[i].TabVoeu[y]->vcand==1) printf("Accepté\n");
+                else printf("Refusé");
+            }
+        }
+        return;
+    }
+    
+    printf("Candidat non trouvé");
 }
 
 //void gestionPhaseCandidatures(); A FAIRE.*/
diff --git a/src/partie2/saeP2.h b/src/partie2/saeP2.h
index 4d1ac16..dc104af 100644
--- a/src/partie2/saeP2.h
+++ b/src/partie2/saeP2.h
@@ -18,5 +18,6 @@ typedef struct
 }candidat;
 
 candidat* LoadCandid(void);
-void RechercheCandidat(int ID, int nbcandidat, int tmax,candidat* tcandidat);
+void RechercheCandidat(int ID, int nbcandidat,candidat* tcandidat);
+void ListeCandidat(int nbcandidat,candidat *tcandidat);
 //void gestionPhaseCandidatures(); A FAIRE.