Merge branch 'master' of https://codefirst.iut.uca.fr/git/jade.van_brabandt/Projet_IHM

2 years ago · 9b3c7baced
parent f82c2134b7 6f14b3e283
commit 9b3c7baced
4 changed files with 73 additions and 25 deletions
--- a/README.md
+++ b/README.md
@ -1,16 +1,15 @@
-[![Build Status](https://codefirst.iut.uca.fr/api/badges/jade.van_brabandt/Stim/status.svg)](https://codefirst.iut.uca.fr/jade.van_brabandt/Stim)  
-[![Quality Gate Status](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=alert_status)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
-[![Bugs](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=bugs)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
-[![Code Smells](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=code_smells)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
-[![Coverage](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=coverage)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)  
-[![Duplicated Lines (%)](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=duplicated_lines_density)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
-[![Lines of Code](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=ncloc)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
-[![Maintainability Rating](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=sqale_rating)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
-[![Reliability Rating](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=reliability_rating)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)  
-[![Security Rating](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=security_rating)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
-[![Technical Debt](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=sqale_index)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
-[![Vulnerabilities](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=vulnerabilities)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)  
-
+[![Build Status](https://codefirst.iut.uca.fr/api/badges/jade.van_brabandt/Stim/status.svg&token=4188e57c889322a13941a026c82869c25c1733a1)](https://codefirst.iut.uca.fr/jade.van_brabandt/Stim)  
+[![Quality Gate Status](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=alert_status&token=4188e57c889322a13941a026c82869c25c1733a1)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
+[![Bugs](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=bugs&token=4188e57c889322a13941a026c82869c25c1733a1)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
+[![Code Smells](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=code_smells&token=4188e57c889322a13941a026c82869c25c1733a1)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
+[![Coverage](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=coverage&token=4188e57c889322a13941a026c82869c25c1733a1)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)  
+[![Duplicated Lines (%&token=4188e57c889322a13941a026c82869c25c1733a1)](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=duplicated_lines_density&token=4188e57c889322a13941a026c82869c25c1733a1)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
+[![Lines of Code](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=ncloc&token=4188e57c889322a13941a026c82869c25c1733a1)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
+[![Maintainability Rating](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=sqale_rating&token=4188e57c889322a13941a026c82869c25c1733a1)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
+[![Reliability Rating](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=reliability_rating&token=4188e57c889322a13941a026c82869c25c1733a1)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)  
+[![Security Rating](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=security_rating&token=4188e57c889322a13941a026c82869c25c1733a1)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
+[![Technical Debt](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=sqale_index&token=4188e57c889322a13941a026c82869c25c1733a1)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)
+[![Vulnerabilities](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=Stim&metric=vulnerabilities&token=4188e57c889322a13941a026c82869c25c1733a1)](https://codefirst.iut.uca.fr/sonar/dashboard?id=Stim)  
 
 # Stim

--- a/Sources/Stim.Model/Game.cs
+++ b/Sources/Stim.Model/Game.cs
@ -9,16 +9,16 @@ namespace Model
    public class Game : INotifyPropertyChanged, IEquatable<Game>
    {
        [DataMember]
-        public string? Name
+        public string Name
        {
            get => name;
            private set
            {
-                if (string.IsNullOrWhiteSpace(value)) return;
+                if (string.IsNullOrWhiteSpace(value)) name="Default";
                name = value;
            }
        }
-        private string? name;
+        private string name;

        [DataMember]
        public string? Description
@ -45,16 +45,16 @@ namespace Model
        private int year;

        [DataMember]
-        public string? Cover
+        public string Cover
        {
            get => cover;
            private set
            {
-                if (string.IsNullOrWhiteSpace(value)) return;
+                if (string.IsNullOrWhiteSpace(value)) cover="no_cover.png";
                cover = value;
            }
        }
-        private string? cover;
+        private string cover;

        [DataMember]
        public ObservableCollection<string> Tags
@ -94,7 +94,7 @@ namespace Model
            Year = year;
            if (c_tags is not null) tags = new ObservableCollection<string>(c_tags);
            else tags = new ObservableCollection<string>();
-            if (string.IsNullOrWhiteSpace(cover)) Cover = "Default";
+            if (string.IsNullOrWhiteSpace(cover)) Cover = "no_cover.png";
            else Cover = cover;
            if (string.IsNullOrWhiteSpace(c_lien)) Lien = "Default";
            else Lien = c_lien;
@ -144,7 +144,8 @@ namespace Model
            {
                sum += review.Rate;
            }
-            return (float)(Math.Round((sum / Reviews.Count) * 2, MidpointRounding.AwayFromZero) / 2);
+            Average= (float)(Math.Round((sum / Reviews.Count) * 2, MidpointRounding.AwayFromZero) / 2);
+            return Average;
        }

        public void AddReview(Review review)
--- a/Sources/Stim/DetailledPage.xaml.cs
+++ b/Sources/Stim/DetailledPage.xaml.cs
@ -11,8 +11,8 @@ public partial class DetailledPage : ContentPage
 		InitializeComponent();
        BindingContext = game;
        CurrGame= game;
-        avgLabel.Text = game.Average.ToString();
-        AddStars(starsContainer, game.Average);
+        avgLabel.Text = game.GetAvgRate().ToString();
+        AddStars(starsContainer, game.GetAvgRate());
    }

    private void AddStars(object sender, EventArgs e)
--- a/Sources/Stim/MainPage.xaml.cs
+++ b/Sources/Stim/MainPage.xaml.cs
@ -5,6 +5,7 @@ using StimStub;
 using Microsoft.Maui.Storage;
 using MailKit.Search;
 using System.Linq;
+using System.Collections.Generic;

 public partial class MainPage : ContentPage
 {
@ -31,18 +32,65 @@ public partial class MainPage : ContentPage
        string Tag1Text = Tag1.Text;
        string Tag2Text = Tag2.Text;
        ((App)App.Current).Manager.ResearchedGame.Clear();
-
-        var filteredGames = ((App)App.Current).Manager.GameList
+        IEnumerable<Game> filteredGames = ((App)App.Current).Manager.GameList;
+        if (GameText != null && Tag1Text != null && Tag2.Text != null)
+        {
+            filteredGames = ((App)App.Current).Manager.GameList
            .Where(game => game.Name.IndexOf(GameText, StringComparison.OrdinalIgnoreCase) >= 0
            &&
            game.Tags.Any(tag => tag.IndexOf(Tag1Text, StringComparison.OrdinalIgnoreCase) >= 0)
            &&
            game.Tags.Any(tag => tag.IndexOf(Tag2Text, StringComparison.OrdinalIgnoreCase) >= 0)
            );
+        }
+        else if (GameText == null && Tag1Text !=null && Tag2Text !=null)
+        {
+                filteredGames = ((App)App.Current).Manager.GameList
+                .Where(game => game.Tags.Any(tag => tag.IndexOf(Tag1Text, StringComparison.OrdinalIgnoreCase) >= 0)
+                &&
+                game.Tags.Any(tag => tag.IndexOf(Tag2Text, StringComparison.OrdinalIgnoreCase) >= 0)
+                );
+        }
+        else if (GameText != null && Tag1Text == null && Tag2Text != null)
+        {
+            filteredGames = ((App)App.Current).Manager.GameList
+            .Where(game => game.Name.IndexOf(GameText, StringComparison.OrdinalIgnoreCase) >= 0
+            &&
+            game.Tags.Any(tag => tag.IndexOf(Tag2Text, StringComparison.OrdinalIgnoreCase) >= 0)
+            );
+        }
+        else if (GameText != null && Tag1Text != null && Tag2Text == null)
+        {
+            filteredGames = ((App)App.Current).Manager.GameList
+            .Where(game => game.Name.IndexOf(GameText, StringComparison.OrdinalIgnoreCase) >= 0
+            &&
+            game.Tags.Any(tag => tag.IndexOf(Tag1Text, StringComparison.OrdinalIgnoreCase) >= 0)
+            );
+        }
+        else if (GameText == null && Tag1Text==null && Tag2Text!=null)
+        {
+            filteredGames = ((App)App.Current).Manager.GameList
+            .Where(game => game.Tags.Any(tag => tag.IndexOf(Tag2Text, StringComparison.OrdinalIgnoreCase) >= 0)
+            );
+        }
+        else if (GameText==null &&Tag1Text!=null&& Tag2Text ==null)
+        {
+            filteredGames = ((App)App.Current).Manager.GameList
+            .Where(game => game.Tags.Any(tag => tag.IndexOf(Tag1Text, StringComparison.OrdinalIgnoreCase) >= 0)
+            );
+        }
+        else if (GameText!=null&& Tag1Text == null  && Tag2Text==null)
+        {
+            filteredGames = ((App)App.Current).Manager.GameList
+            .Where(game => game.Name.IndexOf(GameText, StringComparison.OrdinalIgnoreCase) >= 0
+            );
+        }

        foreach (var game in filteredGames)
        {
            ((App)App.Current).Manager.ResearchedGame.Add(game);
        }
+
+
    }
 }