Fix : Croisade contre les nullables inutiles; update Researched Game.
continuous-integration/drone/push Build is passing Details

Popup_qui_marche_pas
Jade VAN BRABANDT 2 years ago
parent 4b7a90ffc5
commit 5aad8b81b5

@ -12,7 +12,7 @@ namespace Model
[DataMember] [DataMember]
public string Name public string Name
{ {
get => name; get => name ?? "Default";
private set private set
{ {
if (string.IsNullOrWhiteSpace(value)) name="Default"; if (string.IsNullOrWhiteSpace(value)) name="Default";
@ -23,12 +23,12 @@ namespace Model
} }
} }
} }
private string? name; private string name;
[DataMember] [DataMember]
public string? Description public string Description
{ {
get => description; get => description ?? "Pas de description";
private set private set
{ {
if (string.IsNullOrWhiteSpace(value)) return; if (string.IsNullOrWhiteSpace(value)) return;
@ -39,7 +39,7 @@ namespace Model
} }
} }
} }
private string? description; private string description;
[DataMember] [DataMember]
public int Year public int Year
@ -58,9 +58,9 @@ namespace Model
private int year; private int year;
[DataMember] [DataMember]
public string? Cover public string Cover
{ {
get => cover; get => cover ?? "no_cover.png";
private set private set
{ {
if (string.IsNullOrWhiteSpace(value)) cover="no_cover.png"; if (string.IsNullOrWhiteSpace(value)) cover="no_cover.png";
@ -71,7 +71,7 @@ namespace Model
} }
} }
} }
private string? cover; private string cover;
[DataMember] [DataMember]
public ObservableCollection<string> Tags public ObservableCollection<string> Tags
@ -95,13 +95,13 @@ namespace Model
public double Average => AverageCalc(); public double Average => AverageCalc();
public double AverageCalc() public double AverageCalc()
{ {
if (Reviews.Count > 0) return Math.Round((double)Reviews.Select(review => review.Rate).Average(), 1); // FAUT FIX POUR QUAND Y'A PAS DE REVIEWS if (Reviews.Count > 0) return Math.Round((double)Reviews.Select(review => review.Rate).Average(), 1);
else return 0; else return 0;
} }
[DataMember] [DataMember]
public string? Lien { public string Lien {
get => lien; get => lien ?? "Pas de lien";
private set private set
{ {
if (string.IsNullOrWhiteSpace(value)) return; if (string.IsNullOrWhiteSpace(value)) return;
@ -112,20 +112,20 @@ namespace Model
} }
} }
} }
private string? lien; private string lien;
public Game(string name, string description, int year, List<string> c_tags, string cover, string c_lien) public Game(string name, string description, int year, List<string> c_tags, string cover, string c_lien)
{ {
if (string.IsNullOrWhiteSpace(name)) Name = "Default"; if (string.IsNullOrWhiteSpace(name)) Name = "Default";
else Name = name; else Name = name;
if (string.IsNullOrWhiteSpace(description)) Description = "Default"; if (string.IsNullOrWhiteSpace(description)) Description = "Pas de description";
else Description = description; else Description = description;
Year = year; Year = year;
if (c_tags is not null) tags = new ObservableCollection<string>(c_tags); if (c_tags is not null) tags = new ObservableCollection<string>(c_tags);
else tags = new ObservableCollection<string>(); else tags = new ObservableCollection<string>();
if (string.IsNullOrWhiteSpace(cover)) Cover = "no_cover.png"; if (string.IsNullOrWhiteSpace(cover)) Cover = "no_cover.png";
else Cover = cover; else Cover = cover;
if (string.IsNullOrWhiteSpace(c_lien)) Lien = "Default"; if (string.IsNullOrWhiteSpace(c_lien)) Lien = "Pas de lien";
else Lien = c_lien; else Lien = c_lien;
Reviews = new List<Review>(); Reviews = new List<Review>();
} }

@ -30,7 +30,7 @@ namespace Model
private string? text; private string? text;
[DataMember] [DataMember]
public string? AuthorName { get; set; } public string AuthorName { get; set; }
public Review(string username, float rate, string text) public Review(string username, float rate, string text)
{ {

@ -24,14 +24,14 @@ namespace Model
} }
} }
} }
private string? username; private string username;
[DataMember] [DataMember]
public string? Biographie public string Biographie
{ {
get => biographie; get => biographie ?? "Pas de biographie";
private set private set
{ {
if (string.IsNullOrWhiteSpace(value)) biographie = "Default"; if (string.IsNullOrWhiteSpace(value)) biographie = "Pas de biographie";
else else
{ {
biographie = value; biographie = value;
@ -39,9 +39,9 @@ namespace Model
} }
} }
} }
private string? biographie; private string biographie;
[DataMember] [DataMember]
public string? Email public string Email
{ {
get => email; get => email;
private set private set
@ -55,9 +55,9 @@ namespace Model
else email = "Default"; else email = "Default";
} }
} }
private string? email; private string email;
[DataMember] [DataMember]
public string? Password public string Password
{ {
get => password; get => password;
private set private set
@ -71,7 +71,7 @@ namespace Model
} }
} }
} }
private string? password; private string password;
public event PropertyChangedEventHandler? PropertyChanged; public event PropertyChangedEventHandler? PropertyChanged;

@ -36,4 +36,9 @@ public partial class MainPage : ContentPage
BindingContext=((App)App.Current).Manager.FilterGames(GameText, Tag1Text, Tag2Text); BindingContext=((App)App.Current).Manager.FilterGames(GameText, Tag1Text, Tag2Text);
} }
protected override void OnAppearing()
{
SearchBar_GameChanged(null,null);
base.OnAppearing();
}
} }

@ -40,7 +40,7 @@ namespace Test
Assert.False(game.Description == ""); Assert.False(game.Description == "");
Game game2 = new("name", null, 2012, new List<String> {"1","2","3"}, "cover", "www.link.com"); Game game2 = new("name", null, 2012, new List<String> {"1","2","3"}, "cover", "www.link.com");
Assert.True(game2.Description=="Default"); Assert.True(game2.Description=="Pas de description");
Game game3 = new("name", "good", 2012, new List<String> {"1","2","3"}, "cover", "www.link.com"); Game game3 = new("name", "good", 2012, new List<String> {"1","2","3"}, "cover", "www.link.com");
Assert.Equal("good", game3.Description); Assert.Equal("good", game3.Description);
@ -82,9 +82,9 @@ namespace Test
Game game = new("name", "description", 2012, new List<String> { "1", "2", "3" }, "cover", "www.link.com"); Game game = new("name", "description", 2012, new List<String> { "1", "2", "3" }, "cover", "www.link.com");
Assert.NotNull(game.Lien); Assert.NotNull(game.Lien);
Game game2 = new("name", "description", 2012, new List<String> { "1", "2", "3" }, "cover", null); Game game2 = new("name", "description", 2012, new List<String> { "1", "2", "3" }, "cover", null);
Assert.Equal("Default", game2.Lien); Assert.Equal("Pas de lien", game2.Lien);
Game game3 = new("name", "description", 2012, new List<String> { "1", "2", "3" }, "cover", ""); Game game3 = new("name", "description", 2012, new List<String> { "1", "2", "3" }, "cover", "");
Assert.Equal("Default", game3.Lien); Assert.Equal("Pas de lien", game3.Lien);
} }
[Fact] [Fact]

@ -25,7 +25,7 @@ namespace Test
public void Biographie() public void Biographie()
{ {
User user = new(null, "username", "", "adresse.mail@gmail.com", "Azerty123*"); User user = new(null, "username", "", "adresse.mail@gmail.com", "Azerty123*");
Assert.Equal("Default", user.Biographie); Assert.Equal("Pas de biographie", user.Biographie);
User user2 = new(null, "username", null, "adresse.mail@gmail.com", "Azerty123*"); User user2 = new(null, "username", null, "adresse.mail@gmail.com", "Azerty123*");
Assert.Equal("Default", user2.Biographie); Assert.Equal("Default", user2.Biographie);

Loading…
Cancel
Save