Danila Alekseev 1 năm trước cách đây
mục cha
commit
1e79dd8a6c

+ 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">

+ 1 - 0
ROGOZ/Executor.cs

@@ -28,5 +28,6 @@ namespace ROGOZ
         public virtual User User { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<Task> Task { get; set; }
+
     }
 }

+ 1 - 1
ROGOZ/Pages/AddEditPage.xaml

@@ -42,7 +42,7 @@
             <StackPanel Orientation="Vertical">
                 <TextBlock Text="Исполнитель:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="50,0,0,5"/>
                 <!--<ComboBox x:Name="CmbExecutor" Style="{DynamicResource ComboBoxStyle1}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}" Text="{Binding ExecutorID}" DisplayMemberPath="ID" Width="770" HorizontalAlignment="Left" Margin="25,0,0,0"/>-->
-                <ComboBox x:Name="CmbExecutor" Style="{DynamicResource ComboBoxStyle1}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}" Width="770" HorizontalAlignment="Left" Margin="25,0,0,0"/>
+                <ComboBox x:Name="CmbExecutor" DisplayMemberPath="ID" Text="{Binding ExecutorID}" Style="{DynamicResource ComboBoxStyle1}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}" Width="770" HorizontalAlignment="Left" Margin="25,0,0,0"/>
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">

+ 21 - 18
ROGOZ/Pages/AddEditPage.xaml.cs

@@ -22,45 +22,47 @@ namespace ROGOZ.Pages
     /// </summary>
     public partial class AddEditPage : Page
     {
-        private user1Entities _context = new user1Entities();
-        private List<string> listUsers = new List<string>();
+        //private user1Entities _context = new user1Entities();
+        //private List<string> listUsers = new List<string>();
         private Task _currentTask = null;
 
         
         public AddEditPage()
         {
             InitializeComponent();
-            //DPCreateDateTime.SelectedDate = DateTime.Today;
-            //DPDeadLine.SelectedDate = DateTime.Today;
             DataContext = _currentTask;
             CmbStatus.ItemsSource = Status.FillStatus();
             CmbTaskType.ItemsSource = WorkType.FillWorkType();
-            foreach (var user in _context.User.ToList())
-            {
-                listUsers.Add(user.getFamilia());
-            }
-            CmbExecutor.ItemsSource = listUsers;
+
+
+
+            //foreach (var user in _context.User.ToList())
+            //{
+            //    listUsers.Add(user.getFamilia());
+            //}
+            //CmbExecutor.ItemsSource = listUsers;
         }
 
         public AddEditPage(Task selectedTask)
         {
             InitializeComponent();
-            //DPCreateDateTime.DisplayDate = DateTime.Now.Date;
-            //DPDeadLine.SelectedDate = DateTime.Today;
             _currentTask = selectedTask;
             CmbStatus.ItemsSource = Status.FillStatus();
             CmbExecutor.ItemsSource = user1Entities.GetContext().User.ToList();
-            //CmbExecutor.ItemsSource = listUsers;
             CmbTaskType.ItemsSource = WorkType.FillWorkType();
             if (selectedTask != null)
                 _currentTask = selectedTask;
             DataContext = _currentTask;
 
-            foreach (var user in _context.User.ToList())
-            {
-                listUsers.Add(user.getFamilia());
-            }
-            CmbExecutor.ItemsSource = listUsers;
+
+
+
+            //foreach (var user in _context.User.ToList())
+            //{
+            //    listUsers.Add(user.getFamilia());
+            //}
+            //CmbExecutor.ItemsSource = listUsers;
+            //CmbExecutor.ItemsSource = _currentTask.Executor.User.getFamilia();
         }
         private void BtnCancel_Click(object sender, RoutedEventArgs e)
         {
@@ -98,7 +100,8 @@ namespace ROGOZ.Pages
                         {
                             //ExecutorID = CmbExecutor.,
 
-                            //Executor = user1Entities.GetContext().Executor.FirstOrDefault(o=>o.User.getFamilia()== CmbExecutor.Text),
+                            //Executor = int.Parse(user1Entities.GetContext().Executor.FirstOrDefault(o=>o.User.getFamilia()== CmbExecutor.Text)),
+                            ExecutorID = int.Parse(CmbExecutor.Text),
                             Title = TaskNameTB.Text,
                             Description = TaskDescriptionTB.Text,
                             CreateDateTime = DateTime.Parse(DPCreateDateTime.Text),

+ 1 - 1
ROGOZ/Pages/TaskList.xaml

@@ -20,7 +20,7 @@
             </ComboBox>
 
             <Separator Background="Transparent" BorderThickness="0" Width="7"/>
-            <ComboBox Margin="5" Padding="6 5" Width="200" Height="40" Name="CmbExecutorSort" FontSize="20" Style="{DynamicResource ComboBoxStyle1}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}" />
+            <ComboBox Margin="5" Padding="6 5" Width="200" Height="40" Name="CmbExecutorSort" FontSize="20" DisplayMemberPath="{Binding Executor.User.MiddleName}" SelectedValuePath="ID" Text="{Binding ExecutorID}" Style="{DynamicResource ComboBoxStyle1}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}" />
 
             <Separator Background="Transparent" BorderThickness="0" Width="7"/>
             <TextBox Name="TBoxSearch" Width="200" Height="40" Margin="5" FontSize="20" HorizontalAlignment="Right" Style="{DynamicResource AddTaskTB}" TextChanged="TBoxSearch_TextChanged" />

+ 6 - 6
ROGOZ/Pages/TaskList.xaml.cs

@@ -21,7 +21,7 @@ namespace ROGOZ.Pages
     public partial class TaskList : Page
     {
         private user1Entities _context = new user1Entities();
-        private List<string> listUsers = new List<string>();
+        //private List<string> listUsers = new List<string>();
         public TaskList()
         {
             InitializeComponent();
@@ -32,11 +32,11 @@ namespace ROGOZ.Pages
 
             DGTasks.ItemsSource = user1Entities.GetContext().Task.ToList();
 
-            foreach (var user in _context.User.ToList())
-            {
-                listUsers.Add(user.getFamilia());
-            }
-            CmbExecutorSort.ItemsSource = listUsers;
+            //foreach (var user in _context.User.ToList())
+            //{
+            //    listUsers.Add(user.getFamilia());
+            //}
+            //CmbExecutorSort.ItemsSource = listUsers;
 
         }