diff --git a/README.md b/README.md index d1b279a..db35a73 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ [![Build Status](https://codefirst.iut.uca.fr/api/badges/victor_perez.ngounou/BowlingScoreApp/status.svg)](https://codefirst.iut.uca.fr/victor_perez.ngounou/BowlingScoreApp) [![Quality Gate Status](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=alert_status&token=d89d41f6a247037395d41fe6f40f53a402943bd9)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) [![Bugs](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=bugs&token=d89d41f6a247037395d41fe6f40f53a402943bd9)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) -[![Code Smells](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=code_smells)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) +[![Code Smells](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=code_smells&token=d89d41f6a247037395d41fe6f40f53a402943bd9)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) [![Coverage](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=coverage&token=d89d41f6a247037395d41fe6f40f53a402943bd9)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) -[![Duplicated Lines (%)](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=duplicated_lines_density)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) -[![Lines of Code](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=ncloc)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) -[![Maintainability Rating](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=sqale_rating)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) -[![Reliability Rating](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=reliability_rating)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) -[![Security Rating](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=security_rating)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) -[![Technical Debt](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=sqale_index)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) -[![Vulnerabilities](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=vulnerabilities)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) +[![Duplicated Lines (%)](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=duplicated_lines_density&token=d89d41f6a247037395d41fe6f40f53a402943bd9)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) +[![Lines of Code](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=ncloc&token=d89d41f6a247037395d41fe6f40f53a402943bd9)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) +[![Maintainability Rating](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=sqale_rating&token=d89d41f6a247037395d41fe6f40f53a402943bd9)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) +[![Reliability Rating](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=reliability_rating&token=d89d41f6a247037395d41fe6f40f53a402943bd9)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) +[![Security Rating](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=security_rating&token=d89d41f6a247037395d41fe6f40f53a402943bd9)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) +[![Technical Debt](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=sqale_index&token=d89d41f6a247037395d41fe6f40f53a402943bd9)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) +[![Vulnerabilities](https://codefirst.iut.uca.fr/sonar/api/project_badges/measure?project=BowlingScoreApp&metric=vulnerabilities&token=d89d41f6a247037395d41fe6f40f53a402943bd9)](https://codefirst.iut.uca.fr/sonar/dashboard?id=BowlingScoreApp) # BowlingScoreApp diff --git a/Sources/BowlingLib/Model/Equipe.cs b/Sources/BowlingLib/Model/Equipe.cs index 0723871..65c2df7 100644 --- a/Sources/BowlingLib/Model/Equipe.cs +++ b/Sources/BowlingLib/Model/Equipe.cs @@ -15,9 +15,8 @@ namespace BowlingLib.Model { private string nom; private readonly long id; - - - public List Joueurs = new List(); + + public List Joueurs = new List(); public string Nom @@ -32,8 +31,7 @@ namespace BowlingLib.Model public Equipe(string nom, params Joueur[] joueurs) { this.nom = nom; - AjouterJoueurs(joueurs); - // foreach (Joueur nouv in joueurs) AjouterJoueur(nouv); + AjouterJoueurs(joueurs); } public long Id @@ -47,10 +45,12 @@ namespace BowlingLib.Model this.nom = nom; } - public Equipe(long id, string nom, List joueurs) + public Equipe(long id, string nom, IEnumerable joueurs) + //liste implemente dautre methode a l indxeur + { this.id = id; - Joueurs = joueurs; + Joueurs.AddRange( joueurs); Nom = nom; } diff --git a/Sources/BowlingLib/Model/Frame.cs b/Sources/BowlingLib/Model/Frame.cs index 233a4c4..ee9410d 100644 --- a/Sources/BowlingLib/Model/Frame.cs +++ b/Sources/BowlingLib/Model/Frame.cs @@ -39,11 +39,12 @@ namespace BowlingLib.Model { return quillesRestantes; } - set + private set { this.quillesRestantes = value; } } + private int quillesRestantes; public int QuillesTombees @@ -171,8 +172,7 @@ namespace BowlingLib.Model throw new ArgumentException("Le nombre de quilles tombees doit et etre positif"); } - //Situation lor du dernier frame - if (this.Numero == 10) + if (this.Numero == MAX_QUILLE) { if (this.Lancer1 == null) { @@ -279,7 +279,7 @@ namespace BowlingLib.Model this.IsSpare = true; } } - if (this.QuillesRestantes == 0 || (this.Lancer2 != null && this.Numero != 10) || (!IsStrike && !IsSpare && Numero == 10)) + if (this.QuillesRestantes == 0 || (this.Lancer2 != null && this.Numero != MAX_QUILLE)) { this.IsFinished = true; } diff --git a/Sources/BowlingLib/Model/Joueur.cs b/Sources/BowlingLib/Model/Joueur.cs index 4413a6e..d9a6b11 100644 --- a/Sources/BowlingLib/Model/Joueur.cs +++ b/Sources/BowlingLib/Model/Joueur.cs @@ -43,14 +43,17 @@ namespace BowlingLib.Model } public override bool Equals(object obj) - { + { + if (ReferenceEquals(obj, null)) return false; + if(ReferenceEquals(obj,this)) return true; + return obj is Joueur joueur && pseudo == joueur.pseudo && Pseudo == joueur.Pseudo; } public override int GetHashCode() - { + {//getHashcode utiliser par le set retur un codehch video sur dictionnaire return HashCode.Combine(id, Id, Pseudo); } } diff --git a/Sources/BowlingMaping/EquipeDbDataManager.cs b/Sources/BowlingMaping/EquipeDbDataManager.cs index b1f583d..b033be6 100644 --- a/Sources/BowlingMaping/EquipeDbDataManager.cs +++ b/Sources/BowlingMaping/EquipeDbDataManager.cs @@ -1,4 +1,5 @@ -using BowlingEF.Context; + +using BowlingEF.Context; using BowlingEF.Entities; using BowlingLib.Model; using Business; diff --git a/Sources/BowlingStub/StubEquipe.cs b/Sources/BowlingStub/StubEquipe.cs index bbfd5b5..7561756 100644 --- a/Sources/BowlingStub/StubEquipe.cs +++ b/Sources/BowlingStub/StubEquipe.cs @@ -10,9 +10,7 @@ namespace BowlingStub public int nbrJ = 10,nbrE = 2; public StubEquipe() { - //listEquipes.Add(new Equipe("Equipe 1", new Joueur("Joueur 1"), new Joueur("Joueur 2"))); - //listEquipes.Add(new Equipe("Equipe 2", new Joueur("Joueur 3"), new Joueur("Joueur 4"))); - //listEquipes.Add(new Equipe("Equipe 3", new Joueur("Joueur 5"), new Joueur("Joueur 6"))); + } public bool Add(Equipe data) diff --git a/Sources/BowlingStub/StubManager.cs b/Sources/BowlingStub/StubManager.cs deleted file mode 100644 index 167bff7..0000000 --- a/Sources/BowlingStub/StubManager.cs +++ /dev/null @@ -1,28 +0,0 @@ -using BowlingLib.Model; -using Business; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BowlingStub -{ - internal class StubManager - { - private List lesjoueurs = new List(); - private List parties = new List(); - private List equipes = new List(); - - public void Add(Manager data) - { - - } - - public void Delete(Manager data) - { - - } - - } -}