Cosmetic changes

Customer.cpp

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

Interface.cpp

@@ -11,8 +11,9 @@ 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);
     */
-
-    cout << "\nWelcome to the parking system. Please login..";
+    __label__ exit;
+    system("CLS");
+    cout << "\nWelcome to the parking system. Please login...";
     int id;
     string password;
     cout << "\nEnter your id: ";
@@ -21,9 +22,12 @@ 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:\n";
+        cout << "ERROR: wrong password. Please retype your password or type [x] to exit:\n";
         std::getline(cin, password);
+        if (password == "x")
+            goto exit;
     }
     if (query_role_customer(id) == 1) {
         interface_admin(spots);
@@ -32,11 +36,18 @@ void interface(vector<Park_spot>& spots) {
     } else {
         cout << "ERROR ROLE_INVALID!";
     }
+exit:;
 }
 
 void interface_member(vector<Park_spot>& spots, Customer& c) {
+    __label__ begin, exit;
     cout << "\nLogged in succesfully!\n";
-    cout << "select an option:\n [1] Parking\n[2]Monthly report\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";
     int option;
     cin >> option;
     cin.ignore(10000, '\n');
@@ -46,20 +57,41 @@ void interface_member(vector<Park_spot>& spots, Customer& c) {
         break;
     }
     case 2: {
-        cout << "Has not been implemented yet\n";
+        report_customer(c.id);
+        string lol;
+        std::cout<<"Enter any character to continue...";
+        std::cin>>lol;
+        break;
+    }
+
+    case 3: {
+        edit_information(c);
+        break;
+    }
+
+    case 4: {
+        cout << "Exiting...\n";
+        Sleep(2000);
+        goto exit;
         break;
     }
 
     default:
         break;
     }
+    goto begin;
+exit:;
 }
 
 void interface_admin(vector<Park_spot>& spots) {
-    cout << "\nWelcome to the admin interface.\n";
+    __label__ begin, exit;
+begin:
+    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: ";
     int option;
     cin >> option;
@@ -70,6 +102,9 @@ 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] 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;
@@ -91,13 +126,30 @@ void interface_admin(vector<Park_spot>& spots) {
             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;
+        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;
@@ -105,18 +157,30 @@ void interface_admin(vector<Park_spot>& spots) {
         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;
         }
+        
+        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;
@@ -130,41 +194,60 @@ void interface_admin(vector<Park_spot>& spots) {
             new_admin();
             break;
         }
-        default:
+        case 3: {
+            goto begin;
             break;
         }
-    }
         default:
             break;
         }
+    case 4: {
+        std::cout<<"Exiting...";
+        Sleep(2000);
+        goto exit;
+        break;
+    } break;
+    }
+
+    default:
+        break;
+    }
+    goto begin;
+exit:;
+
 }
 
 // --------- individual things.
 
 void park(Customer& c, vector<Park_spot>& spots) {
+    __label__ exit;
     cout << "You have selected parking option.\n";
     if (!(c.parked())) {
-        cout << "The following spots fit your vehicle and are available: ";
+        cout << "The following spots fit your vehicle and are available: \n";
         for (Park_spot i : spots) {
-            if (i.v_type == c.vehicle) {
+            if ((i.v_type == c.vehicle) & (i.taken == false)) {
                 cout << i.id << ", ";
             }
         }
 
-        cout << "\nWhere do you want to park?";
+        cout << "\nWhere do you want to park? Or type [0] to exit.";
         int parkID;
         cin >> parkID;
+        if (!parkID)
+            goto exit;
         cin.ignore(10000, '\n');
         for (Park_spot& i : spots) {
             if (i.id == parkID) {
+                if (confirm()) {
                     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[1] Yes\n[2] No";
         int answer = 0;
         cin >> answer;
         cin.ignore(10000, '\n');
@@ -172,9 +255,10 @@ 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."; // exit to customer login
+            cout << "OK, have a nice day."; 
         }
     }
+exit:;
 }
 
 void new_customer() {
@@ -185,7 +269,7 @@ void new_customer() {
     int role = 0;
     cout << "\nWhat's the name of the customer? ";
     std::getline(cin, name);
-    cout << "\nWhat's the vehicle type? \n[1]twoweeler\n[2] fourweeler\n";
+    cout << "\nWhat's the vehicle type? \n[1]Twowheeler\n[2] Fourwheeler\n";
     cin >> vtype;
     cin.ignore(10000, '\n');
     cout << "What's the telephone number? +";
@@ -194,6 +278,7 @@ void new_customer() {
     std::getline(cin, password);
     Customer newcustomer{name, password, Vehicle_type(vtype), telephone, role};
     cout << "\nNew customer sucessfully created\n";
+    if (confirm())
         newcustomer.update_db();
 }
 
@@ -211,17 +296,47 @@ void new_admin() {
     std::getline(cin, password);
     Customer newcustomer{name, password, Vehicle_type(vtype), telephone, role};
     cout << "\nNew customer sucessfully created\n";
+    if (confirm())
         newcustomer.update_db();
 }
 
 void new_parkspot(vector<Park_spot>& spots) {
-    cout << "What type of parking spot? \n[1] twoweeler\n[2] fourweeler\n";
+    cout << "What type of parking spot? \n[1] Two-wheeler\n[2] Four-wheeler\n";
     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";
+    }
+}
+
+void edit_information(Customer& c)
+{
+    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 Input to update phone number or press [0] to keep current number:\n";    
+    std::getline(cin,string0);
+    if (string0=="0");
+    else    c.telephone=string0;
+    c.role=0;
+    if(confirm()){c.update_db();}
 }
 
 // time stuff-----------------------------------------------------
@@ -259,6 +374,26 @@ pair<int, int> create_week_period() {
     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) {
@@ -299,9 +434,9 @@ void report_customer(int customerID, bool weekly) {
     }
     pair<int, int> period;
     if (weekly) {
-        pair<int, int> period = create_week_period();
+        period = create_week_period();
     } else {
-        pair<int, int> period = create_month_period();
+        period = create_month_period();
     }
     reports_from_customer(customerID, period);
 }

Park_time.cpp

@@ -60,7 +60,8 @@ 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_);
-    os << "duration : " << pt.duration << "\n";
+    float dur_h = pt.duration / 3600.0;
+    os << "duration : " << dur_h << " h\n";
     os << "- - - - - - - - - - - - - - - - - - - -\n";
     return os;
 }

Query.cpp

@@ -135,18 +135,20 @@ 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";
-        cout << "PS #" << i.id << "\n";
-        cout << "Taken: " << ((i.taken) ? "true" : "false") << "\n";
+        cout << "\n" << i.id << "\t\t" << ((i.taken) ? "true" : "false");
         if (i.taken) {
-            cout << "Customer#" << i.parked_customer << "  parked there\n";
+            cout << "\t\t" << i.parked_customer;
         }
     }
+    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);
@@ -159,11 +161,14 @@ vector<Park_time> reports_from_customer(int cid, pair<int, int> period) {
         int duration = query.getColumn(5);
         Park_time result{id, cid, spotid, start, duration};
         park_times.push_back(result);
+        sum += duration/3600;
     }
     query.reset();
 
     for (auto i : park_times) {
-        cout << i;
+        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;
 }

data.cpp

@@ -20,7 +20,7 @@ SQLite::Database start_db() {
     }
     db.exec(
         "create table if not exists Customer (id integer primary key, name "
-        "text, password text, vehicle int, telephone text)");
+        "text, password text, vehicle int, telephone text, role int)");
     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,7 +1,10 @@
 #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);
@@ -9,11 +12,16 @@ 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 stuff
+// 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();

headers/Query.h

@@ -3,6 +3,7 @@
 #pragma once
 
 #include "Park_spot.h"
+#include <iomanip> 
 using std::pair;
 
 /*these are the functions that search the database and create objects from it.

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;
-        }
     }
 }