From b4d6c6d530ebe5a57cdac154ca3fdf0a88a9b3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tommy=20=C3=96man?= Date: Mon, 13 Oct 2025 12:13:12 +0200 Subject: [PATCH] =?UTF-8?q?Inf=C3=B6rt=20Observable=20Property=20=C3=B6ver?= =?UTF-8?q?allt,=20d=C3=A4r=20till=C3=A4mpligt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EntityClasses/GamePoint.cs | 105 ++++---------- .../EntityClasses/GameRound.cs | 74 +++------- .../EntityClasses/Participant.cs | 67 +++------ .../HelperEntities/PlayerColumn.cs | 50 ++----- .../HelperEntities/RoundBuilderElement.cs | 130 ++++-------------- .../HelperEntities/RoundBuilderGroup.cs | 55 ++------ .../ViewModelClasses/RoundRunningViewModel.cs | 29 ---- .../RoundStartingViewModel.cs | 57 -------- 8 files changed, 111 insertions(+), 456 deletions(-) diff --git a/GreadyPoang.EntityLayer/EntityClasses/GamePoint.cs b/GreadyPoang.EntityLayer/EntityClasses/GamePoint.cs index 981f01e..68bd0a9 100644 --- a/GreadyPoang.EntityLayer/EntityClasses/GamePoint.cs +++ b/GreadyPoang.EntityLayer/EntityClasses/GamePoint.cs @@ -3,95 +3,40 @@ using SQLite; namespace GreadyPoang.EntityLayer; [Table("GamePoint")] -public class GamePoint : ObservableObject +public partial class GamePoint : ObservableObject { public GamePoint() { - _gamePointId = 0; - _participantId = 0; - _gameRoundId = 0; - _gameDate = DateTime.Now; - _gameRoundRegNr = 0; - _gameRegPoints = 0; + GamePointId = 0; + ParticipantId = 0; + GameRoundId = 0; + GameDate = DateTime.Now; + GameRoundRegNr = 0; + GameRegPoints = 0; } - private int _gamePointId; - private int _participantId; - private int _gameRoundId; - private DateTime _gameDate; - private int _gameRoundRegNr; - private int _gameRegPoints; + [ObservableProperty] + [property: PrimaryKey, AutoIncrement, Column("GamePointId")] + private int gamePointId; - [PrimaryKey] - [AutoIncrement] - [Column("GamePointId")] - public int GamePointId - { - get { return _gamePointId; } - set - { - _gamePointId = value; - OnPropertyChanged(nameof(GamePointId)); - } - } + [ObservableProperty] + [property: Column("ParticipantId")] + private int participantId; - [Column("ParticipantId")] - public int ParticipantId - { - get { return _participantId; } - set - { - _participantId = value; - OnPropertyChanged(nameof(ParticipantId)); - } - } - [Column("GameRoundId")] - public int GameRoundId - { - get { return _gameRoundId; } - set - { - _gameRoundId = value; - OnPropertyChanged(nameof(GameRoundId)); - } - } + [ObservableProperty] + [property: Column("GameRoundId")] + private int gameRoundId; - [Column("GameDate")] - public DateTime GameDate - { - get { return _gameDate; } - set - { - _gameDate = value; - OnPropertyChanged(nameof(GameDate)); - } - } - - // GameRoundRegNr räknas upp när en spelare får en ny gamepoint inlagd - // Alltså hans/hennes senaste i samma runda uppräknad med 1 - - [Column("GameRoundRegNr")] - public int GameRoundRegNr - { - get { return _gameRoundRegNr; } - set - { - _gameRoundRegNr = value; - OnPropertyChanged(nameof(GameRoundRegNr)); - } - } - - [Column("GameRegPoints")] - public int GameRegPoints - { - get { return _gameRegPoints; } - set - { - _gameRegPoints = value; - OnPropertyChanged(nameof(GameRegPoints)); - } - } + [ObservableProperty] + [property: Column("GameDate")] + private DateTime gameDate; + [ObservableProperty] + [property: Column("GameRoundRegNr")] + private int gameRoundRegNr; + [ObservableProperty] + [property: Column("GameRegPoints")] + private int gameRegPoints; } diff --git a/GreadyPoang.EntityLayer/EntityClasses/GameRound.cs b/GreadyPoang.EntityLayer/EntityClasses/GameRound.cs index 2c2853d..55967ce 100644 --- a/GreadyPoang.EntityLayer/EntityClasses/GameRound.cs +++ b/GreadyPoang.EntityLayer/EntityClasses/GameRound.cs @@ -6,72 +6,34 @@ namespace GreadyPoang.EntityLayer; [Table("GameRound")] -public class GameRound : ObservableObject +public partial class GameRound : ObservableObject { public GameRound() { - _gameRoundId = 0; - _gameRoundStartDate = DateTime.Now; - _gameStatus = GamePointStatus.New; - _gameRoundFinished = null; + GameRoundId = 0; + GameRoundStartDate = DateTime.Now; + GameStatus = GamePointStatus.New; + GameRoundFinished = null; } - private int _gameRoundId; - private DateTime _gameRoundStartDate; - private GamePointStatus _gameStatus; - private DateTime? _gameRoundFinished; + [ObservableProperty] + [property: PrimaryKey, AutoIncrement, Column("GameRoundId")] + private int gameRoundId; - [Column("GameRoundFinished")] - public DateTime? GameRoundFinished - { - get { return _gameRoundFinished; } - set - { - _gameRoundFinished = value; - OnPropertyChanged(nameof(GameRoundFinished)); - } - } + [ObservableProperty] + [property: Column("GameRoundStartDate")] + private DateTime gameRoundStartDate; - [Column("GameRoundStartDate")] - public DateTime GameRoundStartDate - { - get { return _gameRoundStartDate; } - set - { - _gameRoundStartDate = value; - OnPropertyChanged(nameof(GameRoundStartDate)); - } - } + [ObservableProperty] + [property: Column("GameStatus")] + private GamePointStatus gameStatus; - [Column("GameStatus")] - public GamePointStatus GameStatus - { - get { return _gameStatus; } - set - { - _gameStatus = value; - OnPropertyChanged(nameof(GameStatus)); - } - } - - - [PrimaryKey] - [AutoIncrement] - [Column("GameRoundId")] - public int GameRoundId - { - get { return _gameRoundId; } - set - { - _gameRoundId = value; - OnPropertyChanged(nameof(GameRoundId)); - } - } + [ObservableProperty] + [property: Column("GameRoundFinished")] + private DateTime? gameRoundFinished; public string GameRoundStartDateString { - get { return _gameRoundStartDate.ToString("yyyy-MM-dd"); } + get { return GameRoundStartDate.ToString("yyyy-MM-dd"); } } - - } diff --git a/GreadyPoang.EntityLayer/EntityClasses/Participant.cs b/GreadyPoang.EntityLayer/EntityClasses/Participant.cs index e70a222..9dc6233 100644 --- a/GreadyPoang.EntityLayer/EntityClasses/Participant.cs +++ b/GreadyPoang.EntityLayer/EntityClasses/Participant.cs @@ -3,65 +3,30 @@ using SQLite; namespace GreadyPoang.EntityLayer; [Table("Participants")] -public class Participant : ObservableObject +public partial class Participant : ObservableObject { public Participant() { - _firstName = string.Empty; - _lastName = string.Empty; - _email = string.Empty; + FirstName = string.Empty; + LastName = string.Empty; + Email = string.Empty; } - private int _participantId; - private string _firstName; - private string _lastName; - private string _email; + [ObservableProperty] + [property: PrimaryKey, AutoIncrement, Column("ParticipantId")] + private int participantId; - [PrimaryKey] - [AutoIncrement] - [Column("ParticipantId")] - public int ParticipantId - { - get { return _participantId; } - set - { - _participantId = value; - OnPropertyChanged(nameof(ParticipantId)); - } - } + [ObservableProperty] + [property: Column("FirstName")] + private string firstName; - [Column("FirstName")] - public string FirstName - { - get { return _firstName; } - set - { - _firstName = value; - OnPropertyChanged(nameof(FirstName)); - } - } + [ObservableProperty] + [property: Column("LastName")] + private string lastName; - [Column("LastName")] - public string LastName - { - get { return _lastName; } - set - { - _lastName = value; - OnPropertyChanged(nameof(LastName)); - } - } - - [Column("Email")] - public string Email - { - get { return _email; } - set - { - _email = value; - OnPropertyChanged(nameof(Email)); - } - } + [ObservableProperty] + [property: Column("Email")] + private string email; public string FullName { diff --git a/GreadyPoang.EntityLayer/HelperEntities/PlayerColumn.cs b/GreadyPoang.EntityLayer/HelperEntities/PlayerColumn.cs index 52a53d5..b6c1391 100644 --- a/GreadyPoang.EntityLayer/HelperEntities/PlayerColumn.cs +++ b/GreadyPoang.EntityLayer/HelperEntities/PlayerColumn.cs @@ -2,54 +2,26 @@ namespace GreadyPoang.EntityLayer; -public class PlayerColumn : ObservableObject +public partial class PlayerColumn : ObservableObject { public PlayerColumn() { - _playerName = string.Empty; - _values = new List(); + PlayerName = string.Empty; + Values = new List(); } - private int _playerId; - private string _playerName; - private List _values; - public string PlayerName - { - get { return _playerName; } - set - { - _playerName = value; - OnPropertyChanged(nameof(PlayerName)); - } - } - public List Values - { - get { return _values; } - set - { - _values = value; - OnPropertyChanged(nameof(Values)); - } - } + [ObservableProperty] + private int playerId; - public int PlayerId - { - get { return _playerId; } - set - { - _playerId = value; - OnPropertyChanged(nameof(PlayerId)); - } - } + [ObservableProperty] + private string playerName; - private int _playerPoints; + [ObservableProperty] + private List values; - public int PlayerPoints - { - get { return _playerPoints; } - set { _playerPoints = value; } - } + [ObservableProperty] + private int playerPoints; } diff --git a/GreadyPoang.EntityLayer/HelperEntities/RoundBuilderElement.cs b/GreadyPoang.EntityLayer/HelperEntities/RoundBuilderElement.cs index fccf7f0..389cb4a 100644 --- a/GreadyPoang.EntityLayer/HelperEntities/RoundBuilderElement.cs +++ b/GreadyPoang.EntityLayer/HelperEntities/RoundBuilderElement.cs @@ -2,127 +2,55 @@ namespace GreadyPoang.EntityLayer; -public class RoundBuilderElement : ObservableObject +public partial class RoundBuilderElement : ObservableObject { public RoundBuilderElement() { - _participantId = 0; - _participantName = string.Empty; - _gameRoundRegNr = 0; - _gameRegPoints = 0; - _status = GamePointStatus.New; - _gameRoundStartDate = DateTime.MinValue; - _gameRoundId = 0; - _gamePointId = 0; + ParticipantId = 0; + ParticipantName = string.Empty; + GameRoundRegNr = 0; + GameRegPoints = 0; + Status = GamePointStatus.New; + GameRoundStartDate = DateTime.MinValue; + GameRoundId = 0; + GamePointId = 0; } - private int _participantId; - private string _participantName; - private int _gameRoundRegNr; - private int _gameRegPoints; - private GamePointStatus _status; - private DateTime _gameRoundStartDate; - private int _gameRoundId; - private int _gamePointId; + [ObservableProperty] + private int participantId; - public int ParticipantId - { - get { return _participantId; } - set - { - _participantId = value; - OnPropertyChanged(nameof(ParticipantId)); - } - } + [ObservableProperty] + private string participantName; + [ObservableProperty] + private int gameRoundRegNr; - public string ParticipantName - { - get { return _participantName; } - set - { - _participantName = value; - OnPropertyChanged(nameof(ParticipantName)); - } - } + [ObservableProperty] + private int gameRegPoints; + [ObservableProperty] + [NotifyPropertyChangedFor(nameof(StatusString))] + private GamePointStatus status; - public int GameRoundRegNr - { - get { return _gameRoundRegNr; } - set - { - _gameRoundRegNr = value; - OnPropertyChanged(nameof(GameRoundRegNr)); - } - } + [ObservableProperty] + [NotifyPropertyChangedFor(nameof(GameRoundStartDateString))] + private DateTime gameRoundStartDate; + [ObservableProperty] + private int gameRoundId; - public int GameRegPoints - { - get { return _gameRegPoints; } - set - { - _gameRegPoints = value; - OnPropertyChanged(nameof(GameRegPoints)); - } - } - - - public GamePointStatus Status - { - get { return _status; } - set - { - _status = value; - OnPropertyChanged(nameof(Status)); - OnPropertyChanged(nameof(StatusString)); - } - } + [ObservableProperty] + private int gamePointId; public string StatusString { - get { return _status.ToString(); } - } - - public DateTime GameRoundStartDate - { - get { return _gameRoundStartDate; } - set - { - _gameRoundStartDate = value; - OnPropertyChanged(nameof(GameRoundStartDate)); - OnPropertyChanged(nameof(GameRoundStartDateString)); - } + get { return status.ToString(); } } public string GameRoundStartDateString { - get { return _gameRoundStartDate.ToString("yyyy-MM-dd"); } + get { return gameRoundStartDate.ToString("yyyy-MM-dd"); } } - public int GameRoundId - { - get { return _gameRoundId; } - set - { - _gameRoundId = value; - OnPropertyChanged(nameof(GameRoundId)); - } - } - - - public int GamePointId - { - get { return _gamePointId; } - set - { - _gamePointId = value; - OnPropertyChanged(nameof(GamePointId)); - } - } - - - } diff --git a/GreadyPoang.EntityLayer/HelperEntities/RoundBuilderGroup.cs b/GreadyPoang.EntityLayer/HelperEntities/RoundBuilderGroup.cs index e12a358..773b4bd 100644 --- a/GreadyPoang.EntityLayer/HelperEntities/RoundBuilderGroup.cs +++ b/GreadyPoang.EntityLayer/HelperEntities/RoundBuilderGroup.cs @@ -6,52 +6,21 @@ public partial class RoundBuilderGroup : ObservableObject { public RoundBuilderGroup() { - _gameRoundId = 0; - _gameRoundStartDate = DateTime.MinValue; - _status = GamePointStatus.New; + GameRoundId = 0; + GameRoundStartDate = DateTime.MinValue; + Status = GamePointStatus.New; Elements = new List(); } - private int _gameRoundId; - private DateTime _gameRoundStartDate; + + [ObservableProperty] + private int gameRoundId; + + [ObservableProperty] + private DateTime gameRoundStartDate; + + [ObservableProperty] private GamePointStatus _status; + [ObservableProperty] private List elements; - public int GameRoundId - { - get { return _gameRoundId; } - set - { - _gameRoundId = value; - // No need to raise property changed for this example - } - } - public DateTime GameRoundStartDate - { - get { return _gameRoundStartDate; } - set - { - _gameRoundStartDate = value; - // No need to raise property changed for this example - } - } - public GamePointStatus Status - { - get { return _status; } - set - { - _status = value; - // No need to raise property changed for this example - } - } - - //public List Elements - //{ - // get { return _elements; } - // set - // { - // _elements = value; - // OnPropertyChanged(nameof(Elements)); - // // No need to raise property changed for this example - // } - //} } diff --git a/GreadyPoang.ViewModelLayer/ViewModelClasses/RoundRunningViewModel.cs b/GreadyPoang.ViewModelLayer/ViewModelClasses/RoundRunningViewModel.cs index 7dec962..30cf0a6 100644 --- a/GreadyPoang.ViewModelLayer/ViewModelClasses/RoundRunningViewModel.cs +++ b/GreadyPoang.ViewModelLayer/ViewModelClasses/RoundRunningViewModel.cs @@ -57,35 +57,6 @@ public partial class RoundRunningViewModel : ObservableObject RebuildRequested?.Invoke(this, EventArgs.Empty); } - //public ObservableCollection RoundElements - //{ - // get { return _roundElements; } - // set - // { - // _roundElements = value; - // OnPropertyChanged(nameof(RoundElements)); - // } - //} - - //public Collection PlayerColumns - //{ - // get { return _playerColumns; } - // set - // { - // _playerColumns = value; - // OnPropertyChanged(nameof(PlayerColumns)); - // } - //} - - //public RoundBuilderElement BuilderObject - //{ - // get { return _builderObject; } - // set - // { - // _builderObject = value; - // OnPropertyChanged(nameof(BuilderObject)); - // } - //} public ObservableCollection Get() diff --git a/GreadyPoang.ViewModelLayer/ViewModelClasses/RoundStartingViewModel.cs b/GreadyPoang.ViewModelLayer/ViewModelClasses/RoundStartingViewModel.cs index 6b7d7d2..4c87b94 100644 --- a/GreadyPoang.ViewModelLayer/ViewModelClasses/RoundStartingViewModel.cs +++ b/GreadyPoang.ViewModelLayer/ViewModelClasses/RoundStartingViewModel.cs @@ -62,63 +62,6 @@ public partial class RoundStartingViewModel : ObservableObject private ObservableCollection participantList = new(); - #region commented out - - //public ObservableCollection RoundElements - //{ - // get { return _roundElements; } - // set - // { - // _roundElements = value; - // OnPropertyChanged(nameof(RoundElements)); - // } - //} - - - //public Participant SelectedItem - //{ - // get => _selectedItem; - // set - // { - // if (_selectedItem != value) - // { - - // _selectedItem = value; - // OnPropertyChanged(nameof(SelectedItem)); - // OnItemSelected(value); // Metod som triggas vid val - // } - // } - //} - - //public GameRound? GameRoundObject - //{ - // get { return _GameRoundObject; } - // set - // { - // _GameRoundObject = value; - // OnPropertyChanged(nameof(GameRoundObject)); - // } - //} - - //public ObservableCollection GameRoundList - //{ - // get { return _GameRoundList; } - // set - // { - // _GameRoundList = value; - // OnPropertyChanged(nameof(GameRoundList)); - // } - //} - //public ObservableCollection ParticipantList - //{ - // get { return _ParticipantList; } - // set - // { - // _ParticipantList = value; - // OnPropertyChanged(nameof(ParticipantList)); - // } - //} - #endregion private void OnItemSelected(Participant item) { if (RoundElements.Count == 0)