mirror of
https://github.com/bvanroll/cs-oo-project.git
synced 2025-08-29 20:12:40 +00:00
euh
This commit is contained in:
@@ -1,10 +1,23 @@
|
||||
using System;
|
||||
using Globals.Interfaces;
|
||||
using Newtonsoft.Json;
|
||||
using static Globals.main;
|
||||
|
||||
namespace Globals.classes
|
||||
{
|
||||
public class Bet : IBet
|
||||
{
|
||||
[JsonConstructor]
|
||||
public Bet(int Id, Game g, Person p, double cash, state ploeg, bool finished)
|
||||
{
|
||||
this.Id = Id;
|
||||
this.game = g;
|
||||
this.person = p;
|
||||
this.cash = cash;
|
||||
this.ploeg = ploeg;
|
||||
this.finished = finished;
|
||||
|
||||
}
|
||||
public Bet(Game game, Person person, double cash, main.state ploeg)
|
||||
{
|
||||
this.game = game;
|
||||
@@ -17,12 +30,25 @@ namespace Globals.classes
|
||||
public Game game { get; set; }
|
||||
public Person person { get; set; }
|
||||
public double cash { get; set; }
|
||||
public bool succes { get { return (ploeg == game.getWinner());}}
|
||||
public main.state ploeg { get; set; }
|
||||
public bool finished { get; set; }
|
||||
|
||||
|
||||
public bool succes()
|
||||
{
|
||||
return (ploeg == game.getWinner());
|
||||
}
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
try
|
||||
{
|
||||
Bet be = (Bet)obj;
|
||||
|
||||
} catch (Exception e)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Bet b = (Bet)obj;
|
||||
return this.Id == b.Id;
|
||||
}
|
||||
@@ -37,7 +63,7 @@ namespace Globals.classes
|
||||
double tmp = 0;
|
||||
if (finished)
|
||||
{
|
||||
if (succes)
|
||||
if (succes())
|
||||
{
|
||||
tmp += cash * 2;
|
||||
}
|
||||
|
@@ -1,12 +1,21 @@
|
||||
using System;
|
||||
using Globals.Interfaces;
|
||||
using Newtonsoft.Json;
|
||||
using static Globals.main;
|
||||
|
||||
namespace Globals.classes
|
||||
{
|
||||
public class Game : IGame
|
||||
{
|
||||
public DateTime date { get; set; } //y m d
|
||||
|
||||
[JsonConstructor]
|
||||
public Game(int Id, Ploeg home, Ploeg away, DateTime date)
|
||||
{
|
||||
this.Id = Id;
|
||||
this.home = home;
|
||||
this.away = away;
|
||||
this.date = date;
|
||||
}
|
||||
public Game(Ploeg home, Ploeg away, DateTime d)
|
||||
{
|
||||
this.home = home;
|
||||
@@ -27,7 +36,6 @@ namespace Globals.classes
|
||||
this.home = home ?? throw new ArgumentNullException(nameof(home));
|
||||
this.away = away ?? throw new ArgumentNullException(nameof(away));
|
||||
}
|
||||
|
||||
public Game(int id, Ploeg home, Ploeg away, int scoreHome, int scoreAway)
|
||||
{
|
||||
Id = id;
|
||||
@@ -36,17 +44,14 @@ namespace Globals.classes
|
||||
this.home.score = scoreHome;
|
||||
this.away.score = scoreAway;
|
||||
}
|
||||
|
||||
[JsonProperty("id")]
|
||||
public int Id { get; set; }
|
||||
[JsonProperty("home")]
|
||||
public Ploeg home { get; set; }
|
||||
[JsonProperty("away")]
|
||||
public Ploeg away { get; set; }
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
[JsonProperty("Date")]
|
||||
public DateTime date { get; set; } //y m d
|
||||
|
||||
public state getWinner()
|
||||
{
|
||||
@@ -61,27 +66,25 @@ namespace Globals.classes
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
|
||||
try
|
||||
{
|
||||
Game gam = (Game)obj;
|
||||
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
Game ga = (Game)obj;
|
||||
|
||||
return this.Id == ga.Id;
|
||||
}
|
||||
|
||||
public override int GetHashCode()
|
||||
{
|
||||
return base.GetHashCode();
|
||||
}
|
||||
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return this.Id + ": " + this.home.ToString() + " / " + this.away.ToString();
|
||||
|
@@ -1,10 +1,22 @@
|
||||
using System;
|
||||
using Globals.Interfaces;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace Globals.classes
|
||||
{
|
||||
public class Person : IPerson
|
||||
{
|
||||
[JsonConstructor]
|
||||
public Person (int Id, string name, string lastname, string adress, string gsm, double balance)
|
||||
{
|
||||
this.Id = Id;
|
||||
this.name = name;
|
||||
this.lastname = lastname;
|
||||
this.adress = adress;
|
||||
this.gsm = gsm;
|
||||
this.balance = balance;
|
||||
}
|
||||
|
||||
public Person( string name, string lastname, string adress, string gsm, double balance)
|
||||
{
|
||||
this.name = name;
|
||||
|
@@ -1,10 +1,19 @@
|
||||
using System;
|
||||
using Globals.Interfaces;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace Globals.classes
|
||||
{
|
||||
public class Ploeg : IPloeg
|
||||
{
|
||||
[JsonConstructor]
|
||||
public Ploeg(int Id, string naam, int score)
|
||||
{
|
||||
this.Id = Id;
|
||||
this.naam = naam;
|
||||
this.score = score;
|
||||
}
|
||||
|
||||
public Ploeg(string naam)
|
||||
{
|
||||
this.naam = naam;
|
||||
|
Reference in New Issue
Block a user