Browse Source

Ладно щас комбобоксы сделаем и потом фигачем лабы

Danila Alekseev 1 năm trước cách đây
mục cha
commit
fb079f2130
3 tập tin đã thay đổi với 41 bổ sung10 xóa
  1. 35 0
      ROGOZ/Dictionary.xaml
  2. 4 8
      ROGOZ/Pages/AddEditPage.xaml.cs
  3. 2 2
      ROGOZ/Pages/TaskList.xaml

+ 35 - 0
ROGOZ/Dictionary.xaml

@@ -291,6 +291,41 @@
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="Padding" Value="6 -1 6 -1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TextBox">
+                    <Border Background="{TemplateBinding Background}" 
+                            BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="True">
+                        <Grid Margin="{TemplateBinding Margin}">
+                            <ScrollViewer x:Name="PART_ContentHost"
+                                          Focusable="False"
+                                          HorizontalScrollBarVisibility="Hidden"
+                                          VerticalScrollBarVisibility="Hidden"/>
+                            <Label x:Name="WaterMarkerLabel" 
+                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                   Visibility="Collapsed"
+                                   Margin="7,-7,0,0"
+                                   Content="{TemplateBinding Tag}"
+                                   FontSize="25"
+                                   Foreground="#293745"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="Text" Value=""/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Visibility"
+                                    TargetName="WaterMarkerLabel"
+                                    Value="Visible"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
         <Style.Resources>
             <Style TargetType ="Border">
                 <Setter Property="CornerRadius" Value="10"/>

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

@@ -34,12 +34,8 @@ namespace ROGOZ.Pages
             CmbTaskType.ItemsSource = WorkType.FillWorkType();
             //CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();
 
-            //CmbExecutor.ItemsSource = _context.User.Where(u=>u.Executor != null).ToList();
-            LoadExecutors();
-        }
-        private void LoadExecutors()
-        {
-            CmbExecutor.ItemsSource = _context.User.Where(u => u.Executor != null).ToList();
+            CmbExecutor.ItemsSource = _context.User.Where(u=>u.Executor != null).ToList();
+            
         }
 
         public AddEditPage(Task selectedTask)
@@ -49,8 +45,8 @@ namespace ROGOZ.Pages
             CmbStatus.ItemsSource = Status.FillStatus();
             //CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();
 
-            //CmbExecutor.ItemsSource = _context.User.Where(u => u.Executor != null).ToList();
-            LoadExecutors();
+            CmbExecutor.ItemsSource = _context.User.Where(u => u.Executor != null).ToList();
+           
 
             CmbTaskType.ItemsSource = WorkType.FillWorkType();
             if (selectedTask != null)

+ 2 - 2
ROGOZ/Pages/TaskList.xaml

@@ -15,7 +15,7 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.RowSpan="2" Width="725">
-            <ComboBox Margin="10" Padding="6 5" Width="200" Height="40" Name="CmbStatusSort" FontSize="18" Text="{Binding Status}" DisplayMemberPath="Name" Style="{DynamicResource ComboBoxStyle1}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}" LostFocus="CmbStatusSort_LostFocus" SelectionChanged="CmbStatusSort_SelectionChanged" >
+            <ComboBox Margin="50,10" Padding="6 5" Width="250" Height="40" Name="CmbStatusSort" FontSize="18" Text="{Binding Status}" DisplayMemberPath="Name" Style="{DynamicResource ComboBoxStyle1}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}" LostFocus="CmbStatusSort_LostFocus" SelectionChanged="CmbStatusSort_SelectionChanged" >
                 
             </ComboBox>
 
@@ -23,7 +23,7 @@
             <!--<ComboBox Margin="5" Padding="6 5" Width="200" Height="40" Name="CmbExecutorSort" FontSize="20" DisplayMemberPath="" 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" />
+            <TextBox Name="TBoxSearch" Padding="7,0,0,0" Tag="Поиск" Width="250" Height="40" Margin="0,0,20,0" FontSize="25" HorizontalAlignment="Right" Style="{DynamicResource AddTaskTB}" TextChanged="TBoxSearch_TextChanged" />
 
             <Separator Background="Transparent" BorderThickness="0" Width="7"/>
             <Button Name="ClearFilters" Width="45" Height="45" Style="{DynamicResource ClearSort}" Click="ClearFilters_Click">