From ad3aaa3147810d94e36e5abd3807c70e3cd75d7f Mon Sep 17 00:00:00 2001 From: Yann CHAMPEAU Date: Tue, 3 Jan 2023 11:58:17 +0100 Subject: [PATCH 01/18] =?UTF-8?q?R=C3=A9glage=20de=20probl=C3=A8mes=20dive?= =?UTF-8?q?rs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Etudiants.bin | 1 + Makefile | 6 +++++- src/Makefile | 7 ++----- src/annexe/saeAnnexe.c | 3 ++- src/partie1/saeP1.c | 10 +++++----- src/partie2/saeP2.c | 4 ++-- src/partie2/saeP2.h | 3 ++- src/saeMain.c | 39 ++++++++++++++++++++++++--------------- 8 files changed, 43 insertions(+), 30 deletions(-) create mode 120000 Etudiants.bin diff --git a/Etudiants.bin b/Etudiants.bin new file mode 120000 index 0000000..aabe1e1 --- /dev/null +++ b/Etudiants.bin @@ -0,0 +1 @@ +src/DataBase/Etudiants.bin \ No newline at end of file diff --git a/Makefile b/Makefile index d65dfa5..83674d5 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,13 @@ PHONY : clean doc all -all : prog +all : prog EXE prog : make -C src all +EXE : + rm -f SAE + gcc -o SAE src/saeMain.o src/annexe/saeAnnexe.o src/partie1/saeP1.o src/partie2/saeP2.o src/partie3/saeP3.o src/partie4/saeP4.o + doc : make -C src doc diff --git a/src/Makefile b/src/Makefile index cbe6040..4d3a4aa 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ -all : SAE +all : saeMain.o lib .PHONY : all doc clean @@ -9,9 +9,6 @@ lib : annexe/saeAnnexe.o partie1/saeP1.o partie2/saeP2.o partie3/saeP3.o partie4 make -C partie3 all make -C partie4 all -SAE : saeMain.o lib - gcc -o ../SAE saeMain.o annexe/saeAnnexe.o partie1/saeP1.o partie2/saeP2.o partie3/saeP3.o partie4/saeP4.o - saeMain.o : saeMain.c gcc -Wall -c saeMain.c @@ -27,4 +24,4 @@ clean : make -C partie1 clean make -C partie2 clean make -C partie3 clean - make -C partie4 clean \ No newline at end of file + make -C partie4 clean diff --git a/src/annexe/saeAnnexe.c b/src/annexe/saeAnnexe.c index 1006507..4641c10 100644 --- a/src/annexe/saeAnnexe.c +++ b/src/annexe/saeAnnexe.c @@ -13,7 +13,8 @@ void menu(void){ printf("#--------------------------------------------------------------------#\n\n"); printf("Codes pour accéder aux différents profils :\n\n"); printf("C : Consultation.\n"); - printf("A : Administrateur.\n\n"); + printf("A : Administrateur.\n"); + printf("Q : Quitter.\n\n"); printf("#--------------------------------------------------------------------#\n\n"); printf("Choisissez votre session : "); } diff --git a/src/partie1/saeP1.c b/src/partie1/saeP1.c index e9de19f..405d46a 100644 --- a/src/partie1/saeP1.c +++ b/src/partie1/saeP1.c @@ -8,7 +8,7 @@ //Partie Consultant. -void MenuUser(VilleIUT* lvIUT[],int tlogi) +void menuUser(VilleIUT* lvIUT[],int tlogi) { int intUserEntry=0; printf("#--------------------------------------------------------------------#\n"); @@ -167,7 +167,7 @@ void modifPlaces(VilleIUT* tiut[],int tlogi){ printf("\n\nEntrez le département à modifier:"); char dep[31]; scanf("%*c%s",&dep); - if(!existeDep(tiut->ldept,dep)){ + if(!existeDep(v->ldept,dep)){ fprintf(stderr,"\nDépartement non existant !\n"); return; } @@ -228,7 +228,7 @@ void supprimerDep(VilleIUT* tiut[],int tlogi){ printf("\n\nEntrez le département à supprimer:"); char dep[31]; scanf("%*c%s",&dep); - if(!existeDep(tiut->ldept,dep)){ + if(!existeDep(v->ldept,dep)){ fprintf(stderr,"\nDépartement non existant !\n"); return; } @@ -268,7 +268,7 @@ void modifNomResponsable(VilleIUT* tiut[],int tlogi){ printf("\n\nEntrez le département à modifier:"); char dep[31]; scanf("%*c%s",&dep); - if(!existeDep(tiut->ldept,dep)){ + if(!existeDep(v->ldept,dep)){ fprintf(stderr,"\nDépartement non existant !\n"); return; } @@ -280,4 +280,4 @@ void modifNomResponsable(VilleIUT* tiut[],int tlogi){ strcpy(m->resp,nom); printf("\n\nLe nom du responsable du département %s de l'IUT de %s a bien été changé pour %s.\n",dep,ville,nom); return; -} \ No newline at end of file +} diff --git a/src/partie2/saeP2.c b/src/partie2/saeP2.c index 1cfa471..80d3175 100644 --- a/src/partie2/saeP2.c +++ b/src/partie2/saeP2.c @@ -3,7 +3,7 @@ #include #include "saeP2.h" - +/* candidat* LoadCandid(void) { //J'ouvre le fichier @@ -110,4 +110,4 @@ void RechercheCandidat(int ID, int nbcandidat, int tmax,candidat *tcand) } -//void gestionPhaseCandidatures(); A FAIRE. \ No newline at end of file +//void gestionPhaseCandidatures(); A FAIRE.*/ diff --git a/src/partie2/saeP2.h b/src/partie2/saeP2.h index 2cbcd60..1409b29 100644 --- a/src/partie2/saeP2.h +++ b/src/partie2/saeP2.h @@ -1,3 +1,4 @@ +/* typedef struct { char ville[31]; @@ -17,4 +18,4 @@ typedef struct candidat* LoadCandid(void); -//void gestionPhaseCandidatures(); A FAIRE. \ No newline at end of file +//void gestionPhaseCandidatures(); A FAIRE.*/ diff --git a/src/saeMain.c b/src/saeMain.c index 7e69780..0afd953 100644 --- a/src/saeMain.c +++ b/src/saeMain.c @@ -9,22 +9,31 @@ int main(void) { + system("clear"); VilleIUT* tiut[36529]; - int tlogi=loadIUT(tiut); - menu(); - char user; - scanf("%c",&user); - switch(user){ - case 'C': - reset(); - menuUser(tiut,tlogi); - reset(); - break; - case 'A': - reset(); - menuAdmin(tiut,tlogi); - reset(); + int tlogi=loadIUT(tiut), quit=0; + while(!quit){ + menu(); + char user, confirmation; + scanf("%c",&user); + switch(user){ + case 'C': + reset(); + menuUser(tiut,tlogi); + reset(); + break; + case 'A': + reset(); + menuAdmin(tiut,tlogi); + reset(); + break; + case 'Q': + printf("Êtes-vous sûr de vouloir quitter ? (Y pour continuer)\n\n"); + scanf("%*c%c",&confirmation); + if(confirmation=='Y') quit=1; + system("clear"); + } } //save(); return 0; -} \ No newline at end of file +} From c435315d5df958fa3c167d1ed19d21f9b093d6be Mon Sep 17 00:00:00 2001 From: "jade.van_brabandt" Date: Tue, 3 Jan 2023 12:16:54 +0100 Subject: [PATCH 02/18] Fix de segfault, Je hais Git --- src/partie1/saeP1.c | 43 ++++++++++++++++++++++++++++++------------- src/partie2/saeP2.c | 10 +++++----- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/partie1/saeP1.c b/src/partie1/saeP1.c index e9de19f..7162f46 100644 --- a/src/partie1/saeP1.c +++ b/src/partie1/saeP1.c @@ -10,6 +10,9 @@ void MenuUser(VilleIUT* lvIUT[],int tlogi) { + int quit=0; + while(!quit) + { int intUserEntry=0; printf("#--------------------------------------------------------------------#\n"); printf("| |\n"); @@ -23,16 +26,30 @@ void MenuUser(VilleIUT* lvIUT[],int tlogi) printf("4 : Rechercher les IUTs possèdant un département précis.\n"); printf("9 : Revenir à l'écran de sélection du profil.\n\n"); printf("#--------------------------------------------------------------------#\n\n"); - while(intUserEntry!=9) - { - printf("Choisissez l'action que vous voulez exécuter : "); - if (!(scanf("%d",intUserEntry)))printf("Entrée innexacte. Veuillez réessayer"); - if (intUserEntry==1) SearchCityWithIUT(lvIUT,tlogi); - if (intUserEntry==2) DepEachIUT(lvIUT,tlogi); - if (intUserEntry==3) SearchPlaceFromDepInIUT(lvIUT,tlogi); - if (intUserEntry==4) SearchIUTFromDep(lvIUT,tlogi); - if (intUserEntry==9) printf("Sortie en cours.\n"); - else printf("Entrée innexacte. Veuillez réessayer"); + int act; + scanf("%d",&act); + switch(act){ + case 1: + SearchCityWithIUT(lvIUT,tlogi); + reset(); + break; + case 2: + DepEachIUT(lvIUT,tlogi); + reset(); + break; + case 3: + SearchPlaceFromDepInIUT(lvIUT,tlogi); + reset(); + break; + case 4: + SearchIUTFromDep(lvIUT,tlogi); + reset(); + break; + case 9: + quit=1; + break; + + } } } @@ -167,7 +184,7 @@ void modifPlaces(VilleIUT* tiut[],int tlogi){ printf("\n\nEntrez le département à modifier:"); char dep[31]; scanf("%*c%s",&dep); - if(!existeDep(tiut->ldept,dep)){ + if(!existeDep(v->ldept,dep)){ fprintf(stderr,"\nDépartement non existant !\n"); return; } @@ -228,7 +245,7 @@ void supprimerDep(VilleIUT* tiut[],int tlogi){ printf("\n\nEntrez le département à supprimer:"); char dep[31]; scanf("%*c%s",&dep); - if(!existeDep(tiut->ldept,dep)){ + if(!existeDep(v->ldept,dep)){ fprintf(stderr,"\nDépartement non existant !\n"); return; } @@ -268,7 +285,7 @@ void modifNomResponsable(VilleIUT* tiut[],int tlogi){ printf("\n\nEntrez le département à modifier:"); char dep[31]; scanf("%*c%s",&dep); - if(!existeDep(tiut->ldept,dep)){ + if(!existeDep(v->ldept,dep)){ fprintf(stderr,"\nDépartement non existant !\n"); return; } diff --git a/src/partie2/saeP2.c b/src/partie2/saeP2.c index 1cfa471..951a966 100644 --- a/src/partie2/saeP2.c +++ b/src/partie2/saeP2.c @@ -2,13 +2,13 @@ #include #include #include "saeP2.h" - +/* candidat* LoadCandid(void) { //J'ouvre le fichier FILE* file; - if((file=fopen(candid.bin,"wb")==NULL) + if((file=fopen("candid.bin","rb"))==NULL) { perror("Erreur : "); exit(1); @@ -42,8 +42,8 @@ candidat* LoadCandid(void) int vcand; fread(ville,sizeof(char)*31,1,file); fread(dep,sizeof(char)*31,1,file); - fread(ddep,sizeof(int),1,file); - fread(vcand,sizeof(int),1,file); + fread(&ddep,sizeof(int),1,file); + fread(&vcand,sizeof(int),1,file); voeu voeu_ajout; voeu_ajout.ville=ville; voeu_ajout.dep=dep; @@ -110,4 +110,4 @@ void RechercheCandidat(int ID, int nbcandidat, int tmax,candidat *tcand) } -//void gestionPhaseCandidatures(); A FAIRE. \ No newline at end of file +//void gestionPhaseCandidatures(); A FAIRE.*/ \ No newline at end of file From 9ea8c27836a09a5a3b4a35ce00edf00b5a11cdc6 Mon Sep 17 00:00:00 2001 From: Yann CHAMPEAU Date: Wed, 4 Jan 2023 09:56:49 +0100 Subject: [PATCH 03/18] =?UTF-8?q?Rien=20n'a=20avanc=C3=A9=20:=5F).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 3 +- SAE | Bin 0 -> 26608 bytes src/Makefile | 16 ++--- src/annexe/Makefile | 4 ++ src/annexe/saeAnnexe.c | 7 +- src/annexe/saeAnnexe.h | 4 +- src/partie1/saeP1.c | 158 +++++++++++++++++++++++++---------------- src/partie1/saeP1.h | 6 +- src/saeMain.c | 2 +- 9 files changed, 121 insertions(+), 79 deletions(-) create mode 100755 SAE diff --git a/Makefile b/Makefile index 83674d5..3b48226 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ -PHONY : clean doc all +.PHONY: clean doc all + all : prog EXE prog : diff --git a/SAE b/SAE new file mode 100755 index 0000000000000000000000000000000000000000..23d6b812c0ba5673b66677a9289144000e7d48ba GIT binary patch literal 26608 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 J9RiLf`yWL*{doWY literal 0 HcmV?d00001 diff --git a/src/Makefile b/src/Makefile index 4d3a4aa..3c10091 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,13 +1,13 @@ -all : saeMain.o lib +.PHONY : all doc clean lib -.PHONY : all doc clean +all : saeMain.o lib -lib : annexe/saeAnnexe.o partie1/saeP1.o partie2/saeP2.o partie3/saeP3.o partie4/saeP4.o - make -C annexe all - make -C partie1 all - make -C partie2 all - make -C partie3 all - make -C partie4 all +lib : + make -C annexe + make -C partie1 + make -C partie2 + make -C partie3 + make -C partie4 saeMain.o : saeMain.c gcc -Wall -c saeMain.c diff --git a/src/annexe/Makefile b/src/annexe/Makefile index 6f41ebb..b9bd736 100644 --- a/src/annexe/Makefile +++ b/src/annexe/Makefile @@ -1,3 +1,7 @@ + +CC = gcc +CCOPTS = -Wall + all : saeAnnexe.o saeAnnexe.o : saeAnnexe.c saeAnnexe.h diff --git a/src/annexe/saeAnnexe.c b/src/annexe/saeAnnexe.c index 4641c10..562757e 100644 --- a/src/annexe/saeAnnexe.c +++ b/src/annexe/saeAnnexe.c @@ -59,14 +59,17 @@ int loadIUT(VilleIUT** tiut){ return tlogi; } -int rechercheTabPtVilleIUT(VilleIUT* tab[],int lTab,char* mot){ +int rechercheIUT(VilleIUT* tab[],int lTab,char mot[]){ + printf("CPT1\n"); + /* if(!lTab){ - fprintf(stderr,"Erreur, Pas d'éléments dans le tableau !"); + fprintf(stderr,"Erreur, Pas de villes enregistrées !\n"); return -1; } for(int i=0; iVille==mot) return i; } + */ return -1; } diff --git a/src/annexe/saeAnnexe.h b/src/annexe/saeAnnexe.h index 3ea8b4c..19aa4c4 100644 --- a/src/annexe/saeAnnexe.h +++ b/src/annexe/saeAnnexe.h @@ -31,7 +31,7 @@ void menu(void); // // int loadIUT(VilleIUT** tiut); //Fichier Binaire. // // -int rechercheTabPtVilleIUT(VilleIUT* tab[],int lTab,char* mot); // +int rechercheIUT(VilleIUT* tab[],int lTab,char mot[]); // // // // @@ -70,4 +70,4 @@ void vider_file(File f); // // // // void reset(void); // -//--------------------------------------------------------------// \ No newline at end of file +//--------------------------------------------------------------// diff --git a/src/partie1/saeP1.c b/src/partie1/saeP1.c index 405d46a..fae75c1 100644 --- a/src/partie1/saeP1.c +++ b/src/partie1/saeP1.c @@ -106,59 +106,64 @@ void SearchIUTFromDep(VilleIUT* lvIUT[],int tlogi) //Partie Administrateur. -void menuAdmin(VilleIUT* tiut[],int tlogi){ - int quit=0; - while(!quit){ - printf("#--------------------------------------------------------------------#\n"); - printf("| |\n"); - printf("| SAE S1.02 |\n"); - printf("| |\n"); - printf("#--------------------------------------------------------------------#\n\n"); - printf("Codes correspondant aux différentes actions :\n\n"); - printf("1 : Modifier le nombre de places dans un département.\n"); - printf("2 : Créer un département dans un IUT.\n"); - printf("3 : Supprimer un département d’un IUT.\n"); - printf("4 : Lancer et arrêter la phase de candidature.\n"); - printf("5 : Modifier le nom d'un responsable de département.\n"); - printf("9 : Revenir à l'écran de sélection du profil.\n\n"); - printf("#--------------------------------------------------------------------#\n\n"); - printf("Choisissez l'action que vous voulez exécuter : "); - int act; - scanf("%d",&act); - switch(act){ - case 1: - modifPlaces(tiut,tlogi); - reset(); - break; - case 2: - creerDep(tiut,tlogi); - reset(); - break; - case 3: - supprimerDep(tiut,tlogi); - reset(); - break; - case 4: - //gestionPhaseCandidatures(); A Faire (Partie 2). - reset(); - break; - case 5: - modifNomResponsable(tiut,tlogi); - reset(); - break; - case 9: - quit=1; - reset(); - } - } +void menuAdmin(VilleIUT* tiut[],int *tlogi){ + int quit=0; + while(!quit){ + printf("#--------------------------------------------------------------------#\n"); + printf("| |\n"); + printf("| SAE S1.02 |\n"); + printf("| |\n"); + printf("#--------------------------------------------------------------------#\n\n"); + printf("Codes correspondant aux différentes actions :\n\n"); + printf("1 : Modifier le nombre de places dans un département.\n"); + printf("2 : Créer un département dans un IUT.\n"); + printf("3 : Supprimer un département d’un IUT.\n"); + printf("4 : Lancer et arrêter la phase de candidature.\n"); + printf("5 : Modifier le nom d'un responsable de département.\n"); + printf("6 : Créer un IUT.\n"); + printf("9 : Revenir à l'écran de sélection du profil.\n\n"); + printf("#--------------------------------------------------------------------#\n\n"); + printf("Choisissez l'action que vous voulez exécuter : "); + int act; + scanf("%d",&act); + switch(act){ + case 1: + modifPlaces(tiut,*tlogi); + reset(); + break; + case 2: + creerDep(tiut,*tlogi); + reset(); + break; + case 3: + supprimerDep(tiut,*tlogi); + reset(); + break; + case 4: + //gestionPhaseCandidatures(); A Faire (Partie 2). + reset(); + break; + case 5: + modifNomResponsable(tiut,*tlogi); + reset(); + break; + case 6: + creerIUT(tiut,tlogi); + reset(); + break; + case 9: + quit=1; + reset(); + } + } } void modifPlaces(VilleIUT* tiut[],int tlogi){ - printf("\nEntrez la ville correspondant à l'IUT à modifier (Q pour abandonner):"); + printf("\nEntrez la ville correspondant à l'IUT à modifier (Q pour abandonner): "); char ville[31]; - scanf("%*c%s",&ville); + scanf("%*c%s",ville); if(ville[0]=='Q' && ville[1]=='\0') return; - int noVille=rechercheTabPtVilleIUT(tiut,tlogi,ville); + int noVille=rechercheIUT(tiut,tlogi,ville); if(noVille<=0){ fprintf(stderr,"\nVille non existante !\n"); return; @@ -166,7 +171,7 @@ void modifPlaces(VilleIUT* tiut[],int tlogi){ VilleIUT* v=tiut[noVille]; printf("\n\nEntrez le département à modifier:"); char dep[31]; - scanf("%*c%s",&dep); + scanf("%*c%s",dep); if(!existeDep(v->ldept,dep)){ fprintf(stderr,"\nDépartement non existant !\n"); return; @@ -182,11 +187,11 @@ void modifPlaces(VilleIUT* tiut[],int tlogi){ } void creerDep(VilleIUT* tiut[],int tlogi){ - printf("\nEntrez la ville correspondant à l'IUT à modifier (Q pour abandonner):"); + printf("\nEntrez la ville correspondant à l'IUT à modifier (Q pour abandonner): "); char ville[31]; - scanf("%*c%s",&ville); + scanf("%*c%s",ville); if(ville[0]=='Q' && ville[1]=='\0') return; - int noVille=rechercheTabPtVilleIUT(tiut,tlogi,ville); + int noVille=rechercheIUT(tiut,tlogi,ville); if(noVille<=0){ fprintf(stderr,"\nVille non existante !\n"); return; @@ -202,24 +207,24 @@ void creerDep(VilleIUT* tiut[],int tlogi){ m=m->suivant; printf("\n\nEntrez le nom du département à créer :"); char dep[31]; - scanf("%*c%s",&dep); + scanf("%*c%s",dep); strcpy(m->departement,dep); printf("\n\nEntrez le nombre de places disponibles dans le département :"); scanf("%d",&m->nbp); printf("\n\nEntrez le nom du responsable de département :"); char resp[51]; - scanf("%*c%s",&resp); + scanf("%*c%s",resp); strcpy(m->resp,resp); printf("\n\nLe département %s a bien été ajouté à l'IUT de %s.\n",dep,ville); return; } void supprimerDep(VilleIUT* tiut[],int tlogi){ - printf("\nEntrez la ville correspondant à l'IUT à modifier (Q pour abandonner):"); + printf("\nEntrez la ville correspondant à l'IUT à modifier (Q pour abandonner): "); char ville[31]; - scanf("%*c%s",&ville); + scanf("%*c%s",ville); if(ville[0]=='Q' && ville[1]=='\0') return; - int noVille=rechercheTabPtVilleIUT(tiut,tlogi,ville); + int noVille=rechercheIUT(tiut,tlogi,ville); if(noVille<=0){ fprintf(stderr,"\nVille non existante !\n"); return; @@ -227,7 +232,7 @@ void supprimerDep(VilleIUT* tiut[],int tlogi){ VilleIUT* v=tiut[noVille]; printf("\n\nEntrez le département à supprimer:"); char dep[31]; - scanf("%*c%s",&dep); + scanf("%*c%s",dep); if(!existeDep(v->ldept,dep)){ fprintf(stderr,"\nDépartement non existant !\n"); return; @@ -236,6 +241,7 @@ void supprimerDep(VilleIUT* tiut[],int tlogi){ if(m->departement==dep){ printf("\n\nVoulez-vous supprimer le département %s de la ville de %s ? (Y pour continuer)\n\n",m->departement,v->Ville); char choix; + scanf("%*c%c",&choix); if(choix!='Y') return; v->ldept=m->suivant; free(m); @@ -244,6 +250,7 @@ void supprimerDep(VilleIUT* tiut[],int tlogi){ while(m->suivant->departement!=dep) m=m->suivant; printf("\n\nVoulez-vous supprimer le département %s de la ville de %s ? (Y pour continuer)\n\n",m->suivant->departement,v->Ville); char choix; + scanf("%*c%c",&choix); if(choix!='Y') return; MaillonDep* temp; temp=m->suivant; @@ -255,11 +262,11 @@ void supprimerDep(VilleIUT* tiut[],int tlogi){ } void modifNomResponsable(VilleIUT* tiut[],int tlogi){ - printf("\nEntrez la ville correspondant à l'IUT à modifier (Q pour abandonner):"); + printf("\nEntrez la ville correspondant à l'IUT à modifier (Q pour abandonner): "); char ville[31]; - scanf("%*c%s",&ville); + scanf("%*c%s",ville); if(ville[0]=='Q' && ville[1]=='\0') return; - int noVille=rechercheTabPtVilleIUT(tiut,tlogi,ville); + int noVille=rechercheIUT(tiut,tlogi,ville); if(noVille<=0){ fprintf(stderr,"\nVille non existante !\n"); return; @@ -267,7 +274,7 @@ void modifNomResponsable(VilleIUT* tiut[],int tlogi){ VilleIUT* v=tiut[noVille]; printf("\n\nEntrez le département à modifier:"); char dep[31]; - scanf("%*c%s",&dep); + scanf("%*c%s",dep); if(!existeDep(v->ldept,dep)){ fprintf(stderr,"\nDépartement non existant !\n"); return; @@ -276,8 +283,33 @@ void modifNomResponsable(VilleIUT* tiut[],int tlogi){ while(m->departement!=dep) m=m->suivant; printf("\n\nLe responsable du département %s de l'IUT de la ville de %s est actuellement %s. Quel est le nom du nouveau responsable ?\n\n",m->departement,v->Ville,m->resp); char nom[51]; - scanf("%d",&nom); + scanf("%s",nom); strcpy(m->resp,nom); printf("\n\nLe nom du responsable du département %s de l'IUT de %s a bien été changé pour %s.\n",dep,ville,nom); return; } + +void creerIUT(VilleIUT* tiut[],int* tlogi){ + printf("\nEntrez le nom de la ville correspondant à l'IUT à ajouter (Q pour abandonner): "); + char ville[31]; + scanf("%*c%s",ville); + if(ville[0]=='Q' && ville[1]=='\0') return; + fprintf(stderr,"before !\n"); + int noVille=rechercheIUT(tiut,*tlogi,ville); + fprintf(stderr,"end !\n"); + if(noVille>0){ + fprintf(stderr,"\nVille déjà existante !\n"); + return; + } + VilleIUT* v=(VilleIUT*)malloc(sizeof(VilleIUT)); + if(v==NULL){ + perror("malloc"); + exit(errno); + } + strcpy(v->Ville,ville); + v->ldept=NULL; + tiut[*tlogi]=v; + *tlogi=*tlogi+1; + printf("\n\nL'IUT de %s a bien été ajouté.\n",ville); + return; +} diff --git a/src/partie1/saeP1.h b/src/partie1/saeP1.h index d52d2d6..84f282c 100644 --- a/src/partie1/saeP1.h +++ b/src/partie1/saeP1.h @@ -28,7 +28,7 @@ void SearchIUTFromDep(VilleIUT* lvIUT[],int tlogi); //Admin -void menuAdmin(VilleIUT* tiut[],int tlogi); +void menuAdmin(VilleIUT* tiut[],int* tlogi); void modifPlaces(VilleIUT* tiut[],int tlogi); @@ -36,4 +36,6 @@ void creerDep(VilleIUT* tiut[],int tlogi); void supprimerDep(VilleIUT* tiut[],int tlogi); -void modifNomResponsable(VilleIUT* tiut[],int tlogi); \ No newline at end of file +void modifNomResponsable(VilleIUT* tiut[],int tlogi); + +void creerIUT(VilleIUT* tiut[],int* tlogi); diff --git a/src/saeMain.c b/src/saeMain.c index 0afd953..a9d7a49 100644 --- a/src/saeMain.c +++ b/src/saeMain.c @@ -24,7 +24,7 @@ int main(void) break; case 'A': reset(); - menuAdmin(tiut,tlogi); + menuAdmin(tiut,&tlogi); reset(); break; case 'Q': From 9fa2473914b6c83027730d3105d0e195290d54f3 Mon Sep 17 00:00:00 2001 From: "jade.van_brabandt" Date: Thu, 5 Jan 2023 10:13:49 +0100 Subject: [PATCH 04/18] Changement menu utilisateur --- SAE | Bin 0 -> 26584 bytes src/partie2/saeP2.c | 11 +++++++---- src/partie2/saeP2.h | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100755 SAE diff --git a/SAE b/SAE new file mode 100755 index 0000000000000000000000000000000000000000..ddf5ef2905151a56610d59e230f1e5b6f7137129 GIT binary patch literal 26584 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 ZkQINbeZ@=ZnoEAMQ*eyU63D8u{{az=8mIsO literal 0 HcmV?d00001 diff --git a/src/partie2/saeP2.c b/src/partie2/saeP2.c index a654f9e..7dfa7dc 100644 --- a/src/partie2/saeP2.c +++ b/src/partie2/saeP2.c @@ -2,7 +2,7 @@ #include #include #include "saeP2.h" -/* + candidat* LoadCandid(void) { //J'ouvre le fichier @@ -15,11 +15,12 @@ candidat* LoadCandid(void) //Lire la première ligne pr savoir combien d'étudiant je vais lire int nbcandid; fread(&nbcandid,sizeof(int),1,file); - candidat Listecandidat[nbcandid]; + candidat* Listecandidat=(candidat*) malloc (sizeof(candidat)*nbcandid); //Tant que j'ai des étudiants à lire : for(int i=0;nbcandid>i;++i) { -//Son numéro, Son nom, Son prenom, liste de note +//Son numéro, Son nom, Son prenom, liste de note` + candidat Candidat_ajout; int numcandid; char surname[31]; char name[31]; @@ -32,6 +33,7 @@ candidat* LoadCandid(void) int nbchoix; fread(&nbchoix,sizeof(int),1,file); //Tant que j'ai pas fait tout ces choix : + voeu* ListeVoeu_ajout=NULL; for(int y=0;y Date: Thu, 5 Jan 2023 11:23:52 +0100 Subject: [PATCH 05/18] CA COMPILE --- SAE | Bin 26584 -> 30784 bytes src/partie1/saeP1.c | 6 +-- src/partie2/saeP2.c | 103 ++++++++++++++++++-------------------------- src/partie2/saeP2.h | 7 +-- 4 files changed, 49 insertions(+), 67 deletions(-) diff --git a/SAE b/SAE index ddf5ef2905151a56610d59e230f1e5b6f7137129..417d2d09b4774bc55c114b3e9c0e3d5601706a1f 100755 GIT binary patch literal 30784 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 delta 7270 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 + if (strcmp(lvIUT[i]->Ville,sVille)) { + printf("Département y étant disponible :\n"); MaillonDep* MaillonAct=lvIUT[i]->ldept; while (MaillonAct!=NULL) printf("%s",MaillonAct->departement); boolF=1; @@ -98,7 +98,7 @@ void SearchPlaceFromDepInIUT(VilleIUT* lvIUT[],int tlogi) while (MaillonAct!=NULL) { - if(MaillonAct->departement==sDep) + if(strcmp(MaillonAct->departement,sDep)) { printf("Nombre de place : %d\n",MaillonAct->nbp); return; diff --git a/src/partie2/saeP2.c b/src/partie2/saeP2.c index 7dfa7dc..88d526a 100644 --- a/src/partie2/saeP2.c +++ b/src/partie2/saeP2.c @@ -2,6 +2,7 @@ #include #include #include "saeP2.h" +#include candidat* LoadCandid(void) { @@ -15,93 +16,72 @@ candidat* LoadCandid(void) //Lire la première ligne pr savoir combien d'étudiant je vais lire int nbcandid; fread(&nbcandid,sizeof(int),1,file); - candidat* Listecandidat=(candidat*) malloc (sizeof(candidat)*nbcandid); + candidat* Tabcandidat=(candidat*) malloc (sizeof(candidat)*nbcandid); //Tant que j'ai des étudiants à lire : for(int i=0;nbcandid>i;++i) { //Son numéro, Son nom, Son prenom, liste de note` candidat Candidat_ajout; - int numcandid; - char surname[31]; - char name[31]; - float note[4]; - fread(&numcandid,sizeof(int),1,file); - fread(surname,sizeof(char)*31,1,file); - fread(name,sizeof(char)*31,1,file); - fread(note,sizeof(int)*4,1,file); + fread(&Candidat_ajout.numcandid,sizeof(int),1,file); + fread(Candidat_ajout.surname,sizeof(char)*31,1,file); + fread(Candidat_ajout.name,sizeof(char)*31,1,file); + fread(Candidat_ajout.note,sizeof(float)*4,1,file); //Son nb de choix - int nbchoix; - fread(&nbchoix,sizeof(int),1,file); + fread(&Candidat_ajout.nbchoix,sizeof(int),1,file); //Tant que j'ai pas fait tout ces choix : - voeu* ListeVoeu_ajout=NULL; - for(int y=0;yville,sizeof(char)*31,1,file); + fread(voeu_ajout->dep,sizeof(char)*31,1,file); + fread(&voeu_ajout->ddep,sizeof(int),1,file); + fread(&voeu_ajout->vcand,sizeof(int),1,file); + Candidat_ajout.TabVoeu[i]=voeu_ajout; } - Candidat_ajout.numcandid=numcandid; - Candidat_ajout.surname=surname; - Candidat_ajout.name=name; - Candidat_ajout.note=note; - Candidat_ajout.ListeVoeu=ListeVoeu_ajout; - Listecandidat[i]=Candidat_ajout; + Tabcandidat[i]=Candidat_ajout; } //Je sors en disant que le load est sucessful printf("Chargement réussie."); - return Listecandidat; + return Tabcandidat; } -/* -void RechercheCandidat(int ID, int nbcandidat, int tmax,candidat *tcand) + +void RechercheCandidat(int ID, int nbcandidat, int tmax,candidat *tcandidat) { for(int i=0;iville,tcandidat[i].TabVoeu[y]->dep); + if(tcandidat[i].TabVoeu[y]->ddep==0) printf("Dossier non traité\n"); else { - if(==1) printf("Admis\n"); + if(tcandidat[i].TabVoeu[y]->ddep==1) printf("Admis\n"); else { - if (==2) printf("Liste d'attente\n"); + if (tcandidat[i].TabVoeu[y]->ddep==2) printf("Liste d'attente\n"); else printf("Refusé\n"); } } - printf("Décision du candidat : ") - if(==0) printf("Décision non rendu\n"); + printf("Décision du candidat : "); + if(tcandidat[i].TabVoeu[y]->vcand==0) printf("Décision non rendu\n"); else { - if(==1) printf("Accepté\n"); - else prinf("Refusé"); + if(tcandidat[i].TabVoeu[y]->vcand==1) printf("Accepté\n"); + else printf("Refusé"); } } return; @@ -110,5 +90,6 @@ void RechercheCandidat(int ID, int nbcandidat, int tmax,candidat *tcand) printf("Candidat non trouvé"); return; } + //void gestionPhaseCandidatures(); A FAIRE.*/ diff --git a/src/partie2/saeP2.h b/src/partie2/saeP2.h index 527fa4a..4d1ac16 100644 --- a/src/partie2/saeP2.h +++ b/src/partie2/saeP2.h @@ -12,10 +12,11 @@ typedef struct int numcandid; char surname[31]; char name[31]; - int note[4]; - voeu ListeVoeu[100]; + float note[4]; + int nbchoix; + voeu* TabVoeu[20]; }candidat; candidat* LoadCandid(void); - +void RechercheCandidat(int ID, int nbcandidat, int tmax,candidat* tcandidat); //void gestionPhaseCandidatures(); A FAIRE. From 95abe17e1bc02bbb60272186a02a73a2158b7b25 Mon Sep 17 00:00:00 2001 From: "jade.van_brabandt" Date: Thu, 5 Jan 2023 12:00:54 +0100 Subject: [PATCH 06/18] Pour une fois on segfault pas --- SAE | Bin 30784 -> 30784 bytes src/partie1/saeP1.c | 12 +++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/SAE b/SAE index 417d2d09b4774bc55c114b3e9c0e3d5601706a1f..195723858d8435f7c63443c4b9c14383c8ac525d 100755 GIT binary patch delta 3555 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 diff --git a/src/partie1/saeP1.c b/src/partie1/saeP1.c index b7ef22e..850bf6f 100644 --- a/src/partie1/saeP1.c +++ b/src/partie1/saeP1.c @@ -13,7 +13,6 @@ void menuUser(VilleIUT* lvIUT[],int tlogi) int quit=0; while(!quit) { - int intUserEntry=0; printf("#--------------------------------------------------------------------#\n"); printf("| |\n"); printf("| SAE S1.02 |\n"); @@ -64,7 +63,11 @@ void DepEachIUT(VilleIUT* lvIUT[], int tlogi) { printf("%s :",lvIUT[i]->Ville); MaillonDep* MaillonAct=lvIUT[i]->ldept; - while (MaillonAct!=NULL) printf("\t-%s\n",MaillonAct->departement); + while (MaillonAct!=NULL) + { + printf("\t-%s\n",MaillonAct->departement); + MaillonAct=MaillonAct->suivant; + } } } @@ -75,13 +78,16 @@ void SearchPlaceFromDepInIUT(VilleIUT* lvIUT[],int tlogi) int boolF=0, i; printf("Entrez le nom de la ville contenant le département recherché :\n"); scanf("%s",sVille); + printf("%d",tlogi); for (i=0;iVille,sVille)) + if (!strcmp(lvIUT[i]->Ville,sVille)) { printf("Département y étant disponible :\n"); MaillonDep* MaillonAct=lvIUT[i]->ldept; + printf("Test"); while (MaillonAct!=NULL) printf("%s",MaillonAct->departement); + printf("Test"); boolF=1; MaillonAct=MaillonAct->suivant; break; From b7e9cc297a2ee7a2618aa5a5b4d52a2f5f23d2b7 Mon Sep 17 00:00:00 2001 From: Yann CHAMPEAU Date: Thu, 5 Jan 2023 12:00:59 +0100 Subject: [PATCH 07/18] =?UTF-8?q?R=C3=A9glages=20de=20probl=C3=A8mes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/annexe/saeAnnexe.c | 5 +--- src/partie1/saeP1.c | 56 +++++++++++++++++++++++------------------- src/partie2/saeP2.c | 4 +-- src/partie2/saeP2.h | 4 +-- src/saeMain.c | 2 -- 5 files changed, 36 insertions(+), 35 deletions(-) diff --git a/src/annexe/saeAnnexe.c b/src/annexe/saeAnnexe.c index 562757e..56c7391 100644 --- a/src/annexe/saeAnnexe.c +++ b/src/annexe/saeAnnexe.c @@ -60,16 +60,13 @@ int loadIUT(VilleIUT** tiut){ } int rechercheIUT(VilleIUT* tab[],int lTab,char mot[]){ - printf("CPT1\n"); - /* if(!lTab){ fprintf(stderr,"Erreur, Pas de villes enregistrées !\n"); return -1; } for(int i=0; iVille==mot) return i; + if(!strcmp(tab[i]->Ville,mot)) return i; } - */ return -1; } diff --git a/src/partie1/saeP1.c b/src/partie1/saeP1.c index 8cabde3..f404693 100644 --- a/src/partie1/saeP1.c +++ b/src/partie1/saeP1.c @@ -12,8 +12,7 @@ void menuUser(VilleIUT* lvIUT[],int tlogi) { int quit=0; while(!quit) - { - int intUserEntry=0; + { printf("#--------------------------------------------------------------------#\n"); printf("| |\n"); printf("| SAE S1.02 |\n"); @@ -26,6 +25,7 @@ void menuUser(VilleIUT* lvIUT[],int tlogi) printf("4 : Rechercher les IUTs possèdant un département précis.\n"); printf("9 : Revenir à l'écran de sélection du profil.\n\n"); printf("#--------------------------------------------------------------------#\n\n"); + printf("Choisissez l'action que vous voulez exécuter : "); int act; scanf("%d",&act); switch(act){ @@ -47,7 +47,7 @@ void menuUser(VilleIUT* lvIUT[],int tlogi) break; case 9: quit=1; - break; + reset(); } } @@ -55,14 +55,14 @@ void menuUser(VilleIUT* lvIUT[],int tlogi) void SearchCityWithIUT(VilleIUT* lvIUT[], int tlogi) { - for (int i=0;iVille); + for (int i=0;iVille); } void DepEachIUT(VilleIUT* lvIUT[], int tlogi) { for (int i=0;iVille); + printf("\n - %s :",lvIUT[i]->Ville); MaillonDep* MaillonAct=lvIUT[i]->ldept; while (MaillonAct!=NULL) printf("\t-%s\n",MaillonAct->departement); } @@ -209,30 +209,38 @@ void creerDep(VilleIUT* tiut[],int tlogi){ scanf("%*c%s",ville); if(ville[0]=='Q' && ville[1]=='\0') return; int noVille=rechercheIUT(tiut,tlogi,ville); - if(noVille<=0){ + if(noVille<0){ fprintf(stderr,"\nVille non existante !\n"); return; } VilleIUT* v=tiut[noVille]; - MaillonDep* m=v->ldept; - while(m->suivant!=NULL) m=m->suivant; - m->suivant=(MaillonDep*)malloc(sizeof(MaillonDep)); - if(m->suivant==NULL){ - perror("malloc"); - exit(errno); + int ck=0; + if(v->ldept==NULL){ + ck=1; + v->ldept=(MaillonDep*)malloc(sizeof(MaillonDep)); + if(v->ldept==NULL){ + perror("malloc"); + exit(errno); + } } - m=m->suivant; - printf("\n\nEntrez le nom du département à créer :"); - char dep[31]; - scanf("%*c%s",dep); - strcpy(m->departement,dep); - printf("\n\nEntrez le nombre de places disponibles dans le département :"); + MaillonDep* m=v->ldept; + if(!ck){ + while(m->suivant!=NULL) m=m->suivant; + m->suivant=(MaillonDep*)malloc(sizeof(MaillonDep)); + if(m->suivant==NULL){ + perror("malloc"); + exit(errno); + } + m=m->suivant; + } + printf("\n\nEntrez le nom du département à créer : "); + scanf("%*c%s",m->departement); + printf("\n\nEntrez le nombre de places disponibles dans le département : "); scanf("%d",&m->nbp); - printf("\n\nEntrez le nom du responsable de département :"); - char resp[51]; - scanf("%*c%s",resp); - strcpy(m->resp,resp); - printf("\n\nLe département %s a bien été ajouté à l'IUT de %s.\n",dep,ville); + printf("\n\nEntrez le nom du responsable de département : \n"); + scanf("%*c"); + fgets(m->resp, 51, stdin); + printf("\n\nLe département %s a bien été ajouté à l'IUT de %s.\n",m->departement,ville); return; } @@ -311,9 +319,7 @@ void creerIUT(VilleIUT* tiut[],int* tlogi){ char ville[31]; scanf("%*c%s",ville); if(ville[0]=='Q' && ville[1]=='\0') return; - fprintf(stderr,"before !\n"); int noVille=rechercheIUT(tiut,*tlogi,ville); - fprintf(stderr,"end !\n"); if(noVille>0){ fprintf(stderr,"\nVille déjà existante !\n"); return; diff --git a/src/partie2/saeP2.c b/src/partie2/saeP2.c index 7dfa7dc..e116ef9 100644 --- a/src/partie2/saeP2.c +++ b/src/partie2/saeP2.c @@ -3,7 +3,7 @@ #include #include "saeP2.h" -candidat* LoadCandid(void) +/*candidat* LoadCandid(void) { //J'ouvre le fichier FILE* file; @@ -63,7 +63,7 @@ candidat* LoadCandid(void) //Je sors en disant que le load est sucessful printf("Chargement réussie."); return Listecandidat; -} +}*/ /* void RechercheCandidat(int ID, int nbcandidat, int tmax,candidat *tcand) { diff --git a/src/partie2/saeP2.h b/src/partie2/saeP2.h index 527fa4a..bfd7647 100644 --- a/src/partie2/saeP2.h +++ b/src/partie2/saeP2.h @@ -1,5 +1,5 @@ -typedef struct +/*typedef struct { char ville[31]; char dep[31]; @@ -18,4 +18,4 @@ typedef struct candidat* LoadCandid(void); -//void gestionPhaseCandidatures(); A FAIRE. +//void gestionPhaseCandidatures(); A FAIRE.*/ diff --git a/src/saeMain.c b/src/saeMain.c index a9d7a49..be0c401 100644 --- a/src/saeMain.c +++ b/src/saeMain.c @@ -20,12 +20,10 @@ int main(void) case 'C': reset(); menuUser(tiut,tlogi); - reset(); break; case 'A': reset(); menuAdmin(tiut,&tlogi); - reset(); break; case 'Q': printf("Êtes-vous sûr de vouloir quitter ? (Y pour continuer)\n\n"); From 81eecfb1dc332293c73ce71d38826f532dbf8326 Mon Sep 17 00:00:00 2001 From: Jade VAN BRABANDT Date: Thu, 5 Jan 2023 12:04:16 +0100 Subject: [PATCH 08/18] Ignore de l'exe --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ec70424..de7816f 100644 --- a/.gitignore +++ b/.gitignore @@ -59,11 +59,15 @@ dkms.conf .LSOverride # Icon must end with two \r -Icon +Icon + # Thumbnails ._* +# Executables +.SAE + # Files that might appear in the root of a volume .DocumentRevisions-V100 .fseventsd From 3dec73e60a6b7a84832ad6474a6bc04cf6529371 Mon Sep 17 00:00:00 2001 From: Yann CHAMPEAU Date: Thu, 5 Jan 2023 12:10:12 +0100 Subject: [PATCH 09/18] Fix pcq l'autre la elle sait pas faire des gitignore --- .gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index de7816f..ef51d06 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ *.i*86 *.x86_64 *.hex +SAE # Debug files *.dSYM/ @@ -65,9 +66,6 @@ Icon # Thumbnails ._* -# Executables -.SAE - # Files that might appear in the root of a volume .DocumentRevisions-V100 .fseventsd From 4254dd544280f30dc04a5b3f51a3ba722cef303b Mon Sep 17 00:00:00 2001 From: "jade.van_brabandt" Date: Tue, 10 Jan 2023 11:47:17 +0100 Subject: [PATCH 10/18] 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 zcmZ`-3s_Xu7CvW21yP2 z4c%7WEV@>=o7zo{x>xN}UOw=RW@=W7rgjJ`OzOiccJ9B=K63=E^L^+1Yp;K;wf9+j z?Y+-TeFrag@YV6WxF+F3!0i}LzHY~mFy0=pekg0MA4;b1drUjBS@UkR@=R|f37Rc~ zo7OcaJ1;-CIr8ygE9RIcO*BpTesZm-nG)20mzCoLZ{Q4TZF1-;oj=Hs`b@Luqce3kp@an%vl0^I> zBkzxo=Qz=FLy`oqt6p&L7rZHbq1r)*BzmCtxYo(qhB%)#hU7)wKZFCfsy=vC6%65Y z6SVjt*%%pQh6qm7f^W$ zlRZ?P$mFe5PU^^zJN}Y3Vif{qBpR434=9Mq^ex%IN6HFU7kkz1uxI)rQf!O}+zUHT zAC0hH@DABQ))*uC2C~&?;NK^Qj0S(tO(ahnmsDc&)rQ$|t};gO^u3UU3UoK@ z(jn9y8V{M)!bglnn7008PK?R&lR96kew1S?RkTyp?=AZ1 z%*A)eRCBVWM)kb*gBW-!Gg>Ou5~*OW%8PDS^`DY( zi{0i$!S{U8F`4(iXg++z3Q}sBQTgRHjKkfCRAc6{^JJtuz^eLk15y%1$NmLuL?<2| z4pZ?R^`Pc#qv(QFr#gm3lvI~njamio_?*1CNTNKYQaem5y(yyVZ1)*e)f-t}J~I09 zQYZ&bxuqKOvSQT}*prxTlG@oAUmS0?Rq(1N?laB z=t@NLX)*1e!b0{erg$1MkhI1)EVtDcp36eM%@Xl|+SLY<6dT7kk^ESv<z+U_mA==(2*=9Rg93SR% zs9FByI~rT932(}K5x%#v(QavB-%~cvlil&*1L)?l1LT zs_5oc&^oy>iFIJ;VU1*D?KPb6$ z9UT)}s%hkZ36rvqsGC$0OxpQscI?d%R$hzeF#_-CldwS0WAyZzNW-{YtvIk-x$>b< zH&XRjsOwEv{Vi<1Z%_JF5o)io>R<>TIr=E~z~H^EINz00D3Fle}AAbRew&R%RE8hpte zHl5rW9>!0r4I0tN+n!VB_MJ;|^s|CzR+oDI8{HMx+~xRi$!#UKM<(&DB++id^AWoZ z&kFhZfjt)Tak~RgNoGwBldVCOIZQGYT_(oZ0h( ze>!<1IKSm?A_K%h5X}k^;`0!otXGtJMVXfl>&qa%#jLHksIUVlo8fg@dbR~`X&(^J$y1;Hjr!Ht)`?PA!WiT*x!uCtlR{M^ErS+pDB01J z-s;fN(n6JhzNbpmt#AL=^qXDIjGq#X1SJj)ZNru#&IH-EmZg>EZp82O=W#lHv;1G` z69S+1X-de+f8?N%3vW4fIQkVFXq`PrTXkqbUIv+!$ayG~Xv2RuS~^YyTE!XEy@Uqy zO?B$;+xvzaNgak$2U?Wp^u8Vis8|8YX~F)YlxMe6p49w|YVHT~gH6HF=^U5(Xofds z+BgU^C%aFl=1zA1lA4q1?#>mwBb`vs$Vj-2-wOU>+PT{HQLccGody0eSIBK2!wO;9=l8V826>v;(;0 zuq2%Y)&skMbB{<;I2Ou%$0TVS@H8+FxV}Y_mI0Ga;zfWXPr)Df^lA75ok(pL(6;4E z1n3I|*4YH$po@}J06dGs;CbMUVM$p?**TRS)tRe`fCrX@h@w*O6~@x z>5l^R!8ARC>1*s2V7D5;3O*du_(m`ORh3T%zxJpk-Ri~vs`B%+DB>l@C20~ydS`^G z8Z`q5Ku$=~(Ovieh;kd8{Z}(=nPX zFPh13ASa5V@qf_uqOttDBw_x8`oGcdCtUIz0Y#)Dj0@tr$jbSDqCH-kKb!xaq%L?k z^zbOzl9OKqVgXsXK&LN3?y19f@=nEZ_z5Xr&k_^Zzk?0o!nv1A6}1BI%j{0YH`~P2 zav?z6M?#Brdb(YNYQnkdyL>N_)MDM_4#oE>Hf4If#emZy&2&7U(ck*Geq_J}D*Ect zOfgH*N0N=jIzEx?EOzMA6q_oX67))Dz`afQg*yFYg`KNJ&QsXwWE9w03cD$ssq+=K zn9KpYL}9O3nOd$`h|A^PSIf`0Ny9?j5 zVVOOkQ<)Ex+8bq)H2(=9m&)v+z8d$Tm6*yMp{>*9;h@qP?x>wp{-B0`o@`t?w!d>R RQ*Iy^myYGXBKl=<{|8N5$%Fs^ delta 4399 zcmZWs4OmoF8ou`;28aUV;s_4IFvIX?3_tnPW|Lr!U6s@XEG@%ae^6;llQIg?W!W6Z zDcaA<&7U%RdV1EjO-F0RRt7?Z%EI5wOo`R)5?WMdY!5wm-*eBME4!ZOIp_V(_jkVY zo$s7Gqx6cwUa>wy3_hQEAu8K0Xf4}LCeamTi|12YJWUf1rBux1)Bi_{$oUq^ly?87 zyrwIr=KT2?Cfnm6|6OR9oFERDMX`cPy1BjfszitS%T+R|`cLMKV9{)1D-!TQuz7|3OuI zM#?^q!aY|QK3;=FuB}!O5{y4J_#0`sH7{oi=86L<-7j(POhGX*8^7mO?(1q=D4r^; znnIhcrkcUfs0*&PV8vcvflZ71fZ_Yh_lPE$$z)%_eXIt4+}7{7PD5vkW~6J>MWn-Xi&iVe zF~#A?Hv-80PRq4kkBba`In||PVda=xu5+!_^_?51Aeg z8)Y2abVt%kXNp5L&g+G5HQ#y_wHy4SWV4TO{!6RsO6GQj?lx(F+oMod_R{_K368f7 z%l<2x$89`a>u}yYU1R8g-8$@)p?45^l$LIDJZF@MpPT9%Z8G?WDZ}B)+KzG_xX~$h z-?-7`uu=T9&QV;`eHn3hn~`dq+^qXFWQATAtV~2otSt6R&{1Y#@Ci7IpP29+LKU22#u<%NQMu^ewAB^RL^kr(IV>_;o{*Y|`88y(Uunc8gL;dR+S}Wg}p-$*4hvB084O(D#(Nh_wf{8|!!!_SV zP59mWETP@p#zd^JZz!93I+`(Z2zz{aW&DkLGe$Xf8uMqq)&ka_`Gd(Jy+(3nCe|#v ziw7Aw;7!=Yj&V0L^Lc{42-IW;s5b8>?6G5)$m{7x1!U@`g9n(dVy2J6w6?lmSj*}p zOxH>rpjFJYra`Ow&KJRM#OGB|dj5?CjZYZ6-`O^>uY#?VVbJdPU>;Sk78Ad!#T1n_ zW!5?4k(vbE9=Y_TfPI{??*h9K+JZ8l zUd^(ILHcLbDDfhFo|Pl6rpVDYv6!+j=F@bHaa1wdR?~ZteJvFj3Eev|G~(0+CGnEB z8J0J6d@a1k8kpllNWZ|+cmQUa(7z@b2!*EW3d+{&(t`hy4r0!$uS+M>kef|nS-^U8 zvzWcfINQBln)frZZ+@Tg{m=DQU-nii-qMS*_wF+k<;oY&klU4lvCNf)aiccwccp39WvaC>d|6Ip(k@PA={Oc>pUZiZN9tvAnM~jui zAl%G^SExESSz{+T?`4d?USJP6sFt*RO!3Bpcb2Ji|{1`0=1wH!Dd zxB>VE@J-;)z&7B_He5=eyIrkOBfL)rW8ZG=BsKz}djJfCoNS)sKPE zM^*JQ@D*S*3hI$hRrO||sY6wZfG3ZsY6bB3C$JIVvQw}J{{1u91E2mJ_Q0>tTHqiY z45U04Sc1wg0qz5C3#aq<*rhc=l4iRkxsmc`r_GB+iXvD|>J2Zf@BsQ1@U{Obg~MY1 zB;7f5aF|()z9~Xr@~6?ek;;0Y5RywiCKha9Z9|{iOnYbBr4=o7dbU+s*+SO<+goTv zu~n*Xp>cqNEi?ykt%V*3q#vdi0cD5jT|jm#odzszrE7qt2uNSuGwGZwrpb*G^}lJ>etz1#sviN-VWX3y#ulfU}>_ zJiz`Assem*oL&ZOI7tnF6Q}5GX`;&pHwq4DG7|k6&{!tyc$l^hSd-DCaR`0qXwsZX zktHBwzf@H*AdWj3LEZDmOR4z*`-8&<0V#i>DX-gcF#@39*7u!1b_qt##4La&z8Kx|f6O7d+ax90XP82lF^%zRr)K zre$W)PRGh~#IYnUGbcQ+Yue(t%4l740_8z^Cr%_*ND#I>szA7oVv)c&Y2*z%ve2I8=I~TVdG_z1ub@4bX=DGd z>iZ8}=n9HkVUDbXl*Ke8khfyK6xjCg#;`!f$^~JPm_i#@yP{I_c`PW9=G9ZA6)_Z5 w>52;#X9z7cwK6Ae!z`{F!Yu)BHi-v9sr 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;iville,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;iville,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. From 6e5c4b9e0c7900c5924339429e5372a45264c0da Mon Sep 17 00:00:00 2001 From: Jade VAN BRABANDT Date: Tue, 10 Jan 2023 11:49:38 +0100 Subject: [PATCH 11/18] Ignore de l'exe --- SAE | Bin 26584 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 SAE diff --git a/SAE b/SAE deleted file mode 100755 index ddf5ef2905151a56610d59e230f1e5b6f7137129..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26584 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 ZkQINbeZ@=ZnoEAMQ*eyU63D8u{{az=8mIsO From f015f76cb0bdf75519a3d67bd84509d5d4cefd55 Mon Sep 17 00:00:00 2001 From: "jade.van_brabandt" Date: Tue, 10 Jan 2023 11:57:55 +0100 Subject: [PATCH 12/18] Sauvegarde Candidature --- src/partie2/saeP2.c | 16 ++++++++++++++++ src/partie2/saeP2.h | 1 + 2 files changed, 17 insertions(+) diff --git a/src/partie2/saeP2.c b/src/partie2/saeP2.c index 78d894a..0758320 100644 --- a/src/partie2/saeP2.c +++ b/src/partie2/saeP2.c @@ -46,6 +46,22 @@ candidat* LoadCandid(void) return Tabcandidat; } +void SaveCandid(int nbcandidat,candidat *tcandidat) +{ +//J'ouvre le fichier + FILE* file; + if((file=fopen("candid.bin","wb"))==NULL) + { + perror("Erreur : "); + exit(1); + } +//J'écris le nombre d'étudiant que je rentres + fwrite(&nbcandidat,sizeof(int),1,file); +//J'écris tout mes étudiants + fwrite(tcandidat,sizeof(candidat),nbcandidat,file); + printf("Sauvegarde réussit"); +} + void RechercheCandidat(int ID, int nbcandidat,candidat *tcandidat) { for(int i=0;i Date: Tue, 10 Jan 2023 13:20:19 +0100 Subject: [PATCH 13/18] Fix segfault --- .nfs00000000071517970000000f | Bin 0 -> 30984 bytes Input | 5 +++++ Makefile | 2 +- src/partie1/Makefile | 2 +- src/partie1/saeP1.c | 21 +++++++++++++++------ src/partie2/saeP2.c | 7 ++++++- src/partie2/saeP2.h | 2 +- 7 files changed, 29 insertions(+), 10 deletions(-) create mode 100755 .nfs00000000071517970000000f create mode 100644 Input diff --git a/.nfs00000000071517970000000f b/.nfs00000000071517970000000f new file mode 100755 index 0000000000000000000000000000000000000000..9f841144853393ff6faf0068bd1c55900c4c7276 GIT binary patch literal 30984 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 literal 0 HcmV?d00001 diff --git a/Input b/Input new file mode 100644 index 0000000..524f7e6 --- /dev/null +++ b/Input @@ -0,0 +1,5 @@ +A + + +6 +Yann diff --git a/Makefile b/Makefile index 3b48226..1295db6 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ prog : EXE : rm -f SAE - gcc -o SAE src/saeMain.o src/annexe/saeAnnexe.o src/partie1/saeP1.o src/partie2/saeP2.o src/partie3/saeP3.o src/partie4/saeP4.o + gcc -g -o SAE src/saeMain.o src/annexe/saeAnnexe.o src/partie1/saeP1.o src/partie2/saeP2.o src/partie3/saeP3.o src/partie4/saeP4.o doc : make -C src doc diff --git a/src/partie1/Makefile b/src/partie1/Makefile index 7b12495..b677515 100644 --- a/src/partie1/Makefile +++ b/src/partie1/Makefile @@ -1,7 +1,7 @@ all : saeP1.o saeP1.o : saeP1.c saeP1.h - gcc -Wall -c saeP1.c + gcc -Wall -Werror -Wextra -g -c saeP1.c doc : saeP1.h doxygen diff --git a/src/partie1/saeP1.c b/src/partie1/saeP1.c index 8afffcb..dd962be 100644 --- a/src/partie1/saeP1.c +++ b/src/partie1/saeP1.c @@ -23,6 +23,10 @@ void menuUser(VilleIUT* lvIUT[],int tlogi) printf("2 : Afficher tout les départements de chaques IUT\n"); printf("3 : Afficher le nombre de place en première année d'un IUT précis avec un département précis\n"); printf("4 : Rechercher les IUTs possèdant un département précis.\n"); + /*if(CandidOpen) + { + printf("5 : Candidater"); + }*/ printf("9 : Revenir à l'écran de sélection du profil.\n\n"); printf("#--------------------------------------------------------------------#\n\n"); printf("Choisissez l'action que vous voulez exécuter : "); @@ -45,6 +49,10 @@ void menuUser(VilleIUT* lvIUT[],int tlogi) SearchIUTFromDep(lvIUT,tlogi); reset(); break; + case 5: + //candidater(......); + reset(); + break; case 9: quit=1; reset(); @@ -79,18 +87,18 @@ void SearchPlaceFromDepInIUT(VilleIUT* lvIUT[],int tlogi) int boolF=0, i; printf("Entrez le nom de la ville contenant le département recherché :\n"); scanf("%s",sVille); - printf("%d",tlogi); for (i=0;iVille,sVille)) { printf("Département y étant disponible :\n"); MaillonDep* MaillonAct=lvIUT[i]->ldept; - printf("Test"); - while (MaillonAct!=NULL) printf("%s",MaillonAct->departement); - printf("Test"); + while (MaillonAct!=NULL) + { + printf("\t-%s\n",MaillonAct->departement); + MaillonAct=MaillonAct->suivant; + } boolF=1; - MaillonAct=MaillonAct->suivant; break; } } @@ -105,7 +113,7 @@ void SearchPlaceFromDepInIUT(VilleIUT* lvIUT[],int tlogi) while (MaillonAct!=NULL) { - if(strcmp(MaillonAct->departement,sDep)) + if(!strcmp(MaillonAct->departement,sDep)) { printf("Nombre de place : %d\n",MaillonAct->nbp); return; @@ -120,6 +128,7 @@ void SearchIUTFromDep(VilleIUT* lvIUT[],int tlogi) char sDep[31]; printf("Merci de renseignez le département dont vous cherchez les IUTs :\n"); scanf("%s",sDep); + printf("Tlogi : %d",tlogi); for (int i=0;i Date: Wed, 11 Jan 2023 04:23:48 +0100 Subject: [PATCH 14/18] Polishing P1 --- src/partie1/saeP1.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/partie1/saeP1.c b/src/partie1/saeP1.c index dd962be..01d7509 100644 --- a/src/partie1/saeP1.c +++ b/src/partie1/saeP1.c @@ -128,12 +128,11 @@ void SearchIUTFromDep(VilleIUT* lvIUT[],int tlogi) char sDep[31]; printf("Merci de renseignez le département dont vous cherchez les IUTs :\n"); scanf("%s",sDep); - printf("Tlogi : %d",tlogi); for (int i=0;ildept; - if(MaillonAct->departement==sDep) printf("%s",lvIUT[i]->Ville); + if(!strcmp(MaillonAct->departement,sDep)) printf("\t-%s",lvIUT[i]->Ville); } } From ff90296dfe504589d1ea60556e21eda4d3580ca6 Mon Sep 17 00:00:00 2001 From: Yann CHAMPEAU Date: Wed, 11 Jan 2023 09:38:22 +0100 Subject: [PATCH 15/18] =?UTF-8?q?R=C3=A9glages=20de=20probl=C3=A8mes=20ave?= =?UTF-8?q?c=20les=20fonctions=20administrateur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/annexe/saeAnnexe.c | 1 - src/partie1/saeP1.c | 45 ++++++++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/annexe/saeAnnexe.c b/src/annexe/saeAnnexe.c index 56c7391..b4c8b3d 100644 --- a/src/annexe/saeAnnexe.c +++ b/src/annexe/saeAnnexe.c @@ -61,7 +61,6 @@ int loadIUT(VilleIUT** tiut){ int rechercheIUT(VilleIUT* tab[],int lTab,char mot[]){ if(!lTab){ - fprintf(stderr,"Erreur, Pas de villes enregistrées !\n"); return -1; } for(int i=0; iVille,sVille)) { - printf("Département y étant disponible :\n"); + printf("\nDépartement y étant disponible :\n"); MaillonDep* MaillonAct=lvIUT[i]->ldept; while (MaillonAct!=NULL) { @@ -104,10 +104,10 @@ void SearchPlaceFromDepInIUT(VilleIUT* lvIUT[],int tlogi) } if (!boolF) { - printf("La ville n'est pas dans la liste.\nMerci de vérifier l'orthographe.\n"); + printf("\nLa ville n'est pas dans la liste.\nMerci de vérifier l'orthographe.\n"); return; } - printf("Entrez le nom du département dont vous souhaitez connaitre le nombre de place\n"); + printf("\nEntrez le nom du département dont vous souhaitez connaitre le nombre de place\n"); scanf("%s",sDep); MaillonDep* MaillonAct=lvIUT[i]->ldept; while (MaillonAct!=NULL) @@ -115,24 +115,27 @@ void SearchPlaceFromDepInIUT(VilleIUT* lvIUT[],int tlogi) if(!strcmp(MaillonAct->departement,sDep)) { - printf("Nombre de place : %d\n",MaillonAct->nbp); + printf("\nNombre de place : %d\n",MaillonAct->nbp); return; } MaillonAct=MaillonAct->suivant; } - printf("Le département n'est pas dans la liste.\nMerci de vérifier l'orthographe.\n"); + printf("\nLe département n'est pas dans la liste.\nMerci de vérifier l'orthographe.\n"); } void SearchIUTFromDep(VilleIUT* lvIUT[],int tlogi) { char sDep[31]; - printf("Merci de renseignez le département dont vous cherchez les IUTs :\n"); + printf("\nMerci de renseignez le département dont vous cherchez les IUTs :\n"); scanf("%s",sDep); - + printf("\nVoici la liste des IUTs contenant le département mentionné :\n\n"); for (int i=0;ildept; - if(!strcmp(MaillonAct->departement,sDep)) printf("\t-%s",lvIUT[i]->Ville); + while(MaillonAct!=NULL){ + if(!strcmp(MaillonAct->departement,sDep)) printf("\t-%s\n",lvIUT[i]->Ville); + MaillonAct=MaillonAct->suivant; + } } } @@ -193,17 +196,17 @@ void menuAdmin(VilleIUT* tiut[],int *tlogi){ void modifPlaces(VilleIUT* tiut[],int tlogi){ printf("\nEntrez la ville correspondant à l'IUT à modifier (Q pour abandonner): "); char ville[31]; - scanf("%*c%s",ville); + scanf("%s",ville); if(ville[0]=='Q' && ville[1]=='\0') return; int noVille=rechercheIUT(tiut,tlogi,ville); - if(noVille<=0){ + if(noVille<0){ fprintf(stderr,"\nVille non existante !\n"); return; } VilleIUT* v=tiut[noVille]; - printf("\n\nEntrez le département à modifier:"); + printf("\n\nEntrez le département à modifier :"); char dep[31]; - scanf("%*c%s",dep); + scanf("%s",dep); if(!existeDep(v->ldept,dep)){ fprintf(stderr,"\nDépartement non existant !\n"); return; @@ -221,7 +224,7 @@ void modifPlaces(VilleIUT* tiut[],int tlogi){ void creerDep(VilleIUT* tiut[],int tlogi){ printf("\nEntrez la ville correspondant à l'IUT à modifier (Q pour abandonner): "); char ville[31]; - scanf("%*c%s",ville); + scanf("%s",ville); if(ville[0]=='Q' && ville[1]=='\0') return; int noVille=rechercheIUT(tiut,tlogi,ville); if(noVille<0){ @@ -262,17 +265,17 @@ void creerDep(VilleIUT* tiut[],int tlogi){ void supprimerDep(VilleIUT* tiut[],int tlogi){ printf("\nEntrez la ville correspondant à l'IUT à modifier (Q pour abandonner): "); char ville[31]; - scanf("%*c%s",ville); + scanf("%s",ville); if(ville[0]=='Q' && ville[1]=='\0') return; int noVille=rechercheIUT(tiut,tlogi,ville); - if(noVille<=0){ + if(noVille<0){ fprintf(stderr,"\nVille non existante !\n"); return; } VilleIUT* v=tiut[noVille]; printf("\n\nEntrez le département à supprimer:"); char dep[31]; - scanf("%*c%s",dep); + scanf("%s",dep); if(!existeDep(v->ldept,dep)){ fprintf(stderr,"\nDépartement non existant !\n"); return; @@ -304,17 +307,17 @@ void supprimerDep(VilleIUT* tiut[],int tlogi){ void modifNomResponsable(VilleIUT* tiut[],int tlogi){ printf("\nEntrez la ville correspondant à l'IUT à modifier (Q pour abandonner): "); char ville[31]; - scanf("%*c%s",ville); + scanf("%s",ville); if(ville[0]=='Q' && ville[1]=='\0') return; int noVille=rechercheIUT(tiut,tlogi,ville); - if(noVille<=0){ + if(noVille<0){ fprintf(stderr,"\nVille non existante !\n"); return; } VilleIUT* v=tiut[noVille]; printf("\n\nEntrez le département à modifier:"); char dep[31]; - scanf("%*c%s",dep); + scanf("%s",dep); if(!existeDep(v->ldept,dep)){ fprintf(stderr,"\nDépartement non existant !\n"); return; @@ -335,7 +338,7 @@ void creerIUT(VilleIUT* tiut[],int* tlogi){ scanf("%*c%s",ville); if(ville[0]=='Q' && ville[1]=='\0') return; int noVille=rechercheIUT(tiut,*tlogi,ville); - if(noVille>0){ + if(noVille>=0){ fprintf(stderr,"\nVille déjà existante !\n"); return; } From eddc6b8f59222bef80f2a5e333434563f5216ee4 Mon Sep 17 00:00:00 2001 From: Yann CHAMPEAU Date: Wed, 11 Jan 2023 09:40:10 +0100 Subject: [PATCH 16/18] Supprimer '.nfs00000000071517970000000f' --- .nfs00000000071517970000000f | Bin 30984 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 .nfs00000000071517970000000f diff --git a/.nfs00000000071517970000000f b/.nfs00000000071517970000000f deleted file mode 100755 index 9f841144853393ff6faf0068bd1c55900c4c7276..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30984 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 From 7c8e238b6a468f5acbeb2624cff1a31bac3f8033 Mon Sep 17 00:00:00 2001 From: "jade.van_brabandt" Date: Wed, 11 Jan 2023 15:37:39 +0100 Subject: [PATCH 17/18] Candidater --- src/partie2/saeP2.c | 30 ++++++++++++++++++++++++++++-- src/partie2/saeP2.h | 17 +++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/partie2/saeP2.c b/src/partie2/saeP2.c index 338df93..b7b5b20 100644 --- a/src/partie2/saeP2.c +++ b/src/partie2/saeP2.c @@ -3,6 +3,7 @@ #include #include "saeP2.h" #include +#include "../annexe/saeAnnexe.h" candidat* LoadCandid(void) { @@ -154,10 +155,35 @@ void ListeCandidat(int nbcandidat,candidat *tcandidat) printf("Candidat non trouvé"); } -void Candidater() +void Candidater(VilleIUT* tiut[],int *tlogi, candidat* tcandidat, int numcandid) { - + char VilleRech[31]; + printf("Veuillez entrez la ville de l'IUT au quel vous souhaitez candidatez :"); + scanf("%s",VilleRech); + int ind=rechercheIUT(tiut,*tlogi,VilleRech); + if(ind==-1) return; + else + { + char DepRech[31]; + printf("Veuillez entrez le département dans lequel vous souhaitez y postuler :"); + scanf("%s",DepRech); + if (existeDep(tiut[ind]->ldept, DepRech)==0) return; + else + { + int i; + for (i=0;tcandidat[i].numcandid!=numcandid;++i); + voeu* voeu_ajout = (voeu*) malloc (sizeof(voeu)); + strcpy(voeu_ajout->ville,VilleRech); + strcpy(voeu_ajout->dep,DepRech); + voeu_ajout->ddep=0; + voeu_ajout->vcand=0; + tcandidat[i].TabVoeu[tcandidat[i].nbchoix]=voeu_ajout; + tcandidat[i].nbchoix++; + } + + } } + //void gestionPhaseCandidatures(); A FAIRE. \ No newline at end of file diff --git a/src/partie2/saeP2.h b/src/partie2/saeP2.h index eb93739..121eaa0 100644 --- a/src/partie2/saeP2.h +++ b/src/partie2/saeP2.h @@ -17,8 +17,25 @@ typedef struct voeu* TabVoeu[20]; }candidat; +//FIX TEMPORAIRE EN ATTENDANT DE TROUVER MIEUX +typedef struct MaillonDep +{ + char departement[31]; + int nbp; + char resp[51]; + struct MaillonDep* suivant; +} MaillonDep; + +typedef struct +{ + char Ville[31]; + MaillonDep* ldept; +} VilleIUT; +// FIN FIX TEMP + candidat* LoadCandid(void); void SaveCandid(int nbcandidat,candidat *tcandidat); void RechercheCandidat(int ID, int nbcandidat,candidat* tcandidat); void ListeCandidat(int nbcandidat,candidat *tcandidat); +void Candidater(VilleIUT* tiut[],int *tlogi, candidat* tcandidat,int numcandid); //void gestionPhaseCandidatures(); A FAIRE. From d1df1ce5e50feb147850be94e120a32207905272 Mon Sep 17 00:00:00 2001 From: "jade.van_brabandt" Date: Wed, 11 Jan 2023 15:42:15 +0100 Subject: [PATCH 18/18] Oui --- src/partie2/saeP2.c | 1 + src/partie2/saeP2.h | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/partie2/saeP2.c b/src/partie2/saeP2.c index b7b5b20..0e29e1e 100644 --- a/src/partie2/saeP2.c +++ b/src/partie2/saeP2.c @@ -4,6 +4,7 @@ #include "saeP2.h" #include #include "../annexe/saeAnnexe.h" +#include "../partie1/saeP1.h" candidat* LoadCandid(void) { diff --git a/src/partie2/saeP2.h b/src/partie2/saeP2.h index 121eaa0..0a22b0a 100644 --- a/src/partie2/saeP2.h +++ b/src/partie2/saeP2.h @@ -17,22 +17,6 @@ typedef struct voeu* TabVoeu[20]; }candidat; -//FIX TEMPORAIRE EN ATTENDANT DE TROUVER MIEUX -typedef struct MaillonDep -{ - char departement[31]; - int nbp; - char resp[51]; - struct MaillonDep* suivant; -} MaillonDep; - -typedef struct -{ - char Ville[31]; - MaillonDep* ldept; -} VilleIUT; -// FIN FIX TEMP - candidat* LoadCandid(void); void SaveCandid(int nbcandidat,candidat *tcandidat); void RechercheCandidat(int ID, int nbcandidat,candidat* tcandidat);