Autocommit at 07.05.2022 @ 14:48

3 files changed, 30 insertions, 23 deletions

diff --git a/src/Generic/ConsoleInterface/Toolbox.cpp b/src/Generic/ConsoleInterface/Toolbox.cpp
index 145e66c..7fd64ab 100644
--- a/src/Generic/ConsoleInterface/Toolbox.cpp
+++ b/src/Generic/ConsoleInterface/Toolbox.cpp
@@ -6,6 +6,12 @@ void clear() {
 	std::cout << u8"\033[2J\033[1;1H"; 
 }
 
+void _printSubBoxSpacing() {
+	std::cout << "    ";
+}
+
+/* Title boxes */
+
 void titleBox(const char* title) {
 	std::cout << std::endl << "=== " << title << " ===" << std::endl;
 }
@@ -16,16 +22,12 @@ void subTitleBox(const char* title) {
 
 /* Status boxes */
 
-void __printSubBoxSpacing() {
-	std::cout << "    ";
-}
-
 void successBox(const char* message) {
 	std::cout << "<S> " << message << std::endl;
 }
 
 void successSubBox(const char* message) {
-	__printSubBoxSpacing();
+	_printSubBoxSpacing();
 	successBox(message);
 }
 
@@ -34,7 +36,7 @@ void warningBox(const char* message) {
 }
 
 void warningSubBox(const char* message) {
-	__printSubBoxSpacing();
+	_printSubBoxSpacing();
 	warningBox(message);
 }
 
@@ -43,26 +45,16 @@ void errorBox(const char* message) {
 }
 
 void errorSubBox(const char* message) {
-	__printSubBoxSpacing();
+	_printSubBoxSpacing();
 	errorBox(message);
 }
 
-
-void _printOrderedListBeginning() {
-	std::cout << "[" << orderedListIndex++ << "] ";
-}
-
 /* Input line boxes */
 
 void _printInputBoxLabel(const char* label) {
 	std::cout << "(+) " << label;
 }
 
-void _printInputSubBoxLabel(const char* label) {
-	std::cout << "    ";
-	_printInputBoxLabel(label);
-}
-
 void __inputLineBoxGetInput(char* output, unsigned maxWidth) {
 	std::cin.ignore();
 	std::cin.getline(output, maxWidth);
@@ -74,10 +66,23 @@ void inputLineBox(const char* label, char* output, unsigned maxWidth) {
 }
 
 void inputLineSubBox(const char* label, char* output, unsigned maxWidth) {
-	_printInputSubBoxLabel(label);
+	_printSubBoxSpacing();
+	_printInputBoxLabel(label);
 	__inputLineBoxGetInput(output, maxWidth);
 }
 
+/* Ordered list */
+
+int orderedListIndex = 1;
+
+void _printOrderedListBeginning() {
+	std::cout << "[" << orderedListIndex++ << "] ";
+}
+
+void resetOrderedList(int starter) {
+	orderedListIndex = starter;
+}
+
 /* Table */
 
 void __printTableHeaderNumber(unsigned number) {
diff --git a/src/Generic/ConsoleInterface/Toolbox.hpp b/src/Generic/ConsoleInterface/Toolbox.hpp
index ebead10..98a2002 100644
--- a/src/Generic/ConsoleInterface/Toolbox.hpp
+++ b/src/Generic/ConsoleInterface/Toolbox.hpp
@@ -18,13 +18,14 @@ void errorSubBox(const char* message);
 
 void inputLineBox(const char* label, char* output, unsigned maxWidth);
 void inputLineSubBox(const char* label, char* output, unsigned maxWidth);
+void pressEnterToContinue();
 
 void resetOrderedList(int starter = 1);
 
 void table(unsigned startNumber, unsigned columns, const char* items);
 
+void _printSubBoxSpacing();
 void _printInputBoxLabel(const char* label);
-void _printInputSubBoxLabel(const char* label);
 void _printOrderedListBeginning();
 
 template <class T>
@@ -72,7 +73,8 @@ void inputBox(const char* label, T* output) {
 
 template <typename T>
 void inputSubBox(const char* label, T* output) {
-	_printInputSubBoxLabel(label);
+	_printSubBoxSpacing();
+	_printInputBoxLabel(label);
 	std::cin >> *output;
 }
 
diff --git a/src/UserInterface/VenueConsoleUI.cpp b/src/UserInterface/VenueConsoleUI.cpp
index 7ac850d..8c3fdcf 100644
--- a/src/UserInterface/VenueConsoleUI.cpp
+++ b/src/UserInterface/VenueConsoleUI.cpp
@@ -96,7 +96,7 @@ void command_buyTicket() {
 
 	StatusCode s = es->ticketIsReserved(name, date, tic);
 	if (s == Success) {
-		warningBox("Ticket is reserved!");
+		warningSubBox("Ticket is reserved!");
 
 		char pass[PASSWORD_LEN];
 		inputLineSubBox("Enter reservation password: ", pass, PASSWORD_LEN);
@@ -104,8 +104,8 @@ void command_buyTicket() {
 		String note;
 		s = es->buyTicket(name, date, tic, pass, &note);
 		if (note.get_length() > 0) {
-			successBox("The reservation had a note attached. It reads:");
-			successBox(note.get_cstr());
+			successSubBox("The reservation had a note attached. It reads:");
+			successSubBox(note.get_cstr());
 		}
 	}
 	else if (s == W_TicketHadNotBeenReserved) {