年別一覧、年別グラフを追加

MainWindow.xaml.cs ＋年別一覧、年別グラフを追加した
vtr00 · Jun 16, 2018 · 9fb4598 · 9fb4598
1 parent 8b76e61
commit 9fb4598
Show file tree

Hide file tree

Showing 9 changed files with 630 additions and 25 deletions.
diff --git a/.vs/HouseholdAccountBook/v15/.suo b/.vs/HouseholdAccountBook/v15/.suo
diff --git a/HouseholdAccountBook/ConstValue.cs b/HouseholdAccountBook/ConstValue.cs
@@ -38,6 +38,14 @@ public enum Tabs
             /// 月別グラフタブ
             /// </summary>
             MonthlyGraphTab = 3,
+            /// <summary>
+            /// 年別一覧タブ
+            /// </summary>
+            YearlyListTab = 4,
+            /// <summary>
+            /// 年別グラフタブ
+            /// </summary>
+            YearlyGraphTab = 5
         }
 
         /// <summary>

diff --git a/HouseholdAccountBook/HouseholdAccountBook.csproj b/HouseholdAccountBook/HouseholdAccountBook.csproj
@@ -60,7 +60,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CsvHelper, Version=7.0.0.0, Culture=neutral, PublicKeyToken=8c4959082be5c823, processorArchitecture=MSIL">
-      <HintPath>..\packages\CsvHelper.7.1.0\lib\net45\CsvHelper.dll</HintPath>
+      <HintPath>..\packages\CsvHelper.7.1.1\lib\net45\CsvHelper.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
@@ -87,8 +87,8 @@
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Npgsql, Version=3.2.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Npgsql.3.2.7\lib\net451\Npgsql.dll</HintPath>
+    <Reference Include="Npgsql, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Npgsql.4.0.0\lib\net451\Npgsql.dll</HintPath>
     </Reference>
     <Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
       <HintPath>..\packages\OxyPlot.Core.1.0.0\lib\net45\OxyPlot.dll</HintPath>
@@ -115,12 +115,18 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Numerics" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />

diff --git a/HouseholdAccountBook/UpdateLog.txt b/HouseholdAccountBook/UpdateLog.txt
@@ -500,12 +500,15 @@
 2018/05/26
   MainWindow.xaml.cs
     帳簿項目の追加時に、対象の帳簿項目が重複して選択されるのを修正した
+2018/06/16
+  MainWindow.xaml.cs
+    ＋年別一覧、年別グラフを追加した
 
 ---------------------------------------------------------------------------------------------------------------------
 凡例：＋追加 －変更 ×削除 ↑バグ修正
 ---------------------------------------------------------------------------------------------------------------------
 TODO:
-  年別一覧、年別グラフを追加する
+  -
 
 バグ：
   -

diff --git a/HouseholdAccountBook/ViewModels/WindowViewModel/MainWindowViewModel.cs b/HouseholdAccountBook/ViewModels/WindowViewModel/MainWindowViewModel.cs
@@ -391,6 +391,34 @@ public ObservableCollection<SeriesViewModel> MonthlySummaryVMList
         #endregion
         #endregion
 
+        #region 年別一覧タブ
+        #region プロパティ
+        /// <summary>
+        /// 表示年リスト
+        /// </summary>
+        #region DisplayedYears
+        public ObservableCollection<string> DisplayedYears
+        {
+            get { return this._DisplayedYears; }
+            set { SetProperty(ref this._DisplayedYears, value); }
+        }
+        private ObservableCollection<string> _DisplayedYears = default(ObservableCollection<string>);
+        #endregion
+
+        /// <summary>
+        /// 年別合計項目VMリスト
+        /// </summary>
+        #region YearlySummaryVMList
+        public ObservableCollection<SeriesViewModel> YearlySummaryVMList
+        {
+            get { return this._YearlySummaryVMList; }
+            set { SetProperty(ref this._YearlySummaryVMList, value); }
+        }
+        private ObservableCollection<SeriesViewModel> _YearlySummaryVMList = default(ObservableCollection<SeriesViewModel>);
+        #endregion
+        #endregion
+        #endregion
+
         #region グラフタブ
         #region プロパティ
         /// <summary>
@@ -488,6 +516,44 @@ public PlotModel SelectedItemMonthlyGraphModel
         };
         #endregion
 
+        /// <summary>
+        /// 全項目年別グラフプロットモデル
+        /// </summary>
+        #region WholeItemYearlyGraphModel
+        public PlotModel WholeItemYearlyGraphModel
+        {
+            get { return this._WholeItemYearlyGraphModel; }
+            set { SetProperty(ref this._WholeItemYearlyGraphModel, value); }
+        }
+        private PlotModel _WholeItemYearlyGraphModel = new PlotModel() {
+            Title = "年別グラフ",
+            LegendOrientation = LegendOrientation.Horizontal,
+            LegendPlacement = LegendPlacement.Outside,
+            LegendPosition = LegendPosition.RightTop,
+            LegendTitle = "凡例",
+            LegendFontSize = 10.5
+        };
+        #endregion
+
+        /// <summary>
+        /// 選択項目年別グラフプロットモデル
+        /// </summary>
+        #region SelectedItemYearlyGraphModel
+        public PlotModel SelectedItemYearlyGraphModel
+        {
+            get { return this._SelectedItemYearlyGraphModel; }
+            set { SetProperty(ref this._SelectedItemYearlyGraphModel, value); }
+        }
+        private PlotModel _SelectedItemYearlyGraphModel = new PlotModel() {
+            Title = "個別グラフ",
+            LegendOrientation = LegendOrientation.Horizontal,
+            LegendPlacement = LegendPlacement.Outside,
+            LegendPosition = LegendPosition.RightTop,
+            LegendTitle = "凡例",
+            LegendFontSize = 10.5
+        };
+        #endregion
+
         /// <summary>
         /// コントローラ
         /// </summary>