From 9ed7acb6b308e4623027879c6296fbe5a75b814f Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 7 May 2022 20:39:28 +0300 Subject: Autocommit at 07.05.2022 @ 20:39 --- src/Services/EventService.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/Services/EventService.cpp') diff --git a/src/Services/EventService.cpp b/src/Services/EventService.cpp index 4c00a9a..38a3a8c 100644 --- a/src/Services/EventService.cpp +++ b/src/Services/EventService.cpp @@ -206,8 +206,11 @@ bool cond_event_dates(const Event& event, const Date& start, const Date& end) { StatusCode EventService::reportBoughtTickets(int hallNumber, const Date& start, const Date& end, bool all) { List result; + bool (*cond_hall)(const Event&, int) = cond_event_hallNumber; + if (all) cond_hall = cond_event_all; + for (unsigned i = 0; i < events.get_count(); i++) { - if (events[i].get_hall().get_number() == hallNumber) + if (cond_hall(events[i], hallNumber) && cond_event_dates(events[i], start, end)) result.add(events[i]); } } -- cgit v1.3.1-23-gd82d