瀏覽代碼

Полное ФИО и КомбоБоксы за 69,99

MaddieChaotica 1 年之前
父節點
當前提交
85c73ed27e
共有 6 個文件被更改,包括 31 次插入5 次删除
  1. 1 1
      ROGOZ/App.config
  2. 1 1
      ROGOZ/Pages/AddEditPage.xaml
  3. 14 2
      ROGOZ/Pages/AddEditPage.xaml.cs
  4. 1 1
      ROGOZ/Pages/TaskList.xaml
  5. 9 0
      ROGOZ/Pages/TaskList.xaml.cs
  6. 5 0
      ROGOZ/User.cs

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

+ 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}" 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"/>
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">

+ 14 - 2
ROGOZ/Pages/AddEditPage.xaml.cs

@@ -22,6 +22,8 @@ namespace ROGOZ.Pages
     /// </summary>
     public partial class AddEditPage : Page
     {
+        private user1Entities _context = new user1Entities();
+        private List<string> listUsers = new List<string>();
         private Task _currentTask = null;
         public AddEditPage()
         {
@@ -30,8 +32,12 @@ namespace ROGOZ.Pages
             //DPDeadLine.SelectedDate = DateTime.Today;
             DataContext = _currentTask;
             CmbStatus.ItemsSource = Status.FillStatus();
-            CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();
             CmbTaskType.ItemsSource = WorkType.FillWorkType();
+            foreach (var user in _context.User.ToList())
+            {
+                listUsers.Add(user.getFIO());
+            }
+            CmbExecutor.ItemsSource = listUsers;
         }
 
         public AddEditPage(Task selectedTask)
@@ -41,11 +47,17 @@ namespace ROGOZ.Pages
             //DPDeadLine.SelectedDate = DateTime.Today;
             _currentTask = selectedTask;
             CmbStatus.ItemsSource = Status.FillStatus();
-            CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();
+            //CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();
             CmbTaskType.ItemsSource = WorkType.FillWorkType();
             if (selectedTask != null)
                 _currentTask = selectedTask;
             DataContext = _currentTask;
+
+            foreach (var user in _context.User.ToList())
+            {
+                listUsers.Add(user.getFIO());
+            }
+            CmbExecutor.ItemsSource = listUsers;
         }
         private void BtnCancel_Click(object sender, RoutedEventArgs e)
         {

+ 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" Text="{Binding ExecutorID}" DisplayMemberPath="ID" 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" />

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

@@ -20,6 +20,8 @@ namespace ROGOZ.Pages
     /// </summary>
     public partial class TaskList : Page
     {
+        private user1Entities _context = new user1Entities();
+        private List<string> listUsers = new List<string>();
         public TaskList()
         {
             InitializeComponent();
@@ -30,6 +32,13 @@ namespace ROGOZ.Pages
 
             DGTasks.ItemsSource = user1Entities.GetContext().Task.ToList();
             //DGTasks.ItemsSource = user1Entities.GetContext().Manager.ToList();
+
+            foreach (var user in _context.User.ToList())
+            {
+                listUsers.Add(user.getFIO());
+            }
+            CmbExecutorSort.ItemsSource = listUsers;
+
         }
 
         private void BtnAdd_Click(object sender, RoutedEventArgs e)

+ 5 - 0
ROGOZ/User.cs

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