added telephone support
This commit is contained in:
parent
88b718105b
commit
312a27521c
@ -5,7 +5,7 @@ IndentWidth: 4
|
|||||||
|
|
||||||
Language: Cpp
|
Language: Cpp
|
||||||
PointerAlignment: Left
|
PointerAlignment: Left
|
||||||
ColumnLimit: 80
|
ColumnLimit: 100
|
||||||
AlignAfterOpenBracket: Align
|
AlignAfterOpenBracket: Align
|
||||||
AlignTrailingComments: true
|
AlignTrailingComments: true
|
||||||
AllowAllParametersOfDeclarationOnNextLine: true
|
AllowAllParametersOfDeclarationOnNextLine: true
|
||||||
|
53
Customer.cpp
53
Customer.cpp
@ -1,19 +1,24 @@
|
|||||||
#include "headers/Customer.h"
|
#include "headers/Customer.h"
|
||||||
|
|
||||||
|
|
||||||
// constructors
|
// constructors
|
||||||
Customer::Customer(string name_, string password_, Vehicle_type vehicle_)
|
Customer::Customer(string name_, string password_, Vehicle_type vehicle_, string telephone_)
|
||||||
: name{name_}, vehicle{vehicle_}, password{hash_password(password_)} {
|
: id{auto_increment_db() + 1},
|
||||||
id = auto_increment_db() + 1;
|
name{name_},
|
||||||
|
password{hash_password(password_)},
|
||||||
|
vehicle{vehicle_},
|
||||||
|
telephone{telephone_} {
|
||||||
save_db();
|
save_db();
|
||||||
}
|
}
|
||||||
|
|
||||||
Customer::Customer(int id_, string name_, string password_,
|
Customer::Customer(int id_, string name_, string password_, Vehicle_type vehicle_,
|
||||||
Vehicle_type vehicle_, vector<Park_time> instances)
|
vector<Park_time> instances, string telephone_)
|
||||||
: id{id_},
|
: id{id_},
|
||||||
name{name_},
|
name{name_},
|
||||||
password{password_},
|
password{password_},
|
||||||
vehicle{vehicle_},
|
vehicle{vehicle_},
|
||||||
park_instances{instances} {}
|
park_instances{instances},
|
||||||
|
telephone{telephone_} {}
|
||||||
|
|
||||||
// clock in/out methods
|
// clock in/out methods
|
||||||
// ====================================================================================
|
// ====================================================================================
|
||||||
@ -31,41 +36,27 @@ void Customer::clock_out(int s_id) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool Customer::parked() {
|
bool Customer::parked() {
|
||||||
if (!park_instances.size()){
|
if (!park_instances.size()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if ((park_instances[park_instances.size() - 1].duration)) {
|
if ((park_instances[park_instances.size() - 1].duration)) {
|
||||||
// if duration of the last parktime == 0, meaning
|
// if duration of the last parktime == 0, meaning
|
||||||
// that the customer has not clocked out
|
// that the customer has not clocked out
|
||||||
return false;
|
return false;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int Customer::parked_at(){
|
int Customer::parked_at() { return park_instances[park_instances.size() - 1].spot_id; }
|
||||||
return park_instances[park_instances.size() - 1].spot_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
// report gen
|
|
||||||
void Customer::gen_monthly() {
|
|
||||||
cout << "NAME: " << name << "\n";
|
|
||||||
cout << "-------------------------------------------------\n";
|
|
||||||
for (auto& i : park_instances) {
|
|
||||||
// TODO: need some logic to only include from this month. scratch that,
|
|
||||||
// need to remove gen monthly
|
|
||||||
cout << i;
|
|
||||||
}
|
|
||||||
cout << "-------------------------------------------------\n\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
//================================================================================================
|
//================================================================================================
|
||||||
// functions that interact with the database
|
// functions that interact with the database
|
||||||
|
|
||||||
void Customer::save_db() {
|
void Customer::save_db() {
|
||||||
string statement{"insert into Customer values (, '', '', );"};
|
string statement{"insert into Customer values (, '', '', , );"};
|
||||||
// after ( = 28)
|
// after ( = 28)
|
||||||
|
statement.insert(40, telephone);
|
||||||
statement.insert(38, to_string(int(vehicle)));
|
statement.insert(38, to_string(int(vehicle)));
|
||||||
statement.insert(36, password);
|
statement.insert(36, password);
|
||||||
statement.insert(32, name);
|
statement.insert(32, name);
|
||||||
@ -77,11 +68,15 @@ void Customer::save_db() {
|
|||||||
|
|
||||||
void Customer::update_db() {
|
void Customer::update_db() {
|
||||||
string statement =
|
string statement =
|
||||||
"UPDATE Customer SET name = '', card_code = '' where id = '';";
|
"UPDATE Customer SET name = '', password = '', "
|
||||||
statement.insert(58, to_string(id));
|
"vehicle = '', telephone = '' where id = '';";
|
||||||
statement.insert(44, password);
|
statement.insert(87, to_string(id));
|
||||||
|
statement.insert(73, telephone);
|
||||||
|
statement.insert(57, to_string(int(vehicle)));
|
||||||
|
statement.insert(43, password);
|
||||||
statement.insert(28, name);
|
statement.insert(28, name);
|
||||||
data::db.exec(statement);
|
cout << statement;
|
||||||
|
// data::db.exec(statement);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Customer::delete_db() {
|
void Customer::delete_db() {
|
||||||
|
@ -47,7 +47,7 @@ void interface_member(vector<Park_spot>& spots) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 2: {
|
case 2: {
|
||||||
c.gen_monthly();
|
cout << "Has not been implemented yet\n";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -63,7 +63,8 @@ void interface_admin(vector<Park_spot>& spots) {
|
|||||||
cout << "[3] See monthly report of a specific parking spot\n";
|
cout << "[3] See monthly report of a specific parking spot\n";
|
||||||
cout << "[4] See weekly 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 << "[5] See current status of parking spots\n";
|
||||||
cout << "option[1-5]:";
|
cout << "[6] Make new customer\n";
|
||||||
|
cout << "option[1-6]:";
|
||||||
int option;
|
int option;
|
||||||
cin >> option;
|
cin >> option;
|
||||||
switch (option) {
|
switch (option) {
|
||||||
@ -92,6 +93,12 @@ void interface_admin(vector<Park_spot>& spots) {
|
|||||||
case 5: {
|
case 5: {
|
||||||
current_status_parkspots(spots);
|
current_status_parkspots(spots);
|
||||||
}
|
}
|
||||||
|
case 6: {
|
||||||
|
new_customer();
|
||||||
|
}
|
||||||
|
case 7: {
|
||||||
|
new_parkspot(spots);
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@ -122,9 +129,8 @@ void park(Customer& c, vector<Park_spot>& spots) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
cout
|
cout << "You are parked at spot " << c.parked_at()
|
||||||
<< "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;
|
int answer = 0;
|
||||||
cin >> answer;
|
cin >> answer;
|
||||||
if (answer) {
|
if (answer) {
|
||||||
@ -134,4 +140,29 @@ void park(Customer& c, vector<Park_spot>& spots) {
|
|||||||
cout << "OK, have a nice day";
|
cout << "OK, have a nice day";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void new_customer() {
|
||||||
|
int vtype;
|
||||||
|
string name;
|
||||||
|
string password;
|
||||||
|
string telephone;
|
||||||
|
cout << "What's the name of the customer? ";
|
||||||
|
cin >> name;
|
||||||
|
cout << "What's the vehicle type? [1]twoweeler, [2] fourweeler: ";
|
||||||
|
cin >> vtype;
|
||||||
|
cout << "What's the telephone number? ";
|
||||||
|
cin >> telephone;
|
||||||
|
cout << "What's the password? ";
|
||||||
|
cin >> password;
|
||||||
|
Customer newcustomer{name, password, Vehicle_type(vtype), telephone};
|
||||||
|
cout << "New customer sucessfully created\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
void new_parkspot(vector<Park_spot>& spots) {
|
||||||
|
cout << "What type of parking spot? [1] twoweeler, [2] fourweeler: ";
|
||||||
|
int vtype;
|
||||||
|
Park_spot newspot{Vehicle_type(vtype)};
|
||||||
|
spots.push_back(newspot);
|
||||||
|
cout << "new parking spot sucessfully created.\n";
|
||||||
}
|
}
|
@ -7,14 +7,13 @@ Park_spot::Park_spot(Vehicle_type v_type_)
|
|||||||
save_db();
|
save_db();
|
||||||
}
|
}
|
||||||
|
|
||||||
Park_spot::Park_spot(int id_, bool taken_, int parked,Vehicle_type v_type_)
|
Park_spot::Park_spot(int id_, bool taken_, int parked, Vehicle_type v_type_)
|
||||||
: parked_customer{parked},
|
: parked_customer{parked},
|
||||||
id{id_},
|
id{id_},
|
||||||
v_type{v_type_},
|
v_type{v_type_},
|
||||||
taken{taken_} // TODO: think about how init parked?
|
taken{taken_} // TODO: think about how init parked?
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
// clock in en out, calls de juist(in/out) van de customer aan de hand van
|
// clock in en out, calls de juist(in/out) van de customer aan de hand van
|
||||||
// internal state van taken
|
// internal state van taken
|
||||||
void Park_spot::clock(Customer& c_customer) {
|
void Park_spot::clock(Customer& c_customer) {
|
||||||
@ -34,8 +33,7 @@ void Park_spot::clock(Customer& c_customer) {
|
|||||||
// --------------------- db functs
|
// --------------------- db functs
|
||||||
|
|
||||||
void Park_spot::update_db() {
|
void Park_spot::update_db() {
|
||||||
string statement =
|
string statement = "UPDATE Park_spot SET taken = '', customer_id = '' where id = '';";
|
||||||
"UPDATE Park_spot SET taken = '', customer_id = '' where id = '';";
|
|
||||||
statement.insert(63, to_string(id));
|
statement.insert(63, to_string(id));
|
||||||
if (taken) {
|
if (taken) {
|
||||||
statement.insert(49, to_string(parked_customer));
|
statement.insert(49, to_string(parked_customer));
|
||||||
|
@ -17,14 +17,11 @@ Park_time::Park_time(int c_id, int s_id)
|
|||||||
save_db();
|
save_db();
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
this one initializes with data from the database. should probably only be used in the query functions.
|
this one initializes with data from the database. should probably only be used in the query
|
||||||
|
functions.
|
||||||
*/
|
*/
|
||||||
Park_time::Park_time(int id_, int customer_id_, int spot_id_, int start_,
|
Park_time::Park_time(int id_, int customer_id_, int spot_id_, int start_, int duration_)
|
||||||
int duration_)
|
: id{id_}, customer_id{customer_id_}, spot_id{spot_id_}, duration{duration_} {
|
||||||
: id{id_},
|
|
||||||
customer_id{customer_id_},
|
|
||||||
spot_id{spot_id_},
|
|
||||||
duration{duration_} {
|
|
||||||
start = time_point<system_clock>(seconds(start_));
|
start = time_point<system_clock>(seconds(start_));
|
||||||
end = time_point<system_clock>(seconds(start_ + duration_));
|
end = time_point<system_clock>(seconds(start_ + duration_));
|
||||||
}
|
}
|
||||||
@ -48,8 +45,7 @@ void Park_time::clock_out(int c_id, int s_id) {
|
|||||||
|
|
||||||
if (!duration) {
|
if (!duration) {
|
||||||
end = high_resolution_clock::now();
|
end = high_resolution_clock::now();
|
||||||
duration =
|
duration = duration_cast<seconds>(end - start).count(); // use mins later
|
||||||
duration_cast<seconds>(end - start).count(); // use mins later
|
|
||||||
update_db();
|
update_db();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@ -97,8 +93,7 @@ void Park_time::save_db() {
|
|||||||
}
|
}
|
||||||
// same as above
|
// same as above
|
||||||
void Park_time::update_db() {
|
void Park_time::update_db() {
|
||||||
string statement =
|
string statement = "UPDATE Park_time SET end = , duration = where id = '';";
|
||||||
"UPDATE Park_time SET end = , duration = where id = '';";
|
|
||||||
statement.insert(53, to_string(id));
|
statement.insert(53, to_string(id));
|
||||||
statement.insert(40, to_string(duration));
|
statement.insert(40, to_string(duration));
|
||||||
statement.insert(27, to_string(start_to_int() + duration));
|
statement.insert(27, to_string(start_to_int() + duration));
|
||||||
@ -115,7 +110,6 @@ int Park_time::auto_increment_db() {
|
|||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//------------------ test function to help test this
|
//------------------ test function to help test this
|
||||||
|
|
||||||
void Wait(int sec)
|
void Wait(int sec)
|
||||||
|
53
Query.cpp
53
Query.cpp
@ -8,8 +8,7 @@ vector<Park_time> query_parktimes_for_customer(int cid) {
|
|||||||
*/
|
*/
|
||||||
vector<Park_time> park_times;
|
vector<Park_time> park_times;
|
||||||
|
|
||||||
SQLite::Statement query(data::db,
|
SQLite::Statement query(data::db, "SELECT * FROM Park_time WHERE customer_id = ?;");
|
||||||
"SELECT * FROM Park_time WHERE customer_id = ?;");
|
|
||||||
query.bind(1, cid);
|
query.bind(1, cid);
|
||||||
while (query.executeStep()) {
|
while (query.executeStep()) {
|
||||||
int id = query.getColumn(0);
|
int id = query.getColumn(0);
|
||||||
@ -33,18 +32,18 @@ vector<Customer> query_customer_with_name(string name) {
|
|||||||
2. multiple customers could be returned with the same name.
|
2. multiple customers could be returned with the same name.
|
||||||
*/
|
*/
|
||||||
vector<Customer> result;
|
vector<Customer> result;
|
||||||
SQLite::Statement query(
|
SQLite::Statement query(data::db,
|
||||||
data::db,
|
"SELECT id, name, password, vehicle FROM Customer WHERE name = ?;");
|
||||||
"SELECT id, name, password, vehicle FROM Customer WHERE name = ?;");
|
|
||||||
query.bind(1, name);
|
query.bind(1, name);
|
||||||
while (query.executeStep()) {
|
while (query.executeStep()) {
|
||||||
int id = query.getColumn(0);
|
int id = query.getColumn(0);
|
||||||
string name_ = query.getColumn(1);
|
string name_ = query.getColumn(1);
|
||||||
string password = query.getColumn(2);
|
string password = query.getColumn(2);
|
||||||
int vehicle = query.getColumn(3); // cast to vehicle
|
int vehicle = query.getColumn(3); // cast to vehicle
|
||||||
|
string telephone = query.getColumn(4);
|
||||||
vector<Park_time> park_instances = query_parktimes_for_customer(id);
|
vector<Park_time> park_instances = query_parktimes_for_customer(id);
|
||||||
result.push_back(Customer{
|
result.push_back(
|
||||||
id, name_, password, Vehicle_type(vehicle), park_instances});
|
Customer{id, name_, password, Vehicle_type(vehicle), park_instances, telephone});
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@ -63,9 +62,9 @@ Customer query_customer_with_id(int id) {
|
|||||||
string name = query.getColumn(1);
|
string name = query.getColumn(1);
|
||||||
string password = query.getColumn(2);
|
string password = query.getColumn(2);
|
||||||
int vehicle = query.getColumn(3); // cast to vehicle
|
int vehicle = query.getColumn(3); // cast to vehicle
|
||||||
|
string telephone = query.getColumn(4);
|
||||||
vector<Park_time> park_instances = query_parktimes_for_customer(id);
|
vector<Park_time> park_instances = query_parktimes_for_customer(id);
|
||||||
Customer result{
|
Customer result{id, name, password, Vehicle_type(vehicle), park_instances, telephone};
|
||||||
id, name, password, Vehicle_type(vehicle), park_instances};
|
|
||||||
// DEBUG
|
// DEBUG
|
||||||
// cout << "{" << result.id << "," <<result.password <<"," <<
|
// cout << "{" << result.id << "," <<result.password <<"," <<
|
||||||
// int(vehicle) << "}\n";
|
// int(vehicle) << "}\n";
|
||||||
@ -86,16 +85,17 @@ Park_spot query_parkspot_with_id(int id, vector<Park_spot>& parkspots) {
|
|||||||
void reports_from_parkspot(int spotid, bool weekly) {
|
void reports_from_parkspot(int spotid, bool weekly) {
|
||||||
std::time_t t = std::time(0); // get time now
|
std::time_t t = std::time(0); // get time now
|
||||||
std::tm* now = std::localtime(&t);
|
std::tm* now = std::localtime(&t);
|
||||||
int s_since_epoch = ((now->tm_year - 70) * 365.2425 * 24 * 3600) +
|
|
||||||
(now->tm_mon * 30.436875 * 24 * 3600);
|
|
||||||
|
|
||||||
if (weekly){
|
if (weekly) {
|
||||||
s_since_epoch += ((now->tm_mday/ 7) * 24 * 3600);
|
now->tm_wday = 1;
|
||||||
|
} else {
|
||||||
|
now->tm_mday = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int s_since_epoch = mktime(now);
|
||||||
|
|
||||||
vector<Park_time> park_times;
|
vector<Park_time> park_times;
|
||||||
SQLite::Statement query(
|
SQLite::Statement query(data::db, "SELECT * FROM Park_time WHERE spot_id = ? AND start > ?;");
|
||||||
data::db, "SELECT * FROM Park_time WHERE spot_id = ? AND start > ?;");
|
|
||||||
query.bind(1, spotid);
|
query.bind(1, spotid);
|
||||||
query.bind(2, s_since_epoch);
|
query.bind(2, s_since_epoch);
|
||||||
while (query.executeStep()) {
|
while (query.executeStep()) {
|
||||||
@ -113,19 +113,19 @@ void reports_from_parkspot(int spotid, bool weekly) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void reports_from_allparkspots(bool weekly) {
|
void reports_from_allparkspots(bool weekly) {
|
||||||
std::time_t t = std::time(0); // get time now
|
std::time_t t = std::time(0); // get time now
|
||||||
std::tm* now = std::localtime(&t);
|
std::tm* now = std::localtime(&t);
|
||||||
int s_since_epoch = ((now->tm_year - 70) * 365.2425 * 24 * 3600) +
|
if (weekly) {
|
||||||
(now->tm_mon * 30.436875 * 24 * 3600);
|
now->tm_wday = 1;
|
||||||
if (weekly){
|
} else {
|
||||||
s_since_epoch += ((now->tm_mday/ 7) * 24 * 3600);
|
now->tm_mday = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int s_since_epoch = mktime(now);
|
||||||
|
|
||||||
vector<Park_time> park_times;
|
vector<Park_time> park_times;
|
||||||
SQLite::Statement query(
|
SQLite::Statement query(data::db, "SELECT * FROM Park_time WHERE start > ?;");
|
||||||
data::db, "SELECT * FROM Park_time WHERE start > ?;");
|
|
||||||
query.bind(1, s_since_epoch);
|
query.bind(1, s_since_epoch);
|
||||||
while (query.executeStep()) {
|
while (query.executeStep()) {
|
||||||
int id = query.getColumn(0);
|
int id = query.getColumn(0);
|
||||||
@ -143,15 +143,12 @@ void reports_from_allparkspots(bool weekly) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void current_status_parkspots(vector<Park_spot>& spots) {
|
||||||
|
for (auto& i : spots) {
|
||||||
|
|
||||||
void current_status_parkspots(vector<Park_spot>& spots){
|
|
||||||
for(auto& i : spots){
|
|
||||||
cout << "---------------------------\n";
|
cout << "---------------------------\n";
|
||||||
cout << "PS #" << i.id << "\n";
|
cout << "PS #" << i.id << "\n";
|
||||||
cout << "Taken: " << ((i.taken) ? "true" : "false") << "\n";
|
cout << "Taken: " << ((i.taken) ? "true" : "false") << "\n";
|
||||||
if (i.taken){
|
if (i.taken) {
|
||||||
cout << "Customer#" << i.parked_customer << " parked there\n";
|
cout << "Customer#" << i.parked_customer << " parked there\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
7
data.cpp
7
data.cpp
@ -6,8 +6,7 @@ SQLite::Database start_db() {
|
|||||||
/*
|
/*
|
||||||
Opens the database, creates it if it can't find the file.
|
Opens the database, creates it if it can't find the file.
|
||||||
*/
|
*/
|
||||||
SQLite::Database db("test.db3",
|
SQLite::Database db("test.db3", SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE);
|
||||||
SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE);
|
|
||||||
while (sodium_init() < 0) {
|
while (sodium_init() < 0) {
|
||||||
std::cout << "SODIUM NOT WORKING";
|
std::cout << "SODIUM NOT WORKING";
|
||||||
/*
|
/*
|
||||||
@ -17,11 +16,9 @@ SQLite::Database start_db() {
|
|||||||
with any libsodium function.
|
with any libsodium function.
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
//sql syntax is surprisingly readable.
|
|
||||||
db.exec(
|
db.exec(
|
||||||
"create table if not exists Customer (id integer primary key, name "
|
"create table if not exists Customer (id integer primary key, name "
|
||||||
"text, password text, vehicle int)");
|
"text, password text, vehicle int, telephone text)");
|
||||||
// getting errors when using bool, so i used an int instead.
|
|
||||||
db.exec(
|
db.exec(
|
||||||
"create table if not exists Park_spot (id integer primary key, taken "
|
"create table if not exists Park_spot (id integer primary key, taken "
|
||||||
"int, customer_id int, vehicle_type int)");
|
"int, customer_id int, vehicle_type int)");
|
||||||
|
10
encrypt.cpp
10
encrypt.cpp
@ -15,11 +15,8 @@ string hash_password(string password) {
|
|||||||
int memory_limit = 3.2e+7; // 3.2e7 = 32e6 = 32 mb
|
int memory_limit = 3.2e+7; // 3.2e7 = 32e6 = 32 mb
|
||||||
int cpu_limit = 1; // this is n_threads
|
int cpu_limit = 1; // this is n_threads
|
||||||
|
|
||||||
int result = crypto_pwhash_str(hashed_password_,
|
int result =
|
||||||
password_,
|
crypto_pwhash_str(hashed_password_, password_, strlen(password_), cpu_limit, memory_limit);
|
||||||
strlen(password_),
|
|
||||||
cpu_limit,
|
|
||||||
memory_limit);
|
|
||||||
string hashed_password{hashed_password_};
|
string hashed_password{hashed_password_};
|
||||||
|
|
||||||
return hashed_password;
|
return hashed_password;
|
||||||
@ -32,8 +29,7 @@ bool verify_password(string hashed_password, string unhashed_password) {
|
|||||||
const char* password_ = unhashed_password.c_str();
|
const char* password_ = unhashed_password.c_str();
|
||||||
const char* hashed_password_ = hashed_password.c_str();
|
const char* hashed_password_ = hashed_password.c_str();
|
||||||
|
|
||||||
if (crypto_pwhash_str_verify(
|
if (crypto_pwhash_str_verify(hashed_password_, password_, strlen(password_)) != 0) {
|
||||||
hashed_password_, password_, strlen(password_)) != 0) {
|
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
return true;
|
return true;
|
||||||
|
@ -16,7 +16,7 @@ hood, it's still an int. This is here so you won't have to have global variables
|
|||||||
for these categories, or worse, use magic numbers in the code.
|
for these categories, or worse, use magic numbers in the code.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
enum class Vehicle_type { bike = 1, small_car = 2, suv = 3, pickup = 4 };
|
enum class Vehicle_type { twoweeler = 1, fourweeler = 2 };
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Customer constructors do the same stuff as all the other constructors.
|
Customer constructors do the same stuff as all the other constructors.
|
||||||
@ -38,9 +38,11 @@ class Customer {
|
|||||||
int id;
|
int id;
|
||||||
string name;
|
string name;
|
||||||
string password;
|
string password;
|
||||||
Customer(string name_, string password_, Vehicle_type vehicle_);
|
Vehicle_type vehicle;
|
||||||
|
string telephone;
|
||||||
|
Customer(string name_, string password_, Vehicle_type vehicle_, string telephone_);
|
||||||
Customer(int id_, string name_, string password_, Vehicle_type vehicle_,
|
Customer(int id_, string name_, string password_, Vehicle_type vehicle_,
|
||||||
vector<Park_time> instances);
|
vector<Park_time> instances, string telephone_);
|
||||||
void clock_in(int s_id);
|
void clock_in(int s_id);
|
||||||
void clock_out(int s_id);
|
void clock_out(int s_id);
|
||||||
bool parked();
|
bool parked();
|
||||||
@ -49,9 +51,6 @@ class Customer {
|
|||||||
void update_db();
|
void update_db();
|
||||||
void delete_db();
|
void delete_db();
|
||||||
|
|
||||||
void gen_monthly();
|
|
||||||
Vehicle_type vehicle;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
vector<Park_time> park_instances;
|
vector<Park_time> park_instances;
|
||||||
void save_db();
|
void save_db();
|
||||||
|
@ -2,11 +2,12 @@
|
|||||||
|
|
||||||
#include "Query.h"
|
#include "Query.h"
|
||||||
|
|
||||||
|
|
||||||
using std::cin;
|
using std::cin;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void interface(vector<Park_spot>& spots);
|
void interface(vector<Park_spot>& spots);
|
||||||
void interface_member(vector<Park_spot>& spots);
|
void interface_member(vector<Park_spot>& spots);
|
||||||
void interface_admin(vector<Park_spot>& spots);
|
void interface_admin(vector<Park_spot>& spots);
|
||||||
void park(Customer& c, vector<Park_spot>& spots);
|
void park(Customer& c, vector<Park_spot>& spots);
|
||||||
|
void new_customer();
|
||||||
|
void new_parkspot(vector<Park_spot>& spots);
|
@ -19,7 +19,7 @@ class Park_spot {
|
|||||||
bool taken;
|
bool taken;
|
||||||
int parked_customer;
|
int parked_customer;
|
||||||
Vehicle_type v_type;
|
Vehicle_type v_type;
|
||||||
|
|
||||||
Park_spot(Vehicle_type v_type_);
|
Park_spot(Vehicle_type v_type_);
|
||||||
Park_spot(int id_, bool taken_, int parked, Vehicle_type v_type_);
|
Park_spot(int id_, bool taken_, int parked, Vehicle_type v_type_);
|
||||||
void clock(Customer& c_customer);
|
void clock(Customer& c_customer);
|
||||||
|
@ -5,10 +5,10 @@
|
|||||||
#include "data.h"
|
#include "data.h"
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <thread>
|
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <thread>
|
||||||
|
|
||||||
using namespace std::chrono;
|
using namespace std::chrono;
|
||||||
using std::cout;
|
using std::cout;
|
||||||
@ -32,21 +32,21 @@ operator<< is << overload, can(should) be used for report generation.
|
|||||||
|
|
||||||
|
|
||||||
// implementation stuff------------------------
|
// implementation stuff------------------------
|
||||||
start and end are time points representing when someone clocks in and out. they're from the chrono namespace.
|
start and end are time points representing when someone clocks in and out. they're from the chrono
|
||||||
|
namespace.
|
||||||
|
|
||||||
save and update save and update info in the database.
|
save and update save and update info in the database.
|
||||||
auto_increment pulls the highest id stored in the db, to be used in the constructor.
|
auto_increment pulls the highest id stored in the db, to be used in the constructor.
|
||||||
|
|
||||||
start_to_int() is used to convert the start timepoint to an integer that can be saved in the database
|
start_to_int() is used to convert the start timepoint to an integer that can be saved in the
|
||||||
SQL datetime and chrono datetime don't seem the most compatible.
|
database SQL datetime and chrono datetime don't seem the most compatible.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class Park_time {
|
class Park_time {
|
||||||
public:
|
public:
|
||||||
Park_time(int c_id, int s_id);
|
Park_time(int c_id, int s_id);
|
||||||
Park_time(int id_, int customer_id_, int spot_id_, int start_,
|
Park_time(int id_, int customer_id_, int spot_id_, int start_, int duration_);
|
||||||
int duration_);
|
|
||||||
int id;
|
int id;
|
||||||
int customer_id;
|
int customer_id;
|
||||||
int spot_id;
|
int spot_id;
|
||||||
@ -64,8 +64,7 @@ class Park_time {
|
|||||||
int start_to_int(); // helper
|
int start_to_int(); // helper
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// test funciton
|
||||||
//test funciton
|
|
||||||
void Wait(int sec);
|
void Wait(int sec);
|
||||||
|
|
||||||
#endif // Park_time
|
#endif // Park_time
|
@ -26,7 +26,7 @@ customers who have the same name.
|
|||||||
2. I have no clue how many of you have done error handling in c++
|
2. I have no clue how many of you have done error handling in c++
|
||||||
(try/catch/finally).
|
(try/catch/finally).
|
||||||
Ya boi is nice and doesn't want to bombard you with more new concepts than needed.
|
Ya boi is nice and doesn't want to bombard you with more new concepts than needed.
|
||||||
so now you'd do
|
so now you'd do
|
||||||
|
|
||||||
vector<Customer> test = query_customer_with_name("Testman");
|
vector<Customer> test = query_customer_with_name("Testman");
|
||||||
|
|
||||||
@ -34,7 +34,7 @@ if (!test.size()) {print no customers found, do stuff}
|
|||||||
else if (test.size() > 1) { do stuff to get the right one if you only need one
|
else if (test.size() > 1) { do stuff to get the right one if you only need one
|
||||||
}
|
}
|
||||||
|
|
||||||
instead of
|
instead of
|
||||||
try {
|
try {
|
||||||
customer test = query_customer_with_name("Testman");
|
customer test = query_customer_with_name("Testman");
|
||||||
}
|
}
|
||||||
@ -46,7 +46,8 @@ finally{
|
|||||||
do more stuff
|
do more stuff
|
||||||
}
|
}
|
||||||
|
|
||||||
3. Ya boi needs to brush up on how to create custom exceptions class, and it will complicate code furhter.
|
3. Ya boi needs to brush up on how to create custom exceptions class, and it will complicate code
|
||||||
|
furhter.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -59,8 +60,8 @@ vector<Park_spot> populate_spots();
|
|||||||
|
|
||||||
Park_spot query_parkspot_with_id(int id, vector<Park_spot>& parkspots);
|
Park_spot query_parkspot_with_id(int id, vector<Park_spot>& parkspots);
|
||||||
|
|
||||||
void reports_from_parkspot(int spotid, bool weekly=false);
|
void reports_from_parkspot(int spotid, bool weekly = false);
|
||||||
void reports_from_allparkspots(bool weekly=false);
|
void reports_from_allparkspots(bool weekly = false);
|
||||||
|
|
||||||
void current_status_parkspots(vector<Park_spot>& spots);
|
void current_status_parkspots(vector<Park_spot>& spots);
|
||||||
#endif // CUSTOMER_H
|
#endif // CUSTOMER_H
|
||||||
|
@ -8,8 +8,8 @@ namespace data {
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
start_db is the function that opens the database, and
|
start_db is the function that opens the database, and
|
||||||
if the necesary tables are not there, creates them.
|
if the necesary tables are not there, creates them.
|
||||||
db is the database, and is static to avoid multiple redefinition errors.
|
db is the database, and is static to avoid multiple redefinition errors.
|
||||||
*/
|
*/
|
||||||
SQLite::Database start_db();
|
SQLite::Database start_db();
|
||||||
static SQLite::Database db = start_db();
|
static SQLite::Database db = start_db();
|
||||||
|
@ -10,11 +10,11 @@
|
|||||||
using std::string;
|
using std::string;
|
||||||
/*
|
/*
|
||||||
hash_password takes the password, and encrypts it. This needs to be done,
|
hash_password takes the password, and encrypts it. This needs to be done,
|
||||||
because storing passwords in plaintext is BAD!
|
because storing passwords in plaintext is BAD!
|
||||||
|
|
||||||
verify_password takes in a password and the hashed password, and then does magic encryption stuff(no, not
|
verify_password takes in a password and the hashed password, and then does magic encryption
|
||||||
really. It basically hashes the password with the same salt and other
|
stuff(no, not really. It basically hashes the password with the same salt and other parameters) and
|
||||||
parameters) and to see if the password stored and the given password match.
|
to see if the password stored and the given password match.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
string hash_password(string password);
|
string hash_password(string password);
|
||||||
|
5
main.cpp
5
main.cpp
@ -1,8 +1,5 @@
|
|||||||
#include "headers/Interface.h"
|
#include "headers/Interface.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Code structure is like this:
|
Code structure is like this:
|
||||||
1. encrypt.cpp en /header/encrypt.h contain functions to hash passwords and
|
1. encrypt.cpp en /header/encrypt.h contain functions to hash passwords and
|
||||||
@ -52,8 +49,6 @@ int main() {
|
|||||||
// er is een customer met id 1(testcustomer) met password "password"
|
// er is een customer met id 1(testcustomer) met password "password"
|
||||||
|
|
||||||
interface(parking_spots);
|
interface(parking_spots);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
BIN
oldtest.db3
Normal file
BIN
oldtest.db3
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user