Danila Alekseev пре 1 година
родитељ
комит
748f617d12
2 измењених фајлова са 5 додато и 4 уклоњено
  1. 3 2
      ROGOZ/Pages/AddEditPage.xaml
  2. 2 2
      ROGOZ/Pages/AddEditPage.xaml.cs

+ 3 - 2
ROGOZ/Pages/AddEditPage.xaml

@@ -3,6 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:sys="clr-namespace:System;assembly=mscorlib"
       xmlns:local="clr-namespace:ROGOZ.Pages"
       mc:Ignorable="d" 
       d:Height="630" d:Width="820"
@@ -46,11 +47,11 @@
             <StackPanel Orientation="Horizontal">
                 <StackPanel Orientation="Vertical" Width="275">
                     <TextBlock Text="Срок исполнения:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="30,10,0,5"/>
-                    <DatePicker Style="{DynamicResource DatePickerStyle1}"  CalendarStyle="{DynamicResource DPCalendarStyle}" Name="DPDeadLine" Tag="Выбор даты" SelectedDate="{Binding Deadline}"   Margin="25,0,0,0"/>
+                    <DatePicker Style="{DynamicResource DatePickerStyle1}"  CalendarStyle="{DynamicResource DPCalendarStyle}" Name="DPDeadLine" Tag="Выбор даты" SelectedDate="{x:Static sys:DateTime.Now}" Margin="25,0,0,0"/>
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Width="275">
                     <TextBlock Text="Дата выполнения:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="25,10,0,5"/>
-                    <DatePicker Name="DPCreateDateTime" Style="{DynamicResource DatePickerStyle1}" CalendarStyle="{DynamicResource DPCalendarStyle}" Tag="Выбор даты" SelectedDate="{Binding CreateDateTime}" Margin="15,0,10,0"/>
+                    <DatePicker Name="DPCreateDateTime"  Style="{DynamicResource DatePickerStyle1}" CalendarStyle="{DynamicResource DPCalendarStyle}" Tag="Выбор даты" SelectedDate="{Binding CreateDateTime}" Margin="15,0,10,0"/>
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Width="270">
                     <TextBlock Text="Время выполнения:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="240" Margin="10,10,0,5"/>

+ 2 - 2
ROGOZ/Pages/AddEditPage.xaml.cs

@@ -37,8 +37,8 @@ namespace ROGOZ.Pages
         public AddEditPage(Task selectedTask)
         {
             InitializeComponent();
-            DPCreateDateTime.SelectedDate = DateTime.Today;
-            DPDeadLine.SelectedDate = DateTime.Today;
+            //DPCreateDateTime.DisplayDate = DateTime.Now.Date;
+            //DPDeadLine.SelectedDate = DateTime.Today;
             _currentTask = selectedTask;
             CmbStatus.ItemsSource = Status.FillStatus();
             CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();