Website Summary Files Commits Branches @commit @diff @stats
path: root / src / EventSystem
diff options
context:
space:
mode:
2 files changed, 10 insertions, 24 deletions
-rw-r--r--src/EventSystem/EventSystem.cpp28
-rw-r--r--src/EventSystem/EventSystem.h6
diff --git a/src/EventSystem/EventSystem.cpp b/src/EventSystem/EventSystem.cpp
index 4de7b70..28d9ebb 100644
--- a/src/EventSystem/EventSystem.cpp
+++ b/src/EventSystem/EventSystem.cpp
@@ -101,32 +101,18 @@ StatusCode EventSystem::buyTicket(const char* name, const Date& date, const Tick
return events[ind].buyTicketFromReservation(Reservation(ticket), password);
}
-// List<Ticket> EventSystem::queryFreeTickets(const char* name, const Date& date) {
-// unsigned ind = indexOfEvent(name, date);
-//
-// if (ind == events.get_count())
-// return List<Ticket>();
-//
-// List<Ticket> freeTickets;
-//
-// unsigned nextIndT = 0, nextIndR = 0;
-// for (unsigned r = 1; r <= events[ind].get_hall().get_rowCount(); r++) {
-// for (unsigned s = 1; s <= events[ind].get_hall().get_seatsPerRow(); s++) {
-// // TODO: finish
-// }
-// }
-//
-// return freeTickets;
-// }
-
-List<Ticket> EventSystem::queryTickets(const char* name, const Date& date) {
+OrderedList<Ticket> EventSystem::queryTickets(const char* name, const Date& date) {
unsigned ind = indexOfEvent(name, date);
if (ind == events.get_count())
- return E_EventDoesNotExist;
+ return OrderedList<Ticket>();
return events[ind].get_tickets();
}
-List<Reservation> EventSystem::queryReservations(const char* name, const Date& date) {
+OrderedList<Reservation> EventSystem::queryReservations(const char* name, const Date& date) {
+ unsigned ind = indexOfEvent(name, date);
+ if (ind == events.get_count())
+ return OrderedList<Reservation>();
+ return events[ind].get_reservations();
}
diff --git a/src/EventSystem/EventSystem.h b/src/EventSystem/EventSystem.h
index 7df7ecb..a3a513d 100644
--- a/src/EventSystem/EventSystem.h
+++ b/src/EventSystem/EventSystem.h
@@ -33,9 +33,9 @@ public:
StatusCode buyTicket(const char* name, const Date& date, unsigned row, unsigned seat, const char* password);
StatusCode buyTicket(const char* name, const Date& date, const Ticket& ticket, const char* password);
- // List<Ticket> queryFreeTickets(const char* name, const Date& date);
- List<Ticket> queryTickets(const char* name, const Date& date);
- List<Reservation> queryReservations(const char* name, const Date& date);
+ OrderedList<Ticket> queryTickets(const char* name, const Date& date);
+ OrderedList<Reservation> queryReservations(const char* name, const Date& date);
+
void queryBoughtTickets(Date start, Date end, unsigned hall);
void queryMostVisited();
void queryInsufficientlyVisited();