Browse Source

create button edit in OutletsView

GoncharovaNE 4 months ago
parent
commit
06a7dcbf3d
3 changed files with 13 additions and 8 deletions
  1. 1 1
      Acosta.csproj
  2. 1 1
      Views/EmployeesView.axaml
  3. 11 6
      Views/OutletsView.axaml

+ 1 - 1
Acosta.csproj

@@ -12,7 +12,7 @@
     <Folder Include="Models\" />
     <AvaloniaResource Include="Assets\**" />
   </ItemGroup>
-
+	
   <ItemGroup>
 	  <AvaloniaResource Include="Assets\eye.png" />
   </ItemGroup>

+ 1 - 1
Views/EmployeesView.axaml

@@ -193,7 +193,7 @@
 					<TextBlock Classes="TextColumns">ТЕЛЕФОН</TextBlock>
 				</StackPanel>
 			</Border>
-			<ScrollViewer Height="600">
+			<ScrollViewer Height="550">
 			<StackPanel Orientation="Vertical">				
 				<!--СЛИТНОЕ ФИО-->
 				<!--<StackPanel Orientation="Horizontal" Margin="40 0 0 0">

+ 11 - 6
Views/OutletsView.axaml

@@ -188,7 +188,7 @@
 					<TextBlock Classes="TextColumns">МЕСТОПОЛОЖЕНИЕ</TextBlock>
 				</StackPanel>
 			</Border>
-			<ScrollViewer Height="600">
+			<ScrollViewer Height="550">
 				<StackPanel Orientation="Vertical">
 					<ListBox Classes="filters" ItemsSource="{Binding ListOutlets}" Background="Transparent" IsTabStop="False">
 						<ListBox.ItemTemplate>
@@ -203,19 +203,24 @@
 									<Border  Classes="Data" CornerRadius="13"  Width="150" Height="40" Margin="0 0 120 0">
 										<TextBlock Text="{Binding Outletid}" Classes="Data">Типа id</TextBlock>
 									</Border>
-									<Border  Classes="Data" CornerRadius="13"  Width="240" Height="40" Margin="0 0 160 0">
+									<Border  Classes="Data" CornerRadius="13"  Width="280" Height="40" Margin="0 0 130 0">
 										<TextBlock Text="{Binding TradeNetworksNavigation.Title}" Classes="Data">Типа название торговой сети</TextBlock>
 									</Border>
 									<!--<Border  Classes="Data" CornerRadius="13"  Width="310" Height="40" Margin="0 0 140 0">
 						<TextBlock Classes="Data">Типа название торговой сети</TextBlock>
 					</Border>-->
-									<Border  Classes="Data" CornerRadius="13"  Width="220" Height="40" Margin="0 0 120 0">
+									<Border  Classes="Data" CornerRadius="13"  Width="220" Height="40" Margin="0 0 110 0">
 										<TextBlock Text="{Binding Address}" Classes="Data">Типа  адрес</TextBlock>
 									</Border>
-									<Border  Classes="Data" CornerRadius="13"  Width="280" Height="40">
-										<TextBlock Text="{Binding Location}" Classes="Data">Типа  местоположение </TextBlock>
+									<Border  Classes="Data" CornerRadius="13"  Width="350" Height="40" Margin="0 0 20 0">
+										<TextBlock Text="{Binding Location}" Classes="Data">Типа  местоположение</TextBlock>
 									</Border>
-									<Button Content="Изменить" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).EditOutlet}" CommandParameter ="{Binding Outletid}"/>
+									<!--<Button Classes="BtEdit" Content="Изменить" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).EditOutlet}" CommandParameter ="{Binding Outletid}"/>-->
+									<StackPanel Orientation="Horizontal">
+										<Button Classes="BtEdit" Width="40" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).EditOutlet}" CommandParameter ="{Binding Outletid}">
+											<Image Source="avares://Acosta/Assets/change.png" Width="25"></Image>
+										</Button>										
+									</StackPanel>
 								</StackPanel>
 							</DataTemplate>
 						</ListBox.ItemTemplate>