Browse Source

Угу угу угу

Danila Alekseev 1 year ago
parent
commit
1e77be3c4e

+ 10 - 10
ROGOZ/Pages/AddEditPage.xaml

@@ -12,27 +12,27 @@
         <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"/>
+                <TextBox x:Name="TaskNameTB" Height="35" Width="700" FontSize="30" FontFamily="Comic Sans Ms" Text="{Binding Title}"/>
             </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"/>
+                    <TextBox x:Name="TaskDescriptionTB" Text="{Binding Description}" 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"/>
+                        <ComboBox x:Name="CmbStatus" Text="{Binding Status}" DisplayMemberPath="Name" 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"/>
+                        <ComboBox x:Name="CmbTaskType" Text="{Binding WorkType}" DisplayMemberPath="Name" 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"/>
+                        <TextBox x:Name="DifficultyTB" Text="{Binding Difficulty}" Height="35" Width="340" HorizontalAlignment="Left" Margin="10,0,0,0"/>
                     </StackPanel>
                 </StackPanel>
 
@@ -40,28 +40,28 @@
 
             <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"/>
+                <ComboBox x:Name="CmbExecutor" Text="{Binding ExecutorID}" DisplayMemberPath="ID" 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"/>
+                    <DatePicker Name="DPDeadLine" SelectedDate="{Binding Deadline}" 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"/>
+                    <DatePicker Name="DPCreateDateTime" SelectedDate="{Binding CreateDateTime}" 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"/>
+                    <TextBox x:Name="TimeTB" Text="{Binding Time}" 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="BtnCancel" Content="Отмена" Style="{StaticResource AuthoButtons}" Click="BtnCancel_Click"/>
             <Button x:Name="BtnSaveTask" Content="Сохранить" Style="{StaticResource AuthoButtons}" Margin="100,0,0,0"/>
         </StackPanel>
 

+ 8 - 0
ROGOZ/Pages/AddEditPage.xaml.cs

@@ -23,6 +23,14 @@ namespace ROGOZ.Pages
         public AddEditPage()
         {
             InitializeComponent();
+            CmbStatus.ItemsSource = Status.FillStatus();
+            CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();
+            CmbTaskType.ItemsSource = WorkType.FillWorkType();
+        }
+
+        private void BtnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            NavigationService.GoBack();
         }
     }
 }

+ 2 - 2
ROGOZ/Pages/AddTask.xaml

@@ -56,8 +56,8 @@
             </StackPanel>
             <StackPanel Width="700" Height="70" Orientation="Horizontal" Margin="0,20">
 
-                <Button Content="Отмена" Style="{StaticResource AuthoButtons}" Click="Button_Click"/>
-                <Button Content="Сохранить" Name="NewTaskSave" Style="{StaticResource AuthoButtons}" Margin="100,0,0,0" Click="NewTaskSave_Click"/>
+                <Button Content="Отмена" Style="{StaticResource AuthoButtons}"/>
+                <Button Content="Сохранить" Name="NewTaskSave" Style="{StaticResource AuthoButtons}" Margin="100,0,0,0"/>
 
             </StackPanel>
         </StackPanel>

+ 85 - 84
ROGOZ/Pages/AddTask.xaml.cs

@@ -30,97 +30,98 @@ namespace ROGOZ.Pages
 
         }
 
-        public AddTask(Task selectedTask)
-        {
-            InitializeComponent();
-            StatusBox.ItemsSource = Status.FillStatus();
-            ExecutorBox.ItemsSource = user1Entities.GetContext().Executor.ToList();
-            ManagerBox.ItemsSource = user1Entities.GetContext().Manager.ToList();
-        }
 
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            NavigationService.GoBack();
-        }
+        //public AddTask(Task selectedTask)
+        //{
+        //    InitializeComponent();
+        //    StatusBox.ItemsSource = Status.FillStatus();
+        //    ExecutorBox.ItemsSource = user1Entities.GetContext().Executor.ToList();
+        //    ManagerBox.ItemsSource = user1Entities.GetContext().Manager.ToList();
+        //}
 
-        private void NewTaskSave_Click(object sender, RoutedEventArgs e)
-        {
+        //private void Button_Click(object sender, RoutedEventArgs e)
+        //{
+        //    NavigationService.GoBack();
+        //}
 
-            var errorMessage = CheckErrors();
-            if (errorMessage.Length > 0)
-            {
-                MessageBox.Show(errorMessage, "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-            else
-            {
-                if (_currentTask != null)
-                {
-                    var selectedTask = new Task
-                    {
-                        Title = TaskName.Text,
-                        Status = StatusBox.Text,
-                        ExecutorID = int.Parse(ExecutorBox.Text),
-                        
-                    };
-                    user1Entities.GetContext().Task.Add(_currentTask);
-                    user1Entities.GetContext().SaveChanges();
-                    //App.Context.Task.Add(selectedTask);
-                    //App.Context.SaveChanges();
-                    //MessageBox.Show("Добавление успешно выполнено");
-                    //NavigationService.GoBack();
-                }
-
-                NavigationService.GoBack();
-            }
-
-            //StringBuilder errors = new StringBuilder();
-
-            //if (string.IsNullOrEmpty(_currentTask.Title))
-            //    errors.AppendLine("Укажите название задачи");
-            //if (_currentTask.Status == null)
-            //    errors.AppendLine("Выберите статус задачи");
-            //if (_currentTask.Executor == null)
-            //    errors.AppendLine("Выберите исполнителя");
-
-            //if (errors.Length > 0)
-            //{
-            //    MessageBox.Show(errors.ToString());
-            //    return;
-            //}
-            //if (_currentTask.ID == 0)
-            //    user1Entities.GetContext().Task.Add(_currentTask);
-            //try
-            //{
-            //    user1Entities.GetContext().SaveChanges();
-            //    MessageBox.Show("Задача добавлена");
-            //    NavigationService.GoBack();
-            //}
-            //catch (Exception ex)
-            //{
-            //    MessageBox.Show(ex.Message.ToString());
-            //}
+        //private void NewTaskSave_Click(object sender, RoutedEventArgs e)
+        //{
 
-        }
-        private string CheckErrors()
-        {
-            var errorBuilder = new StringBuilder();
+        //    var errorMessage = CheckErrors();
+        //    if (errorMessage.Length > 0)
+        //    {
+        //        MessageBox.Show(errorMessage, "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
+        //    }
+        //    else
+        //    {
+        //        if (_currentTask != null)
+        //        {
+        //            var selectedTask = new Task
+        //            {
+        //                Title = TaskName.Text,
+        //                Status = StatusBox.Text,
+        //                ExecutorID = int.Parse(ExecutorBox.Text),
 
-            //Проверка на заполнение наименования Задачи
-            if (string.IsNullOrWhiteSpace(TaskName.Text))
-                errorBuilder.AppendLine("Название задачи обязательно для заполнения");
-            //if (_currentTask.Status == null)
-            //    errorBuilder.AppendLine("Выберите статус задачи");
-            //if (_currentTask.Executor == null)
-            //    errorBuilder.AppendLine("Выберите исполнителя");
+        //            };
+        //            user1Entities.GetContext().Task.Add(_currentTask);
+        //            user1Entities.GetContext().SaveChanges();
+        //            //App.Context.Task.Add(selectedTask);
+        //            //App.Context.SaveChanges();
+        //            //MessageBox.Show("Добавление успешно выполнено");
+        //            //NavigationService.GoBack();
+        //        }
 
+        //        NavigationService.GoBack();
+        //    }
 
+        //    //StringBuilder errors = new StringBuilder();
 
-            //Просто вывод ошибок, которые нужно исправить
-            if (errorBuilder.Length > 0)
-            {
-                errorBuilder.Insert(0, "Устраните следующие ошибки:\n");
-            }
-            return errorBuilder.ToString();
-        }
+        //    //if (string.IsNullOrEmpty(_currentTask.Title))
+        //    //    errors.AppendLine("Укажите название задачи");
+        //    //if (_currentTask.Status == null)
+        //    //    errors.AppendLine("Выберите статус задачи");
+        //    //if (_currentTask.Executor == null)
+        //    //    errors.AppendLine("Выберите исполнителя");
+
+        //    //if (errors.Length > 0)
+        //    //{
+        //    //    MessageBox.Show(errors.ToString());
+        //    //    return;
+        //    //}
+        //    //if (_currentTask.ID == 0)
+        //    //    user1Entities.GetContext().Task.Add(_currentTask);
+        //    //try
+        //    //{
+        //    //    user1Entities.GetContext().SaveChanges();
+        //    //    MessageBox.Show("Задача добавлена");
+        //    //    NavigationService.GoBack();
+        //    //}
+        //    //catch (Exception ex)
+        //    //{
+        //    //    MessageBox.Show(ex.Message.ToString());
+        //    //}
+
+        //}
+        //private string CheckErrors()
+        //{
+        //    var errorBuilder = new StringBuilder();
+
+        //    //Проверка на заполнение наименования Задачи
+        //    if (string.IsNullOrWhiteSpace(TaskName.Text))
+        //        errorBuilder.AppendLine("Название задачи обязательно для заполнения");
+        //    //if (_currentTask.Status == null)
+        //    //    errorBuilder.AppendLine("Выберите статус задачи");
+        //    //if (_currentTask.Executor == null)
+        //    //    errorBuilder.AppendLine("Выберите исполнителя");
+
+
+
+        //    //Просто вывод ошибок, которые нужно исправить
+        //    if (errorBuilder.Length > 0)
+        //    {
+        //        errorBuilder.Insert(0, "Устраните следующие ошибки:\n");
+        //    }
+        //    return errorBuilder.ToString();
+        //}
     }
 }

+ 1 - 0
ROGOZ/ROGOZ.csproj

@@ -114,6 +114,7 @@
     <Compile Include="Windows\AccExitWin.xaml.cs">
       <DependentUpon>AccExitWin.xaml</DependentUpon>
     </Compile>
+    <Compile Include="WorkType.cs" />
     <Page Include="Dictionary.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

+ 30 - 0
ROGOZ/WorkType.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ROGOZ
+{
+    internal class WorkType
+    {
+        string name;
+
+        public string Name
+        {
+            get { return name; }
+            set { name = value; }
+        }
+
+        public static List<WorkType> FillWorkType()
+        {
+            List<WorkType> listType = new List<WorkType>
+            {
+                new WorkType { Name = "анализ и проектирование" },
+                new WorkType { Name = "установка оборудования" },
+                new WorkType { Name = "техническое обслуживание и сопровождение" }
+            };
+            return listType;
+        }
+    }
+}