From 4c1f8f7c13f22fc701206ea56dae30d26aca9bda Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 7 May 2022 16:03:34 +0300 Subject: Autocommit at 07.05.2022 @ 16:03 --- src/Generic/List/List.hpp | 9 +++++++++ src/Services/EventService.cpp | 9 +++++---- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Generic/List/List.hpp b/src/Generic/List/List.hpp index d2a759f..2569380 100644 --- a/src/Generic/List/List.hpp +++ b/src/Generic/List/List.hpp @@ -25,6 +25,8 @@ public: T& operator[](unsigned index); const T& operator[](unsigned index) const; + List& operator+=(const List other); + std::istream& read(std::istream& istr); std::ostream& write(std::ostream& ostr) const; @@ -132,6 +134,13 @@ const T& List::operator[](unsigned index) const { return elements[index]; } +template +List& List::operator+=(const List other) { + for (unsigned i = 0; i < other.length; i++) + add(other[i]); + return *this; +} + template std::istream& List::read(std::istream& istr) { istr.read((char*)&length, sizeof(length)); diff --git a/src/Services/EventService.cpp b/src/Services/EventService.cpp index dd8938f..26c9bb6 100644 --- a/src/Services/EventService.cpp +++ b/src/Services/EventService.cpp @@ -1,6 +1,7 @@ #include "EventService.h" #include "StatusCode.h" #include +#include /* Private */ @@ -180,9 +181,9 @@ StatusCode EventService::reportReservations(const char* name, const Date& date) if (date.compare(Date(0, 0, 0)) == 0) cond_date = cond_event_all; for (unsigned i = 0; i < events.get_count(); i++) { - for (unsigned j = 0; i < events[i].get_reservations().get_count(); j++) { - if (cond_name(events[i].get_reservations()[j], name) && cond_date(events[i].get_reservations()[j], date)) - result.add(events[i].get_reservations()[j]); - } + if (cond_name(events[i], name) && cond_date(events[i], date)) + result += events[i].get_reservations(); } + + } -- cgit v1.3.1-26-gb76a