added pspots and ptimes

Customer.cpp

@@ -73,7 +73,7 @@ void Customer::update_db() {
     string statement =
         "UPDATE Customer SET name = '', password = '', "
         "vehicle = '', telephone = '', role = '' where id = '';";
-    statement.insert(98, to_string(id));
+    statement.insert(89, to_string(id));
     statement.insert(84, to_string(role));
     statement.insert(73, telephone);
     statement.insert(57, to_string(int(vehicle)));

Interface.cpp

@@ -1,19 +1,22 @@
 #include "headers/Interface.h"
+#include <stdlib.h>
+#include <synchapi.h>
 
 // I added it to pass spots, because the parking options need it to check where
 // is free parking_spots is declared in main, and if i declare it
 // liberal use of
 // cin.ignore(10000, '\n');
 // so it skips to the next newline, in essence clearing the cin buffer
+void update_information(Customer& c);//temp declaration of independence
 
 void interface(vector<Park_spot>& spots) {
     /*
     string introduction = "P A R K M A N N E"; //logo animation, disable during testing
-    text_animation(introduction, 50);
+    text_animation(introduction, 50); 
     */
-    __label__ exit;
-    system("CLS");
-    cout << "\nWelcome to the parking system. Please login...";
+   __label__ begin;
+   begin:
+    cout << "\nWelcome to the parking system. Please login..";
     int id;
     string password;
     cout << "\nEnter your id: ";
@@ -22,232 +25,165 @@ void interface(vector<Park_spot>& spots) {
     Customer c = query_customer_with_id(id);
     cout << "\nEnter your password: ";
     std::getline(cin, password);
-
     while (!(verify_password(c.password, password))) {
-        cout << "ERROR: wrong password. Please retype your password or type [x] to exit:\n";
+        cout << "ERROR: wrong password. Please retype your password or type [exit] to exit:\n";
         std::getline(cin, password);
-        if (password == "x")
-            goto exit;
+        if (password=="exit") {goto begin;}
     }
-    if (query_role_customer(id) == 1) {
+    if(query_role_customer(id)==1){
         interface_admin(spots);
-    } else if (query_role_customer(id) == 0) {
+    } else if(query_role_customer(id)==0){
         interface_member(spots, c);
     } else {
-        cout << "ERROR ROLE_INVALID!";
+        cout << "ERROR ROLE_INVALID..";
     }
-exit:;
 }
 
-void interface_member(vector<Park_spot>& spots, Customer& c) {
-    __label__ begin, exit;
-    cout << "\nLogged in succesfully!\n";
-
-begin:
-    system("CLS");
-    cout << "Hello! " << c.name
-         << ", please select an option:\n[1]Parking\n[2]Monthly report\n"
-            "[3]Edit information\n[4]Exit\n";
+void interface_member(vector<Park_spot>& spots,Customer& c) {
+    __label__ exit,begin ;
+    begin:
+    cout << "Logged in succesfully as "<<c.name<<"\n";
+    cout << "Please select an option\n[1] Parking options\n[2]Monthly report\n[3]Edit information\n[4]Exit\n";
     int option;
     cin >> option;
     cin.ignore(10000, '\n');
     switch (option) {
-    case 1: {
+    case 1: 
         park(c, spots);
         break;
-    }
-    case 2: {
-        report_customer(c.id);
-        string lol;
-        std::cout<<"Enter any character to continue...";
-        std::cin>>lol;
+    
+    case 2: 
+        cout << "Has not been implemented yet\n";
         break;
-    }
-
-    case 3: {
-        edit_information(c);
+    
+    case 3:
+        update_information(c);
         break;
-    }
-
-    case 4: {
-        cout << "Exiting...\n";
-        Sleep(2000);
+    case 4: 
+        
         goto exit;
         break;
-    }
+    
 
     default:
         break;
-    }
-    goto begin;
-exit:;
+    
+    
+}
+ cout<<"\n[1]Return or [2]Log out?\n";
+    //cin.ignore(10000, '\n');
+    cin>>option;
+    if(option==1)goto begin;
+    exit:
+    cout<<"Logging out...";
+    Sleep(3000);//testing wait synchapi header
+    system ("CLS");//testing clear screen , stdlib header
 }
 
 void interface_admin(vector<Park_spot>& spots) {
-    __label__ begin, exit;
-begin:
+    __label__ begin,exit;
+    begin:
+    Sleep(1000);
     system("CLS");
-    cout << "\nWelcome to the admin interface\n";
-    cout << "\n[1] Reports & analytics";
-    cout << "\n[2] Parking spots";
-    cout << "\n[3] Make new user";
-    cout << "\n[4] Exit";
-    cout << "\nEnter option number: ";
+    cout << "Welcome to the admin interface. It is not completely ready yet.\n";
+    cout << "[1] See monthly report of ALL parking spots\n";
+    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] See current status of parking spots\n";
+    cout << "[6] Make new customer\n";
+    cout << "[7] Make new admin\n";
+    cout << "[8] Make new parking spot\n";
+    cout << "[9] Exit\n";
+    cout << "option[1-9]:";
     int option;
     cin >> option;
     cin.ignore(10000, '\n');
     switch (option) {
     case 1: {
-        cout << "[1] See monthly report of ALL parking spots\n";
-        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] See monthly report of a specific customer\n";
-        cout << "[6] See weekly report of a specific customer\n";
-        cout << "[7] Return\n";
-        cout << "Enter option number: ";
-        int option_1;
-        cin >> option_1;
-        cin.ignore(10000, '\n');
-        switch (option_1) {
-        case 1: {
-            report_all_spots();
-            break;
-        }
-        case 2: {
-            report_all_spots(true);
-            break;
-        }
-        case 3: {
-            report_single_spot();
-            break;
-        }
-        case 4: {
-            report_single_spot(true);
-            break;
-        }
-        case 5: {
-            report_customer(0);
-            break;
-        }
-        case 6: {
-            report_customer(0, true);
-            break;
-        }
-        case 7: {
-            goto begin;
-            break;
-        }
-        default:
-            break;
-        }
-        string lol;
-        std::cout<<"Enter any character to continue...";
-        std::cin>>lol;
+        reports_from_allparkspots();
         break;
     }
     case 2: {
-        cout << "[1] See current status of parking spots\n";
-        cout << "[2] Make new parking spot\n";
-        cout << "[3] Return\n";
-        cout << "Enter option number: ";
-        int option_2;
-        cin >> option_2;
-        cin.ignore(10000, '\n');
-        switch (option_2) {
-        case 1: {
-            current_status_parkspots(spots);
-            string lol;
-            std::cout<<"Enter any character to continue...";
-            std::cin>>lol;
-            break;
-        }
-        case 2: {
-            new_parkspot(spots);
-            break;
-        }
-        case 3: {
-            goto begin;
-            break;
-        }
-        default:
-            break;
-        }
-        
+        reports_from_allparkspots(true);
         break;
     }
     case 3: {
-        system("CLS");
-        cout << "[1] Make new customer\n";
-        cout << "[2] Make new admin\n";
-        cout << "[3] Return\n";
-        cout << "Enter option number: ";
-        int option_3;
-        cin >> option_3;
+        cout << "Which parking spot would you like a report on?\nID:";
+        int spotid;
+        cin >> spotid;
         cin.ignore(10000, '\n');
-        switch (option_3) {
-        case 1: {
-            new_customer();
-            break;
-        }
-        case 2: {
-            new_admin();
-            break;
-        }
-        case 3: {
-            goto begin;
-            break;
-        }
-        default:
-            break;
-        }
+        reports_from_parkspot(spotid);
+        break;
+    }
     case 4: {
-        std::cout<<"Exiting...";
-        Sleep(2000);
+        cout << "Which parking spot would you like a report on?\nID:";
+        int spotid;
+        cin >> spotid;
+        cin.ignore(10000, '\n');
+        reports_from_parkspot(spotid, true);
+        break;
+    }
+    case 5: {
+        current_status_parkspots(spots);
+        break;
+    }
+    case 6: {
+        new_customer();
+        break;
+    }
+    case 7: {
+        new_admin();
+    }
+    case 8: {
+        new_parkspot(spots);
+        break;
+    }
+    case 9: {
         goto exit;
         break;
-    } break;
     }
 
     default:
         break;
     }
-    goto begin;
-exit:;
-
+    cout<<"\n[1]Return or [2]Log out?\n";
+    cin.ignore(10000, '\n');
+    cin>>option;
+    if(option==1)goto begin;
+    exit:
+    cout<<"Logging out...";
+    Sleep(3000);
+    system("CLS");
 }
 
 // --------- individual things.
 
 void park(Customer& c, vector<Park_spot>& spots) {
-    __label__ exit;
-    cout << "You have selected parking option.\n";
+    cout << "You have selected parking option";
     if (!(c.parked())) {
-        cout << "The following spots fit your vehicle and are available: \n";
+        cout << "The following spots[which can fit your vehicle] are "
+                "available: \n";
         for (Park_spot i : spots) {
-            if ((i.v_type == c.vehicle) & (i.taken == false)) {
+            if ((i.v_type == c.vehicle)&(i.taken==false)) {
                 cout << i.id << ", ";
             }
         }
 
-        cout << "\nWhere do you want to park? Or type [0] to exit.";
-        int parkID;
-        cin >> parkID;
-        if (!parkID)
-            goto exit;
+        cout << "where do you want to park?";
+        int parkid;
+        cin >> parkid;
         cin.ignore(10000, '\n');
         for (Park_spot& i : spots) {
-            if (i.id == parkID) {
-                if (confirm()) {
-                    i.clock(c);
-                    cout << "You have parked sucessfully!";
-                }
+            if (i.id == parkid) {
+                i.clock(c);
+                cout << "You have parked sucessfully";
             }
         }
 
     } else {
         cout << "You are parked at spot " << c.parked_at()
-             << ", do you want to clock out?\n[1] Yes\n[2] No";
+             << ", do you want to clock out?\n Enter [1] for yes and [0] for no:";
         int answer = 0;
         cin >> answer;
         cin.ignore(10000, '\n');
@@ -255,10 +191,11 @@ void park(Customer& c, vector<Park_spot>& spots) {
             query_parkspot_with_id(c.parked_at(), spots).clock(c);
             cout << "You have sucessfully clocked out.";
         } else {
-            cout << "OK, have a nice day."; 
+            cout << "OK, have a nice day";
+            Sleep(3000);
+            system("CLS");
         }
     }
-exit:;
 }
 
 void new_customer() {
@@ -267,176 +204,72 @@ void new_customer() {
     string password;
     string telephone;
     int role = 0;
-    cout << "\nWhat's the name of the customer? ";
+    cout << "What's the name of the customer? ";
     std::getline(cin, name);
-    cout << "\nWhat's the vehicle type? \n[1]Twowheeler\n[2] Fourwheeler\n";
+    cout << "What's the vehicle type? [1]Twowheeler, [2] Fourwheeler: ";
     cin >> vtype;
     cin.ignore(10000, '\n');
-    cout << "What's the telephone number? +";
+    cout << "What's the telephone number? ";
     std::getline(cin, telephone);
-    cout << "\nWhat's the password? ";
+    cout << "What's the password?";
     std::getline(cin, password);
     Customer newcustomer{name, password, Vehicle_type(vtype), telephone, role};
-    cout << "\nNew customer sucessfully created\n";
-    if (confirm())
-        newcustomer.update_db();
+    cout << "New customer sucessfully created\n";
+    newcustomer.update_db();
 }
 
 void new_admin() {
-    int vtype = 2; // revision required! Needs to be set to NULL
+    int vtype = 2; //revision required!
     string name;
     string password;
     string telephone;
     int role = 1;
-    cout << "\nWhat's the name of the admin? ";
+    cout << "What's the name of the admin? ";
     std::getline(cin, name);
-    cout << "\nWhat's the telephone number? +";
+    cout << "What's the telephone number? ";
     std::getline(cin, telephone);
-    cout << "\nWhat's the password?";
+    cout << "What's the password?";
     std::getline(cin, password);
     Customer newcustomer{name, password, Vehicle_type(vtype), telephone, role};
-    cout << "\nNew customer sucessfully created\n";
-    if (confirm())
-        newcustomer.update_db();
+    cout << "New customer sucessfully created\n";
+    newcustomer.update_db();
 }
 
 void new_parkspot(vector<Park_spot>& spots) {
-    cout << "What type of parking spot? \n[1] Two-wheeler\n[2] Four-wheeler\n";
+    cout << "What type of parking spot? [1] Twowheeler, [2] Fourwheeler: ";
     int vtype;
     cin >> vtype;
     cin.ignore(10000, '\n');
     Park_spot newspot{Vehicle_type(vtype)};
-    if (confirm()) {
-        spots.push_back(newspot);
-        cout << "New parking spot sucessfully created.\n";
-    }
+    spots.push_back(newspot);
+    cout << "new parking spot sucessfully created.\n";
 }
 
-void edit_information(Customer& c)
+void update_information(Customer& c)//Do not know how to use customer::update_db()
 {
     string string0; int int0;
-    /*std::cout<<"\nInput to update name or press [0] to keep name:\n";    
-    std::getline(cin,string0);
-    if (string0=="0");
-    else c.name=string0;*/
-
-    std::cout<<"\n Input to update vehicle to [1]Two-Wheeler," 
-    "[2]Four-Wheeler or press [0] to keep vehicle type:\n";    
-    std::cin>>int0;
-    if (!int0);
-    else    c.vehicle=Vehicle_type(int0);
-    cin.ignore();
-    std::cout<<"\n Input to update password or press [0] to keep current password:\n";
-    std::getline(cin,string0);
-    if (string0=="0");
-    else    c.password=hash_password(string0);
+    std::cout<<"\n fixme pls Input to update name or press 0 to keep name:\n";
     
-    std::cout<<"\n Input to update phone number or press [0] to keep current number:\n";    
     std::getline(cin,string0);
+    //cin.ignore(10000, '\n');
+    if (string0=="0");
+    else c.name=string0;
+    //vehicle type give problem//std::cout<<"\n Input to update vehicle to [1]Two-Wheeler, [2]Four-Wheeler or press [0] to keep vehicle type:\n";
+    
+    //std::cin>>int0;
+    //if (int0==0);
+    //else    c.Vehicle_type(int0);
+    std::cout<<"\n Input to update password or press [0] to keep current password:\n";
+    
+    std::getline(cin,string0);
+    if (string0=="0");
+    else    c.password=string0;
+    //cin.ignore(10000, '\n');
+    std::cout<<"\n Input to update phone number or press [0] to keep current number:\n";
+    
+    std::getline(cin,string0);
+    //cin.ignore(10000, '\n');
     if (string0=="0");
     else    c.telephone=string0;
-    c.role=0;
-    if(confirm()){c.update_db();}
-}
-
-// time stuff-----------------------------------------------------
-
-pair<int, int> create_month_period() {
-    std::time_t t = std::time(0);
-    std::tm* date = std::localtime(&t);
-    int month, year = 0;
-    cout << "Which month do you want a report on?[6 2018 for June 2018]\n";
-    cin >> month >> year;
-    date->tm_year = year - 1900;
-    date->tm_mday = 1;
-    date->tm_mon = month - 1;
-    pair<int, int> period;
-    period.first = mktime(date);
-    date->tm_mon = month;
-    period.second = mktime(date);
-    return period;
-}
-
-pair<int, int> create_week_period() {
-    std::time_t t = std::time(0);
-    std::tm* date = std::localtime(&t);
-    int day, month, year = 0;
-    cout << "Which month do you want a report on?[ 20 6 2018 for June 20th, 2018]\n";
-    cin >> day >> month >> year;
-    date->tm_year = year - 1900;
-    date->tm_mday = day;
-    date->tm_mon = month - 1;
-    date->tm_hour = 0;
-    date->tm_min = 0;
-    pair<int, int> period;
-    period.first = mktime(date);
-    period.second = period.first + 604800; // plus 7 days in seconds.
-    return period;
-}
-
-bool confirm(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")
-    {
-        std::cout<<"Succes! Changes Saved.";
-        Sleep(1000);
-        return true;
-    }
-    else
-    {
-        std::cout<<"No changes committed.";
-        Sleep(1000);
-        return false;
-    }
-}
-
-// ------------------------------ report stuff
-
-void report_all_spots(bool weekly) {
-    pair<int, int> period;
-    if (weekly) {
-        period = create_week_period(); // remove the pair<int, int>
-    } else {
-        period = create_month_period(); // ^
-    }
-
-    cout << "working timeperiods: " << period.first << ", " << period.second; // DEBUG
-
-    reports_from_allparkspots(period); // TODO: namechange of reports_from_allparkspots in  query?
-}
-
-void report_single_spot(bool weekly) {
-    cout << "Which parking spot would you like a report on?\n";
-    cout << "Parking spot ID: ";
-    int spotID;
-    cin >> spotID;
-    cin.ignore(10000, '\n');
-    pair<int, int> period;
-    if (weekly) {
-        period = create_week_period(); // remove the pair<int, int>
-    } else {
-        period = create_month_period();
-    }
-    reports_from_parkspot(spotID, period);
-}
-
-void report_customer(int customerID, bool weekly) {
-    // use report_customer(0) to make interactive
-    // so admin can call the interactive version, but customer can only call
-    // report_customer(own_cid)
-    if (!customerID) {
-        cout << "What customer do you want a report on? ID: ";
-        cin >> customerID;
-    }
-    pair<int, int> period;
-    if (weekly) {
-        period = create_week_period();
-    } else {
-        period = create_month_period();
-    }
-    reports_from_customer(customerID, period);
+    c.update_db();
 }

Park_time.cpp

@@ -60,8 +60,7 @@ std::ostream& operator<<(std::ostream& os, const Park_time& pt) {
     os << "Customer # " << pt.customer_id << "at parking spot " << pt.spot_id << "\n";
     os << "Clocked in :" << std::ctime(&start_);
     os << "clocked out : " << std::ctime(&end_);
-    float dur_h = pt.duration / 3600.0;
-    os << "duration : " << dur_h << " h\n";
+    os << "duration : " << pt.duration << "\n";
     os << "- - - - - - - - - - - - - - - - - - - -\n";
     return os;
 }
@@ -125,10 +124,11 @@ cpp/header
 }
 
 // text animtion duh
-void text_animation(const string& text, unsigned int pause_time) {
-    for (const char m : text) // range loop; for each character in string
-    {
-        cout << m << flush;
-        sleep_for(milliseconds(pause_time));
-    }
+void text_animation(const string& text, unsigned int pause_time)
+{
+  for(const char m:text) // range loop; for each character in string
+  {
+    cout << m << flush;
+    sleep_for(milliseconds(pause_time));
+  }
 }

Query.cpp

@@ -65,14 +65,17 @@ Customer query_customer_with_id(int id) {
         string telephone = query.getColumn(4);
         vector<Park_time> park_instances = query_parktimes_for_customer(id);
         Customer result{id, name, password, Vehicle_type(vehicle), park_instances, telephone};
+        // DEBUG
+        // cout << "{" << result.id << "," <<result.password <<"," <<
+        // int(vehicle) << "}\n";
         return result;
     }
 }
 
-int query_role_customer(int id) {
+int query_role_customer(int id){
     SQLite::Statement query(data::db, "SELECT * FROM Customer WHERE id = ?;");
     query.bind(1, id);
-    while (query.executeStep()) {
+    while(query.executeStep()){
         int role = query.getColumn(5);
         return role;
     }
@@ -80,8 +83,6 @@ int query_role_customer(int id) {
 
 //------------------------------- parkspot info
 
-// -- parkspots info, report gen
-
 Park_spot query_parkspot_with_id(int id, vector<Park_spot>& parkspots) {
     for (Park_spot& i : parkspots) {
         if (i.id == id) {
@@ -90,13 +91,22 @@ Park_spot query_parkspot_with_id(int id, vector<Park_spot>& parkspots) {
     }
 }
 
-void reports_from_parkspot(int spotid, pair<int, int> period) {
+void reports_from_parkspot(int spotid, bool weekly) {
+    std::time_t t = std::time(0); // get time now
+    std::tm* now = std::localtime(&t);
+
+    if (weekly) {
+        now->tm_wday = 1;
+    } else {
+        now->tm_mday = 1;
+    }
+
+    int s_since_epoch = mktime(now);
+
     vector<Park_time> park_times;
-    SQLite::Statement query(data::db,
-                            "SELECT * FROM Park_time WHERE spot_id = ? AND start > ? AND end < ?;");
+    SQLite::Statement query(data::db, "SELECT * FROM Park_time WHERE spot_id = ? AND start > ?;");
     query.bind(1, spotid);
-    query.bind(2, period.first);
-    query.bind(3, period.second);
+    query.bind(2, s_since_epoch);
     while (query.executeStep()) {
         int id = query.getColumn(0);
         int cid = query.getColumn(1);
@@ -112,12 +122,20 @@ void reports_from_parkspot(int spotid, pair<int, int> period) {
     }
 }
 
-void reports_from_allparkspots(pair<int, int> period) {
-    vector<Park_time> park_times;
-    SQLite::Statement query(data::db, "SELECT * FROM Park_time WHERE start > ? AND end < ?;");
-    query.bind(1, period.first);
-    query.bind(2, period.second);
+void reports_from_allparkspots(bool weekly) {
+    std::time_t t = std::time(0); // get time now
+    std::tm* now = std::localtime(&t);
+    if (weekly) {
+        now->tm_wday = 1;
+    } else {
+        now->tm_mday = 1;
+    }
 
+    int s_since_epoch = mktime(now);
+
+    vector<Park_time> park_times;
+    SQLite::Statement query(data::db, "SELECT * FROM Park_time WHERE start > ?;");
+    query.bind(1, s_since_epoch);
     while (query.executeStep()) {
         int id = query.getColumn(0);
         int cid = query.getColumn(1);
@@ -135,40 +153,29 @@ void reports_from_allparkspots(pair<int, int> period) {
 }
 
 void current_status_parkspots(vector<Park_spot>& spots) {
-    cout << "P.spot \t\tStatus\t\t Customer\n";
     for (auto& i : spots) {
-        cout << "\n" << i.id << "\t\t" << ((i.taken) ? "true" : "false");
+        cout << "---------------------------\n";
+        cout << "PS #" << i.id << "\n";
+        cout << "Taken: " << ((i.taken) ? "true" : "false") << "\n";
         if (i.taken) {
-            cout << "\t\t" << i.parked_customer;
+            cout << "Customer#" << i.parked_customer << "  parked there\n";
         }
     }
-    cout << "\n";
 }
 
-vector<Park_time> reports_from_customer(int cid, pair<int, int> period) {
-    vector<Park_time> park_times;
-    int verhicle = int(query_customer_with_id(cid).vehicle);
-    float sum = 0;
-    SQLite::Statement query(
-        data::db, "SELECT * FROM Park_time WHERE customer_id = ? AND start > ? AND end < ?;");
-    query.bind(1, cid);
-    query.bind(2, period.first);
-    query.bind(3, period.second);
-    while (query.executeStep()) {
-        int id = query.getColumn(0);
-        int spotid = query.getColumn(2);
-        int start = query.getColumn(3);
-        int duration = query.getColumn(5);
-        Park_time result{id, cid, spotid, start, duration};
-        park_times.push_back(result);
-        sum += duration/3600;
-    }
-    query.reset();
+// -------------- paroking spots
 
-    for (auto i : park_times) {
-        cout << std::setprecision(2) << i;
-        sum += i.duration / 3600.0;
-    }
-    cout << "Your fees for this month: $" << std::setprecision(4) << sum * verhicle << "\n";
-    return park_times;
-}
+// vector<Park_spot> populate_spots(){
+//         vector<Park_spot> spots;
+//     SQLite::Statement query(data::db, "SELECT * FROM Park_spot WHERE id >
+//     0;");
+//     // query.bind(1, 2);
+//     while (query.executeStep()) {
+//         int id = query.getColumn(0);
+//         int taken = query.getColumn(1);
+//         int cid = query.getColumn(2);
+//         // park_customers.push_back(query_customer_with_id(cid));
+//         spots.push_back({id, taken, cid});
+//     }
+//     return spots;
+// }

data.cpp

@@ -13,14 +13,12 @@ SQLite::Database start_db() {
         This shouldn't be here, really, but I can't think of a better place
         where it runs at least once. This seeds the random generator needed for
         salts and other stuff, and needs to be run at least once when working
-        with any libsodium function. And since this definitely needs to be run at least once, why
-        not include it here? you can't (well, shouldn't be able to) login into anything if this
-        doesn't run, since you need to compare passwords to login
+        with any libsodium function.
          */
     }
     db.exec(
         "create table if not exists Customer (id integer primary key, name "
-        "text, password text, vehicle int, telephone text, role int)");
+        "text, password text, vehicle int, telephone text)");
     db.exec(
         "create table if not exists Park_spot (id integer primary key, taken "
         "int, customer_id int, vehicle_type int)");

headers/Interface.h

@@ -1,27 +1,14 @@
+
+
 #include "Query.h"
-#include <stdlib.h>
-#include <synchapi.h>
+
 
 using std::cin;
 
-//interface functions
 void interface(vector<Park_spot>& spots);
 void interface_member(vector<Park_spot>& spots, Customer& c);
 void interface_admin(vector<Park_spot>& spots);
 void park(Customer& c, vector<Park_spot>& spots);
 void new_customer();
 void new_admin();
-void new_parkspot(vector<Park_spot>& spots);
-void edit_information(Customer&);
-
-// time creation
-pair<int, int> create_month_period();
-pair<int, int> create_week_period();
-
-// report functions
-void report_single_spot(bool weekly = false);
-void report_all_spots(bool weekly = false);
-void report_customer(int customerID, bool weekly = false);
-
-// confirmation function
-bool confirm();
+void new_parkspot(vector<Park_spot>& spots);

headers/Park_time.h

@@ -15,8 +15,8 @@ using std::cout;
 using std::flush;
 using std::string;
 using std::to_string;
-using std::chrono::milliseconds;
 using std::this_thread::sleep_for;
+using std::chrono::milliseconds;
 /*
 
 

headers/Query.h

@@ -3,8 +3,6 @@
 #pragma once
 
 #include "Park_spot.h"
-#include <iomanip> 
-using std::pair;
 
 /*these are the functions that search the database and create objects from it.
 
@@ -54,16 +52,17 @@ furhter.
  */
 
 vector<Park_time> query_parktimes_for_customer(int cid);
+
 vector<Customer> query_customer_with_name(string name);
 Customer query_customer_with_id(int id);
-Park_spot query_parkspot_with_id(int id, vector<Park_spot>& parkspots);
-int query_role_customer(int id);
 
 vector<Park_spot> populate_spots();
 
-void reports_from_parkspot(int spotid, pair<int, int> period);
-void reports_from_allparkspots(pair<int, int> period);
-void current_status_parkspots(vector<Park_spot>& spots);
-vector<Park_time> reports_from_customer(int cid, pair<int, int> period);
+Park_spot query_parkspot_with_id(int id, vector<Park_spot>& parkspots);
+int query_role_customer(int id);
 
+void reports_from_parkspot(int spotid, bool weekly = false);
+void reports_from_allparkspots(bool weekly = false);
+
+void current_status_parkspots(vector<Park_spot>& spots);
 #endif // CUSTOMER_H

main.cpp

@@ -1,4 +1,3 @@
-
 #include "headers/Interface.h"
 
 /*
@@ -45,9 +44,19 @@ static vector<Park_spot> parking_spots = populate_spots();
 static vector<Customer> park_customers;
 
 int main() {
-
-    while (true) {
+    // 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;
+        }*/
     }
 }
 
@@ -56,7 +65,6 @@ Why is this not in query.cpp? Because somehow, it errors out when it's there.
 The error message indicates it is a memory issue but I suspect it's a
 concurrency issue. Do not move this.
  */
-
 vector<Park_spot> populate_spots() {
     vector<Park_spot> spots;
     SQLite::Statement query(data::db, "SELECT * FROM Park_spot WHERE id > 0;");
@@ -68,4 +76,4 @@ vector<Park_spot> populate_spots() {
         spots.push_back({id, taken, cid, vtype});
     }
     return spots;
-}
+}