paul-nhlapo
diff --git a/‎AddOn.o
-56 Bytes b/‎AddOn.o
-56 Bytes
diff --git a/‎Bake.o
-64 Bytes b/‎Bake.o
-64 Bytes
diff --git a/‎Bar.o
-64 Bytes b/‎Bar.o
-64 Bytes
diff --git a/‎Bartender.o
-56 Bytes b/‎Bartender.o
-56 Bytes
diff --git a/‎Base.o
-64 Bytes b/‎Base.o
-64 Bytes
diff --git a/‎Boil.o
-56 Bytes b/‎Boil.o
-56 Bytes
diff --git a/‎Builder.o
-64 Bytes b/‎Builder.o
-64 Bytes
diff --git a/‎BusyState.o
-64 Bytes b/‎BusyState.o
-64 Bytes
diff --git a/‎Cash.o
-56 Bytes b/‎Cash.o
-56 Bytes
diff --git a/‎Chef.o
-64 Bytes b/‎Chef.o
-64 Bytes
diff --git a/‎Cocktail.o
-56 Bytes b/‎Cocktail.o
-56 Bytes
diff --git a/‎CocktailMixer.o
-56 Bytes b/‎CocktailMixer.o
-56 Bytes
diff --git a/‎CocktailOrder.o
-56 Bytes b/‎CocktailOrder.o
-56 Bytes
diff --git a/‎CocktailOrderDetail.o
-64 Bytes b/‎CocktailOrderDetail.o
-64 Bytes
diff --git a/‎ColdDessert.o
-56 Bytes b/‎ColdDessert.o
-56 Bytes
diff --git a/‎Command.o
-64 Bytes b/‎Command.o
-64 Bytes
diff --git a/‎ConcreteChefCreator.o
-64 Bytes b/‎ConcreteChefCreator.o
-64 Bytes
diff --git a/‎CreditCard.o
-56 Bytes b/‎CreditCard.o
-56 Bytes
diff --git a/‎Customer.o
-56 Bytes b/‎Customer.o
-56 Bytes
diff --git a/‎DessertChef.o
-64 Bytes b/‎DessertChef.o
-64 Bytes
diff --git a/‎DessertMenu.o
-56 Bytes b/‎DessertMenu.o
-56 Bytes
diff --git a/‎DessertOrder.o
-56 Bytes b/‎DessertOrder.o
-56 Bytes
diff --git a/‎DessertOrderBuilder.o
-56 Bytes b/‎DessertOrderBuilder.o
-56 Bytes
diff --git a/‎Factory.o
-64 Bytes b/‎Factory.o
-64 Bytes
diff --git a/‎Floor.o
-64 Bytes b/‎Floor.o
-64 Bytes
diff --git a/‎FreeState.o
-64 Bytes b/‎FreeState.o
-64 Bytes
diff --git a/‎Fruit.o
-56 Bytes b/‎Fruit.o
-56 Bytes
diff --git a/‎Fry.o
-56 Bytes b/‎Fry.o
-56 Bytes
diff --git a/‎Grill.o
-56 Bytes b/‎Grill.o
-56 Bytes
diff --git a/‎HeadChef.o
-56 Bytes b/‎HeadChef.o
-56 Bytes
diff --git a/‎High.o
-56 Bytes b/‎High.o
-56 Bytes
diff --git a/‎HotDessert.o
-56 Bytes b/‎HotDessert.o
-56 Bytes
diff --git a/‎Ice.o
-56 Bytes b/‎Ice.o
-56 Bytes
diff --git a/‎Individual.o
-56 Bytes b/‎Individual.o
-56 Bytes
diff --git a/‎Kitchen.o
-56 Bytes b/‎Kitchen.o
-56 Bytes
diff --git a/‎Low.o
-56 Bytes b/‎Low.o
-56 Bytes
diff --git a/‎Main
1.73 KB b/‎Main
1.73 KB
diff --git a/‎Main.o
-56 Bytes b/‎Main.o
-56 Bytes
diff --git a/‎MainChef.o
-56 Bytes b/‎MainChef.o
-56 Bytes
diff --git a/‎MainMenu.o
-64 Bytes b/‎MainMenu.o
-64 Bytes
diff --git a/‎MainOrder.o
-56 Bytes b/‎MainOrder.o
-56 Bytes
diff --git a/‎MainOrderBuilder.o
-56 Bytes b/‎MainOrderBuilder.o
-56 Bytes
diff --git a/‎Manager.o
-64 Bytes b/‎Manager.o
-64 Bytes
diff --git a/‎MealBuilder.o
-56 Bytes b/‎MealBuilder.o
-56 Bytes
diff --git a/‎MealProduct.o
-56 Bytes b/‎MealProduct.o
-56 Bytes
diff --git a/‎Medium.o
-64 Bytes b/‎Medium.o
-64 Bytes
diff --git a/‎Menu.o
-56 Bytes b/‎Menu.o
-56 Bytes
diff --git a/‎NoCook.o
-56 Bytes b/‎NoCook.o
-56 Bytes
diff --git a/‎Order.o
-56 Bytes b/‎Order.o
-56 Bytes
diff --git a/‎OrderFactory.o
-64 Bytes b/‎OrderFactory.o
-64 Bytes
diff --git a/‎Salad.o
-56 Bytes b/‎Salad.o
-56 Bytes
diff --git a/‎Satisfaction.o
-56 Bytes b/‎Satisfaction.o
-56 Bytes
diff --git a/‎Saute.o
-56 Bytes b/‎Saute.o
-56 Bytes
diff --git a/‎Simmer.o
-56 Bytes b/‎Simmer.o
-56 Bytes
diff --git a/‎SimpleOrder.o
-56 Bytes b/‎SimpleOrder.o
-56 Bytes
diff --git a/‎Staff.o
-56 Bytes b/‎Staff.o
-56 Bytes
diff --git a/‎StarterChef.o
-56 Bytes b/‎StarterChef.o
-56 Bytes
diff --git a/‎StarterMenu.o
-64 Bytes b/‎StarterMenu.o
-64 Bytes
diff --git a/‎StarterOrder.o
-56 Bytes b/‎StarterOrder.o
-56 Bytes
diff --git a/‎StarterOrderBuilder.o
-64 Bytes b/‎StarterOrderBuilder.o
-64 Bytes
diff --git a/‎Sushi.o
-56 Bytes b/‎Sushi.o
-56 Bytes
diff --git a/‎Table.o
-64 Bytes b/‎Table.o
-64 Bytes
diff --git a/‎Type.o
-64 Bytes b/‎Type.o
-64 Bytes
diff --git a/‎UI.cpp
+77-34 b/‎UI.cpp
+77-34
diff --git a/‎UI.o
3.96 KB b/‎UI.o
3.96 KB
diff --git a/‎Waiter.o
-56 Bytes b/‎Waiter.o
-56 Bytes
diff --git a/‎concreteCommand.o
-64 Bytes b/‎concreteCommand.o
-64 Bytes
diff --git a/‎customerFactory.o
-56 Bytes b/‎customerFactory.o
-56 Bytes
diff --git a/‎maitreD.o
-64 Bytes b/‎maitreD.o
-64 Bytes
@@ -2,6 +2,7 @@
 #include <string>
 #include <iostream>
 #include <vector>
+#include <limits>
 using namespace std;
 
 UI::UI(concreteCommand *c, Floor *f)
@@ -14,7 +15,6 @@ UI::UI(concreteCommand *c, Floor *f)
     b1->setBuilder(cm1);
     bar_ = new Bar();
     bar_->setBarTender(b1);
-    
 }
 
 UI::~UI()
@@ -30,52 +30,95 @@ void UI::addCustomer()
     cout << endl;
     int size;
 
-    if (!(cin >> size))
+    while (!(cin >> size) || (size != 1 && size != 2))
     {
-        cout << "Input is not a number. Try again." << endl;
-        cin >> size;
+        cin.clear();                                         // clear the error flags
+        cin.ignore(numeric_limits<streamsize>::max(), '\n'); // ignore the rest of the line
+        cout << "Invalid input. Please enter 1 for Single or 2 for Group." << endl;
     }
+    // if (size == 1)
+    // {
+    //     Customer *single = c1->produceCustomer('!');
+    //     // c1->seatCustomer(single);
+    // }
+    // else
+    // {
+    //     if (size == 2)
+    //     {
+    //         cout << "Enter your group's size: " << endl;
+    //         int gSize;
+    //         cin >> gSize;
+
+    //         vector<Customer *> tempVec;
+    //         int x;
+    //         int y;
+    //         pair<int, int> option = c1->reserveGroupTable();
+    //         x = option.first;
+    //         y = option.second;
+    //         for (int i = 0; i < gSize; i++)
+    //         {
+    //             tempVec.push_back(c1->produceCustomer(c1->getGroupID()));
+    //         }
+    //         cout << "x " << x << " y " << y << endl;
+    //         int counter = 1;
+    //         for (Customer *customer : tempVec)
+    //         {
+    //             cout << "Seating customer: " << counter << endl;
+    //             c1->seatMultipleCustomers(x, y, customer);
+    //             counter++;
+    //         }
+    //         c1->setGroupID();
+    //     }
+
+    //     else
+    //     {
+    //         if (size != 1 || size != 2)
+    //             cout << "Invalid input, moving forward as single" << endl;
+    //         Customer *single = c1->produceCustomer('!');
+    //         return;
+    //     }
+    // }
     if (size == 1)
     {
         Customer *single = c1->produceCustomer('!');
         // c1->seatCustomer(single);
     }
-    else
+    else if (size == 2)
     {
-        if (size == 2)
+        cout << "Enter your group's size: " << endl;
+        int gSize;
+        while (!(cin >> gSize) || gSize <= 0)
         {
-            cout << "Enter your group's size: " << endl;
-            int gSize;
-            cin >> gSize;
-
-            vector<Customer *> tempVec;
-            int x;
-            int y;
-            pair<int, int> option = c1->reserveGroupTable();
-            x = option.first;
-            y = option.second;
-            for (int i = 0; i < gSize; i++)
-            {
-                tempVec.push_back(c1->produceCustomer(c1->getGroupID()));
-            }
-            cout << "x " << x << " y " << y << endl;
-            int counter = 1;
-            for (Customer *customer : tempVec)
-            {
-                cout << "Seating customer: " << counter << endl;
-                c1->seatMultipleCustomers(x, y, customer);
-                counter++;
-            }
-            c1->setGroupID();
+            cin.clear();
+            cin.ignore(numeric_limits<streamsize>::max(), '\n');
+            cout << "Invalid input. Please enter a positive number." << endl;
         }
 
-        else
+        vector<Customer *> tempVec;
+        int x;
+        int y;
+        pair<int, int> option = c1->reserveGroupTable();
+        x = option.first;
+        y = option.second;
+        for (int i = 0; i < gSize; i++)
         {
-            if (size != 1 || size != 2)
-                cout << "Invalid input, moving forward as single" << endl;
-            Customer *single = c1->produceCustomer('!');
-            return;
+            tempVec.push_back(c1->produceCustomer(c1->getGroupID()));
         }
+        cout << "x " << x << " y " << y << endl;
+        int counter = 1;
+        for (Customer *customer : tempVec)
+        {
+            cout << "Seating customer: " << counter << endl;
+            c1->seatMultipleCustomers(x, y, customer);
+            counter++;
+        }
+        c1->setGroupID();
+    }
+    else
+    {
+        cout << "Invalid input, moving forward as single" << endl;
+        Customer *single = c1->produceCustomer('!');
+        // c1->seatCustomer(single);
     }
 }