Перелапатил страницу добавления и редактирования

ROGOZ/Dictionary.xaml

@@ -304,5 +304,64 @@
             </Setter.Value>
         </Setter>
     </Style>
+    
+    <!--Добавление задачи-->
+
+    <Style x:Key="AddTaskTB" TargetType="TextBox">
+        <Setter Property="Width" Value="700"/>
+        <Setter Property="Height" Value="55"/>
+        <Setter Property="Background" Value="#e6f4ff"/>
+        <Setter Property="FontSize" Value="25"/>
+        <Setter Property="FontFamily" Value="Comic Sans MS"/>
+        <Setter Property="Padding" Value="10"/>
+        <Setter Property="AllowDrop" Value="True"/>
+        <Setter Property="BorderThickness" Value="3"/>
+        <Setter Property="Cursor" Value="IBeam"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="Padding" Value="6 4"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TextBox">
+                    <Border Background="{TemplateBinding Background}" 
+                            BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="True">
+                        <Grid Margin="{TemplateBinding Margin}">
+                            <ScrollViewer x:Name="PART_ContentHost"
+                                          Focusable="False"
+                                          HorizontalScrollBarVisibility="Hidden"
+                                          VerticalScrollBarVisibility="Hidden"/>
+                            <Label x:Name="WaterMarkerLabel" 
+                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                   Visibility="Collapsed"
+                                   Margin="5,0"
+                                   Content="{TemplateBinding Tag}"
+                                   Foreground="Gray"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="Text" Value=""/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Visibility"
+                                    TargetName="WaterMarkerLabel"
+                                    Value="Visible"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Resources>
+            <Style TargetType ="Border">
+                <Setter Property="CornerRadius" Value="15"/>
+            </Style>
+        </Style.Resources>
+        
+    </Style>
 
 </ResourceDictionary>

ROGOZ/Pages/AddEditPage.xaml

@@ -0,0 +1,69 @@
+<Page x:Class="ROGOZ.Pages.AddEditPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      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:local="clr-namespace:ROGOZ.Pages"
+      mc:Ignorable="d" 
+      d:Height="620" d:Width="750"
+      Title="AddEditPage">
+
+    <Grid>
+        <StackPanel Orientation="Vertical" Height="550" VerticalAlignment="Top">
+            <StackPanel Orientation="Vertical">
+                <TextBlock Text="Название задачи:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="210" Margin="50,10,0,5"/>
+                <TextBox x:Name="TaskNameTB" Height="35" Width="700" FontSize="30" FontFamily="Comic Sans Ms"/>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+                <StackPanel Orientation="Vertical" Width="375">
+                    <TextBlock Text="Описание задачи:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="50,10,0,5"/>
+                    <TextBox x:Name="TaskDescriptionTB" Height="205" Width="340" TextWrapping="Wrap" HorizontalAlignment="Left" Margin="25,0,0,0" FontSize="25" FontFamily="Comic Sans Ms"/>
+                </StackPanel>
+                <StackPanel Width="375" Orientation="Vertical">
+                    <StackPanel Orientation="Vertical">
+                        <TextBlock Text="Cтатус задачи:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="40,10,0,5"/>
+                        <ComboBox x:Name="CmbStatus" Height="35" Width="340" HorizontalAlignment="Left" Margin="10,0,0,0"/>
+                    </StackPanel>
+
+                    <StackPanel Orientation="Vertical">
+                        <TextBlock Text="Характер задачи:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="40,10,0,5"/>
+                        <ComboBox x:Name="CmbTaskCharacter" Height="35" Width="340" HorizontalAlignment="Left" Margin="10,0,0,0"/>
+                    </StackPanel>
+
+                    <StackPanel Orientation="Vertical">
+                        <TextBlock Text="Сложность задачи:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="40,10,0,5"/>
+                        <TextBox x:Name="HardTB" Height="35" Width="340" HorizontalAlignment="Left" Margin="10,0,0,0"/>
+                    </StackPanel>
+                </StackPanel>
+
+            </StackPanel>
+
+            <StackPanel Orientation="Vertical">
+                <TextBlock Text="Исполнитель:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="50,10,0,5"/>
+                <ComboBox x:Name="CmbExecutor" Height="35" Width="700" HorizontalAlignment="Left" Margin="25,0,0,0"/>
+            </StackPanel>
+
+            <StackPanel Orientation="Horizontal">
+                <StackPanel Orientation="Vertical" Width="250">
+                    <TextBlock Text="Срок исполнения:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="30,10,0,5"/>
+                    <DatePicker Margin="25,0,0,0"/>
+                </StackPanel>
+                <StackPanel Orientation="Vertical" Width="250">
+                    <TextBlock Text="Дата выполнения:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="25,10,0,5"/>
+                    <DatePicker Margin="15,0,10,0"/>
+                </StackPanel>
+                <StackPanel Orientation="Vertical" Width="250">
+                    <TextBlock Text="Время выполнения:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="240" Margin="10,10,0,5"/>
+                    <TextBox Margin="10,0,25,0" Height="35" FontSize="30" FontFamily="Comic Sans Ms"/>
+                </StackPanel>
+            </StackPanel>
+        </StackPanel>
+
+
+        <StackPanel Width="700" Height="70" Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0,20,0,5">
+            <Button x:Name="BtnCancel" Content="Отмена" Style="{StaticResource AuthoButtons}"/>
+            <Button x:Name="BtnSaveTask" Content="Сохранить" Style="{StaticResource AuthoButtons}" Margin="100,0,0,0"/>
+        </StackPanel>
+
+    </Grid>
+</Page>

ROGOZ/Pages/AddEditPage.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ROGOZ.Pages
+{
+    /// <summary>
+    /// Логика взаимодействия для AddEditPage.xaml
+    /// </summary>
+    public partial class AddEditPage : Page
+    {
+        public AddEditPage()
+        {
+            InitializeComponent();
+        }
+    }
+}

ROGOZ/Pages/AddTask.xaml

@@ -10,19 +10,34 @@
 
     <Grid>
 
-        <StackPanel HorizontalAlignment="Center" Height="600" Width="750">
-            <Label Style="{StaticResource LabelStyle}" HorizontalAlignment="Center">
-                Добавление задачи
-            </Label>
-            <StackPanel Orientation="Vertical" HorizontalAlignment="Center" Height="370" Width="750" Margin="0,20,0,0">
-                <StackPanel Orientation="Horizontal" Width="750" Margin="0,15,0,0">
-                    <TextBlock Text="Задача:" Style="{StaticResource BlockHeader}" HorizontalAlignment="Left" FontSize="35"/>
-                    <TextBox x:Name="TaskName" Width="450" Height="35" Margin="135,0,0,0" Style="{StaticResource TextBoxStyle}" FontSize="20" Text="{Binding Title}"/>
+        <StackPanel HorizontalAlignment="Center" Height="620" Width="750">
+            <StackPanel Orientation="Vertical" HorizontalAlignment="Center" Height="500" Width="750">
+                <StackPanel Orientation="Vertical" Width="750" Margin="0,15,0,0">
+                    <TextBlock Text="Название задачи:" Style="{StaticResource BlockHeader}" HorizontalAlignment="Left" FontSize="30" Margin="50,0"/>
+                    <TextBox x:Name="TaskName" Style="{StaticResource AddTaskTB}" Text="{Binding Title}" HorizontalAlignment="Left" Height="45" Margin="25,0"/>
                 </StackPanel>
 
+                <StackPanel Orientation="Vertical" Width="750" Margin="0,15,0,0">
+                    <TextBlock Text="Описание задачи:" Style="{StaticResource BlockHeader}" HorizontalAlignment="Left" FontSize="30" Margin="50,0"/>
+                    <TextBox x:Name="TaskDescription" Style="{StaticResource AddTaskTB}" Text="{Binding Title}" HorizontalAlignment="Left" Margin="25,0"/>
+                </StackPanel>
+                
                 <Separator Background="{x:Null}" Height="15"/>
 
-                <StackPanel Orientation="Horizontal" Width="750" Margin="0,15,0,0">
+                <StackPanel Orientation="Horizontal" Width="750">
+                    <StackPanel Orientation="Vertical" Width="375">
+                        <TextBlock Text="Срок исполнения:" Style="{StaticResource BlockHeader}" HorizontalAlignment="Left" FontSize="30" Margin="50,0"/>
+                        <DatePicker Margin="25,0"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Vertical" Width="375">
+                        <TextBlock Text="Дата выполнения:" Style="{StaticResource BlockHeader}" HorizontalAlignment="Left" FontSize="30" Margin="50,0"/>
+                        <DatePicker Margin="25,0"/>
+                    </StackPanel>
+                </StackPanel>
+
+                <Separator Background="{x:Null}" Height="15"/>
+
+                <!--<StackPanel Orientation="Horizontal" Width="750" Margin="0,15,0,0">
                     <TextBlock Text="Статус:" Style="{StaticResource BlockHeader}" HorizontalAlignment="Left" FontSize="35"/>
                     <ComboBox x:Name="StatusBox" Width="450" Height="35" Margin="142,0,0,0" Text="{Binding Status}" DisplayMemberPath="Name"/>
                 </StackPanel>
@@ -37,7 +52,7 @@
                 <StackPanel Orientation="Horizontal" Width="750" Margin="0,15,0,0">
                     <TextBlock Text="Менеджер:" Style="{StaticResource BlockHeader}" HorizontalAlignment="Left" FontSize="35"/>
                     <ComboBox x:Name="ManagerBox" Width="450" Height="35" Margin="83,0,0,0" SelectedItem="{Binding Manager.User.MiddleName}" DisplayMemberPath="ID"/>
-                </StackPanel>
+                </StackPanel>-->
             </StackPanel>
             <StackPanel Width="700" Height="70" Orientation="Horizontal" Margin="0,20">
 

ROGOZ/Pages/TaskList.xaml.cs

@@ -28,7 +28,7 @@ namespace ROGOZ.Pages
 
         private void BtnAdd_Click(object sender, RoutedEventArgs e)
         {
-            NavigationService.Navigate(new AddTask());
+            NavigationService.Navigate(new AddEditPage());
         }
 
         private void BtnDel_Click(object sender, RoutedEventArgs e)

ROGOZ/ROGOZ.csproj

@@ -95,6 +95,9 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Model1.tt</DependentUpon>
     </Compile>
+    <Compile Include="Pages\AddEditPage.xaml.cs">
+      <DependentUpon>AddEditPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\AddTask.xaml.cs">
       <DependentUpon>AddTask.xaml</DependentUpon>
     </Compile>
@@ -127,6 +130,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="Pages\AddEditPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Pages\AddTask.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

ROGOZ/Status.cs

@@ -22,7 +22,7 @@ namespace ROGOZ
             List<Status> list = new List<Status>
             {
                 new Status { Name = "запланирована" },
-                new Status { Name = "принята к исполнению" },
+                new Status { Name = "исполняется" },
                 new Status { Name = "выполнена" },
                 new Status { Name = "отменена" }
             };