瀏覽代碼

修改时间查询

ltwork 1 年之前
父節點
當前提交
400ffc8748

+ 20 - 16
BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/BaseConfigViewModel.cs

@@ -100,8 +100,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             DeviceKindName = "---";
             TestName = string.Empty;
             SelectTest = string.Empty;
-            StartTime = DateTime.MinValue;
-            EndTime = DateTime.MinValue;
+            StartTime = string.Empty;
+            EndTime = string.Empty;
         }
         /// <summary>
         /// 查询
@@ -110,19 +110,23 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         private void Query(object obj)
         {
 
-            if (StartTime > EndTime)
+            if ((!string.IsNullOrEmpty(StartTime)) && (!string.IsNullOrEmpty(EndTime)))
             {
-                MessageBox.Show("起始时间大于结束时间,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
-                return;
+                if (Convert.ToDateTime(StartTime) > Convert.ToDateTime(EndTime))
+                {
+                    MessageBox.Show("起始时间大于结束时间,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+
             }
-                //if (Convert.ToDateTime(StartTime).AddDays(2) < Convert.ToDateTime(EndTime))
-                //{
-                //    MessageBox.Show("起始时间和结束时间间隔不能大于2天,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
-                //    return;
-                //}
-            
+            //if (Convert.ToDateTime(StartTime).AddDays(2) < Convert.ToDateTime(EndTime))
+            //{
+            //    MessageBox.Show("起始时间和结束时间间隔不能大于2天,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
+            //    return;
+            //}
+
             conditionConfig = (from a in allConfigList
-                                      where (EndTime == DateTime.MinValue ? true : (a.CreateTime < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < a.CreateTime))
+                                      where (EndTime == string.Empty ? true : (a.CreateTime < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < a.CreateTime))
                                        && (string.IsNullOrEmpty(ScheduleName) ? true : (a.SchemeName == ScheduleName))
                                          && (DeviceKindName == "---") ? true : (a.DeviceKindName == DeviceKindName)
                                select a).ToList();
@@ -405,14 +409,14 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             set { selectTest = value; RaisePropertyChanged(); }
         }
 
-        private DateTime startTime = DateTime.Now;
-        public DateTime StartTime
+        private string startTime = DateTime.Now.AddHours(-1).ToString();
+        public string StartTime
         {
             get { return startTime; }
             set { startTime = value; RaisePropertyChanged(); }
         }
-        private DateTime endTime =DateTime.Now;
-        public DateTime EndTime
+        private string endTime =DateTime.Now.ToString();
+        public string EndTime
         {
             get { return endTime; }
             set { endTime = value; RaisePropertyChanged(); }

+ 28 - 4
BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/DeviceKindViewModel.cs

@@ -68,7 +68,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         {
             DeviceKindNo = string.Empty;
             DeviceKindName = "---";
-            
+            StartTime = string.Empty;
+            EndTime = string.Empty;
 
         }
         /// <summary>
@@ -146,11 +147,20 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <param name="obj"></param>
         private void Query(object obj)
         {
+            if ((!string.IsNullOrEmpty(StartTime)) && (!string.IsNullOrEmpty(EndTime)))
+            {
+                if (Convert.ToDateTime(StartTime) > Convert.ToDateTime(EndTime))
+                {
+                    MessageBox.Show("起始时间大于结束时间,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+
+            }
             conditionDeviceKind = (from a in allDeviceKindList
                                 where ((DeviceKindName== "---") ? true : (a.DeviceKindName == DeviceKindName))
                                 && (string.IsNullOrEmpty(DeviceKindNo) ? true : (a.DeviceKindNo == DeviceKindNo))
-                        
-                                select a).ToList();
+                                && (EndTime == string.Empty ? true : (a.CreateTime < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < a.CreateTime))
+                                   select a).ToList();
             //默认显示的第一页
             conditionDeviceKind = conditionDeviceKind.OrderBy(x => x.DeviceKindId).ToList();
             Getpage();
@@ -334,7 +344,21 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             get { return deviceKindNameList; }
             set { deviceKindNameList = value; RaisePropertyChanged(); }
         }
-
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        private string startTime = DateTime.Now.AddDays(-1).ToString();
+        public string StartTime
+        {
+            get { return startTime; }
+            set { startTime = value; RaisePropertyChanged(); }
+        }
+        private string endTime = DateTime.Now.ToString();
+        public string EndTime
+        {
+            get { return endTime; }
+            set { endTime = value; RaisePropertyChanged(); }
+        }
         /// <summary>
         /// 总条数
         /// </summary>

+ 28 - 1
BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/DeviceViewModel.cs

@@ -82,7 +82,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             DeviceName = string.Empty;
             DeviceKindName = "---";
             ProjectName = "---";
-
+            StartTime = string.Empty;
+            EndTime = string.Empty;
         }
         /// <summary>
         /// 修改
@@ -159,11 +160,21 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <param name="obj"></param>
         private void Query(object obj)
         {
+            if ((!string.IsNullOrEmpty(StartTime)) && (!string.IsNullOrEmpty(EndTime)))
+            {
+                if (Convert.ToDateTime(StartTime) > Convert.ToDateTime(EndTime))
+                {
+                    MessageBox.Show("起始时间大于结束时间,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+
+            }
             conditionDevices = (from a in allDeviceList
                                    where (string.IsNullOrEmpty(DeviceName) ? true : (a.DeviceName == DeviceName))
                                    && (string.IsNullOrEmpty(DeviceNo) ? true : (a.DeviceNo == DeviceNo))
                                    && (DeviceKindName == "---") ? true : (a.DeviceKindName == DeviceKindName)
                                    &&(ProjectName == "---") ? true : (a.ProjectName == ProjectName)
+                                    && (EndTime == string.Empty ? true : (a.CreateTime < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < a.CreateTime))
                                 select a).ToList();
             //默认显示的第一页
             conditionDevices = conditionDevices.OrderBy(x => x.DeviceId).ToList();
@@ -375,6 +386,22 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             get { return deviceKindNameList; }
             set { deviceKindNameList = value; RaisePropertyChanged(); }
         }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        private string startTime = DateTime.Now.AddDays(-1).ToString();
+        public string StartTime
+        {
+            get { return startTime; }
+            set { startTime = value; RaisePropertyChanged(); }
+        }
+        private string endTime = DateTime.Now.ToString();
+        public string EndTime
+        {
+            get { return endTime; }
+            set { endTime = value; RaisePropertyChanged(); }
+        }
         /// <summary>
         /// 总条数
         /// </summary>

+ 31 - 1
BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/ProjectViewModel.cs

@@ -53,7 +53,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             ProjectName = string.Empty;
             ProjectNo = string.Empty;
             ProjectLeader = string.Empty;
-            
+            StartTime = string.Empty;
+            EndTime = string.Empty;
         }
         /// <summary>
         /// 修改
@@ -130,10 +131,21 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <param name="obj"></param>
         private void Query(object obj)
         {
+            if ((!string.IsNullOrEmpty(StartTime))&& (!string.IsNullOrEmpty(EndTime)))
+            {
+                if (Convert.ToDateTime(StartTime) > Convert.ToDateTime(EndTime))
+                {
+                    MessageBox.Show("起始时间大于结束时间,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+              
+            }
+           
             conditionProject = (from a in allProjectList
                                where (string.IsNullOrEmpty(ProjectNo) ? true : (a.ProjectNo == ProjectNo))
                                && (string.IsNullOrEmpty(ProjectName) ? true : (a.ProjectName == ProjectName))
                                  && (string.IsNullOrEmpty(ProjectLeader) ? true : (a.ProjectLeader == ProjectLeader))
+                                 && (EndTime == string.Empty ? true : (a.CreateTime < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < a.CreateTime))
                                 select a).ToList();
             //默认显示的第一页
             conditionProject = conditionProject.OrderBy(x => x.ProjectId).ToList();
@@ -281,6 +293,24 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         #endregion
 
         #region 数据绑定
+
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        private string startTime=DateTime.Now.AddDays(-1).ToString();
+        public string StartTime
+        {
+            get { return startTime; }
+            set { startTime = value; RaisePropertyChanged(); }
+        }
+        private string endTime = DateTime.Now.ToString();
+        public string EndTime
+        {
+            get { return endTime; }
+            set { endTime = value; RaisePropertyChanged(); }
+        }
+        
         private ObservableCollection<BasProjectDto> projectItemList = new ObservableCollection<BasProjectDto>();
         public ObservableCollection<BasProjectDto> ProjectItemList
         {

+ 28 - 2
BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/DeviceTestViewModel.cs

@@ -90,8 +90,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             DeviceName = string.Empty;
             DeviceKindName = "---";
             ProjectName = "---";
-
-
+            StartTime = string.Empty;
+            EndTime = string.Empty;
         }
 
         /// <summary>
@@ -150,11 +150,21 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// <param name="obj"></param>
         private void Query(object obj)
         {
+            if ((!string.IsNullOrEmpty(StartTime)) && (!string.IsNullOrEmpty(EndTime)))
+            {
+                if (Convert.ToDateTime(StartTime) > Convert.ToDateTime(EndTime))
+                {
+                    MessageBox.Show("起始时间大于结束时间,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+
+            }
             conditionDevices = (from a in allDeviceList
                                 where (string.IsNullOrEmpty(DeviceName) ? true : (a.DeviceName == DeviceName))
                                 && (string.IsNullOrEmpty(DeviceNo) ? true : (a.DeviceNo == DeviceNo))
                                  && ((DeviceKindName == "---") ? true : (a.DeviceKindName == DeviceKindName))
                                    && ((ProjectName == "---") ? true : (a.ProjectName == ProjectName))
+                                     && (EndTime == string.Empty ? true : (a.CreateTime < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < a.CreateTime))
                                 select a).ToList();
             //默认显示的第一页
             conditionDevices = conditionDevices.OrderBy(x => x.DeviceId).ToList();
@@ -351,6 +361,22 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             get { return deviceKindNameList; }
             set { deviceKindNameList = value; RaisePropertyChanged(); }
         }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        private string startTime = DateTime.Now.AddDays(-1).ToString();
+        public string StartTime
+        {
+            get { return startTime; }
+            set { startTime = value; RaisePropertyChanged(); }
+        }
+        private string endTime = DateTime.Now.ToString();
+        public string EndTime
+        {
+            get { return endTime; }
+            set { endTime = value; RaisePropertyChanged(); }
+        }
         /// <summary>
         /// 总条数
         /// </summary>

+ 29 - 1
BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ResultQueryViewModel.cs

@@ -18,6 +18,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using QuestPDF.Fluent;
+using System.Windows;
 
 namespace PLCTool.ViewModels.BusinessManageViewModel
 {
@@ -119,7 +120,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             DeviceName = string.Empty;
             DeviceKindName = "---";
             ProjectName = "---";
-
+            StartTime = string.Empty;
+            EndTime = string.Empty;
         }
 
         /// <summary>
@@ -151,11 +153,21 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// <param name="obj"></param>
         private void Query(object obj)
         {
+            if ((!string.IsNullOrEmpty(StartTime)) && (!string.IsNullOrEmpty(EndTime)))
+            {
+                if (Convert.ToDateTime(StartTime) > Convert.ToDateTime(EndTime))
+                {
+                    MessageBox.Show("起始时间大于结束时间,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+
+            }
             conditionDevices = (from a in allDeviceList
                                 where (string.IsNullOrEmpty(DeviceName) ? true : (a.DeviceName == DeviceName))
                                 && (string.IsNullOrEmpty(DeviceNo) ? true : (a.DeviceNo == DeviceNo))
                                   && ((DeviceKindName == "---") ? true : (a.DeviceKindName == DeviceKindName))
                                    && ((ProjectName == "---") ? true : (a.ProjectName == ProjectName))
+                                     && (EndTime == string.Empty ? true : (a.CreateTime < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < a.CreateTime))
                                 select a).ToList();
             //默认显示的第一页
             conditionDevices = conditionDevices.OrderBy(x => x.DeviceId).ToList();
@@ -594,6 +606,22 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             get { return projectNameList; }
             set { projectNameList = value; RaisePropertyChanged(); }
         }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        private string startTime = DateTime.Now.AddDays(-1).ToString();
+        public string StartTime
+        {
+            get { return startTime; }
+            set { startTime = value; RaisePropertyChanged(); }
+        }
+        private string endTime = DateTime.Now.ToString();
+        public string EndTime
+        {
+            get { return endTime; }
+            set { endTime = value; RaisePropertyChanged(); }
+        }
         /// <summary>
         /// 设备类型
         /// </summary>

+ 2 - 2
BlankApp1/BlankApp1/Views/BasicConfigView/BaseConfigView.xaml

@@ -49,11 +49,11 @@
             <StackPanel Grid.Column="0" Orientation="Horizontal">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="创建时间:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding StartTime}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding StartTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="至:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding EndTime}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding EndTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
             </StackPanel>
             <StackPanel Grid.Column="1" Orientation="Horizontal">

+ 2 - 2
BlankApp1/BlankApp1/Views/BasicConfigView/DeviceKindView.xaml

@@ -42,11 +42,11 @@
             <StackPanel Grid.Column="0" Orientation="Horizontal">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="创建时间:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding StartTime}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding StartTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="至:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding EndTime}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding EndTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
             </StackPanel>
             <StackPanel Grid.Column="1" Orientation="Horizontal">

+ 2 - 2
BlankApp1/BlankApp1/Views/BasicConfigView/DeviceView.xaml

@@ -52,11 +52,11 @@
             <StackPanel Grid.Column="0" Orientation="Horizontal">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="创建时间:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding StartTime}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding StartTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="至:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding EndTime}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding EndTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
             </StackPanel>
             <StackPanel Grid.Column="1" Orientation="Horizontal">

+ 2 - 2
BlankApp1/BlankApp1/Views/BasicConfigView/ProjectView.xaml

@@ -42,11 +42,11 @@
             <StackPanel Grid.Column="0" Orientation="Horizontal">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="创建时间:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding StartTime}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding StartTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="至:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding EndTime}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding EndTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
             </StackPanel>
             <StackPanel Grid.Column="1" Orientation="Horizontal">

+ 2 - 2
BlankApp1/BlankApp1/Views/BusinessManageView/DeviceTestView.xaml

@@ -56,11 +56,11 @@
             <StackPanel Grid.Column="0" Orientation="Horizontal">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="创建时间:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding StartTime}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding StartTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="至:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding EndTime}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding EndTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
             </StackPanel>
             <StackPanel Grid.Column="1" Orientation="Horizontal">

+ 2 - 2
BlankApp1/BlankApp1/Views/BusinessManageView/ResultQueryView.xaml

@@ -56,11 +56,11 @@
             <StackPanel Grid.Column="0" Orientation="Horizontal">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="创建时间:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding StartTime}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding StartTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="至:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding EndTime}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160"  Text="{Binding EndTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                 </StackPanel>
             </StackPanel>
             <StackPanel Grid.Column="1" Orientation="Horizontal">