Fix default dates bindings

Author: Alexander Fuks

BusinessAccounting/BusinessAccounting/UserControls/CashPage.xaml

@@ -100,7 +100,7 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Grid.Row="0" Content="Дата" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" />
-                    <DatePicker Grid.Row="0" Grid.Column="1" controls:TextboxHelper.Watermark="Выберите дату" FirstDayOfWeek="Monday" Name="InputDate" SelectedDateFormat="Long" SelectedDate="{Binding DefaultInputDate, Mode=OneWay, TargetNullValue={x:Static system:DateTime.Now}}"/>
+                    <DatePicker Grid.Row="0" Grid.Column="1" controls:TextboxHelper.Watermark="Выберите дату" FirstDayOfWeek="Monday" Name="InputDate" SelectedDateFormat="Long" SelectedDate="{Binding DefaultInputDate, Mode=OneWay}"/>
 
                     <Label Grid.Row="1" Grid.Column="0" Content="Сумма" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" />
                     <TextBox Grid.Row="1" Grid.Column="1" controls:TextboxHelper.Watermark="Введите сумму" controls:TextboxHelper.ClearTextButton="True" Name="InputSum"/>

BusinessAccounting/BusinessAccounting/UserControls/CashPage.xaml.cs

@@ -5,12 +5,8 @@
 using System.Configuration;
 using System.Data;
 using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Threading;
 using XDatabase;
 using XDatabase.Core;
 
@@ -25,12 +21,14 @@ public CashPage()
         {
             InitializeComponent();
 
+            InputDate.DataContext = this;
+
             LoadDefaultDate();
             LoadHistory();
             LoadEmployees();
         }
 
-        public DateTime DefaultInputDate { get; set; }
+        public DateTime? DefaultInputDate { get; set; }
 
         public static RoutedCommand SaveRecordCommand = new RoutedCommand();
         public static RoutedCommand LoadHistoryCommand = new RoutedCommand();
@@ -83,7 +81,7 @@ private void LoadEmployees()
             {
                 foreach (DataRow r in employeesData.Rows)
                 {
-                    _employees.Add(new Employee()
+                    _employees.Add(new Employee
                     {
                         Id = Convert.ToInt32(r.ItemArray[0]),
                         FullName = r.ItemArray[1].ToString()
@@ -139,7 +137,7 @@ private void SaveRecord()
 
             if (result)
             {
-                InputDate.SelectedDate = DefaultInputDate != DateTime.MinValue ? DefaultInputDate : (DateTime?)null;
+                InputDate.SelectedDate = DefaultInputDate;
                 InputSum.Text = "";
                 InputComment.Text = "";
                 ComboEmployee.SelectedIndex = -1;
@@ -192,7 +190,6 @@ private void LoadDefaultDate()
             int offset;
             if (!int.TryParse(ConfigurationManager.AppSettings["DefaultInputDateOffset"], out offset)) return;
             DefaultInputDate = DateTime.Now.Date.AddDays(offset);
-            InputDate.DataContext = this;
         }
         #endregion
 

BusinessAccounting/BusinessAccounting/UserControls/GraphicsPage.xaml.cs

@@ -25,8 +25,8 @@ public GraphicsPage()
             LoadDefaultDates();
         }
 
-        public DateTime DefaultStartDate { get; set; }
-        public DateTime DefaultEndDate { get; set; }
+        public DateTime? DefaultStartDate { get; set; }
+        public DateTime? DefaultEndDate { get; set; }
 
         public static readonly RoutedCommand PrintChartCommand = new RoutedCommand();
         public static readonly RoutedCommand SaveChartCommand = new RoutedCommand();
@@ -38,10 +38,14 @@ private void LoadDefaultDates()
         {
             int startOffset;
             int endOffset;
-            if (!int.TryParse(ConfigurationManager.AppSettings["DefaultStartDateOffset"], out startOffset)) return;
-            if (!int.TryParse(ConfigurationManager.AppSettings["DefaultEndDateOffset"], out endOffset)) return;
-            DefaultStartDate = DateTime.Now.Date.AddDays(startOffset);
-            DefaultEndDate = DateTime.Now.Date.AddDays(endOffset);
+            if (int.TryParse(ConfigurationManager.AppSettings["DefaultStartDateOffset"], out startOffset))
+            {
+                DefaultStartDate = DateTime.Now.Date.AddDays(startOffset);
+            }
+            if (int.TryParse(ConfigurationManager.AppSettings["DefaultEndDateOffset"], out endOffset))
+            {
+                DefaultEndDate = DateTime.Now.Date.AddDays(endOffset);
+            }
         }
 
         #region Charts