added pspots and ptimes

Interface.cpp

@@ -1,17 +1,21 @@
 #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); 
     */
-
+   __label__ begin;
+   begin:
     cout << "\nWelcome to the parking system. Please login..";
     int id;
     string password;
@@ -22,61 +26,80 @@ void interface(vector<Park_spot>& spots) {
     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 [exit] to exit:\n";
         std::getline(cin, password);
+        if (password=="exit") {goto begin;}
     }
     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 << "ERROR ROLE_INVALID..";
     }
 }
 
 void interface_member(vector<Park_spot>& spots,Customer& c) {
-    cout << "\nLogged in succesfully!\n";
+    __label__ exit,begin ;
-    cout << "select an option:\n [1] Parking\n[2]Monthly report\n";
+    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: {
+    case 2: 
         cout << "Has not been implemented yet\n";
         break;
-    }
+    
+    case 3:
+        update_information(c);
+        break;
+    case 4: 
+        
+        goto exit;
+        break;
+    
 
     default:
         break;
-    }
+    
+    
+}
+ 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) {
-    cout << "\nWelcome to the admin interface.\n";
+    __label__ begin,exit;
-    cout << "\n[1] Reports & analytics";
+    begin:
-    cout << "\n[2] Parking spots";
+    Sleep(1000);
-    cout << "\n[3] Make new user";
+    system("CLS");
-    cout << "\nEnter option number: ";
+    cout << "Welcome to the admin interface. It is not completely ready yet.\n";
-    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 month\n";
+    cout << "[5] See current status of parking spots\n";
-        cout << "[6] See weekly report of a specific week\n"; */
+    cout << "[6] Make new customer\n";
-        cout << "Enter option number: ";
+    cout << "[7] Make new admin\n";
-        int option_1;
+    cout << "[8] Make new parking spot\n";
-        cin >> option_1;
+    cout << "[9] Exit\n";
+    cout << "option[1-9]:";
+    int option;
+    cin >> option;
     cin.ignore(10000, '\n');
-        switch (option_1) {
+    switch (option) {
     case 1: {
         reports_from_allparkspots();
         break;
@@ -86,117 +109,81 @@ void interface_admin(vector<Park_spot>& spots) {
         break;
     }
     case 3: {
-                cout << "Which parking spot would you like a report on?\n";
+        cout << "Which parking spot would you like a report on?\nID:";
-                cout << "Parking spot ID: ";
+        int spotid;
-                int spotID;
+        cin >> spotid;
-                cin >> spotID;
         cin.ignore(10000, '\n');
-                reports_from_parkspot(spotID);
+        reports_from_parkspot(spotid);
         break;
     }
     case 4: {
-                cout << "Which parking spot would you like a report on?\n";
+        cout << "Which parking spot would you like a report on?\nID:";
-                cout << "Parking spot ID: ";
+        int spotid;
-                int spotID;
+        cin >> spotid;
-                cin >> spotID;
         cin.ignore(10000, '\n');
-                reports_from_parkspot(spotID, true);
+        reports_from_parkspot(spotid, true);
         break;
     }
-            /*case 5: {
+    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: {
-        cout << "[1] See current status of parking spots\n";
-        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: {
+    case 6: {
-                new_parkspot(spots);
-            }
-            default:
-            break;
-        }
-    }
-    case 3: {
-        cout << "[1] Make new customer\n";
-        cout << "[2] Make new admin\n";
-        cout << "Enter option number: ";
-        int option_3;
-        cin >> option_3;
-        cin.ignore(10000, '\n');
-        switch (option_3) {
-            case 1: {
         new_customer();
         break;
     }
-            case 2: {
+    case 7: {
         new_admin();
+    }
+    case 8: {
+        new_parkspot(spots);
         break;
     }
+    case 9: {
+        goto exit;
+        break;
+    }
+
     default:
         break;
     }
-    }
+    cout<<"\n[1]Return or [2]Log out?\n";
-    default:
+    cin.ignore(10000, '\n');
-        break;
+    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) {
-    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: ";
+        cout << "The following spots[which can fit your vehicle] 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 << "where 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[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');
@@ -204,7 +191,9 @@ 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";
+            Sleep(3000);
+            system("CLS");
         }
     }
 }
@@ -215,43 +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]twoweeler\n[2] fourweeler\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";
+    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";
+    cout << "New customer sucessfully created\n";
     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? [1] Twowheeler, [2] Fourwheeler: ";
     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";
+}
+
+void update_information(Customer& c)//Do not know how to use customer::update_db()
+{
+    string string0; int int0;
+    std::cout<<"\n fixme pls Input to update name or press 0 to keep name:\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.update_db();
 }

Query.cpp

@@ -83,36 +83,6 @@ int query_role_customer(int id){
 
 //------------------------------- 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) {
@@ -193,3 +163,19 @@ 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/Query.h

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

@@ -50,13 +50,13 @@ int main() {
     while(true) {
         cin.clear();
         interface(parking_spots);
-        cout<<"\nexit? Input 'y' or 'n'..";
+        /* cout<<"\nexit? Input 'y' or 'n'..";
         char n;
         cin >> n;
         cin.clear();
         if(n=='y'){
             break;
-        }
+        }*/
     }
 }