timme functs, not incorporated yet

Adding animation, 2n try

CMakeLists.txt

@@ -1,51 +1,54 @@
-cmake_minimum_required(VERSION 3.10)
+
-project(park)
+
-
+cmake_minimum_required(VERSION 3.10)
-set(CMAKE_CXX_STANDARD 11)
+project(park)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/thirdparty/SQLiteCpp)
+
-
+set(CMAKE_CXX_STANDARD 11)
-include_directories(
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/thirdparty/SQLiteCpp)
-        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/SQLiteCpp/include
+
-)
+include_directories(
-
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/SQLiteCpp/include
-
+)
-add_executable(park
+
-        main.cpp
+
-
+add_executable(park
-        data.cpp
+        main.cpp
-        headers/data.h
+
-        encrypt.cpp
+        data.cpp
-        headers/encrypt.h
+        headers/data.h
-
+        encrypt.cpp
-        Customer.cpp
+        headers/encrypt.h
-        headers/Customer.h
+
-        Park_spot.cpp
+        Customer.cpp
-        headers/Park_spot.h
+        headers/Customer.h
-        Park_time.cpp
+        Park_spot.cpp
-        headers/Park_time.h
+        headers/Park_spot.h
-        Query.cpp
+        Park_time.cpp
-        headers/Query.h
+        headers/Park_time.h
-        Interface.cpp
+        Query.cpp
-        headers/Interface.h
+        headers/Query.h
- )
+        Interface.cpp
-
+        headers/Interface.h
-
+    )
-
+
-
+
-if (UNIX)
+
-        target_link_libraries(park
+
-        SQLiteCpp
+if (UNIX)
-        sqlite3
+        target_link_libraries(park
-        pthread
+        SQLiteCpp
-        dl
+        sqlite3
-        sodium
+        pthread
-        )
+        dl
-elseif (MSYS OR MINGW)
+        sodium
-        target_link_libraries(park
+        )
-        SQLiteCpp
+elseif (MSYS OR MINGW)
-        sqlite3
+        target_link_libraries(park
-        pthread
+        SQLiteCpp
-        ssp
+        sqlite3
-        libsodium
+        pthread
-        )
+        ssp
-endif()
+        libsodium
+        )
+endif()
+

Customer.cpp

@@ -2,12 +2,13 @@
 
 
 // constructors
-Customer::Customer(string name_, string password_, Vehicle_type vehicle_, string telephone_)
+Customer::Customer(string name_, string password_, Vehicle_type vehicle_, string telephone_, int role_)
     : id{auto_increment_db() + 1},
       name{name_},
       password{hash_password(password_)},
       vehicle{vehicle_},
-      telephone{telephone_} {
+      telephone{telephone_},
+      role{role_} {
     save_db();
 }
 
@@ -54,8 +55,9 @@ int Customer::parked_at() { return park_instances[park_instances.size() - 1].spo
 // functions that interact with the database
 
 void Customer::save_db() {
-    string statement{"insert into Customer values (, '', '', ,'');"};
+    string statement{"insert into Customer values (, '', '', ,'', );"};
     // after ( = 28)
+    statement.insert(43, to_string(role));
     statement.insert(41, telephone);
     statement.insert(38, to_string(int(vehicle)));
     statement.insert(36, password);
@@ -70,8 +72,9 @@ void Customer::save_db() {
 void Customer::update_db() {
     string statement =
         "UPDATE Customer SET name = '', password = '', "
-        "vehicle = '', telephone = '' where id = '';";
+        "vehicle = '', telephone = '', role = '' where id = '';";
-    statement.insert(87, 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)));
     statement.insert(43, password);

Interface.cpp

@@ -7,41 +7,36 @@
 // so it skips to the next newline, in essence clearing the cin buffer
 
 void interface(vector<Park_spot>& spots) {
-    int selector;
+    /*
-    cout << "\nHello and welcome to the parking spot! Please select a suitable "
+    string introduction = "P A R K M A N N E"; //logo animation, disable during testing
-            "option:";
+    text_animation(introduction, 50); 
-    cout << "\n[1]Log in as member";
+    */
-    cout << "\n[2]Log in as administrator";
-    cin >> selector;
-    cin.ignore(10000, '\n');
-    switch (selector) {
-    case 1: {
-        interface_member(spots);
-        break;
-    }
-    case 2: {
-        interface_admin(spots);
-        break;
-    }
-    }
-}
 
-void interface_member(vector<Park_spot>& spots) {
+    cout << "\nWelcome to the parking system. Please login..";
     int id;
     string password;
-    cout << "\nPlease input id:";
+    cout << "\nEnter your id: ";
     cin >> id;
     cin.ignore(10000, '\n');
     Customer c = query_customer_with_id(id);
-    cout << "\nPlease input password:";
+    cout << "\nEnter your password: ";
     std::getline(cin, password);
     while (!(verify_password(c.password, password))) {
         cout << "ERROR: wrong password. Please retype your password:\n";
         std::getline(cin, password);
     }
+    if(query_role_customer(id)==1){
+        interface_admin(spots);
+    } else if(query_role_customer(id)==0){
+        interface_member(spots, c);
+    } else {
+        cout << "ERROR ROLE_INVALID!";
+    }
+}
 
-    cout << "Logged in succesfully\n";
+void interface_member(vector<Park_spot>& spots,Customer& c) {
-    cout << "select an option\n [1] Parking options\n[2]monthy report\n";
+    cout << "\nLogged in succesfully!\n";
+    cout << "select an option:\n [1] Parking\n[2]Monthly report\n";
     int option;
     cin >> option;
     cin.ignore(10000, '\n');
@@ -61,56 +56,116 @@ void interface_member(vector<Park_spot>& spots) {
 }
 
 void interface_admin(vector<Park_spot>& spots) {
-    cout << "Welcome to the admin interface. It is not completely ready yet.\n";
+    cout << "\nWelcome to the admin interface.\n";
-    cout << "[1] See monthly report of ALL parking spots\n";
+    cout << "\n[1] Reports & analytics";
-    cout << "[2] See weekly report of ALL parking spots\n";
+    cout << "\n[2] Parking spots";
-    cout << "[3] See monthly report of a specific parking spot\n";
+    cout << "\n[3] Make new user";
-    cout << "[4] See weekly report of a specific parking spot\n";
+    cout << "\nEnter option number: ";
-    cout << "[5] See current status of parking spots\n";
-    cout << "[6] Make new customer\n";
-    cout << "[7] Make new parking spot\n";
-    cout << "option[1-7]:";
     int option;
     cin >> option;
     cin.ignore(10000, '\n');
     switch (option) {
     case 1: {
-        reports_from_allparkspots();
+        cout << "[1] See monthly report of ALL parking spots\n";
-        break;
+        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 month\n";
+        cout << "[6] See weekly report of a specific week\n"; */
+        cout << "Enter option number: ";
+        int option_1;
+        cin >> option_1;
+        cin.ignore(10000, '\n');
+        switch (option_1) {
+            case 1: {
+                reports_from_allparkspots();
+                break;
+            }
+            case 2: {
+                reports_from_allparkspots(true);
+                break;
+            }
+            case 3: {
+                cout << "Which parking spot would you like a report on?\n";
+                cout << "Parking spot ID: ";
+                int spotID;
+                cin >> spotID;
+                cin.ignore(10000, '\n');
+                reports_from_parkspot(spotID);
+                break;
+            }
+            case 4: {
+                cout << "Which parking spot would you like a report on?\n";
+                cout << "Parking spot ID: ";
+                int spotID;
+                cin >> spotID;
+                cin.ignore(10000, '\n');
+                reports_from_parkspot(spotID, true);
+                break;
+            }
+            /*case 5: {
+                cout << "Which month would you like a report on?\n";
+                cout << "[1] January, [2] February, [3] March, [4] April, [5] May,"
+                "\n[6] June, [7] July, [8] August, [9] September, [10] October, [11] November, [12] December\n";
+                cout << "Enter month number: ";
+                int month;
+                cin >> month;
+                cin.ignore(10000, '\n');
+                report_from_month(month);
+                break;
+            } 
+            case 6: {
+                cout << "Which week would you like a report on?\n";
+                cout << "Enter week number: ";
+                int week;
+                cin >> week;
+                cin.ignore(10000, '\n');
+                report_from_week(week);
+                break;
+            }*/
+            default:
+            break;
+        }
     }
     case 2: {
-        reports_from_allparkspots(true);
+        cout << "[1] See current status of parking spots\n";
-        break;
+        cout << "[2] Make new parking spot\n";
+        cout << "Enter option number: ";
+        int option_2;
+        cin >> option_2;
+        cin.ignore(10000, '\n');
+        switch (option_2) {
+            case 1: {
+                current_status_parkspots(spots);
+                break;
+            }
+            case 2: {
+                new_parkspot(spots);
+            }
+            default:
+            break;
+        }
     }
     case 3: {
-        cout << "Which parking spot would you like a report on?ID:";
+        cout << "[1] Make new customer\n";
-        int spotid;
+        cout << "[2] Make new admin\n";
-        cin >> spotid;
+        cout << "Enter option number: ";
+        int option_3;
+        cin >> option_3;
         cin.ignore(10000, '\n');
-        reports_from_parkspot(spotid);
+        switch (option_3) {
-        break;
+            case 1: {
+                new_customer();
+                break;
+            }
+            case 2: {
+                new_admin();
+                break;
+            }
+            default:
+            break;
+        }
     }
-    case 4: {
-        cout << "Which parking spot would you like a report on?ID:";
-        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_parkspot(spots);
-        break;
-    }
-
     default:
         break;
     }
@@ -119,30 +174,29 @@ void interface_admin(vector<Park_spot>& spots) {
 // --------- individual things.
 
 void park(Customer& c, vector<Park_spot>& spots) {
-    cout << "You have selected parking option";
+    cout << "You have selected parking option.\n";
     if (!(c.parked())) {
-        cout << "The following spots[which can fit your vehicle] are "
+        cout << "The following spots fit your vehicle and are available: ";
-                "available: ";
         for (Park_spot i : spots) {
             if (i.v_type == c.vehicle) {
                 cout << i.id << ", ";
             }
         }
 
-        cout << "where do you want to park?";
+        cout << "\nWhere do you want to park?";
-        int parkid;
+        int parkID;
-        cin >> parkid;
+        cin >> parkID;
         cin.ignore(10000, '\n');
         for (Park_spot& i : spots) {
-            if (i.id == parkid) {
+            if (i.id == parkID) {
                 i.clock(c);
-                cout << "You have parked sucessfully";
+                cout << "You have parked sucessfully!";
             }
         }
 
     } else {
         cout << "You are parked at spot " << c.parked_at()
-             << ", do you want to clock out?\n enter [1] for yes and [0] for no";
+             << ", do you want to clock out?\n[1] yes\n[2] no";
         int answer = 0;
         cin >> answer;
         cin.ignore(10000, '\n');
@@ -150,7 +204,7 @@ 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."; //exit to customer login
         }
     }
 }
@@ -160,26 +214,44 @@ void new_customer() {
     string name;
     string password;
     string telephone;
-    cout << "What's the name of the customer? ";
+    int role = 0;
+    cout << "\nWhat's the name of the customer? ";
     std::getline(cin, name);
-    cout << "What's the vehicle type? [1]twoweeler, [2] fourweeler: ";
+    cout << "\nWhat's the vehicle type? \n[1]twoweeler\n[2] fourweeler\n";
     cin >> vtype;
     cin.ignore(10000, '\n');
-    cout << "What's the telephone number? ";
+    cout << "What's the telephone number? +";
     std::getline(cin, telephone);
-    cout << "What's the password?";
+    cout << "\nWhat's the password? ";
     std::getline(cin, password);
-    Customer newcustomer{name, password, Vehicle_type(vtype), telephone};
+    Customer newcustomer{name, password, Vehicle_type(vtype), telephone, role};
-    cout << "New customer sucessfully created\n";
+    cout << "\nNew customer sucessfully created\n";
+    newcustomer.update_db();
+}
+
+void new_admin() {
+    int vtype = 2; //revision required! Needs to be set to NULL
+    string name;
+    string password;
+    string telephone;
+    int role = 1;
+    cout << "\nWhat's the name of the admin? ";
+    std::getline(cin, name);
+    cout << "\nWhat's the telephone number? +";
+    std::getline(cin, telephone);
+    cout << "\nWhat's the password?";
+    std::getline(cin, password);
+    Customer newcustomer{name, password, Vehicle_type(vtype), telephone, role};
+    cout << "\nNew customer sucessfully created\n";
     newcustomer.update_db();
 }
 
 void new_parkspot(vector<Park_spot>& spots) {
-    cout << "What type of parking spot? [1] twoweeler, [2] fourweeler: ";
+    cout << "What type of parking spot? \n[1] twoweeler\n[2] fourweeler\n";
     int vtype;
     cin >> vtype;
     cin.ignore(10000, '\n');
     Park_spot newspot{Vehicle_type(vtype)};
     spots.push_back(newspot);
-    cout << "new parking spot sucessfully created.\n";
+    cout << "New parking spot sucessfully created.\n";
-}
+}

Park_time.cpp

@@ -121,4 +121,14 @@ purposes mostly. TODO: Needs to be removed at completion of project, or seperate
 cpp/header
  */
     std::this_thread::sleep_for(seconds{sec});
-}
+}
+
+// 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));
+  }
+}

Query.cpp

@@ -72,8 +72,47 @@ Customer query_customer_with_id(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()){
+        int role = query.getColumn(5);
+        return role;
+    }
+}
+
 //------------------------------- parkspot info
 
+
+pair<int, int> create_month_period(int month, int year) {
+    std::time_t t = std::time(0); 
+    std::tm* date = std::localtime(&t);
+    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(int day, int month, int year){
+    std::time_t t = std::time(0); 
+    std::tm* date = std::localtime(&t);
+    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;
+}
+
+// -- 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) {
@@ -154,19 +193,3 @@ void current_status_parkspots(vector<Park_spot>& spots) {
     }
 }
 
-// -------------- paroking spots
-
-// 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;
-// }

headers/Customer.h

@@ -40,7 +40,8 @@ class Customer {
     string password;
     Vehicle_type vehicle;
     string telephone;
-    Customer(string name_, string password_, Vehicle_type vehicle_, string telephone_);
+    int role;
+    Customer(string name_, string password_, Vehicle_type vehicle_, string telephone_, int role);
     Customer(int id_, string name_, string password_, Vehicle_type vehicle_,
              vector<Park_time> instances, string telephone_);
     void clock_in(int s_id);

headers/Interface.h

@@ -6,8 +6,9 @@
 using std::cin;
 
 void interface(vector<Park_spot>& spots);
-void interface_member(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);

headers/Park_time.h

@@ -12,8 +12,11 @@
 
 using namespace std::chrono;
 using std::cout;
+using std::flush;
 using std::string;
 using std::to_string;
+using std::this_thread::sleep_for;
+using std::chrono::milliseconds;
 /*
 
 
@@ -64,7 +67,10 @@ class Park_time {
     int start_to_int();      // helper
 };
 
-// test funciton
+// test function
 void Wait(int sec);
 
-#endif // Park_time
+// function that slowly outputs each character one by one
+void text_animation(const string& text, unsigned int pause_time);
+
+#endif // Park_time

headers/Query.h

@@ -3,6 +3,7 @@
 #pragma once
 
 #include "Park_spot.h"
+using std::pair;
 
 /*these are the functions that search the database and create objects from it.
 
@@ -59,9 +60,13 @@ Customer query_customer_with_id(int id);
 vector<Park_spot> populate_spots();
 
 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);
+
+pair<int, int> create_month_period(int month, int year) ;
+pair<int, int> create_week_period(int day, int month, int year);
 #endif // CUSTOMER_H

main.cpp

@@ -47,8 +47,17 @@ 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) {
-    interface(parking_spots);
+        cin.clear();
+        interface(parking_spots);
+        cout<<"\nexit? Input 'y' or 'n'..";
+        char n;
+        cin >> n;
+        cin.clear();
+        if(n=='y'){
+            break;
+        }
+    }
 }
 
 /*
@@ -67,4 +76,4 @@ vector<Park_spot> populate_spots() {
         spots.push_back({id, taken, cid, vtype});
     }
     return spots;
-}
+}

newParkManne.cpp

@@ -0,0 +1,5 @@
+#include <iostream>
+
+void say_hello(){
+    std::cout << "Hello, from newParkManne!\n";
+}

readme.md

@@ -12,6 +12,14 @@ Or click the build icon in vscode *shrugs*
 # Parkmanne
 ## A stroll in the park
 
+######TO-DO List:
+- [x] Admin login
+- [ ] Billing report menu
+- [ ] Report from a specific month i.e. january
+- [ ] Edit option in menu
+- [ ] Option to confirm edit after input
+- [ ] Divide menu in sub menus
+- [ ] Analytics of customer (e.g. # customers with 2-wheeler or list of customer and telephone numbers etc.)
 
 This is a graph of how everything is connected.
 If you need to add functionality that doesn't fall in any of these, and you're unsure of what to include, you can decide something like this: