Interface.cpp

@@ -1,21 +1,17 @@
 #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;
@@ -26,9 +22,8 @@ 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 or type [exit] to exit:\n";
+        cout << "ERROR: wrong password. Please retype your password:\n";
         std::getline(cin, password);
-        if (password=="exit") {goto begin;}
     }
     if(query_role_customer(id)==1){
         interface_admin(spots);
@@ -40,51 +35,27 @@ void interface(vector<Park_spot>& spots) {
 }
 
 void interface_member(vector<Park_spot>& spots,Customer& c) {
-    __label__ exit,begin ;
+    cout << "Logged in succesfully\n";
-    begin:
+    cout << "select an option\n [1] Parking options\n[2]monthy report\n";
-    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) {
-    __label__ begin,exit;
-    begin:
-    Sleep(1000);
-    system("CLS");
     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";
@@ -94,8 +65,7 @@ void interface_admin(vector<Park_spot>& spots) {
     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-8]:";
-    cout << "option[1-9]:";
     int option;
     cin >> option;
     cin.ignore(10000, '\n');
@@ -139,22 +109,10 @@ void interface_admin(vector<Park_spot>& spots) {
         new_parkspot(spots);
         break;
     }
-    case 9: {
-        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);
-    system("CLS");
 }
 
 // --------- individual things.
@@ -163,9 +121,9 @@ void park(Customer& c, vector<Park_spot>& spots) {
     cout << "You have selected parking option";
     if (!(c.parked())) {
         cout << "The following spots[which can fit your vehicle] are "
-                "available: \n";
+                "available: ";
         for (Park_spot i : spots) {
-            if ((i.v_type == c.vehicle)&(i.taken==false)) {
+            if (i.v_type == c.vehicle) {
                 cout << i.id << ", ";
             }
         }
@@ -183,7 +141,7 @@ void park(Customer& c, vector<Park_spot>& spots) {
 
     } 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 enter [1] for yes and [0] for no";
         int answer = 0;
         cin >> answer;
         cin.ignore(10000, '\n');
@@ -192,8 +150,6 @@ void park(Customer& c, vector<Park_spot>& spots) {
             cout << "You have sucessfully clocked out.";
         } else {
             cout << "OK, have a nice day";
-            Sleep(3000);
-            system("CLS");
         }
     }
 }
@@ -206,7 +162,7 @@ void new_customer() {
     int role = 0;
     cout << "What's the name of the customer? ";
     std::getline(cin, name);
-    cout << "What's the vehicle type? [1]Twowheeler, [2] Fourwheeler: ";
+    cout << "What's the vehicle type? [1]twoweeler, [2] fourweeler: ";
     cin >> vtype;
     cin.ignore(10000, '\n');
     cout << "What's the telephone number? ";
@@ -236,7 +192,7 @@ void new_admin() {
 }
 
 void new_parkspot(vector<Park_spot>& spots) {
-    cout << "What type of parking spot? [1] Twowheeler, [2] Fourwheeler: ";
+    cout << "What type of parking spot? [1] twoweeler, [2] fourweeler: ";
     int vtype;
     cin >> vtype;
     cin.ignore(10000, '\n');
@@ -244,32 +200,3 @@ void new_parkspot(vector<Park_spot>& spots) {
     spots.push_back(newspot);
     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();
-}

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;
-        }*/
+        }
     }
 }