From 370856ec3d02c14380f6e240afd9a0381644477a Mon Sep 17 00:00:00 2001 From: Lukian Date: Mon, 20 Nov 2023 17:48:40 +0100 Subject: [PATCH] commit --- conf.c | 12 ++++++------ conf.h | 6 ++++-- data/confs | 21 ++++++--------------- data/listeners | 3 --- fileManager.c | 2 +- fileManager.h | 2 +- main.c | 18 ++++++++---------- main.exe | Bin 48902 -> 48866 bytes screenManager.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- 9 files changed, 68 insertions(+), 42 deletions(-) diff --git a/conf.c b/conf.c index 7699dda..14f5a05 100644 --- a/conf.c +++ b/conf.c @@ -26,20 +26,20 @@ ptConf newConfChain() { return confChain; } -void addConf(ptConf confChain, char title[], char speaker[], int day, int month, int year) { +void addConf(ptConf confChain, int id, char title[], char speaker[], int day, int month, int year) { ptConf px = confChain; while (px -> next != NULL) { px = px -> next; } - px -> id = findConfId(confChain); + px -> id = id; px -> day = day; px -> month = month; px -> year = year; strcpy(px -> title, title); strcpy(px -> speaker, speaker); - // ajouter le builder de liste de participants + px -> listeners = (ptListenerList) malloc(sizeof(tListenerList)); px -> next = (ptConf) malloc(sizeof(tConf)); px -> next -> next = NULL; } @@ -68,18 +68,18 @@ ptListener newListenerChain() { return listenerChain; } -void addListener(ptListener listenerChain, char name[], int age, int level) { +void addListener(ptListener listenerChain, int id, char name[], int age, int level) { ptListener px = listenerChain; while (px -> next != NULL) { px = px -> next; } - px -> id = findListenerId(listenerChain); + px -> id = id; strcpy(px -> name, name); px -> age = age; px -> level = level; - // ajouter la liste de conférences + px -> confs = (ptConfList) malloc(sizeof(tConfList)); px -> next = (ptListener) malloc(sizeof(tListener)); px -> next -> next = NULL; px -> next -> prev = px; diff --git a/conf.h b/conf.h index d48ade3..df182db 100644 --- a/conf.h +++ b/conf.h @@ -39,9 +39,11 @@ typedef tListener* ptListener; typedef tConfList* ptConfList; typedef tListenerList* ptListenerList; +int findConfId(ptConf confChain); ptConf newConfChain(); -void addConf(ptConf confChainStart, char title[], char speaker[], int day, int month, int year); +void addConf(ptConf confChain, int id, char title[], char speaker[], int day, int month, int year); +int findListenerId(ptListener listenerChain); ptListener newListenerChain(); -void addListener(ptListener listenerChain, char name[], int age, int level); +void addListener(ptListener listenerChain, int id, char name[], int age, int level); #endif // CONF_H diff --git a/data/confs b/data/confs index 3389fa3..fd141d3 100644 --- a/data/confs +++ b/data/confs @@ -2,18 +2,9 @@ 2,coucou mes copains,Jean-Pierre,25,12,2023 3,coucou mes copains,Jean-Pierre,25,12,2023 4,coucou mes copains,Jean-Pierre,25,12,2023 -5,test,tesst,21,120,2023 -6,test,tesst,21,120,2023 -7,test,tesst,21,120,2023 -8,test,tesst,21,120,2023 -9,test,tesst,21,120,2023 -10,test,tesst,21,120,2023 -11,test,tesst,21,120,2023 -12,test,tesst,21,120,2023 -13,test,tesst,21,120,2023 -14,test,tesst,21,120,2023 -15,test,tesst,21,120,2023 -16,test,tesst,21,120,2023 -17,test,tesst,21,120,2023 -18,test,tesst,21,120,2023 -19,test,tesst,21,120,2023 +5,la,belle,6422476,762406370,6422132 +6,la,belle,6422476,-26872523,6422132 +7,e,e,22,7,2004 +8,Test,de,6422476,-1123880272,6422132 +9,Test,a,6422476,-2011631347,6422132 +10,test,test,1,1,1 diff --git a/data/listeners b/data/listeners index a85b07f..e69de29 100644 --- a/data/listeners +++ b/data/listeners @@ -1,3 +0,0 @@ -1,Roger,19,4 -2,Roger,19,4 -3,Roger,19,4 diff --git a/fileManager.c b/fileManager.c index 8c7b2eb..a6e71fb 100644 --- a/fileManager.c +++ b/fileManager.c @@ -25,7 +25,7 @@ void readConfs(ptConf confChain) { token = strtok(NULL, ","); } - addConf(confChain, tokens[1], tokens[2], atoi(tokens[3]), atoi(tokens[4]), atoi(tokens[5])); + addConf(confChain, atoi(tokens[0]), tokens[1], tokens[2], atoi(tokens[3]), atoi(tokens[4]), atoi(tokens[5])); } fclose(file); diff --git a/fileManager.h b/fileManager.h index 9be61c1..a85a8e3 100644 --- a/fileManager.h +++ b/fileManager.h @@ -3,7 +3,7 @@ #include "conf.h" -void readConfs(); +void readConfs(ptConf confChain); void saveConf(ptConf confChain); void saveListeners(ptListener listenerChain); diff --git a/main.c b/main.c index 99b44ec..7351f94 100644 --- a/main.c +++ b/main.c @@ -10,19 +10,17 @@ int main() ptListener listenerChain = newListenerChain(); readConfs(confChain); - - addConf(confChain, "test", "tesst", 21, 120, 2023); - addConf(confChain, "test", "tesst", 21, 120, 2023); - addConf(confChain, "test", "tesst", 21, 120, 2023); - - addListener(listenerChain, "Roger", 19, 4); - addListener(listenerChain, "Roger", 19, 4); - addListener(listenerChain, "Roger", 19, 4); - menu(confChain, listenerChain); - saveConf(confChain); saveListeners(listenerChain); + + /*addConf(confChain, "test", "tesst", 21, 120, 2023); + addConf(confChain, "test", "tesst", 21, 120, 2023); + addConf(confChain, "test", "tesst", 21, 120, 2023); + + addListener(listenerChain, "Roger", 19, 4); + addListener(listenerChain, "Roger", 19, 4); + addListener(listenerChain, "Roger", 19, 4);*/ return 0; } \ No newline at end of file diff --git a/main.exe b/main.exe index b9d60c447373c3c41cf27bd96fd365750f95067e..1d28040590e2dc90cefdf989cc8076153da91d38 100644 GIT binary patch delta 5709 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 RZLnH43#;_5y`4=l{|~Bb8~XqN delta 5338 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 aenTmZ97vp1^lXtKcO!{c+19;LBKbdE=T`Or diff --git a/screenManager.c b/screenManager.c index cc95601..228ca7a 100644 --- a/screenManager.c +++ b/screenManager.c @@ -98,7 +98,7 @@ void menuConf(ptConf confChain, ptListener listenerChain) { ptConf px = confChain; while (px -> next != NULL) { - printf("title : %s\nspeaker : %s\n", px -> title, px -> speaker); + printf("id : %d\ntitle : %s\nspeaker : %s\n", px -> id, px -> title, px -> speaker); printf("%d/%d/%d\n\n",px -> day, px -> month, px -> year); px = px -> next; } @@ -107,7 +107,27 @@ void menuConf(ptConf confChain, ptListener listenerChain) { break; case 2: + { + int id, day, month, year; + char title[30]; + char speaker[20]; + + id = findConfId(confChain); + printf("Titre de la conference : "); + scanf("%29s", &title); + printf("Nom du conferencier : "); + scanf("%19s", &speaker); + printf("Jour : "); + scanf("%d", &day); + printf("Mois : "); + scanf("%d", &month); + printf("Année : "); + scanf("%d", &year); + + addConf(confChain, id, title, speaker, day, month, year); + menuConf(confChain, listenerChain); break; + } case 3: break; @@ -146,7 +166,22 @@ void menuAbo(ptConf confChain, ptListener listenerChain) { break; case 2: + { + int id, age, level; + char name[20]; + + id = findListenerId(listenerChain); + printf("Nom : "); + scanf("%19s", &name); + printf("Age : "); + scanf("%d", &age); + printf("Niveau : "); + scanf("%d", &level); + + addListener(listenerChain, id, name, age, level); + menuAbo(confChain, listenerChain); break; + } case 3: break; @@ -163,10 +198,10 @@ void menuAbo(ptConf confChain, ptListener listenerChain) { void menu(ptConf confChain, ptListener listenerChain) { - char *options[] = {"1/ Gestion des conferences", "2/ Gestion des abonnes", "3/ Participer a une conference", "4/ Voir la meilleure conference", "5/ Voir la participation a une conference", "6/ Quitter"}; + char *options[] = {"1/ Gestion des conferences", "2/ Gestion des abonnes", "3/ Participer a une conference", "4/ Voir la meilleure conference", "5/ Voir la participation a une conference", "6/ Sauvegarder", "7/ Quitter"}; system("cls"); - drawMenu(options, 6); - goToCoords(0, 14); + drawMenu(options, 7); + goToCoords(0, 15); printf("Que voulez-vous faire ? : "); int choice; scanf("%d", &choice); @@ -191,6 +226,9 @@ void menu(ptConf confChain, ptListener listenerChain) break; case 6: + saveConf(confChain); + saveListeners(listenerChain); + menu(confChain, listenerChain); break; default: