From 93080461d4e0e9684217ebe11322430a6f73592e Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 7 May 2022 09:17:04 +0300 Subject: Autocommit at 07.05.2022 @ 09:17 --- src/Services/EventService.h | 2 +- src/Services/StatusCode.h | 25 +++++++++++++++++++++++++ src/Services/StatusCodes.h | 25 ------------------------- src/UserInterface/VenueConsoleUI.cpp | 15 +++++++-------- src/UserInterface/VenueConsoleUI.h | 5 +++-- src/main.cpp | 7 ++++++- 6 files changed, 42 insertions(+), 37 deletions(-) create mode 100644 src/Services/StatusCode.h delete mode 100644 src/Services/StatusCodes.h (limited to 'src') diff --git a/src/Services/EventService.h b/src/Services/EventService.h index 125e056..c856c58 100644 --- a/src/Services/EventService.h +++ b/src/Services/EventService.h @@ -5,7 +5,7 @@ #include "../Generic/Date/Date.h" #include "../Models/Event.h" -#include "StatusCodes.h" +#include "StatusCode.h" class EventService { OrderedList events; diff --git a/src/Services/StatusCode.h b/src/Services/StatusCode.h new file mode 100644 index 0000000..a1eaa17 --- /dev/null +++ b/src/Services/StatusCode.h @@ -0,0 +1,25 @@ +#ifndef HEADER_SERVICE_STATUSCODE +#define HEADER_SERVICE_STATUSCODE + +enum StatusCode { + Success, + + + W_TicketHadNotBeenReserved, + + + E_Generic, + E_DoesntExist, + + E_HallDoesntExist, + + E_EventWillOverlap, + E_EventDoesNotExist, + + E_TicketAlreadyBought, + E_TicketAlreadyReserved, + E_ReservationDoesNotExist, + E_WrongReservationPassword, +}; + +#endif diff --git a/src/Services/StatusCodes.h b/src/Services/StatusCodes.h deleted file mode 100644 index 4068cd3..0000000 --- a/src/Services/StatusCodes.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef HEADER_EVENTSYSTEM_STATUSCODES -#define HEADER_EVENTSYSTEM_STATUSCODES - -enum StatusCode { - Success, - - - W_TicketHadNotBeenReserved, - - - E_Generic, - E_DoesntExist, - - E_HallDoesntExist, - - E_EventWillOverlap, - E_EventDoesNotExist, - - E_TicketAlreadyBought, - E_TicketAlreadyReserved, - E_ReservationDoesNotExist, - E_WrongReservationPassword, -}; - -#endif diff --git a/src/UserInterface/VenueConsoleUI.cpp b/src/UserInterface/VenueConsoleUI.cpp index 65e5240..d2b6609 100644 --- a/src/UserInterface/VenueConsoleUI.cpp +++ b/src/UserInterface/VenueConsoleUI.cpp @@ -1,12 +1,11 @@ #include "VenueConsoleUI.h" -#include "List/OrderedList.hpp" -#include "String/String.h" -#include "Date/Date.h" -#include "EventSystem/StatusCodes.h" -#include "EventSystem/Reservation.h" -#include "EventSystem/EventSystem.h" -#include "ConsoleInterface/Menu.h" -#include "ConsoleInterface/Toolbox.hpp" +#include "../Generic/List/OrderedList.hpp" +#include "../Generic/String/String.h" +#include "../Generic/Date/Date.h" +#include "../Services/StatusCode.h" +#include "../Models/Reservation.h" +#include "../Generic/ConsoleInterface/Menu.h" +#include "../Generic/ConsoleInterface/Toolbox.hpp" Venue* v; Menu mainMenu("FMI Ticket System", true, false), ticketManagementMenu("Ticket management", false, true), eventManagementMenu("Event management", false, true), reportsMenu("Report management", false, true); diff --git a/src/UserInterface/VenueConsoleUI.h b/src/UserInterface/VenueConsoleUI.h index f96076a..721b30f 100644 --- a/src/UserInterface/VenueConsoleUI.h +++ b/src/UserInterface/VenueConsoleUI.h @@ -1,8 +1,9 @@ #ifndef HEADER_VENUECONSOLEUI #define HEADER_VENUECONSOLEUI -#include "Venue/Venue.h" +#include "../Services/EventService.h" +#include "../Services/HallService.h" -void runUI(Venue& venue); +void runUI(EventService* es, HallService* hs); #endif diff --git a/src/main.cpp b/src/main.cpp index ca47c56..86ef290 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,8 +1,13 @@ -#include "UserInterface/VenueConsoleUI.h" +#include "Services/EventService.h" +#include "Services/HallService.h" #include "Models/Hall.h" +#include "UserInterface/VenueConsoleUI.h" int main() { Hall myVenueHalls[] = { Hall(1, 20, 30), Hall(2, 15, 15), Hall(3, 10, 20) }; + + EventService es; + HallService hs(myVenueHalls, 3); Venue myVenue(myVenueHalls, 3); runUI(myVenue); -- cgit v1.3.1-26-gb76a