merged commit form master that fixed most things
This commit is contained in:
2019-01-18 23:33:24 +01:00
34 changed files with 752 additions and 671 deletions

View File

@@ -7,11 +7,10 @@ namespace SeniorAssistant.Models.Users
[Column(IsPrimaryKey = true, CanBeNull = false)]
public string Username { get; set; }
[Association(ThisKey = "Username", OtherKey = nameof(User.Username), CanBeNull = false)]
public User UserData { get; set; }
public string Location { get; set; }
public string Schedule { get; set; }
public string PhoneNumber { get; set; }
}
}

View File

@@ -7,12 +7,13 @@ namespace SeniorAssistant.Models.Users
[Column(IsPrimaryKey = true, CanBeNull = false)]
public string Username { get; set; }
[Association(ThisKey = "Username", OtherKey = nameof(User.Username), CanBeNull = false)]
public User UserData { get; set; }
[NotNull]
public string Doctor { get; set; }
public string Notes { get; set; }
public int MaxHeart { get; set; }
public int MinHeart { get; set; }
}
}