Commit: 9b5f965b7402faf4769a4ec83932867924442ef4 - UmaTest (git)

EveryDB2のデータベースを読み込んでWinFormでGUI表示するサンプル

Commit MetaInfo

• Révision: 9b5f965b7402faf4769a4ec83932867924442ef4 (tree)
• l'heure: 2021-06-07 00:43:47
• Auteur: yoshy <yoshy@user...>
• Commiter: yoshy

Message de Log

temp_20210607_0043

Change Summary

• modified: App/Adaptor/Gateway/ViewModel/Dto/RaceInfo.cs
• modified: App/Adaptor/Gateway/ViewModel/Dto/SearchRaceRowDto.cs
• modified: App/Adaptor/Gateway/ViewModel/Dto/UmaRaceRowDto.cs
• modified: App/Adaptor/Gateway/ViewModel/IMainWindowViewModel.cs
• modified: App/Adaptor/Gateway/ViewModel/MainWindowViewModel.cs
• modified: App/Adaptor/Presenter/AsyncLoadManualUmaListPresenter.cs
• modified: App/Adaptor/Presenter/AsyncLoadSelectedRaceUmaListPresenter.cs
• modified: App/Adaptor/Presenter/AsyncLoadTokuUmaListPresenter.cs
• modified: App/Presentation/View/MainWindow.cs
• modified: Infra/Helper/BeanHelper.cs
• modified: Infra/Helper/CodeHelper.cs
• modified: Infra/Helper/FormatHelper.cs

Modification

--- a/App/Adaptor/Gateway/ViewModel/Dto/RaceInfo.cs
+++ b/App/Adaptor/Gateway/ViewModel/Dto/RaceInfo.cs
@@ -14,5 +14,21 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel.Dto
         {
             BeanHelper.Copy(this, race);
         }
+
+        public string YearMonthDay => FormatHelper.FormatYearMonthDay(Year, Monthday);
+
+        public string JyoName => CodeHelper.GetInstance().GetName(CodeHelper.JYO_CODE, Jyocd, 3, "不明");
+
+        public string RaceNumFormatted => FormatHelper.SuppressZeroLeading(Racenum);
+
+        public string RaceName => CodeHelper.GetInstance().GetRaceName(this, "不明");
+
+        public string GradeName => CodeHelper.GetInstance().GetGradeName(this, "不明");
+
+        public string CourseName => CodeHelper.GetInstance().GetTurfDurtName(Trackcd, "不明") + Kyori;
+
+        public string TosuFormatted => FormatHelper.FormatTosu(this);
+
+        public string HassoTimeFormatted => FormatHelper.FormatTimeHHMM(Hassotime);
     }
 }

--- a/App/Adaptor/Gateway/ViewModel/Dto/SearchRaceRowDto.cs
+++ b/App/Adaptor/Gateway/ViewModel/Dto/SearchRaceRowDto.cs
@@ -9,31 +9,11 @@ using UmaTest.Infra.Helper;
 
 namespace UmaTest.App.Adaptor.Gateway.ViewModel.Dto
 {
-    public class SearchRaceRowDto : NRace
+    public class SearchRaceRowDto : RaceInfo
     {
-        public SearchRaceRowDto()
+        public SearchRaceRowDto(NRace race) : base(race)
         {
         }
 
-        public SearchRaceRowDto(NRace race)
-        {
-            BeanHelper.Copy(this, race);
-        }
-
-        public string YearMonthDay => FormatHelper.FormatYearMonthDay(Year, Monthday);
-
-        public string JyoName => CodeHelper.GetInstance().GetName(CodeHelper.JYO_CODE, Jyocd, 3, "不明");
-
-        public string RaceNumFormatted => FormatHelper.SuppressZeroLeading(Racenum);
-
-        public string RaceName => CodeHelper.GetInstance().GetRaceName(this, "不明");
-
-        public string GradeName => CodeHelper.GetInstance().GetGradeName(this, "不明");
-
-        public string CourseName => CodeHelper.GetInstance().GetTurfDurtName(Trackcd, "不明") + Kyori;
-
-        public string TosuFormatted => FormatHelper.FormatTosu(this);
-
-        public string HassoTimeFormatted => FormatHelper.FormatTimeHHMM(Hassotime);
     }
 }

--- a/App/Adaptor/Gateway/ViewModel/Dto/UmaRaceRowDto.cs
+++ b/App/Adaptor/Gateway/ViewModel/Dto/UmaRaceRowDto.cs
@@ -25,7 +25,7 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel.Dto
             Kettonum = kettoNum;
             Bataijyu = bataijyu;
 
-            Race = BeanHelper.CreateAndCopy<NRace>(tokuRace);
+            Race = tokuRace.ToNRace();
 
             InitProperties();
         }

--- a/App/Adaptor/Gateway/ViewModel/IMainWindowViewModel.cs
+++ b/App/Adaptor/Gateway/ViewModel/IMainWindowViewModel.cs
@@ -11,17 +11,19 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel
 {
     public interface IMainWindowViewModel
     {
-        string Caption { get; set; }
+        string Caption { get; }
         ICommand CommandOpenHorseList { get; }
         ICommand CommandOpenTokuRaceList { get; }
         ICommand CommandSearchRace { get; }
         EventHandler EventSelectedHorseChanged { get; }
         IManualHorseListProxy ManualHorseListProxy { get; }
-        BindingList<UmaRaceRowDto> UmaRaceList { get; set; }
+        BindingList<UmaRaceRowDto> UmaRaceList { get; }
         ISearchRaceViewProxy SearchRaceViewProxy { get; }
         ITokuRaceListProxy TokuRaceListProxy { get; }
-        BindingList<UmaSummaryRowDto> UmaSummaryList { get; set; }
-        EventObserver UmaSummaryListChangingEvent { get; set; }
+        BindingList<UmaSummaryRowDto> UmaSummaryList { get; }
+        EventObserver UmaSummaryListChangingEvent { get; set;  }
+
+        RaceInfo Race { get; }
 
         event PropertyChangedEventHandler PropertyChanged;
 

--- a/App/Adaptor/Gateway/ViewModel/MainWindowViewModel.cs
+++ b/App/Adaptor/Gateway/ViewModel/MainWindowViewModel.cs
@@ -18,6 +18,7 @@ using UmaTest.App.Adaptor.Gateway.UI;
 using UmaTest.Infra.Adaptor.ViewModel;
 using System.Collections.ObjectModel;
 using UmaTest.App.Domain.Model.Repository.Database.Entity.EveryDB2;
+using UmaTest.Infra.Helper;
 
 namespace UmaTest.App.Adaptor.Gateway.ViewModel
 {
@@ -70,7 +71,7 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel
         public string Caption
         {
             get => _caption;
-            set => PropertyChanged.RaiseIfSet(() => Caption, ref _caption, value);
+            private set => PropertyChanged.RaiseIfSet(() => Caption, ref _caption, value);
         }
 
         private RaceInfo _race;
@@ -78,7 +79,7 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel
         public RaceInfo Race
         {
             get => _race;
-            set => PropertyChanged.RaiseIfSet(() => Race, ref _race, value);
+            private set => PropertyChanged.RaiseIfSet(() => Race, ref _race, value);
         }
 
         private BindingList<UmaSummaryRowDto> _umaSummaryList = new BindingList<UmaSummaryRowDto>();
@@ -86,7 +87,7 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel
         public BindingList<UmaSummaryRowDto> UmaSummaryList
         {
             get => _umaSummaryList;
-            set => PropertyChanged.RaiseIfSet(() => UmaSummaryList, ref _umaSummaryList, value);
+            private set => PropertyChanged.RaiseIfSet(() => UmaSummaryList, ref _umaSummaryList, value);
         }
 
         private BindingList<UmaRaceRowDto> _umaRaceList = new BindingList<UmaRaceRowDto>();
@@ -94,7 +95,7 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel
         public BindingList<UmaRaceRowDto> UmaRaceList
         {
             get => _umaRaceList;
-            set => PropertyChanged.RaiseIfSet(() => UmaRaceList, ref _umaRaceList, value);
+            private set => PropertyChanged.RaiseIfSet(() => UmaRaceList, ref _umaRaceList, value);
         }
 
         public void RefreshModel(IList<UmaSummaryRowDto> umaSummaryList, IDictionary<string, IList<UmaRaceRowDto>> umaRaceMap)
@@ -107,6 +108,23 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel
             if (race != null)
             {
                 Race = new RaceInfo(race);
+
+                switch (race.Recordspec)
+                {
+                    case "RA":
+                        string dataKbn = CodeHelper.GetInstance().GetName(CodeHelper.RACE_DATA_KUBUN, race.Datakubun, "不明");
+                        Caption = $"レース検索結果：[ {Race.YearMonthDay} {Race.JyoName}{FormatHelper.SuppressZeroLeading(Race.Racenum)}R {Race.RaceName} ({Race.CourseName}m) ] - {dataKbn}";
+                        break;
+                    case "TK":
+                        Caption = $"特別登録：[ {Race.YearMonthDay} {Race.JyoName}{FormatHelper.SuppressZeroLeading(Race.Racenum)}R {Race.RaceName} ({Race.CourseName}m) ]";
+                        break;
+                    default:
+                        break;
+                }
+            }
+            else
+            {
+                Caption = $"仮想出馬表：[ {DateTime.Now} ]";
             }
 
             _umaRaceMap = new ReadOnlyDictionary<string, IList<UmaRaceRowDto>>(umaRaceMap);

--- a/App/Adaptor/Presenter/AsyncLoadManualUmaListPresenter.cs
+++ b/App/Adaptor/Presenter/AsyncLoadManualUmaListPresenter.cs
@@ -80,7 +80,6 @@ namespace UmaTest.App.Gateway.Presenter
             }),
             task =>
             {
-                vm.Caption = $"仮想出馬表：[ {DateTime.Now} ]";
                 vm.RefreshModel(umaSummaryList, umaRaceMap);
             });
         }

--- a/App/Adaptor/Presenter/AsyncLoadSelectedRaceUmaListPresenter.cs
+++ b/App/Adaptor/Presenter/AsyncLoadSelectedRaceUmaListPresenter.cs
@@ -66,10 +66,7 @@ namespace UmaTest.App.Gateway.Presenter
             }),
             task =>
             {
-                SearchRaceRowDto race = req.Race;
-                string dataKbn = CodeHelper.GetInstance().GetName(CodeHelper.RACE_DATA_KUBUN, race.Datakubun, "不明");
-                vm.Caption = $"レース検索結果：[ {race.YearMonthDay} {race.JyoName}{int.Parse(race.Racenum)}R {race.RaceName} ({race.CourseName}m) ] - {dataKbn}";
-                vm.RefreshModel(race, umaSummaryList, umaRaceMap);
+                vm.RefreshModel(req.Race, umaSummaryList, umaRaceMap);
             });
         }
     }

--- a/App/Adaptor/Presenter/AsyncLoadTokuUmaListPresenter.cs
+++ b/App/Adaptor/Presenter/AsyncLoadTokuUmaListPresenter.cs
@@ -51,7 +51,7 @@ namespace UmaTest.App.Gateway.Presenter
                     // FIXME
                     UmaRaceRowDto zenso = umaRaceList.Count > 0 ? umaRaceList[0] : null;
                     UmaRaceRowDto nisoMae = umaRaceList.Count > 1 ? umaRaceList[1] : null;
-                    UmaRaceRowDto konso = new UmaRaceRowDto(req.Race, kettoNum, summaryDto?.Zenso.Bataijyu);
+                    UmaRaceRowDto konso = new UmaRaceRowDto(req.Race, kettoNum, zenso?.Bataijyu);
 
                     summaryDto.LoadUmaRaceList(konso, zenso, nisoMae);
                     summaryDto.SenSuu = umaRaceList.Count.ToString();
@@ -63,9 +63,7 @@ namespace UmaTest.App.Gateway.Presenter
             }),
             task =>
             {
-                TokuRaceRowDto race = req.Race;
-                vm.Caption = $"特別登録：[ {race.YearMonthDay} {race.JyoName}{int.Parse(race.Racenum)}R {race.RaceName} ({race.CourseName}m) ]";
-                vm.RefreshModel(race.ToNRace(), umaSummaryList, umaRaceMap);
+                vm.RefreshModel(req.Race.ToNRace(), umaSummaryList, umaRaceMap);
             });
         }
     }

--- a/App/Presentation/View/MainWindow.cs
+++ b/App/Presentation/View/MainWindow.cs
@@ -31,6 +31,8 @@ namespace UmaTest.App.Presentation.View
 
         private bool isFormInitialized = false;
 
+        private RaceInfo raceInfo = null;
+
         public MainWindow(IMainWindowViewModel vm, IStatusBarViewModel vmStatusBar, ICommandManager cm)
         {
             InitializeComponent();
@@ -799,6 +801,9 @@ namespace UmaTest.App.Presentation.View
                 case "Caption":
                     this.Text = AppConst.CAPTION + " - " + vm.Caption;
                     break;
+                case "Race":
+                    this.raceInfo = vm.Race;
+                    break;
                 case "UmaSummaryList":
                     {
                         bindingSource1.DataSource = vm.UmaSummaryList;

--- a/Infra/Helper/BeanHelper.cs
+++ b/Infra/Helper/BeanHelper.cs
@@ -47,7 +47,7 @@ namespace UmaTest.Infra.Helper
                         }
                     }
 
-                    if (toProperty.PropertyType.IsAssignableFrom(fromValue.GetType()))
+                    if ( (fromValue == null) || toProperty.PropertyType.IsAssignableFrom(fromValue.GetType()) )
                     {
                         toProperty.SetValue(to, fromValue);
                     }

--- a/Infra/Helper/CodeHelper.cs
+++ b/Infra/Helper/CodeHelper.cs
@@ -180,6 +180,11 @@ namespace UmaTest.Infra.Helper
 
         public string GetTurfDurtName(string trackCd, string errorValue)
         {
+            if (string.IsNullOrEmpty(trackCd))
+            {
+                return string.Empty;
+            }
+
             string trackEngName = GetName(TRACK_CODE, trackCd, 2, errorValue);
 
             if (trackCd.CompareTo("50") < 0)

--- a/Infra/Helper/FormatHelper.cs
+++ b/Infra/Helper/FormatHelper.cs
@@ -105,7 +105,7 @@ namespace UmaTest.Infra.Helper
                 return SuppressZeroLeading(race.Ninki);
             }
 
-            if (!string.IsNullOrEmpty(race.OddsTanpuku.Tanninki) && (race.OddsTanpuku.Tanninki != "00"))
+            if (!string.IsNullOrEmpty(race.OddsTanpuku?.Tanninki) && (race.OddsTanpuku.Tanninki != "00"))
             {
                 return SuppressZeroLeading(race.OddsTanpuku.Tanninki);
             }