Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
e47d956
Added parameter canClear, will clear the console
Henno0701 May 11, 2023
92594a2
ada
Jimmy-Tran May 25, 2023
090a252
Merge pull request #35 from Jimmy-Tran/main
maruf128 May 25, 2023
8e54935
nagerecht goed toegevoegd
maruf128 May 25, 2023
50cadd4
Merge pull request #37 from Jimmy-Tran/maruf
maruf128 May 25, 2023
53a740e
added phonenumber
Jimmy-Tran May 25, 2023
c64ecc8
fixed phonenumbers
Jimmy-Tran May 25, 2023
073df2b
a
Jimmy-Tran May 25, 2023
fb502b4
Merge branch 'main' of https://github.com/Jimmy-Tran/Project-B
Jimmy-Tran May 25, 2023
da31817
Merge pull request #38 from Jimmy-Tran/Henno
Henno0701 May 25, 2023
c367e11
Merge branch 'main' of https://github.com/Jimmy-Tran/Project-B
Henno0701 May 25, 2023
7b3c40c
ReservationCode will be send with the Email
Henno0701 May 25, 2023
dedbe54
test
Jimmy-Tran May 25, 2023
549520f
Merge branch 'main' of https://github.com/Jimmy-Tran/Project-B
Jimmy-Tran May 25, 2023
99f3e31
Sleep a sec after coursemenu
Henno0701 May 25, 2023
bdf873b
Merge branch 'main' of https://github.com/Jimmy-Tran/Project-B
Henno0701 May 25, 2023
f7c6c5c
Changes
Henno0701 May 25, 2023
8a44b6a
Merge pull request #40 from Jimmy-Tran/main
maruf128 May 25, 2023
9182814
ervoor gezorgd dat de admin nu ook Wijn kiest
maruf128 May 28, 2023
fe1d897
ervoor gezorgd dat food ook datamodels heeft
maruf128 May 28, 2023
9e2da03
Merge pull request #41 from Jimmy-Tran/maruf
maruf128 May 28, 2023
4c0cad9
Ervoor gezorgd dat 4 gangen menu eigen cat heeft
maruf128 May 30, 2023
8c23325
Wijn arrangement word nu ook berekent met logics
maruf128 May 30, 2023
452278a
Merge pull request #43 from Jimmy-Tran/maruf
maruf128 May 30, 2023
97befe3
Added a tuple
Henno0701 Jun 1, 2023
5d4df6a
Merge branch 'main' of https://github.com/Jimmy-Tran/Project-B
Henno0701 Jun 1, 2023
928d63a
Merge pull request #44 from Jimmy-Tran/main
maruf128 Jun 1, 2023
3d8bdc7
email voor reservatie bij admin, edit food deleted
maruf128 Jun 5, 2023
83d024b
Gangen menu kan je goed lezen en prijs aanpassen
maruf128 Jun 5, 2023
55d4748
Merge pull request #45 from Jimmy-Tran/maruf
maruf128 Jun 5, 2023
3bb4d16
Manager gefinetuned
maruf128 Jun 5, 2023
571d070
Merge pull request #46 from Jimmy-Tran/maruf
maruf128 Jun 5, 2023
37420e6
Added a function which reserv you want to choose
Henno85657 Jun 5, 2023
ddd0a4a
workermenu
joelhogeschool Jun 5, 2023
a52449d
inheritance geadd
maruf128 Jun 6, 2023
7979abb
Merge pull request #47 from Jimmy-Tran/maruf
maruf128 Jun 6, 2023
a0f84db
Merge pull request #48 from Jimmy-Tran/main
maruf128 Jun 6, 2023
2cb393c
Prijs voor de berekeningen word uit json gepakt
maruf128 Jun 6, 2023
4ec6f04
GetReservations() bug fix
Henno0701 Jun 6, 2023
5bfbf9b
Merge branch 'main' of https://github.com/Jimmy-Tran/Project-B
Henno85657 Jun 6, 2023
a17a028
ChangeReservation() Style update
Henno85657 Jun 6, 2023
f28e2b8
MyReservation() get correct reservation fix
Henno85657 Jun 6, 2023
838bb01
locatie gegevens zijn niet hard dated
maruf128 Jun 7, 2023
a8352c9
Merge branch 'main' into maruf
maruf128 Jun 7, 2023
5f116b9
Merge pull request #49 from Jimmy-Tran/maruf
maruf128 Jun 7, 2023
9976f91
push
Henno85657 Jun 7, 2023
3e63cc7
Merge branch 'main' of https://github.com/Jimmy-Tran/Project-B
Henno85657 Jun 7, 2023
eafd4f1
info tijden nettjes onder elkaar
maruf128 Jun 7, 2023
08c5e8e
Merge branch 'maruf' of https://github.com/Jimmy-Tran/Project-B into …
maruf128 Jun 7, 2023
f069f1e
Merge pull request #50 from Jimmy-Tran/maruf
maruf128 Jun 7, 2023
5e6fc24
Merge branch 'main' into origin/Joel
joelhogeschool Jun 7, 2023
bfa46f8
finished workermenu
joelhogeschool Jun 7, 2023
8000ead
ervoor gezorgd dat de wijn prijs niet harddated is
maruf128 Jun 8, 2023
daed20c
Merge pull request #51 from Jimmy-Tran/maruf
maruf128 Jun 8, 2023
4e8cecd
table changes
maruf128 Jun 8, 2023
761dd9f
Merge pull request #54 from Jimmy-Tran/maruf
maruf128 Jun 8, 2023
04fb029
Merge pull request #55 from Jimmy-Tran/main
maruf128 Jun 8, 2023
538a017
dubbele medewerker continue menu verwijder
maruf128 Jun 8, 2023
256bf7d
Merge pull request #56 from Jimmy-Tran/maruf
maruf128 Jun 8, 2023
17045ed
benaming aangepast locatie
maruf128 Jun 11, 2023
8ed8cc0
openingstijden per dag aanpassen
maruf128 Jun 11, 2023
3a78217
datamodels van maruf nullable gemaakt
maruf128 Jun 11, 2023
421fb27
accountslogic nullable
maruf128 Jun 11, 2023
6342f5e
Food_aanpass nullable gemaakt
maruf128 Jun 11, 2023
6a74414
Foodmenu nullable
maruf128 Jun 11, 2023
7a0e5b5
Informatielogic nullable
maruf128 Jun 11, 2023
b2a1da8
Prijs nullable gemaakt
maruf128 Jun 11, 2023
c607c6a
manager menu nullable
maruf128 Jun 11, 2023
f696ac6
customer menu nullable
maruf128 Jun 11, 2023
f03181a
mederwerkers.cs nullable
maruf128 Jun 11, 2023
228a1f4
Menu.cs nullable
maruf128 Jun 11, 2023
1a97153
show.cs nullable
maruf128 Jun 11, 2023
c3397f4
ook workermenu voor locatie showen nullable gedaan
maruf128 Jun 11, 2023
ef0ecd4
Files die we gekregen hebben nullable gemaakt
maruf128 Jun 11, 2023
ee340da
Merge pull request #57 from Jimmy-Tran/maruf
maruf128 Jun 11, 2023
32ad58e
checks gemaakt zodat je niet opnieuw moet beginnen
maruf128 Jun 12, 2023
7c9a582
Readkey switch
Henno0701 Jun 13, 2023
650f00e
Merge branch 'main' of https://github.com/Jimmy-Tran/Project-B
Henno0701 Jun 13, 2023
ed0e2df
informatie met checks
maruf128 Jun 13, 2023
f15defb
Merge pull request #58 from Jimmy-Tran/maruf
maruf128 Jun 13, 2023
6f847f5
Merge pull request #59 from Jimmy-Tran/main
maruf128 Jun 13, 2023
0d1c5d4
account data warnings weg gone loes
maruf128 Jun 13, 2023
1aca7b3
Merge pull request #60 from Jimmy-Tran/maruf
maruf128 Jun 13, 2023
08b22ec
datum word goed gechecked
maruf128 Jun 13, 2023
009c5fa
Merge pull request #61 from Jimmy-Tran/maruf
maruf128 Jun 13, 2023
a371aca
updated registration
joelhogeschool Jun 13, 2023
75180b7
Merge pull request #62 from Jimmy-Tran/main
maruf128 Jun 13, 2023
5745728
nullable weg en validation gebruik ipv zelf kijken
maruf128 Jun 13, 2023
f43f7c3
Merge pull request #63 from Jimmy-Tran/maruf
maruf128 Jun 13, 2023
72899de
added interface
joelhogeschool Jun 13, 2023
044c274
Merge branch 'main' of https://github.com/Jimmy-Tran/Project-B
joelhogeschool Jun 13, 2023
07b0c3c
Fixed reservation view
Jimmy-Tran Jun 13, 2023
7caccf7
Merge branch 'main' of https://github.com/Jimmy-Tran/Project-B
Jimmy-Tran Jun 13, 2023
2d27bce
Merge branch 'main' of https://github.com/Jimmy-Tran/Project-B
Jimmy-Tran Jun 13, 2023
bcdbc20
Merge pull request #64 from Jimmy-Tran/main
maruf128 Jun 13, 2023
507af44
nullable voor alles verwijderd
maruf128 Jun 13, 2023
5062d2d
Merge pull request #65 from Jimmy-Tran/maruf
maruf128 Jun 13, 2023
f36766a
goed getest op reserveren, zou nu okey moeten zijn
maruf128 Jun 13, 2023
502cb87
Merge pull request #66 from Jimmy-Tran/maruf
maruf128 Jun 13, 2023
9c998a3
Update Mederwerker.cs
joelhogeschool Jun 14, 2023
69e2024
Merge pull request #67 from Jimmy-Tran/main
maruf128 Jun 14, 2023
ee34875
tijdslot admin/mederwerker
maruf128 Jun 14, 2023
29405fe
Merge pull request #68 from Jimmy-Tran/maruf
maruf128 Jun 14, 2023
6a38108
small changes
Henno85657 Jun 14, 2023
0bca693
Merge pull request #69 from Jimmy-Tran/main
maruf128 Jun 14, 2023
4863a17
kleine fixes nog aan mederwerker en locatie
maruf128 Jun 15, 2023
cb1af26
Merge pull request #70 from Jimmy-Tran/maruf
maruf128 Jun 15, 2023
de79259
Error fix
Henno0701 Jun 15, 2023
1710d19
AutoVerifing
Henno85657 Jun 15, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DataAccess/AccountsAccess.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ static class AccountsAccess
static string path = System.IO.Path.GetFullPath(System.IO.Path.Combine(Environment.CurrentDirectory, @"DataSources/accounts.json"));


public static List<AccountModel> LoadAll()
public static List<AccountModel>? LoadAll()
{
string json = File.ReadAllText(path);
return JsonSerializer.Deserialize<List<AccountModel>>(json);
Expand Down
2 changes: 1 addition & 1 deletion DataModels/AccountModel.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Text.Json.Serialization;


class AccountModel
class AccountModel: IAccount
{
[JsonPropertyName("id")]
public int Id { get; set; }
Expand Down
8 changes: 8 additions & 0 deletions DataModels/Customer.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
class Customer : AccountModel, IAccount
{
public Customer(int id, string emailAddress, string password, string fullName, int level)
: base(id, emailAddress, password, fullName, level)
{
// Additional customer-specific properties and logic can be added here
}
}
8 changes: 8 additions & 0 deletions DataModels/Employee.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
class Employee : AccountModel, IAccount
{
public Employee(int id, string emailAddress, string password, string fullName, int level)
: base(id, emailAddress, password, fullName, level)
{
// Additional employee-specific properties and logic can be added here
}
}
30 changes: 30 additions & 0 deletions DataModels/FoodModel.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// data models voor de voedsel
public class MenuItem // losse item class
{
public int ID { get; set; }
public string? Category { get; set; }
public string? Name { get; set; }
public decimal Price { get; set; }
}
public class Foodmenu
{
// maak nu een lijst voor iedere gang en drinken
public List<MenuItem> Starters { get; set; }
public List<MenuItem> Soups { get; set; }
public List<MenuItem> Mains { get; set; }
public List<MenuItem> Desserts { get; set; }
public List<MenuItem> Drinks { get; set; }
public List<MenuItem> Wijn { get; set; }
public List<MenuItem> Gangen { get; set; }
public Foodmenu()
{
Starters = new List<MenuItem>();
Soups = new List<MenuItem>();
Mains = new List<MenuItem>();
Desserts = new List<MenuItem>();
Drinks = new List<MenuItem>();
Wijn = new List<MenuItem>();
Gangen = new List<MenuItem>();
}

}
19 changes: 19 additions & 0 deletions DataModels/IAccounts.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System.Text.Json.Serialization;

interface IAccount
{
[JsonPropertyName("id")]
int Id { get; set; }

[JsonPropertyName("emailAddress")]
string EmailAddress { get; set; }

[JsonPropertyName("password")]
string Password { get; set; }

[JsonPropertyName("fullName")]
string FullName { get; set; }

[JsonPropertyName("level")]
int Level { get; set; }
}
40 changes: 40 additions & 0 deletions DataModels/Location.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using System.Text.Json;

public class Location
{
public string Name { get; set; }
public string Address { get; set; }
public string Phone { get; set; }
public string Email { get; set; }
public string? Website { get; set; }
public Dictionary<string, string> OpeningHours { get; set; }

public Location(string name, string address, string phone, string email, Dictionary<string, string> openingHours)
{
Name = name;
Address = address;
Phone = phone;
Email = email;
OpeningHours = openingHours;
}

public static Location? CreateLocation()
{
string json = File.ReadAllText(@"DataSources/Informatie.json");
Location? location = JsonSerializer.Deserialize<Location>(json);

return location;
}

public void SaveToJsonFile(string filePath)
{
string json = JsonSerializer.Serialize(this, new JsonSerializerOptions { WriteIndented = true });
File.WriteAllText(filePath, json);
}

public static Location? ReadLocationFromJson(string filePath)
{
string json = File.ReadAllText(filePath);
return JsonSerializer.Deserialize<Location>(json);
}
}
8 changes: 8 additions & 0 deletions DataModels/Manager.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
class Manager : AccountModel, IAccount
{
public Manager(int id, string emailAddress, string password, string fullName, int level)
: base(id, emailAddress, password, fullName, level)
{
// Additional manager-specific properties and logic can be added here
}
}
7 changes: 6 additions & 1 deletion DataModels/ReservationModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class ReservationModel
public int Amt_People {get; set;}

[JsonPropertyName("Course_Menu")]
public int CourseMenu {get; set;}
public int? CourseMenu {get; set;}

[JsonPropertyName("Verified")]
public bool Verified {get; set;}
Expand All @@ -53,6 +53,11 @@ public ReservationModel(int _id, int _clientnumber, string _name, string _email,
Amt_People = _amt_people;
Verified = false;
}

public override string ToString()
{
return $"{Email} - {Date.ToString("dd-MM-yyyy")} ({TimeSlot.ToString(@"hh\:mm")})";
}
}


Expand Down
16 changes: 16 additions & 0 deletions DataSources/Informatie.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"Name": "Jake",
"Address": "Wijnhaven 107",
"Phone": "0695684596",
"Email": "JakeRestaurant@gmail.com",
"Website": null,
"OpeningHours": {
"zondag": "19:00-22:00",
"maandag": "18:00-22:00",
"dinsdag": "18:00-22:00",
"woensdag": "18:00-22:00",
"donderdag": "18:00-22:00",
"vrijdag": "18:00-22:00",
"zaterdag": "18:00-22:00"
}
}
11 changes: 9 additions & 2 deletions DataSources/accounts.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,15 @@
{
"id": 9,
"emailAddress": "henno.passchier@gmail.com",
"password": "abc",
"fullName": "Henno Passchier",
"password": "Abc123!",
"fullName": "henno passchier",
"level": 0
},
{
"id": 10,
"emailAddress": "ttt@test.nl",
"password": "Abc123",
"fullName": "qwee",
"level": 0
}
]
113 changes: 112 additions & 1 deletion DataSources/menu.json
Original file line number Diff line number Diff line change
@@ -1 +1,112 @@
{"Starters":[{"ID":1,"Category":null,"Name":"Caesar Salad","Price":7.99},{"ID":2,"Category":null,"Name":"Garlic Bread","Price":4.99}],"Mains":[{"ID":1,"Category":null,"Name":"Spaghetti Bolognese","Price":12.99},{"ID":2,"Category":null,"Name":"Beef Burger","Price":10.99}],"Desserts":[{"ID":1,"Category":null,"Name":"Cheesecake","Price":5.99},{"ID":2,"Category":null,"Name":"Chocolate Brownie","Price":4.99}],"Drinks":[{"ID":1,"Category":null,"Name":"Coca-Cola","Price":2.49},{"ID":2,"Category":null,"Name":"Orange juice","Price":2.50}]}
{
"Starters": [
{
"ID": 1,
"Category": null,
"Name": "Caesar Salad",
"Price": 8.0
},
{
"ID": 2,
"Category": null,
"Name": "Garlic Bread",
"Price": 4.99
}
],
"Soups": [
{
"ID": 1,
"Category": null,
"Name": "Tomaten soep",
"Price": 12.5
}
],
"Mains": [
{
"ID": 1,
"Category": null,
"Name": "Spaghetti Bolognese",
"Price": 12.99
},
{
"ID": 2,
"Category": null,
"Name": "Beef Burger",
"Price": 10.99
}
],
"Desserts": [
{
"ID": 1,
"Category": null,
"Name": "Cheesecake",
"Price": 5.99
},
{
"ID": 2,
"Category": null,
"Name": "Chocolate Brownie",
"Price": 4.99
},
{
"ID": 3,
"Category": null,
"Name": "appeltaart",
"Price": 4.5
}
],
"Drinks": [
{
"ID": 1,
"Category": null,
"Name": "Coca-Cola",
"Price": 2.49
},
{
"ID": 2,
"Category": null,
"Name": "Orange juice",
"Price": 2.5
}
],
"Wijn": [
{
"ID": 3,
"Category": null,
"Name": "Vodka",
"Price": 13.5
},
{
"ID": 4,
"Category": null,
"Name": "Barcardi",
"Price": 4.5
}
],
"Gangen": [
{
"ID": 1,
"Category": null,
"Name": "2 Gangen menu",
"Price": 15.5
},
{
"ID": 2,
"Category": null,
"Name": "3 Gangen menu",
"Price": 20.5
},
{
"ID": 3,
"Category": null,
"Name": "4 Gangen menu",
"Price": 25.5
},
{
"ID": 4,
"Category": null,
"Name": "Wijn arrangement",
"Price": 12.50
}
]
}
51 changes: 48 additions & 3 deletions DataSources/reservations.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,61 @@
{
"ID": 1,
"ClientNumber": 0,
"Name": "12-09",
"Email": "adadam@gmail.com",
"Date": "2023-12-09T00:00:00",
"ReservationCode": "RL6S8P",
"TimeSlot": "16:00:00",
"Tables": [
"1"
],
"Amt_People": 2,
"CourseMenu": null,
"Verified": false
},
{
"ID": 2,
"ClientNumber": 0,
"Name": "jeffrey",
"Email": "jeffrey@het.com",
"Date": "2023-12-09T00:00:00",
"ReservationCode": "PM8H3K",
"TimeSlot": "16:00:00",
"Tables": [
"2"
],
"Amt_People": 2,
"CourseMenu": null,
"Verified": false
},
{
"ID": 5,
"ClientNumber": 0,
"Name": "Henno Passchier",
"Email": "henno.passchier@gmail.com",
"Date": "2023-05-26T00:00:00",
"ReservationCode": "XF3S7M",
"Date": "2023-06-15T00:00:00",
"ReservationCode": "LJ8V4G",
"TimeSlot": "20:00:00",
"Tables": [
"1"
],
"Amt_People": 2,
"CourseMenu": 0,
"CourseMenu": null,
"Verified": false
},
{
"ID": 6,
"ClientNumber": 9,
"Name": "Henno Passchier",
"Email": "henno.passchier@gmail.com",
"Date": "2023-06-16T00:00:00",
"ReservationCode": "MN4Z4J",
"TimeSlot": "20:00:00",
"Tables": [
"4"
],
"Amt_People": 2,
"CourseMenu": null,
"Verified": false
}
]
Loading