Autocommit at 07.05.2022 @ 09:17

5 files changed, 19 insertions, 14 deletions

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<Event> events;
diff --git a/src/Services/StatusCodes.h b/src/Services/StatusCode.h
index 4068cd3..a1eaa17 100644
--- a/src/Services/StatusCodes.h
+++ b/src/Services/StatusCode.h
@@ -1,5 +1,5 @@
-#ifndef HEADER_EVENTSYSTEM_STATUSCODES
-#define HEADER_EVENTSYSTEM_STATUSCODES
+#ifndef HEADER_SERVICE_STATUSCODE
+#define HEADER_SERVICE_STATUSCODE
 
 enum StatusCode {
 	Success,
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);