Browse Source

complete edit EditOutletsView and AddOutletsView

GoncharovaNE 4 months ago
parent
commit
d6c3a2de21
2 changed files with 26 additions and 6 deletions
  1. 11 5
      Views/AddOutletsView.axaml
  2. 15 1
      Views/EditOutletsView.axaml

+ 11 - 5
Views/AddOutletsView.axaml

@@ -67,7 +67,7 @@
 					<Setter Property="FontSize" Value="18"></Setter>
 					<Setter Property="Margin" Value="200 30 0 0"></Setter>
 				</Style>
-				<Style Selector="TextBox">
+				<Style Selector="ComboBox">
 					<Setter Property="Background" Value="#FFF8F8"></Setter>
 					<Setter Property="BorderBrush" Value="#E40714"></Setter>
 					<Setter Property="CornerRadius" Value="9"></Setter>
@@ -75,6 +75,14 @@
 					<Setter Property="FontSize" Value="14"></Setter>
 					<Setter Property="FontFamily" Value="Roboto"></Setter>
 				</Style>
+				<Style Selector="TextBox">
+					<Setter Property="Background" Value="#FFF8F8"></Setter>
+					<Setter Property="BorderBrush" Value="#E40714"></Setter>
+					<Setter Property="CornerRadius" Value="9"></Setter>
+					<Setter Property="BorderThickness" Value="2"></Setter>
+					<Setter Property="FontSize" Value="14"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+				</Style>				
 				<Style Selector="TextBox:pointerover /template/ TextBlock#PART_Watermark">
 					<Setter Property="TextBox.BorderBrush" Value="#A10009" />
 				</Style>
@@ -156,15 +164,13 @@
 			<StackPanel Orientation="Vertical">
 				<StackPanel Orientation="Horizontal">
 					<TextBlock Classes="TextToTextBox">Торговая сеть:</TextBlock>
-					<ComboBox ItemsSource="{Binding OutletVM.Trades}" SelectedItem="{Binding OutletVM.CurrentOutlet.TradeNetworksNavigation}">
+					<ComboBox Width="360" Margin="120 25 0 0" ItemsSource="{Binding OutletVM.Trades}" SelectedItem="{Binding OutletVM.CurrentOutlet.TradeNetworksNavigation}">
 						<ComboBox.ItemTemplate>
 							<DataTemplate>
 								<TextBlock Text="{Binding Title}"/>
 							</DataTemplate>
 						</ComboBox.ItemTemplate>
-					</ComboBox>
-				
-									
+					</ComboBox>		
 				</StackPanel>				
 					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>				
 				<StackPanel Orientation="Horizontal">

+ 15 - 1
Views/EditOutletsView.axaml

@@ -67,6 +67,14 @@
 					<Setter Property="FontSize" Value="18"></Setter>
 					<Setter Property="Margin" Value="200 30 0 0"></Setter>
 				</Style>
+				<Style Selector="ComboBox">
+					<Setter Property="Background" Value="#FFF8F8"></Setter>
+					<Setter Property="BorderBrush" Value="#E40714"></Setter>
+					<Setter Property="CornerRadius" Value="9"></Setter>
+					<Setter Property="BorderThickness" Value="2"></Setter>
+					<Setter Property="FontSize" Value="14"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+				</Style>
 				<Style Selector="TextBox">
 					<Setter Property="Background" Value="#FFF8F8"></Setter>
 					<Setter Property="BorderBrush" Value="#E40714"></Setter>
@@ -156,7 +164,13 @@
 			<StackPanel Orientation="Vertical">				
 				<StackPanel Orientation="Horizontal">
 					<TextBlock Classes="TextToTextBox">Торговая сеть:</TextBlock>
-					<TextBox Text="{Binding EditOutletVM.CurrentOutlet.TradeNetworksNavigation.Title}" Watermark="Торговая сеть" Width="360" Margin="120 20 0 0"></TextBox>
+					<ComboBox Width="360" Margin="120 25 0 0" ItemsSource="{Binding OutletVM.Trades}" SelectedItem="{Binding OutletVM.CurrentOutlet.TradeNetworksNavigation}">
+						<ComboBox.ItemTemplate>
+							<DataTemplate>
+								<TextBlock Text="{Binding Title}"/>
+							</DataTemplate>
+						</ComboBox.ItemTemplate>
+					</ComboBox>
 				</StackPanel>
 				<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
 				<StackPanel Orientation="Horizontal">