Forráskód Böngészése

Executors не поладки

Almir Myxametszanov 1 éve
szülő
commit
ed114cf3b2

+ 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=VPMT.RU\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=SRV-WSR\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">

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

@@ -37,7 +37,7 @@ namespace ROGOZ.Pages
             CmbTaskType.ItemsSource = WorkType.FillWorkType();
             foreach (var user in _context.User.ToList())
             {
-                listUsers.Add(user.getFIO());
+                listUsers.Add(user.getFamilia());
             }
             CmbExecutor.ItemsSource = listUsers;
         }
@@ -49,8 +49,8 @@ namespace ROGOZ.Pages
             //DPDeadLine.SelectedDate = DateTime.Today;
             _currentTask = selectedTask;
             CmbStatus.ItemsSource = Status.FillStatus();
-            //CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();
-            CmbExecutor.ItemsSource = listUsers;
+            CmbExecutor.ItemsSource = user1Entities.GetContext().User.ToList();
+            //CmbExecutor.ItemsSource = listUsers;
             CmbTaskType.ItemsSource = WorkType.FillWorkType();
             if (selectedTask != null)
                 _currentTask = selectedTask;
@@ -58,7 +58,7 @@ namespace ROGOZ.Pages
 
             foreach (var user in _context.User.ToList())
             {
-                listUsers.Add(user.getFIO());
+                listUsers.Add(user.getFamilia());
             }
             CmbExecutor.ItemsSource = listUsers;
         }
@@ -96,8 +96,8 @@ namespace ROGOZ.Pages
                     {
                         var selectedTask = new Task
                         {
-                            //ExecutorID = int.Parse(CmbExecutor.Text),
-                            Executor = user1Entities.GetContext().Executor.FirstOrDefault(o=>o.User.getFIO()== CmbExecutor.Text),
+                            ExecutorID = CmbExecutor.TabIndex,
+                            //Executor = user1Entities.GetContext().Executor.FirstOrDefault(o=>o.User.getFamilia()== 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" 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" />

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

@@ -34,7 +34,7 @@ namespace ROGOZ.Pages
 
             foreach (var user in _context.User.ToList())
             {
-                listUsers.Add(user.getFIO());
+                listUsers.Add(user.getFamilia());
             }
             CmbExecutorSort.ItemsSource = listUsers;
 

+ 2 - 2
ROGOZ/User.cs

@@ -25,9 +25,9 @@ namespace ROGOZ
         public virtual Executor Executor { get; set; }
         public virtual Manager Manager { get; set; }
 
-        public string getFIO()
+        public string getFamilia()
         {
-            return FirstName+MiddleName+ " "+ LastName;
+            return MiddleName;
         }
     }
 }