Browse Source

Выпадающий список не работает

Danila Alekseev 1 year ago
parent
commit
34ca8cf2ce
4 changed files with 41 additions and 38 deletions
  1. 1 1
      ROGOZ/App.config
  2. 28 34
      ROGOZ/Pages/AddTask.xaml
  3. 9 0
      ROGOZ/Pages/AddTask.xaml.cs
  4. 3 3
      ROGOZ/Pages/TaskList.xaml

+ 1 - 1
ROGOZ/App.config

@@ -8,7 +8,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
   <connectionStrings>
-    <add name="user1Entities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=SRV-WSR\IS4;initial catalog=user1;user id=user1;password = ScladniyParol;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="user1Entities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=VPMT.RU\IS4;initial catalog=user1;user id=user1;password = ScladniyParol;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">

+ 28 - 34
ROGOZ/Pages/AddTask.xaml

@@ -5,51 +5,45 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:ROGOZ.Pages"
       mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
+      d:Height="620" d:Width="750"
       Title="AddTask">
 
     <Grid>
-        <Label Style="{StaticResource LabelStyle}">
-            не готово! 
-        </Label>
-
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                <StackPanel Orientation="Horizontal">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Style="{StaticResource BlockHeader}" FontSize="16" FontFamily="Arial" Text="ЗАДАЧА"/>
-                        <Separator Width="20" Background="{x:Null}" />
-                        <TextBox Name="TBoxTitle" Width="190"/>
-                    </StackPanel>
-                </StackPanel>
-                <Separator Height="10" Background="{x:Null}" />
 
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock Style="{StaticResource BlockHeader}" FontSize="16" FontFamily="Arial" Text="ИСПОЛНИТЕЛЬ"/>
-                    <Separator Width="20" Background="{x:Null}" />
-                    <TextBox Name="TBoxCost" Width="182"/>
+        <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}"/>
                 </StackPanel>
-                <Separator Height="10" Background="{x:Null}" />
 
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock Style="{StaticResource BlockHeader}" FontSize="16" FontFamily="Arial" Text="МАНАГЕР"/>
-                    <Separator Width="20" Background="{x:Null}" />
-                    <TextBox Name="TBoxDuration" Width="150"/>
+                <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" SelectedItem="{Binding Status}"/>
                 </StackPanel>
+                <Separator Background="{x:Null}" Height="15"/>
 
-                <Separator Height="10" Background="{x:Null}" />
+                <StackPanel Orientation="Horizontal" Width="750" Margin="0,15,0,0">
+                    <TextBlock Text="Исполнитель:" Style="{StaticResource BlockHeader}" HorizontalAlignment="Left" FontSize="35"/>
+                    <ComboBox x:Name="ExecutorBox" Width="450" Height="35" Margin="25,0,0,0" SelectedItem="{Binding Executor.User.MiddleName}"/>
+                </StackPanel>
+                <Separator Background="{x:Null}" Height="15"/>
 
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock Style="{StaticResource BlockHeader}" FontSize="16" FontFamily="Arial" Text="Статус"/>
-                    <Separator Width="20" Background="{x:Null}" />
-                    <TextBox Name="TBoxDescription" TextWrapping="Wrap" Height="115" Width="187"/>
+                <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}"/>
                 </StackPanel>
-                <Separator Height="10" Background="{x:Null}" />
             </StackPanel>
-            <StackPanel VerticalAlignment="Center">
-                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
-                    <Button Height="30" Width="200" Margin="5" Name="BtnSave" Content="Сохранить" FontSize="14"/>
-                </StackPanel>
+            <StackPanel Width="700" Height="70" Orientation="Horizontal" Margin="0,20">
+
+                <Button Content="Отмена" Style="{StaticResource AuthoButtons}" Click="Button_Click"/>
+                <Button Content="Сохранить" Style="{StaticResource AuthoButtons}" Margin="100,0,0,0"/>
+
             </StackPanel>
         </StackPanel>
     </Grid>

+ 9 - 0
ROGOZ/Pages/AddTask.xaml.cs

@@ -20,9 +20,18 @@ namespace ROGOZ.Pages
     /// </summary>
     public partial class AddTask : Page
     {
+        private Task _currentTask = new Task();
         public AddTask()
         {
             InitializeComponent();
+            StatusBox.ItemsSource = user1Entities.GetContext().Task.ToList();
+            ExecutorBox.ItemsSource = user1Entities.GetContext().Executor.ToList();
+            ManagerBox.ItemsSource = user1Entities.GetContext().Manager.ToList();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            NavigationService.Navigate(new TaskList());
         }
     }
 }

+ 3 - 3
ROGOZ/Pages/TaskList.xaml

@@ -28,12 +28,12 @@
             <TextBox Name="TBoxSearch" Width="200" Height="30" Margin="5" FontSize="18"/>
 
         </StackPanel>
-        <DataGrid Grid.Row="2" x:Name="DGTasks" AutoGenerateColumns="False" ItemsSource="{Binding}" RenderTransformOrigin="0.5,0.5" Margin="10,10,10,41" Style="{StaticResource DataGridStyle1}" CellStyle="{StaticResource DataGridCellStyle1}">
+        <DataGrid Grid.Row="2" x:Name="DGTasks" AutoGenerateColumns="False" IsReadOnly="True" ItemsSource="{Binding}" RenderTransformOrigin="0.5,0.5" Margin="10,10,10,41">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Задача" Binding="{Binding Title}" Width="320"/>
-                <DataGridTextColumn Header="Статус" Binding="{Binding Description}" Width="80"/>
+                <DataGridTextColumn Header="Статус" Binding="{Binding Task.Status}" Width="80"/>
                 <DataGridTextColumn Header="Исполнитель" Binding="{Binding Executor.User.MiddleName}" Width="140"/>
-                <DataGridTextColumn Header="Менеджер" Width="*"/>
+                <DataGridTextColumn Header="Менеджер" Width="*" Binding="{Binding Manager.User.MiddleName}"/>
             </DataGrid.Columns>
         </DataGrid>