Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b6bd790
created checking reservations
samnbe Apr 7, 2024
3f3d1df
fixed obj error and created reservation removal
samnbe Apr 8, 2024
e3a7d89
created view available cars func in main
samnbe Apr 8, 2024
e83665f
added viewing cars to user not main
samnbe Apr 8, 2024
2153d42
storing username of client with reservation
samnbe Apr 8, 2024
798d1da
edited add/remove reservations, added reservation editing to employee…
samnbe Apr 9, 2024
d1a309f
edited view reservation
samnbe Apr 9, 2024
32c2cf8
change imports (working now), debugged editing/checking reservations
samnbe Apr 11, 2024
9f0dd7b
edit class structure (now working)
samnbe Apr 11, 2024
491be7c
debugged admin class func
samnbe Apr 11, 2024
5863ee0
debug admin func for employees
samnbe Apr 11, 2024
5fcc9f7
edit imports for admins
samnbe Apr 11, 2024
055148d
quick fix
samnbe Apr 11, 2024
7150cbe
debugging employee class
samnbe Apr 11, 2024
52c55b8
admin should only have the ability to add cars to the system
samnbe Apr 11, 2024
e3082dd
debugging admin editing car list
samnbe Apr 11, 2024
482733b
debugging employee and car class
samnbe Apr 14, 2024
fe111ab
some tests for inhertiance
samnbe Apr 14, 2024
8f648fd
ensure reservations are at least an hour
samnbe Apr 14, 2024
4ca971d
Merge branch 'Jatin' into Samantha
samnbe Apr 15, 2024
0569f87
created search from employee using username and search from car using…
samnbe Apr 16, 2024
d94f884
Merge branch 'Samantha' of https://github.com/gloomafeet/Velocity-Rid…
samnbe Apr 16, 2024
85fd556
seeing what the key value string is so we can display it
samnbe Apr 17, 2024
2745428
make all users be able to make reservations
samnbe Apr 17, 2024
db40e11
move all editing attribute functions to user class and change the nam…
samnbe Apr 17, 2024
af7ddd9
Delete client/node_modules directory
samnbe Apr 17, 2024
3e309ec
Delete server/node_modules directory
samnbe Apr 17, 2024
7989c75
hopefully this works
samnbe Apr 17, 2024
58edb53
Merge branch 'Samantha' of https://github.com/gloomafeet/Velocity-Rid…
samnbe Apr 17, 2024
8455857
connected to my mongodb
samnbe Apr 18, 2024
a2146d9
connect to database and add 1 admin
samnbe Apr 18, 2024
e470032
change port so final can use
samnbe Apr 18, 2024
43da599
Merge branch 'Samantha' of https://github.com/gloomafeet/Velocity-Rid…
samnbe Apr 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
File renamed without changes.
155 changes: 79 additions & 76 deletions Admin.js
Original file line number Diff line number Diff line change
@@ -1,104 +1,107 @@
//just making this as a template change anything you want

//trying to import cars and employees class, not working
import Employee from './Employee'
import Car from './Car'
import Customer from './Customer'
import User from './User'

// var Employee = require('./Employee')
// var Car = require('./Car')
// var Customer = require('./Customer')
// var User = require('./User')
var Employee = require('./Employee.js')
var Cars = require('./Car.js')

class Admin extends Employee{
constructor(username, password, name, location) {
//constructor
super(username, password, name, location);
}
addEmployee;
deleteEmployee;
editEmployeeLocation;
getAdminUsername;
addAdmin;
deleteAdmin;
editAdminUsername;
editAdminLocation;
editAdminsPassword;
}

Admin.prototype.addEmployee = function(employeeArray, username, password, location) {
employeeArray.push(Employee(username, password, location));
return employeeArray; //may not need
}
editLocation(loco) {
this.location = loco;
}

addEmployee(employeeArray, username, password, name, location) {
employeeArray.push(new Employee(username, password, name, location));
}

Admin.prototype.deleteEmployee = function(employeeArray, username) {
for(let i = 0; i < employeeArray.length; i++){
if(username.equals(employeeArray[i].getEmployeeUsername)){
delete employeeArray[i];
deleteEmployee(employeeArray, username) {
for(let i = 0; i < employeeArray.length; i++){
if(username == employeeArray[i].getUsername()){
employeeArray.splice(i, 1);
}
}
}

getEmployee(employeeArray, username){
for(let i = 0; i < employeeArray.length; i++){
if(username == employeeArray[i].getUsername()){
return employeeArray[i];
break;
}
}
}
return employeeArray; //may not need
}
}

Admin.prototype.editEmployeeLocation = function(employeeArray, username, location) {
for(let i = 0; i < employeeArray.length; i++){
if(username.equals(employeeArray[i].getEmployeeUsername)){
employeeArray[i].editEmployeeLocation(location);
break;
editEmployeeLocation(employeeArray, username, location) {
for(let i = 0; i < employeeArray.length; i++){
if(username == employeeArray[i].getUsername()){
employeeArray[i].editEmployeeLocation(location);
break;
}
}
}
return employeeArray; //may not need
}

Admin.prototype.getAdminUsername = function() {
return this.username
}
addAdmin(adminArray, username, password, name, location) {
adminArray.push(new Admin(username, password, name, location));
}

Admin.prototype.addAdmin = function(adminArray, username, password, location) {
adminArray.push(Admin(username, password, location));
return adminArray; //may not need
}
deleteAdmin(adminArray, username) {
for(let i = 0; i < adminArray.length; i++){
if(username == adminArray[i].getUsername()){
adminArray.splice(i, 1);
}
}
}

Admin.prototype.deleteAdmin = function(adminArray, username) {
for(let i = 0; i < adminArray.length; i++){
if(username.equals(adminArray[i].getAdminUsername)){
delete adminArray[i];
editAdminUsername(adminArray, oldUsername, newUsername) {
for(let i = 0; i < adminArray.length; i++){
if(oldUsername == adminArray[i].getUsername()){
adminArray[i].editUsername(newUsername);
break;
}
}
}
return adminArray; //may not need
}
}

Admin.prototype.editAdminUsername = function(adminArray, oldUsername, newUsername) {
for(let i = 0; i < adminArray.length; i++){
if(oldUsername.equals(adminArray[i].getAdminUsername)){
adminArray[i].username = newUsername;
break;
editAdminPassword(adminArray, username, password) {
for(let i = 0; i < adminArray.length; i++){
if(username == adminArray[i].getUsername()){
adminArray[i].editPassword(password);
break;
}
}
}
return employeeArray; //may not need
}

Admin.prototype.editAdminPassword = function(adminArray, username, password) {
for(let i = 0; i < adminArray.length; i++){
if(username.equals(adminArray[i].getAdminUsername)){
adminArray[i].password = password;
break;
editAdminName(adminArray, username, name) {
for(let i = 0; i < adminArray.length; i++){
if(username == adminArray[i].getUsername()){
adminArray[i].editName(name);
break;
}
}
}
return employeeArray; //may not need
}

Admin.prototype.editAdminLocation = function(username, location) {
for(let i = 0; i < adminArray.length; i++){
if(username.equals(adminArray[i].getAdminUsername)){
adminArray[i].location = location;
break;
editAdminLocation(adminArray, username, location) {
for(let i = 0; i < adminArray.length; i++){
if(username == adminArray[i].getUsername()){
adminArray[i].editLocation(location);
break;
}
}
}
return employeeArray; //may not need
}

addCar(carArray, type, location, mileage, dayCost, mileCost, status, availability){
carArray.push(new Cars(type, location, mileage, dayCost, mileCost, status, availability));
}

deleteCar(carArray, type, location, mileage, dayCost, mileCost, status, availability) {
let info = [type, location, mileage, dayCost, mileCost, status, availability];
for (let i = 0; i < carArray.length; i++){
if(JSON.stringify(info) === JSON.stringify(carArray[i].GetInfo())){
carArray.splice(i, 1);
break;
}
}
}
}

module.export = Admin;
module.exports = Admin;
Loading