intergration

Interface.cpp

@@ -6,7 +6,6 @@
 // cin.ignore(10000, '\n');
 // so it skips to the next newline, in essence clearing the cin buffer
 
-
 void interface(vector<Park_spot>& spots) {
     /*
     string introduction = "P A R K M A N N E"; //logo animation, disable during testing
@@ -26,7 +25,8 @@ void interface(vector<Park_spot>& spots) {
     while (!(verify_password(c.password, password))) {
         cout << "ERROR: wrong password. Please retype your password or type [x] to exit:\n";
         std::getline(cin, password);
-        if(password=="x")goto exit;
+        if (password == "x")
+            goto exit;
     }
     if (query_role_customer(id) == 1) {
         interface_admin(spots);
@@ -43,7 +43,8 @@ void interface_member(vector<Park_spot>& spots, Customer& c) {
     cout << "\nLogged in succesfully!\n";
 
 begin:
-    cout <<"Hello! "<<c.name<< ", please select an option:\n[1]Parking\n[2]Monthly report\n"
+    cout << "Hello! " << c.name
+         << ", please select an option:\n[1]Parking\n[2]Monthly report\n"
             "[3]Edit information\n[4]Exit\n";
     int option;
     cin >> option;
@@ -94,7 +95,8 @@ void interface_admin(vector<Park_spot>& spots) {
         cout << "[2] See weekly report of ALL parking spots\n";
         cout << "[3] See monthly report of a specific parking spot\n";
         cout << "[4] See weekly report of a specific parking spot\n";
-        cout << "[5] Return\n";
+        cout << "[5] See monthly report of a specific customer\n";
+        cout << "[6] See weekly report of a specific customer\n";
         cout << "Enter option number: ";
         int option_1;
         cin >> option_1;
@@ -117,9 +119,14 @@ void interface_admin(vector<Park_spot>& spots) {
             break;
         }
         case 5: {
-            goto begin;
+            report_customer(0);
             break;
         }
+        case 6: {
+            report_customer(0, true);
+            break;
+        }
+        default:
             break;
         }
     }
@@ -173,8 +180,10 @@ void interface_admin(vector<Park_spot>& spots) {
         default:
             break;
         }
-        case 4: {goto exit;break;}
+    case 4: {
+        goto exit;
         break;
+    } break;
     }
 
     default:
@@ -200,12 +209,12 @@ void park(Customer& c, vector<Park_spot>& spots) {
         cout << "\nWhere do you want to park? Or type [0] to exit.";
         int parkID;
         cin >> parkID;
-        if (!parkID)goto exit;
+        if (!parkID)
+            goto exit;
         cin.ignore(10000, '\n');
         for (Park_spot& i : spots) {
             if (i.id == parkID) {
-                if (verify())
+                if (verify()) {
-                {
                     i.clock(c);
                     cout << "You have parked sucessfully!";
                 }
@@ -245,7 +254,8 @@ void new_customer() {
     std::getline(cin, password);
     Customer newcustomer{name, password, Vehicle_type(vtype), telephone, role};
     cout << "\nNew customer sucessfully created\n";
-    if (verify())newcustomer.update_db();
+    if (verify())
+        newcustomer.update_db();
 }
 
 void new_admin() {
@@ -262,7 +272,8 @@ void new_admin() {
     std::getline(cin, password);
     Customer newcustomer{name, password, Vehicle_type(vtype), telephone, role};
     cout << "\nNew customer sucessfully created\n";
-    if(verify())newcustomer.update_db();
+    if (verify())
+        newcustomer.update_db();
 }
 
 void new_parkspot(vector<Park_spot>& spots) {
@@ -271,8 +282,10 @@ void new_parkspot(vector<Park_spot>& spots) {
     cin >> vtype;
     cin.ignore(10000, '\n');
     Park_spot newspot{Vehicle_type(vtype)};
-    if(verify()){spots.push_back(newspot);
+    if (verify()) {
-    cout << "New parking spot sucessfully created.\n";}
+        spots.push_back(newspot);
+        cout << "New parking spot sucessfully created.\n";
+    }
 }
 
 // time stuff-----------------------------------------------------
@@ -310,16 +323,16 @@ pair<int, int> create_week_period() {
     return period;
 }
 
-bool verify(void)
+bool verify(void) {
-{
     string ver;
     std::cout << "\nAre you sure you want to commit these actions?"
                  "\n[No] Revert."
                  "\n[Yes] Commit.";
     std::cin >> ver;
-if (ver=="YES"|ver=="Yes"|ver=="yes") return true;
+    if (ver == "YES" | ver == "Yes" | ver == "yes")
-else return false;
+        return true;
-
+    else
+        return false;
 }
 
 // ------------------------------ report stuff

main.cpp

@@ -1,5 +1,5 @@
-#include "headers/Interface.h"
 
+#include "headers/Interface.h"
 
 /*
 Code structure is like this:
@@ -45,19 +45,9 @@ static vector<Park_spot> parking_spots = populate_spots();
 static vector<Customer> park_customers;
 
 int main() {
-    // state of db:
+
-    // er zijn 10 parkspots, 5 met biketype en 5 met pickup type
-    // er is een customer met id 1(testcustomer) met password "password"
     while (true) {
-        cin.clear();
         interface(parking_spots);
-        cout << "\nexit? Input 'y' or 'n'..";
-        char n;
-        cin >> n;
-        cin.clear();
-        if (n == 'y') {
-            break;
-        }
     }
 }