Commit: bb888324b43146bdd91838fcff0522d5549480b9 - UmaTest (git)

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

Commit MetaInfo

• Revision: bb888324b43146bdd91838fcff0522d5549480b9 (tree)
• Zeit: 2021-06-01 06:55:19
• Autor: yoshy <yoshy@user...>
• Commiter: yoshy

Log Message

temp_20210601_0655

Ändern Zusammenfassung

• modified: App/Adaptor/Gateway/ViewModel/Dto/SearchRaceRowDto.cs
• modified: App/Adaptor/Gateway/ViewModel/Dto/TokuRaceRowDto.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/AsyncLoadSelectedRaceUmaListPresenter.cs
• modified: App/Adaptor/Presenter/AsyncLoadTokuUmaListPresenter.cs
• modified: App/Domain/Model/Repository/Database/Dto/OddsInfo.cs
• modified: App/Domain/UseCase/Request/AsyncLoadSelectedRaceUmaListRequest.cs
• modified: App/Domain/UseCase/Request/AsyncLoadTokuUmaListRequest.cs
• modified: App/Presentation/View/MainWindow.cs
• modified: App/Presentation/View/SearchRaceView.cs
• modified: App/Presentation/View/TokuRaceListView.cs
• modified: Infra/Helper/CodeHelper.cs
• modified: UmaTest.csproj

Diff

--- a/App/Adaptor/Gateway/ViewModel/Dto/SearchRaceRowDto.cs
+++ b/App/Adaptor/Gateway/ViewModel/Dto/SearchRaceRowDto.cs
@@ -27,5 +27,7 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel.Dto
         public string RaceName => CodeHelper.GetInstance().GetRaceName(this, "不明");
 
         public string GradeName => CodeHelper.GetInstance().GetName(CodeHelper.GRADE_CODE, Gradecd, "-");
+
+        public string CourseName => CodeHelper.GetInstance().GetTrackKubun(Trackcd, "不明") + Kyori;
     }
 }

--- a/App/Adaptor/Gateway/ViewModel/Dto/TokuRaceRowDto.cs
+++ b/App/Adaptor/Gateway/ViewModel/Dto/TokuRaceRowDto.cs
@@ -22,8 +22,12 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel.Dto
 
         public string YearMonthDay { get => Year + "/" + Monthday.Substring(0, 2) + "/" + Monthday.Substring(2, 2); }
 
+        public string JyoName { get => CodeHelper.GetInstance().GetName(CodeHelper.JYO_CODE, Jyocd, 3, "不明"); }
+
         public string RaceName => CodeHelper.GetInstance().GetRaceName(this, "不明");
 
         public string GradeName => CodeHelper.GetInstance().GetName(CodeHelper.GRADE_CODE, Gradecd, "-");
+
+        public string CourseName => CodeHelper.GetInstance().GetTrackKubun(Trackcd, "不明") + Kyori;
     }
 }

--- a/App/Adaptor/Gateway/ViewModel/Dto/UmaRaceRowDto.cs
+++ b/App/Adaptor/Gateway/ViewModel/Dto/UmaRaceRowDto.cs
@@ -21,10 +21,14 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel.Dto
 
         public string YearMonthDay { get => Year + "/" + Monthday.Substring(0, 2) + "/" + Monthday.Substring(2, 2); }
 
-        public string RaceName => CodeHelper.GetInstance().GetRaceName(Race, "不明");
+        public string JyoName { get => CodeHelper.GetInstance().GetName(CodeHelper.JYO_CODE, Jyocd, 3, "不明"); }
+
+        public string RaceName => Race != null ? CodeHelper.GetInstance().GetRaceName(Race, "不明") : string.Empty;
 
         public string GradeName => CodeHelper.GetInstance().GetName(CodeHelper.GRADE_CODE, Race.Gradecd, "-");
 
+        public string CourseName => Race != null ? CodeHelper.GetInstance().GetTrackKubun(Race.Trackcd, "不明") + Race.Kyori : string.Empty;
+
         public string Kimete => CodeHelper.GetInstance().GetName(CodeHelper.KYAKUSITU_KUBUN, Kyakusitukubun, "不明");
 
         public string BataijyuFormatted

--- a/App/Adaptor/Gateway/ViewModel/IMainWindowViewModel.cs
+++ b/App/Adaptor/Gateway/ViewModel/IMainWindowViewModel.cs
@@ -10,6 +10,7 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel
 {
     public interface IMainWindowViewModel
     {
+        string Caption { get; set; }
         ICommand CommandOpenHorseList { get; }
         ICommand CommandOpenTokuRaceList { get; }
         ICommand CommandSearchRace { get; }
@@ -19,11 +20,10 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel
         ISearchRaceViewProxy SearchRaceViewProxy { get; }
         ITokuRaceListProxy TokuRaceListProxy { get; }
         BindingList<UmaSummaryRowDto> UmaSummaryList { get; set; }
+        EventObserver UmaSummaryListChangingEvent { get; set; }
 
         event PropertyChangedEventHandler PropertyChanged;
 
-        EventObserver UmaSummaryListChangingEvent { get; set;  }
-
         void RefreshModel(List<UmaSummaryRowDto> umaSummaryList, Dictionary<string, List<UmaRaceRowDto>> umaRaceMap);
     }
 }
\ No newline at end of file

--- a/App/Adaptor/Gateway/ViewModel/MainWindowViewModel.cs
+++ b/App/Adaptor/Gateway/ViewModel/MainWindowViewModel.cs
@@ -63,6 +63,14 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel
             EventSelectedHorseChanged = new EventHandler(OnSelectedHorseChanged);
         }
 
+        private string _caption;
+
+        public string Caption
+        {
+            get => _caption;
+            set => PropertyChanged.RaiseIfSet(() => Caption, ref _caption, value);
+        }
+
         private BindingList<UmaSummaryRowDto> _umaSummaryList = new BindingList<UmaSummaryRowDto>();
 
         public BindingList<UmaSummaryRowDto> UmaSummaryList

--- a/App/Adaptor/Presenter/AsyncLoadSelectedRaceUmaListPresenter.cs
+++ b/App/Adaptor/Presenter/AsyncLoadSelectedRaceUmaListPresenter.cs
@@ -22,6 +22,8 @@ namespace UmaTest.App.Gateway.Presenter
         private IMainWindowViewModel vm;
         private IStatusBarProxy statusBar;
 
+        private AsyncLoadSelectedRaceUmaListRequest req;
+
         private List<UmaSummaryRowDto> umaSummaryList = new List<UmaSummaryRowDto>();
         private Dictionary<string, List<UmaRaceRowDto>> umaRaceMap = new Dictionary<string, List<UmaRaceRowDto>>();
 
@@ -36,7 +38,7 @@ namespace UmaTest.App.Gateway.Presenter
         {
             return TaskHelper.RunWithUIAction<UseCaseResponse>(Task.Run<UseCaseResponse>(() =>
             {
-                AsyncLoadSelectedRaceUmaListRequest req = baseRes.Request as AsyncLoadSelectedRaceUmaListRequest;
+                req = baseRes.Request as AsyncLoadSelectedRaceUmaListRequest;
                 AsyncLoadSelectedRaceUmaListResponse res = baseRes as AsyncLoadSelectedRaceUmaListResponse;
 
                 IEnumerable<UmaInfo> horses = res.Horses;
@@ -156,6 +158,8 @@ namespace UmaTest.App.Gateway.Presenter
             {
                 statusBar.SetStatusText("ビューモデルを更新中です...");
 
+                SearchRaceRowDto race = req.Race;
+                vm.Caption = $"レース検索結果：[ {race.YearMonthDay} {race.JyoName}{int.Parse(race.Racenum)}R {race.RaceName} ({race.CourseName}m) ]";
                 vm.RefreshModel(umaSummaryList, umaRaceMap);
             });
         }

--- a/App/Adaptor/Presenter/AsyncLoadTokuUmaListPresenter.cs
+++ b/App/Adaptor/Presenter/AsyncLoadTokuUmaListPresenter.cs
@@ -22,6 +22,7 @@ namespace UmaTest.App.Gateway.Presenter
         private IMainWindowViewModel vm;
         private IStatusBarProxy statusBar;
 
+        private AsyncLoadTokuUmaListRequest req;
         private List<UmaSummaryRowDto> umaSummaryList = new List<UmaSummaryRowDto>();
         private Dictionary<string, List<UmaRaceRowDto>> umaRaceMap = new Dictionary<string, List<UmaRaceRowDto>>();
 
@@ -36,7 +37,7 @@ namespace UmaTest.App.Gateway.Presenter
         {
             return TaskHelper.RunWithUIAction<UseCaseResponse>(Task.Run<UseCaseResponse>(() =>
             {
-                AsyncLoadTokuUmaListRequest req = baseRes.Request as AsyncLoadTokuUmaListRequest;
+                req = baseRes.Request as AsyncLoadTokuUmaListRequest;
                 AsyncLoadTokuUmaListResponse res = baseRes as AsyncLoadTokuUmaListResponse;
 
                 List<string> kettoNums = res.KettoNums;
@@ -157,6 +158,10 @@ namespace UmaTest.App.Gateway.Presenter
             }),
             task =>
             {
+                statusBar.SetStatusText("ビューモデルを更新中です...");
+
+                TokuRaceRowDto race = req.Race;
+                vm.Caption = $"特別登録：[ {race.YearMonthDay} {race.JyoName}{int.Parse(race.Racenum)}R {race.RaceName} ({race.CourseName}m) ]";
                 vm.RefreshModel(umaSummaryList, umaRaceMap);
             });
         }

--- a/App/Domain/Model/Repository/Database/Dto/OddsInfo.cs
+++ b/App/Domain/Model/Repository/Database/Dto/OddsInfo.cs
@@ -23,7 +23,7 @@ namespace UmaTest.App.Domain.Model.Repository.Database.Dto
 
                 try
                 {
-                    return (int.Parse(Tanodds) / 10.0f).ToString();
+                    return (int.Parse(Tanodds) / 10.0f).ToString("#.0");
                 }
                 catch (Exception)
                 {

--- a/App/Domain/UseCase/Request/AsyncLoadSelectedRaceUmaListRequest.cs
+++ b/App/Domain/UseCase/Request/AsyncLoadSelectedRaceUmaListRequest.cs
@@ -12,12 +12,12 @@ namespace UmaTest.App.Domain.UseCase.Request
 {
     public class AsyncLoadSelectedRaceUmaListRequest : UseCaseRequest
     {
-        public AsyncLoadSelectedRaceUmaListRequest(NRace race)
+        public AsyncLoadSelectedRaceUmaListRequest(SearchRaceRowDto race)
         {
             Race = race;
         }
 
-        public NRace Race { get; private set; }
+        public SearchRaceRowDto Race { get; private set; }
 
 
         protected override UseCaseResponse CreateResponse()

--- a/App/Domain/UseCase/Request/AsyncLoadTokuUmaListRequest.cs
+++ b/App/Domain/UseCase/Request/AsyncLoadTokuUmaListRequest.cs
@@ -12,12 +12,12 @@ namespace UmaTest.App.Domain.UseCase.Request
 {
     public class AsyncLoadTokuUmaListRequest : UseCaseRequest
     {
-        public AsyncLoadTokuUmaListRequest(NTokuRace race)
+        public AsyncLoadTokuUmaListRequest(TokuRaceRowDto race)
         {
             Race = race;
         }
 
-        public NTokuRace Race { get; private set; }
+        public TokuRaceRowDto Race { get; private set; }
 
 
         protected override UseCaseResponse CreateResponse()

--- a/App/Presentation/View/MainWindow.cs
+++ b/App/Presentation/View/MainWindow.cs
@@ -138,6 +138,11 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
+                    DataPropertyName = "Konso.FutanFormatted",
+                    Name = "斤量",
+                },
+                new DataGridViewTextBoxColumn
+                {
                     DataPropertyName = "BataijyuFormatted",
                     Name = "馬体重",
                 },
@@ -153,6 +158,11 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
+                    DataPropertyName = "Konso.Kakuteijyuni",
+                    Name = "着順",
+                },
+                new DataGridViewTextBoxColumn
+                {
                     DataPropertyName = "Short.G1",
                     Name = "短G1",
                 },
@@ -254,9 +264,16 @@ namespace UmaTest.App.Presentation.View
             };
 
             grid1Cols.Do(col => col.HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter);
-
             dataGridView1.Columns.AddRange(grid1Cols);
 
+            dataGridView1.Columns["調教師"].HeaderCell.Style.WrapMode = DataGridViewTriState.False;
+            dataGridView1.Columns["馬体重"].HeaderCell.Style.WrapMode = DataGridViewTriState.False;
+            dataGridView1.Columns["オッズ"].HeaderCell.Style.WrapMode = DataGridViewTriState.False;
+
+            dataGridView1.Columns["枠番"].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+            dataGridView1.Columns["戦数"].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight;
+            dataGridView1.Columns["オッズ"].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight;
+
             //
             // Initialize DataGridView2
             //
@@ -276,6 +293,11 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
+                    DataPropertyName = "JyoName",
+                    Name = "場所",
+                },
+                new DataGridViewTextBoxColumn
+                {
                     DataPropertyName = "RaceName",
                     Name = "レース名",
                 },
@@ -286,8 +308,8 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
-                    DataPropertyName = "Race.Kyori",
-                    Name = "距離",
+                    DataPropertyName = "CourseName",
+                    Name = "コース",
                 },
                 new DataGridViewTextBoxColumn
                 {
@@ -322,7 +344,7 @@ namespace UmaTest.App.Presentation.View
                 new DataGridViewTextBoxColumn
                 {
                     DataPropertyName = "FutanFormatted",
-                    Name = "負担",
+                    Name = "斤量",
                 },
                 new DataGridViewTextBoxColumn
                 {
@@ -337,9 +359,14 @@ namespace UmaTest.App.Presentation.View
             };
 
             grid2Cols.Do(col => col.HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter);
-
             dataGridView2.Columns.AddRange(grid2Cols);
 
+            dataGridView2.Columns["レース名"].HeaderCell.Style.WrapMode = DataGridViewTriState.False;
+            dataGridView2.Columns["コース"].HeaderCell.Style.WrapMode = DataGridViewTriState.False;
+            dataGridView2.Columns["馬体重"].HeaderCell.Style.WrapMode = DataGridViewTriState.False;
+
+            dataGridView2.Columns["枠番"].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+
             //
             // Custom Type Descriptor for Child Entity Properties
             //
@@ -424,6 +451,9 @@ namespace UmaTest.App.Presentation.View
 
             switch (args.PropertyName)
             {
+                case "Caption":
+                    this.Text = AppConst.CAPTION + " - " + vm.Caption;
+                    break;
                 case "UmaSummaryList":
                     {
                         bindingSource1.DataSource = vm.UmaSummaryList;

--- a/App/Presentation/View/SearchRaceView.cs
+++ b/App/Presentation/View/SearchRaceView.cs
@@ -107,8 +107,8 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
-                    DataPropertyName = "Kyori",
-                    Name = "距離",
+                    DataPropertyName = "CourseName",
+                    Name = "コース",
                 },
                 new DataGridViewTextBoxColumn
                 {

--- a/App/Presentation/View/TokuRaceListView.cs
+++ b/App/Presentation/View/TokuRaceListView.cs
@@ -87,6 +87,16 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
+                    DataPropertyName = "JyoName",
+                    Name = "場所",
+                },
+                new DataGridViewTextBoxColumn
+                {
+                    DataPropertyName = "Racenum",
+                    Name = "R",
+                },
+                new DataGridViewTextBoxColumn
+                {
                     DataPropertyName = "RaceName",
                     Name = "レース名",
                 },
@@ -97,8 +107,8 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
-                    DataPropertyName = "Kyori",
-                    Name = "距離",
+                    DataPropertyName = "CourseName",
+                    Name = "コース",
                 },
             };
 

--- a/Infra/Helper/CodeHelper.cs
+++ b/Infra/Helper/CodeHelper.cs
@@ -14,6 +14,7 @@ namespace UmaTest.Infra.Helper
         public static readonly string JYO_CODE = "2001";
         public static readonly string GRADE_CODE = "2003";
         public static readonly string JYOKEN_CODE = "2007";
+        public static readonly string TRACK_CODE = "2009";
 
         public static readonly string SEX_CODE = "2202";
 
@@ -86,6 +87,48 @@ namespace UmaTest.Infra.Helper
             return GetName(CodeHelper.JYOKEN_CODE, jyokenCd, errorValue);
         }
 
+        public string GetTrackKubun(string trackCd, string errorValue)
+        {
+            string trackEngName = GetName(TRACK_CODE, trackCd, 2, errorValue);
+
+            if (trackCd.CompareTo("50") < 0)
+            {
+                return ExtractTurfDartKbn(trackEngName);
+            }
+            else
+            {
+                string turfDartKbn = (trackCd != "52") ? ExtractTurfDartKbn(trackEngName) : "芝ダ";
+                return "障" + turfDartKbn;
+            }
+        }
+
+        private static string ExtractTurfDartKbn(string trackEngName)
+        {
+            if (string.IsNullOrEmpty(trackEngName))
+            {
+                return string.Empty;
+            }
+
+            string turfDartKbn;
+            switch (trackEngName.Substring(0, 1))
+            {
+                case "T":
+                    turfDartKbn = "芝";
+                    break;
+                case "D":
+                    turfDartKbn = "ダ";
+                    break;
+                case "S":
+                    turfDartKbn = "砂";
+                    break;
+                default:
+                    turfDartKbn = "？";
+                    break;
+            }
+
+            return turfDartKbn;
+        }
+
         public string GetName(string code, string value, string errorValue = ERROR_VALUE)
         {
             return GetName(code, value, 0, errorValue);

--- a/UmaTest.csproj
+++ b/UmaTest.csproj
@@ -102,6 +102,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="App\Adaptor\Gateway\ViewModel\IMainWindowViewModel.cs" />
     <Compile Include="App\Domain\Model\Repository\Database\Dto\OddsInfo.cs" />
     <Compile Include="App\Domain\Model\Repository\Database\Dto\TokuUmaInfo.cs" />
     <Compile Include="App\Domain\Model\Repository\Database\Dto\UmaInfo.cs" />
@@ -116,7 +117,6 @@
     <Compile Include="App\Adaptor\Gateway\ViewModel\Dto\UmaRaceRowDto.cs" />
     <Compile Include="App\Adaptor\Gateway\ViewModel\Dto\UmaSummaryRowDto.cs" />
     <Compile Include="App\Adaptor\Gateway\UI\ITokuRaceListProxy.cs" />
-    <Compile Include="App\Adaptor\Gateway\ViewModel\IMainWindowViewModel.cs" />
     <Compile Include="App\Adaptor\Gateway\ViewModel\ISearchRaceViewModel.cs" />
     <Compile Include="App\Adaptor\Gateway\ViewModel\ITokuRaceListViewModel.cs" />
     <Compile Include="App\Adaptor\Gateway\ViewModel\SearchRaceViewModel.cs" />