From 99e4e8130e6b07e8a0ef878093d0557097260d88 Mon Sep 17 00:00:00 2001 From: Lukian LEIZOUR Date: Thu, 30 Nov 2023 16:12:33 +0100 Subject: [PATCH] commit --- data/listeners | 4 +--- data/relations | 1 + dataBackup/listeners | 4 +--- dataBackup/relations | 1 + main.exe | Bin 53437 -> 53949 bytes singleFile.c | 22 ++++++++++++++++------ 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/data/listeners b/data/listeners index fabd967..d2f1a19 100644 --- a/data/listeners +++ b/data/listeners @@ -1,5 +1,4 @@ 1,Simon,21,3 -2,Bertrand,42,8 3,Thomas,20,3 4,Victor,19,2 5,Lukian,19,2 @@ -13,9 +12,8 @@ 13,Chayma,22,5 14,Elisa,23,5 15,Erwan,19,2 -16,Juliette,32,8 -17,Malick,25,7 18,Marion,17,1 19,Tom,17,1 20,Sebastien,45,5 21,Jean,50,5 +22,Patrick,15,5 diff --git a/data/relations b/data/relations index 423a92f..17d29d8 100644 --- a/data/relations +++ b/data/relations @@ -3,3 +3,4 @@ 3:12;0,1;4 4:12;0,1;4 9:20;5 +10:21;5 diff --git a/dataBackup/listeners b/dataBackup/listeners index fabd967..d2f1a19 100644 --- a/dataBackup/listeners +++ b/dataBackup/listeners @@ -1,5 +1,4 @@ 1,Simon,21,3 -2,Bertrand,42,8 3,Thomas,20,3 4,Victor,19,2 5,Lukian,19,2 @@ -13,9 +12,8 @@ 13,Chayma,22,5 14,Elisa,23,5 15,Erwan,19,2 -16,Juliette,32,8 -17,Malick,25,7 18,Marion,17,1 19,Tom,17,1 20,Sebastien,45,5 21,Jean,50,5 +22,Patrick,15,5 diff --git a/dataBackup/relations b/dataBackup/relations index 423a92f..17d29d8 100644 --- a/dataBackup/relations +++ b/dataBackup/relations @@ -3,3 +3,4 @@ 3:12;0,1;4 4:12;0,1;4 9:20;5 +10:21;5 diff --git a/main.exe b/main.exe index b3053ca0f6d8d629ca07f5ceebfd462a2acf0a92..8fc8b69698154cebebb7d1492a54527b90a30984 100644 GIT binary patch delta 6167 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 delta 6091 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 VM@jW7)y9go!mwzKySOLt{{eF>_|yOZ diff --git a/singleFile.c b/singleFile.c index 494561a..2a6f509 100644 --- a/singleFile.c +++ b/singleFile.c @@ -683,7 +683,7 @@ void menuConf(ptConf confChain, ptListener listenerChain) printf("Id : %d\nTitre : %s\nConferencier : %s\n", px->id, px->title, px->speaker); printf("Date : %d/%d/%d\n", px->day, px->month, px->year); printf("Nombre de participants : %d\n", confParticipations(px)); - if (px->listeners->next != NULL) + if (px->listeners->next->next != NULL) { printListenerList(px->listeners->next); } @@ -750,6 +750,16 @@ void menuConf(ptConf confChain, ptListener listenerChain) case 4: { + ptConf px = confChain->next; + + printf("\n"); + while (px->next != NULL) + { + printf("%s : %d/%d/%d\n", px->title, px->day, px->month, px->year); + px = px->next; + } + printf("\n"); + int day, month, year, time; printf("Jour : "); scanf("%d", &day); @@ -760,7 +770,7 @@ void menuConf(ptConf confChain, ptListener listenerChain) time = day + 31 * month + 365 * year; - ptConf px = confChain; + px = confChain; while (px->next != NULL) { @@ -781,7 +791,7 @@ void menuConf(ptConf confChain, ptListener listenerChain) } saveConf(confChain->next); - + saveRelations(confChain->next); menuConf(confChain, listenerChain); } @@ -815,7 +825,7 @@ void menuAbo(ptConf confChain, ptListener listenerChain) while (py->next != NULL) { printf("Id : %d\nNom: %s\nAge: %d\nNiveau: %d\n", py->id, py->name, py->age, py->level); - if (py->confs->next != NULL) + if (py->confs->next->next != NULL) { printConfList(py->confs->next); } @@ -951,7 +961,7 @@ void menu(ptConf confChain, ptListener listenerChain) case 4: { - ptConf px = confChain; + ptConf px = confChain -> next; int max = confGradeAvg(px); ptConf confMax = px; @@ -967,7 +977,7 @@ void menu(ptConf confChain, ptListener listenerChain) px = px->next; } - printf("La conférence la mieux notee est : %s\n\n", confMax->title); + printf("La conference la mieux notee est : %s\n\n", confMax->title); system("pause"); menu(confChain, listenerChain);