diff options
Autocommit at 07.05.2022 @ 20:19
4 files changed, 14 insertions, 12 deletions
| -rw-r--r-- | src/Generic/List/List.hpp | 2 | ||||
| -rw-r--r-- | src/Models/Event.cpp | 6 | ||||
| -rw-r--r-- | src/Services/EventService.cpp | 1 | ||||
| -rw-r--r-- | src/report.txt | 17 |
diff --git a/src/Generic/List/List.hpp b/src/Generic/List/List.hpp index 7e57b55..c0ed51b 100644 --- a/src/Generic/List/List.hpp +++ b/src/Generic/List/List.hpp @@ -246,7 +246,7 @@ std::istream& operator>>(std::istream& istr, List<T>& obj) { template <typename T> std::ostream& operator<<(std::ostream& ostr, const List<T>& obj) { - ostr << obj.get_count() << " "; + ostr << obj.get_count() << std::endl; for (int i = 0; i < obj.get_count(); i++) ostr << obj[i]; diff --git a/src/Models/Event.cpp b/src/Models/Event.cpp index db4a817..afb8790 100644 --- a/src/Models/Event.cpp +++ b/src/Models/Event.cpp @@ -82,16 +82,16 @@ void configureInsertionOperator(unsigned char setting) { } std::ostream& operator<<(std::ostream& ostr, const Event& event) { - if (insertionOpSet) { + if (insertionOpSet & 1) { ostr << "| Hall: " << event.get_hall().get_number() << " | Name: " << event.get_name() << " | Date: " << event.get_date() << std::endl; } - if (insertionOpSet) { + if (insertionOpSet & 2) { ostr << "Bought tickets: "; for (unsigned i = 0; i < event.get_tickets().get_count(); i++) ostr << "[" << event.get_tickets()[i] << "] "; ostr << std::endl; } - if(insertionOpSet % 2 == 0) { + if(insertionOpSet & 4) { ostr << "Reserved tickets: "; for (unsigned i = 0; i < event.get_reservations().get_count(); i++) ostr << "[" << event.get_reservations()[i] << "] "; diff --git a/src/Services/EventService.cpp b/src/Services/EventService.cpp index 926aadf..3c7bb85 100644 --- a/src/Services/EventService.cpp +++ b/src/Services/EventService.cpp @@ -189,6 +189,7 @@ StatusCode EventService::reportReservations(const char* name, const Date& date) if (!outFile.is_open()) return E_FileCouldNotBeOpened; + configureInsertionOperator(0b101); outFile << result; outFile.close(); diff --git a/src/report.txt b/src/report.txt index 73d5336..fa6f05b 100644 --- a/src/report.txt +++ b/src/report.txt @@ -1,9 +1,10 @@ -3 Hall: 1 20 30 Name: T Date: 1.2.3 -Bought tickets: -Reserved tickets: 5 9 9 1 -Hall: 1 20 30 Name: R Date: 4.5.6 -Bought tickets: -Reserved tickets: 6 2 -Hall: 3 10 20 Name: Y Date: 4.5.6 -Bought tickets: +5 | Hall: 1 | Name: T | Date: 1.2.3 +Reserved tickets: +| Hall: 1 | Name: R | Date: 2.2.3 +Reserved tickets: +| Hall: 2 | Name: R | Date: 4.5.6 +Reserved tickets: +| Hall: 2 | Name: C | Date: 9.9.9 +Reserved tickets: +| Hall: 3 | Name: 7 8 2 | Date: 1.1.1 Reserved tickets: |
