コミット: faada8b7d130cfd1f9c2af248abeb70aa0b1559f - UmaTest (git)

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

コミットメタ情報

• リビジョン: faada8b7d130cfd1f9c2af248abeb70aa0b1559f (tree)
• 日時: 2021-06-06 23:53:43
• 作者: yoshy <yoshy@user...>
• コミッター: yoshy

ログメッセージ

temp_20210606_0337

変更サマリ

• 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/Dto/UmaSummaryRowDto.cs
• modified: App/Domain/Model/Repository/Database/Dao/NUmaRaceDao.cs
• modified: App/Domain/Model/Repository/Database/Dto/UmaRaceInfo.cs
• add: App/Domain/Model/Repository/Database/Dto/UmaRaceStat.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: Infra/Helper/FormatHelper.cs
• modified: Resources/Sql/NUmaRaceDao_FindAllRacesByKettoNumListAsync.sql
• modified: Resources/Sql/uma_race_stddev2.sql
• modified: UmaTest.csproj

差分

--- a/App/Adaptor/Gateway/ViewModel/Dto/SearchRaceRowDto.cs
+++ b/App/Adaptor/Gateway/ViewModel/Dto/SearchRaceRowDto.cs
@@ -32,7 +32,7 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel.Dto
 
         public string CourseName => CodeHelper.GetInstance().GetTurfDurtName(Trackcd, "不明") + Kyori;
 
-        public string SyussoTosuFormatted => FormatHelper.SuppressZeroLeading(Syussotosu);
+        public string TosuFormatted => FormatHelper.FormatTosu(this);
 
         public string HassoTimeFormatted => FormatHelper.FormatTimeHHMM(Hassotime);
     }

--- a/App/Adaptor/Gateway/ViewModel/Dto/TokuRaceRowDto.cs
+++ b/App/Adaptor/Gateway/ViewModel/Dto/TokuRaceRowDto.cs
@@ -32,6 +32,6 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel.Dto
 
         public string CourseName => CodeHelper.GetInstance().GetTurfDurtName(Trackcd, "不明") + Kyori;
 
-        public string TorokuTosuFormatted => FormatHelper.SuppressZeroLeading(Torokutosu);
+        public string TosuFormatted => FormatHelper.FormatTosu(this);
     }
 }

--- a/App/Adaptor/Gateway/ViewModel/Dto/UmaRaceRowDto.cs
+++ b/App/Adaptor/Gateway/ViewModel/Dto/UmaRaceRowDto.cs
@@ -59,11 +59,11 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel.Dto
 
             BabaJyotaiFormatted = FormatHelper.FormatBabaJyotai(Race);
 
-            NinkiFormatted = FormatHelper.SuppressZeroLeading(Ninki);
+            NinkiFormatted = FormatHelper.FormatNinki(this);
 
             TsukaJyuni = FormatHelper.FormatTsukaJyuni(this);
 
-            KakuteiJyuniFormatted = FormatHelper.SuppressZeroLeading(Kakuteijyuni);
+            JyuniFormatted = FormatHelper.FormatJyuni(this);
 
             Kimete = CodeHelper.GetInstance().GetName(CodeHelper.KYAKUSITU_KUBUN, Kyakusitukubun, "不明");
 
@@ -116,7 +116,7 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel.Dto
 
         public string TsukaJyuni { get; private set; }
 
-        public string KakuteiJyuniFormatted { get; private set; }
+        public string JyuniFormatted { get; private set; }
 
         public string Kimete { get; private set; }
 

--- a/App/Adaptor/Gateway/ViewModel/Dto/UmaSummaryRowDto.cs
+++ b/App/Adaptor/Gateway/ViewModel/Dto/UmaSummaryRowDto.cs
@@ -72,8 +72,7 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel.Dto
             {
                 Chichi = Konso.Chichi;
             }
-
-            if (Zenso?.Chichi != null)
+            else if (Zenso?.Chichi != null)
             {
                 Chichi = Zenso.Chichi;
             }
@@ -82,7 +81,7 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel.Dto
             {
                 HahaChichi = Konso.HahaChichi;
             }
-            if (Zenso?.HahaChichi != null)
+            else if (Zenso?.HahaChichi != null)
             {
                 HahaChichi = Zenso.HahaChichi;
             }
@@ -91,8 +90,7 @@ namespace UmaTest.App.Adaptor.Gateway.ViewModel.Dto
             {
                 BataijyuFormatted = Konso.BataijyuFormatted;
             }
-
-            if (!string.IsNullOrEmpty(Zenso?.Bataijyu))
+            else if (!string.IsNullOrEmpty(Zenso?.Bataijyu))
             {
                 if (string.IsNullOrEmpty(Konso?.Bataijyu) || (Konso?.Bataijyu == "0000"))
                 {

--- a/App/Domain/Model/Repository/Database/Dao/NUmaRaceDao.cs
+++ b/App/Domain/Model/Repository/Database/Dao/NUmaRaceDao.cs
@@ -47,11 +47,11 @@ namespace UmaTest.App.Domain.Model.Repository.Database.Dao
 
                     string sql = DbHelper.GetResourceSQLFile(this);
 
-                    Func<NUmaRace, NRace, KisyuInfo, ChokyosiInfo, OddsInfo, NHansyoku, NHansyoku, AppUmaRaceStddev, UmaRaceInfo> mapper =
+                    Func<NUmaRace, NRace, KisyuInfo, ChokyosiInfo, OddsInfo, NHansyoku, NHansyoku, UmaRaceStat, UmaRaceInfo> mapper =
                             (ur, r, k, c, o, h1, h5, dev) => new UmaRaceInfo(ur, r, k, c, o, h1, h5, dev);
 
                     Type[] mapTypes = new Type[] { typeof(NUmaRace), typeof(NRace), typeof(KisyuInfo),
-                            typeof(ChokyosiInfo), typeof(OddsInfo), typeof(NHansyoku), typeof(NHansyoku), typeof(AppUmaRaceStddev) };
+                            typeof(ChokyosiInfo), typeof(OddsInfo), typeof(NHansyoku), typeof(NHansyoku), typeof(UmaRaceStat) };
 
                     IEnumerable<UmaRaceInfo> races = db.Query<UmaRaceInfo>(
                             mapTypes, mapper, sql, new { KettoNums = kettoNumList.ToArray() });

--- a/App/Domain/Model/Repository/Database/Dto/UmaRaceInfo.cs
+++ b/App/Domain/Model/Repository/Database/Dto/UmaRaceInfo.cs
@@ -16,7 +16,7 @@ namespace UmaTest.App.Domain.Model.Repository.Database.Dto
         {
         }
 
-        public UmaRaceInfo(NUmaRace ur, NRace r, KisyuInfo kisyu, ChokyosiInfo chokyo, OddsInfo oddsTanpuku, NHansyoku chichi, NHansyoku hahachichi, AppUmaRaceStddev stat)
+        public UmaRaceInfo(NUmaRace ur, NRace r, KisyuInfo kisyu, ChokyosiInfo chokyo, OddsInfo oddsTanpuku, NHansyoku chichi, NHansyoku hahachichi, UmaRaceStat stat)
         {
             BeanHelper.Copy(this, ur);
             Race = r;
@@ -26,7 +26,6 @@ namespace UmaTest.App.Domain.Model.Repository.Database.Dto
             Chichi = chichi;
             HahaChichi = hahachichi;
             Stat = stat;
-            Logger.Debug($"AppUmaRaceStddev: {stat.Jyocd}-{stat.Kyori}-{stat.Trackcd}-{stat.Gradecd}-{stat.Syubetucd}-{stat.Kaishudate}-{stat.TimeAvg}-{stat.Harontimel3Avg}-{stat.Avgharontimeminus3Avg}");
         }
 
         [Ignore]
@@ -48,6 +47,6 @@ namespace UmaTest.App.Domain.Model.Repository.Database.Dto
         public NHansyoku HahaChichi { get; set; }
 
         [Ignore]
-        public AppUmaRaceStddev Stat { get; set; }
+        public UmaRaceStat Stat { get; set; }
     }
 }

--- /dev/null
+++ b/App/Domain/Model/Repository/Database/Dto/UmaRaceStat.cs
@@ -0,0 +1,16 @@
+using PetaPoco;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UmaTest.App.Domain.Model.Repository.Database.Entity.EveryDB2;
+
+namespace UmaTest.App.Domain.Model.Repository.Database.Dto
+{
+    public class UmaRaceStat : AppUmaRaceStddev
+    {
+        [Ignore]
+        public string Key => $"{Jyocd}-{Kyori}-{Trackcd}-{Gradecd}-{Syubetucd}-{Kaishudate}";
+    }
+}

--- a/App/Presentation/View/MainWindow.cs
+++ b/App/Presentation/View/MainWindow.cs
@@ -168,7 +168,7 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
-                    DataPropertyName = "Konso.KakuteiJyuniFormatted",
+                    DataPropertyName = "Konso.JyuniFormatted",
                     Name = "着順",
                 },
                 new DataGridViewTextBoxColumn
@@ -223,7 +223,7 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
-                    DataPropertyName = "Zenso.KakuteiJyuniFormatted",
+                    DataPropertyName = "Zenso.JyuniFormatted",
                     Name = "前走着順",
                 },
                 new DataGridViewTextBoxColumn
@@ -308,7 +308,7 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
-                    DataPropertyName = "NisoMae.KakuteiJyuniFormatted",
+                    DataPropertyName = "NisoMae.JyuniFormatted",
                     Name = "前々走着順",
                 },
                 new DataGridViewTextBoxColumn
@@ -607,7 +607,7 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
-                    DataPropertyName = "KakuteiJyuniFormatted",
+                    DataPropertyName = "JyuniFormatted",
                     Name = "着順",
                 },
                 new DataGridViewTextBoxColumn
@@ -662,16 +662,6 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
-                    DataPropertyName = "StatCnt",
-                    Name = "統計件数",
-                },
-                new DataGridViewTextBoxColumn
-                {
-                    DataPropertyName = "StatOriginDate",
-                    Name = "統計開始日",
-                },
-                new DataGridViewTextBoxColumn
-                {
                     DataPropertyName = "StatPCIFormatted",
                     Name = "Avg. ﾍﾟｰｽ変化",
                 },
@@ -685,6 +675,21 @@ namespace UmaTest.App.Presentation.View
                     DataPropertyName = "StatHaronTimeL3Formatted",
                     Name = "Avg.上3F",
                 },
+                new DataGridViewTextBoxColumn
+                {
+                    DataPropertyName = "StatCnt",
+                    Name = "統計件数",
+                },
+                new DataGridViewTextBoxColumn
+                {
+                    DataPropertyName = "Stat.Key",
+                    Name = "統計キー",
+                },
+                //new DataGridViewTextBoxColumn
+                //{
+                //    DataPropertyName = "StatOriginDate",
+                //    Name = "統計開始日",
+                //},
             };
 
             grid2Cols.Do(col => col.HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter);
@@ -751,6 +756,12 @@ namespace UmaTest.App.Presentation.View
                 typeof(UmaRaceInfo)
             );
 
+            // 馬レース情報.統計情報
+            TypeDescriptor.AddProvider(
+                new NestedTypeDescriptionProvider<UmaRaceStat>(TypeDescriptor.GetProvider(typeof(UmaRaceInfo))),
+                typeof(UmaRaceInfo)
+            );
+
             // 馬サマリ行.繁殖馬情報
             TypeDescriptor.AddProvider(
                 new NestedTypeDescriptionProvider<NHansyoku>(TypeDescriptor.GetProvider(typeof(UmaSummaryRowDto))),

--- a/App/Presentation/View/SearchRaceView.cs
+++ b/App/Presentation/View/SearchRaceView.cs
@@ -112,7 +112,7 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
-                    DataPropertyName = "SyussoTosuFormatted",
+                    DataPropertyName = "TosuFormatted",
                     Name = "頭数",
                 },
                 new DataGridViewTextBoxColumn

--- a/App/Presentation/View/TokuRaceListView.cs
+++ b/App/Presentation/View/TokuRaceListView.cs
@@ -112,7 +112,7 @@ namespace UmaTest.App.Presentation.View
                 },
                 new DataGridViewTextBoxColumn
                 {
-                    DataPropertyName = "TorokuTosuFormatted",
+                    DataPropertyName = "TosuFormatted",
                     Name = "頭数",
                 },
             };

--- a/Infra/Helper/CodeHelper.cs
+++ b/Infra/Helper/CodeHelper.cs
@@ -17,6 +17,8 @@ namespace UmaTest.Infra.Helper
         public static readonly string TRACK_CODE = "2009";
         public static readonly string BABA_JYOTAI_CODE = "2010";
 
+        public static readonly string IJYO_CODE = "2101";
+
         public static readonly string SEX_CODE = "2202";
 
         public static readonly string TOZAI_CODE = "2301";
@@ -63,18 +65,27 @@ namespace UmaTest.Infra.Helper
 
         public string GetRaceName(NRace race, string errorValue)
         {
-            return race != null ? GetRaceName(race.Hondai, race.Jyokencd5, errorValue) : string.Empty;
+            return race != null ? GetRaceName(race.Hondai, race.Gradecd, race.Jyokencd5, errorValue) : string.Empty;
         }
 
         public string GetRaceName(NTokuRace race, string errorValue)
         {
-            return race != null ? GetRaceName(race.Hondai, race.Jyokencd5, errorValue) : string.Empty;
+            return race != null ? GetRaceName(race.Hondai, race.Gradecd, race.Jyokencd5, errorValue) : string.Empty;
         }
 
-        private string GetRaceName(string hondai, string jyokenCd, string errorValue)
+        private string GetRaceName(string hondai, string gradeCd, string jyokenCd, string errorValue)
         {
             if (!String.IsNullOrEmpty(hondai))
             {
+                if (gradeCd == "E")
+                {
+                    string jyokenName = GetJyokenName(jyokenCd);
+                    if (jyokenName != RACE_CLASS_OPEN)
+                    {
+                        hondai = $"{hondai} ({jyokenName})";
+                    }
+                }
+
                 return hondai;
             }
 
@@ -125,7 +136,12 @@ namespace UmaTest.Infra.Helper
                 return gradeName;
             }
 
-            switch(jyokenCd)
+            return GetJyokenName(jyokenCd);
+        }
+
+        private static string GetJyokenName(string jyokenCd)
+        {
+            switch (jyokenCd)
             {
                 case "701":
                 case "702":

--- a/Infra/Helper/FormatHelper.cs
+++ b/Infra/Helper/FormatHelper.cs
@@ -4,6 +4,8 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using UmaTest.App.Adaptor.Gateway.ViewModel.Dto;
+using UmaTest.App.Domain.Model.Repository.Database.Dto;
 using UmaTest.App.Domain.Model.Repository.Database.Entity.EveryDB2;
 
 namespace UmaTest.Infra.Helper
@@ -71,6 +73,46 @@ namespace UmaTest.Infra.Helper
             return (toDate.Subtract(fromDate).Days / 7).ToString();
         }
 
+        internal static string FormatJyuni(UmaRaceInfo race)
+        {
+            if (race == null)
+            {
+                return string.Empty;
+            }
+
+            if (!string.IsNullOrEmpty(race.Kakuteijyuni) && (race.Kakuteijyuni != "00"))
+            {
+                return SuppressZeroLeading(race.Kakuteijyuni);
+            }
+
+            if (!string.IsNullOrEmpty(race.Ijyocd) && (race.Ijyocd != "0"))
+            {
+                return CodeHelper.GetInstance().GetName(CodeHelper.IJYO_CODE, race.Ijyocd, 1, "不明");
+            }
+
+            return NODATA;
+        }
+
+        public static string FormatNinki(UmaRaceInfo race)
+        {
+            if (race == null)
+            {
+                return string.Empty;
+            }
+
+            if (!string.IsNullOrEmpty(race.Ninki) && (race.Ninki != "00") )
+            {
+                return SuppressZeroLeading(race.Ninki);
+            }
+
+            if (!string.IsNullOrEmpty(race.OddsTanpuku.Tanninki) && (race.OddsTanpuku.Tanninki != "00"))
+            {
+                return SuppressZeroLeading(race.OddsTanpuku.Tanninki);
+            }
+
+            return NODATA;
+        }
+
         public static bool TryParseYYYYMMDD(string strDate, out DateTime outDate)
         {
             return DateTime.TryParseExact(strDate, "yyyyMMdd", CultureInfo.InvariantCulture, DateTimeStyles.None, out outDate);
@@ -469,6 +511,16 @@ namespace UmaTest.Infra.Helper
             return string.Empty;
         }
 
+        public static string FormatTosu(NTokuRace race)
+        {
+            if (race == null)
+            {
+                return NODATA;
+            }
+
+            return FormatTosu(null, race?.Torokutosu);
+        }
+
         public static string FormatTosu(NRace race)
         {
             if (race == null)
@@ -476,22 +528,26 @@ namespace UmaTest.Infra.Helper
                 return NODATA;
             }
 
-            string syussoTosuu = SuppressZeroLeading(race?.Syussotosu);
+            return FormatTosu(race?.Syussotosu, race?.Torokutosu);
+        }
 
-            if ( !string.IsNullOrEmpty(syussoTosuu) && (syussoTosuu != NODATA) )
+        private static string FormatTosu(string syussotosu, string torokutosu)
+        {
+            string syussoTosuuFormatted = SuppressZeroLeading(syussotosu);
+
+            if (!string.IsNullOrEmpty(syussoTosuuFormatted) && (syussoTosuuFormatted != NODATA))
             {
-                return syussoTosuu;
+                return syussoTosuuFormatted;
             }
 
-            string torokuTosuu = SuppressZeroLeading(race?.Torokutosu);
+            string torokuTosuuFormatted = SuppressZeroLeading(torokutosu);
 
-            if ( !string.IsNullOrEmpty(torokuTosuu) && (torokuTosuu != NODATA) )
+            if (!string.IsNullOrEmpty(torokuTosuuFormatted) && (torokuTosuuFormatted != NODATA))
             {
-                return torokuTosuu;
+                return torokuTosuuFormatted;
             }
 
             return string.Empty;
         }
-
     }
 }

--- a/Resources/Sql/NUmaRaceDao_FindAllRacesByKettoNumListAsync.sql
+++ b/Resources/Sql/NUmaRaceDao_FindAllRacesByKettoNumListAsync.sql
@@ -18,6 +18,7 @@ select distinct
           else 'OP'
         end
       end
+      when 'L' then 'E'
       else r.gradecd
     end as gradecd
   , r.syubetucd
@@ -70,6 +71,7 @@ AND vur.gradecd = case r.gradecd
           else 'OP'
         end
       end
+      when 'L' then 'E'
       else r.gradecd
     end
 AND r.syubetucd = vur.syubetucd

--- a/Resources/Sql/uma_race_stddev2.sql
+++ b/Resources/Sql/uma_race_stddev2.sql
@@ -19,6 +19,7 @@ select
           else 'OP'
         end
       end
+      when 'L' then 'E'
       else r.gradecd
     end as gradecd
   , r.syubetucd

--- a/UmaTest.csproj
+++ b/UmaTest.csproj
@@ -108,6 +108,7 @@
     <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\KisyuInfo.cs" />
+    <Compile Include="App\Domain\Model\Repository\Database\Dto\UmaRaceStat.cs" />
     <Compile Include="App\Domain\Model\Repository\Database\Dto\UmaRaceWithUmaInfo.cs" />
     <Compile Include="Infra\Adaptor\Controller\EventObserver.cs" />
     <Compile Include="App\Adaptor\Gateway\UI\IManualHorseListProxy.cs" />