From 52f9e2de979bf7987b28afd064b427f2be713c49 Mon Sep 17 00:00:00 2001
From: "khena.bruneau" <Khena.BRUNEAU@etu.uca.fr>
Date: Sun, 18 Dec 2022 00:52:15 +0100
Subject: [PATCH] Mise a jour de la partie 2

---
 Partie_2/exe         | Bin 0 -> 16480 bytes
 Partie_2/partie2.c   |  61 ++++++++++++++++++++++++++++++++++---------
 Partie_2/prototype.h |  32 ++++++++++++++---------
 Partie_2/test.c      |   3 +++
 4 files changed, 71 insertions(+), 25 deletions(-)
 create mode 100755 Partie_2/exe

diff --git a/Partie_2/exe b/Partie_2/exe
new file mode 100755
index 0000000000000000000000000000000000000000..04991b474f3ab29f3af2cfe6549e468612e57158
GIT binary patch
literal 16480
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
A$^ZZW

literal 0
HcmV?d00001

diff --git a/Partie_2/partie2.c b/Partie_2/partie2.c
index 4704e2c..f9c005a 100644
--- a/Partie_2/partie2.c
+++ b/Partie_2/partie2.c
@@ -1,19 +1,56 @@
 #include "prototype.h"
 
-Liste inscription(Liste lCand, int nbInsc)
+Liste listenouv(void)
 {
-    Candidat c;
-    printf("Veuillez rentrer votre nom et prénom : ");
-    scanf("%s%*c%s", c.nom, c.prenom);
-    printf("Entrez les notes : ");
-    scanf("%f %f %f %f", c.lNote[0], c.lNote[1], c.lNote[2], c.lNote[3]);
-    c.nbChoix=0;
-    c.lChoix=NULL;
-    c.numC=nbInsc + 1
+    return NULL;
+}
+
+bool vide(Liste l)
+{
+    return l==NULL;
+}
+
+Liste inserer(Liste l, Candidat can)
+{
+    Maillon *m;
+    m=(Maillon*)malloc(sizeof(Maillon));
+    if (vide(m))
+    {
+        printf("Pb malloc\n");
+        exit(1);
+    }
+    m->c=&can;
+    m->suiv=l;
+    m->h=m->h+1;
+    return m;
 }
 
-void affichage(Liste l)
+void affichageT(Liste l)
+/*affiche la liste de tous les candidats*/
 {
-    printf("Numéro \t Prénom \t Nom \t Notes \t Nombre voeux \t Voeux\n");
-    
+    printf("Numéro \tPrénom \tNom\n");
+    affichage1(*l->c);
+}
+
+void affichage1(Candidat c)
+/*affiche les informations d'un candidat*/
+{
+    printf("%d \t%s\n", c.numC, c.prenom);
+}
+
+Liste inscription(Liste lCand, int nbInsc) 
+/* inscript un candidat en rentrant toutes ses informations*/
+{
+    Candidat c;
+    printf("Veuillez rentrer votre prénom : ");
+    scanf("%s", c.prenom);
+    printf("%s\n", c.prenom);
+    printf("Veuillez rentrer votre nom : ");
+    scanf("%s", c.nom);
+    printf("%s\n", c.nom);
+    c.nbChoix=0;
+    c.lChoix=NULL;
+    c.numC=nbInsc + 1;
+    lCand=inserer(lCand, c);
+    return lCand;
 }
\ No newline at end of file
diff --git a/Partie_2/prototype.h b/Partie_2/prototype.h
index 43bdb82..d00c749 100644
--- a/Partie_2/prototype.h
+++ b/Partie_2/prototype.h
@@ -3,6 +3,14 @@
 #include<string.h>
 #include<stdbool.h>
 
+typedef struct
+    {
+        char ville;
+        char dpt;
+        int chDpt;
+        int chCand;
+    } Choix;
+
 typedef struct
     {
         int numC;
@@ -10,27 +18,25 @@ typedef struct
         char nom[20];
         float lNote[4];
         int nbChoix;
-        struct Choix lChoix[nbChoix];
+        Choix *lChoix;
     } Candidat;
 
-typedef struct
-    {
-        char ville;
-        char dpt;
-        int chDpt;
-        int chCand;
-    } Choix;
-
 typedef struct maillon
     {
-        struct Candidat c;
+        Candidat *c;
         struct maillon *suiv;
+        int h;
     } Maillon, *Liste;
 
+/*Implémentation liste*/
+Liste listenouv(void);
+void affichageT(Liste l);
+void affichage1(Candidat c);
+void global(void);
+
+/*Reste*/
 Liste inscription(Liste lCand, int nbInsc);
 Liste candidater(Liste lCand, Candidat c);
 Liste modifier(Liste lCand, Candidat c);
 Liste supprimer(Liste lCand, Candidat c);
-void sauvegarder(Liste l);
-void affichage(Liste l);
-void global(void);
\ No newline at end of file
+void sauvegarder(Liste l);
\ No newline at end of file
diff --git a/Partie_2/test.c b/Partie_2/test.c
index fc96c09..54b1a22 100644
--- a/Partie_2/test.c
+++ b/Partie_2/test.c
@@ -4,10 +4,13 @@ void testInsc(void)
 {
     Liste l;
     int nb=0;
+    l=listenouv();
     l=inscription(l, nb);
+    affichageT(l);
 }
 
 int main(void)
 {
+    testInsc();
     return 1;
 }
\ No newline at end of file