Autocommit at 07.05.2022 @ 10:27

3 files changed, 9 insertions, 30 deletions

diff --git a/src/Services/EventService.cpp b/src/Services/EventService.cpp
index 59d4b43..0fa6bc2 100644
--- a/src/Services/EventService.cpp
+++ b/src/Services/EventService.cpp
@@ -135,15 +135,7 @@ StatusCode EventService::buyTicket(const char* name, const Date& date, const Tic
 	return Success;
 }
 
-const Hall* EventService::queryEventHall(const char* name, const Date& date) {
-	unsigned ind = indexOfEvent(name, date);
-	if (ind == events.get_count())
-		return nullptr;
-
-	return &events[ind].get_hall();
-}
-
-OrderedList<Ticket> EventService::queryTickets(const char* name, const Date& date) {
+OrderedList<Ticket> EventService::getTickets(const char* name, const Date& date) {
 	unsigned ind = indexOfEvent(name, date);
 	if (ind == events.get_count())
 		return OrderedList<Ticket>();
@@ -151,7 +143,7 @@ OrderedList<Ticket> EventService::queryTickets(const char* name, const Date& dat
 	return events[ind].get_tickets();
 }
 
-OrderedList<Reservation> EventService::queryReservations(const char* name, const Date& date) {
+OrderedList<Reservation> EventService::getReservations(const char* name, const Date& date) {
 	unsigned ind = indexOfEvent(name, date);
 	if (ind == events.get_count())
 		return OrderedList<Reservation>();
diff --git a/src/Services/EventService.h b/src/Services/EventService.h
index 6ea1bef..2e651a9 100644
--- a/src/Services/EventService.h
+++ b/src/Services/EventService.h
@@ -34,9 +34,8 @@ public:
 	StatusCode buyTicket(const char* name, const Date& date, unsigned row, unsigned seat);
 	StatusCode buyTicket(const char* name, const Date& date, const Ticket& ticket);
 
-	const Hall* queryEventHall(const char* name, const Date& date);
-	OrderedList<Ticket> queryTickets(const char* name, const Date& date);
-	OrderedList<Reservation> queryReservations(const char* name, const Date& date);
+	OrderedList<Ticket> getTickets(const char* name, const Date& date);
+	OrderedList<Reservation> getReservations(const char* name, const Date& date);
 
 	void queryMostVisited();
 	void queryInsufficientlyVisited();
diff --git a/src/UserInterface/VenueConsoleUI.cpp b/src/UserInterface/VenueConsoleUI.cpp
index 7d86018..0029b17 100644
--- a/src/UserInterface/VenueConsoleUI.cpp
+++ b/src/UserInterface/VenueConsoleUI.cpp
@@ -39,19 +39,13 @@ void handleStatusCode(StatusCode sc, Menu menu) {
 /* Ticket Management */
 
 void command_freeSeats() {
-	/*
 	char name[MAX_LINE_WIDTH];
 	inputLineSubBox("Enter event name: ", name, MAX_LINE_WIDTH);
 	Date date;
 	inputSubBox("Enter event date: ", &date);
 
-	if (!hs->hallExists()) {
-		handleStatusCode(E_HallDoesntExist, ticketManagementMenu);
-		return;
-	}
-
-	OrderedList<Ticket> tickets = es->queryTickets(name, date);
-	OrderedList<Reservation> reservations = es->queryReservations(name, date);
+	OrderedList<Ticket> tickets = es->getTickets(name, date);
+	OrderedList<Reservation> reservations = es->getReservations(name, date);
 
 	unsigned tableSize = hall->get_rowCount() * hall->get_seatsPerRow();
 	char tableData[tableSize + 1];
@@ -72,7 +66,6 @@ void command_freeSeats() {
 
 	char tmp;
 	inputLineBox("[Press enter to continue]", &tmp, 1);
-	*/
 }
 
 void command_reserveTicket() {
@@ -132,19 +125,14 @@ void submenu_ticketManagement() {
 /* Event Management */
 
 void command_createEvent() {
-	unsigned hallIndex;
-	inputSubBox("Enter hall index: ", &hallIndex);
-	// if (!v->hallExists(hallIndex)) {
-	// 	eventManagementMenu.registerError("Invalid hall index!");
-	// 	return;
-	// }
-	
+	unsigned hallNumber;
+	inputSubBox("Enter hall number: ", &hallNumber);
 	char name[MAX_LINE_WIDTH];
 	inputLineSubBox("Enter event name: ", name, MAX_LINE_WIDTH);
 	Date date;
 	inputSubBox("Enter event date: ", &date);
 	
-	StatusCode s = es->createEvent(nullptr, name, date); // TODO
+	StatusCode s = es->createEvent(hallNumber, name, date);
 	handleStatusCode(s, eventManagementMenu);
 }