diff --git a/TeamDBAwesome/TeamDBAwesome/Models/Customer.cs b/TeamDBAwesome/TeamDBAwesome/Models/Customer.cs index 2f8d420..0158244 100644 --- a/TeamDBAwesome/TeamDBAwesome/Models/Customer.cs +++ b/TeamDBAwesome/TeamDBAwesome/Models/Customer.cs @@ -55,5 +55,6 @@ namespace TeamDBAwesome.Models //both of these are just ints public int SupportRepId; public int PersonID; + public int CustomerID; } } \ No newline at end of file diff --git a/TeamDBAwesome/TeamDBAwesome/Models/Employee.cs b/TeamDBAwesome/TeamDBAwesome/Models/Employee.cs new file mode 100644 index 0000000..f885d9e --- /dev/null +++ b/TeamDBAwesome/TeamDBAwesome/Models/Employee.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.ComponentModel.DataAnnotations; + +namespace TeamDBAwesome.Models +{ + public class Employee + { + //alpha upper and lowercase, spaces, dots and dashes from 2 to 20 chars + [RegularExpression(@"^([A-Za-z\s\.-]{2,20})$")] + public string FName; + + //alpha upper and lowercase, spaces, dots and dashes from 2 to 20 chars + [RegularExpression(@"^([A-Za-z\s\.-]{2,20})$")] + public string LName; + + //alpha upper and lowercase, spaces, dots, dashes, numbers, colons, pounds and commas from 2 to 70 chars + [RegularExpression(@"^([A-z\s\-\d\.\#\:\,]{2,70})$")] + public string Address; + + //alpha upper and lowercase, spaces, dots and dashes from 2 to 40 chars + [RegularExpression(@"^([A-Za-z\s\.-]{2,40})$")] + public string City; + + //alpha upper and lowercase, spaces, dots and dashes from 2 to 40 chars + [RegularExpression(@"^([A-Za-z\s\.-]{2,40})$")] + public string State; + + //5-15 digit long numbers + [RegularExpression(@"^(\d{5,15})$")] + public string Post; + + //alpha upper and lowercase, spaces, dots and dashes from 2 to 40 chars + [RegularExpression(@"^([A-Za-z\s\.-]{2,40})$")] + public string Country; + + //match a 10-15 digit long number + [RegularExpression(@"^(\d{10,15})$")] + public string Phone; + + //match a 10-15 digit long number + [RegularExpression(@"^(\d{10,15})$")] + public string Fax; + + //an Email Address + [EmailAddress] + public string Email; + + //alpha upper and lowercase, spaces, dots and dashes from 2 to 80 chars + [RegularExpression(@"^([A-Za-z\s\.-]{2,30})$")] + public string Title; + + public DateTime BirthDate; + + public DateTime HireDate; + + + //both of these are just ints + public int ReportsTo; + public int PersonID; + public int EmployeeID; + } +} \ No newline at end of file diff --git a/chinookmodel.mwb b/chinookmodel.mwb index cf5f6a9..4e36f1e 100644 Binary files a/chinookmodel.mwb and b/chinookmodel.mwb differ diff --git a/chinookmodel.mwb.bak b/chinookmodel.mwb.bak index 288cd10..cf5f6a9 100644 Binary files a/chinookmodel.mwb.bak and b/chinookmodel.mwb.bak differ