ソースを参照

some fixes for outlets

bai 4 ヶ月 前
コミット
e1b4ca233c
1 ファイル変更46 行追加42 行削除
  1. 46 42
      Views/OutletsView.axaml

+ 46 - 42
Views/OutletsView.axaml

@@ -101,17 +101,17 @@
 				</Style>
 			</StackPanel.Styles>
 			<StackPanel Orientation="Horizontal">
-			<Button Classes="BtBack" Command="{Binding BackPersonalAccountView}">
-				<TextBlock Classes="TextBtBack">Назад</TextBlock>
-			</Button>
-			<TextBlock Classes="Chapter">Выберите Торговую точку для изменения</TextBlock>
-			<StackPanel Orientation="Horizontal">
-				<Button Classes="BtAdd" Width="330" Command="{Binding AddOutletsView}">
-				<TextBlock Classes="TextBtAdd">Добавить торговую точку</TextBlock>				
+				<Button Classes="BtBack" Command="{Binding BackPersonalAccountView}">
+					<TextBlock Classes="TextBtBack">Назад</TextBlock>
 				</Button>
-				<Image Source="avares://Acosta/Assets/plus.png" Width="25" Margin="-70 80 0 0"></Image>
-			</StackPanel>			
-			</StackPanel>			
+				<TextBlock Classes="Chapter">Выберите Торговую точку для изменения</TextBlock>
+				<StackPanel Orientation="Horizontal">
+					<Button Classes="BtAdd" Width="330" Command="{Binding AddOutletsView}">
+						<TextBlock Classes="TextBtAdd">Добавить торговую точку</TextBlock>
+					</Button>
+					<Image Source="avares://Acosta/Assets/plus.png" Width="25" Margin="-70 80 0 0"></Image>
+				</StackPanel>
+			</StackPanel>
 		</StackPanel>
 		<StackPanel Background="Transparent" Margin="0 150 0 0" HorizontalAlignment="Center">
 			<StackPanel.Styles>
@@ -142,15 +142,15 @@
 				</Style>
 				<Style Selector="Border.TextColumns">
 					<Setter Property="Margin" Value="0 0 0 20"></Setter>
-				</Style>	
+				</Style>
 				<Style Selector="Border.Data">
 					<Setter Property="Background" Value="#FFF8F8"></Setter>
 					<Setter Property="BorderBrush" Value="#E40714"></Setter>
 					<Setter Property="CornerRadius" Value="13"></Setter>
 					<Setter Property="BorderThickness" Value="2"></Setter>
-				</Style>		
+				</Style>
 				<Style Selector="TextBlock.Data">
-					<Setter Property="Background" Value="#FFF8F8"></Setter>		
+					<Setter Property="Background" Value="#FFF8F8"></Setter>
 					<Setter Property="FontSize" Value="15"></Setter>
 					<Setter Property="FontFamily" Value="Roboto"></Setter>
 					<Setter Property="FontWeight" Value="Medium"></Setter>
@@ -181,41 +181,45 @@
 				</Style>
 			</StackPanel.Styles>
 			<Border Classes="TextColumns" Background="#80E40714" CornerRadius="13"  Width="1490" Height="40">
-					<StackPanel Orientation="Horizontal">
-						<TextBlock Classes="TextColumns">ID</TextBlock>
-						<TextBlock Classes="TextColumns">ТОРГОВАЯ СЕТЬ</TextBlock>
-						<TextBlock Classes="TextColumns">АДРЕС</TextBlock>
-						<TextBlock Classes="TextColumns">МЕСТОПОЛОЖЕНИЕ</TextBlock>
-					</StackPanel>				
+				<StackPanel Orientation="Horizontal">
+					<TextBlock Classes="TextColumns">ID</TextBlock>
+					<TextBlock Classes="TextColumns">ТОРГОВАЯ СЕТЬ</TextBlock>
+					<TextBlock Classes="TextColumns">АДРЕС</TextBlock>
+					<TextBlock Classes="TextColumns">МЕСТОПОЛОЖЕНИЕ</TextBlock>
+				</StackPanel>
 			</Border>
-			<ScrollViewer Height="600">	
-			<StackPanel Orientation="Vertical">
-				<ListBox Classes="filters" ItemsSource="{Binding ListOutlets}" Background="Transparent" IsTabStop="False">
-					<ListBox.ItemTemplate>
-						<DataTemplate>
-							<StackPanel Orientation="Horizontal" Margin="40 20 0 0">
-								<!--<Button Classes="BtEdit" Width="180" Height="40" Margin="0 0 140 0" Command="{Binding EditOutletsView}">
+			<ScrollViewer Height="600">
+				<StackPanel Orientation="Vertical">
+					<ListBox Classes="filters" ItemsSource="{Binding ListOutlets}" Background="Transparent" IsTabStop="False">
+						<ListBox.ItemTemplate>
+							<DataTemplate>
+								<StackPanel Orientation="Horizontal" Margin="40 0 0 0">
+									<!--<Button Classes="BtEdit" Width="180" Height="40" Margin="0 0 140 0" Command="{Binding EditOutletsView}">
 									<TextBlock Classes="TextBtEdit">Типа ID</TextBlock>
 								</Button>-->
-								<!--<Border  Classes="Data" CornerRadius="13"  Width="180" Height="40" Margin="0 0 140 0">
+									<!--<Border  Classes="Data" CornerRadius="13"  Width="180" Height="40" Margin="0 0 140 0">
 						<TextBlock Classes="Data">Типа ID</TextBlock>
 					</Border>-->
-								<TextBlock Text="{Binding Outletid}" Classes="EditTextBox" Width="70" Margin="0 0 140 0">Типа id</TextBlock>
-								<TextBlock Text="{Binding TradeNetworksNavigation.Title}" Classes="EditTextBox" Width="200" Margin="0 0 140 0">Типа название торговой сети</TextBlock>
-								<!--<Border  Classes="Data" CornerRadius="13"  Width="310" Height="40" Margin="0 0 140 0">
+									<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">
+										<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 145 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>
-							</StackPanel>
-						</DataTemplate>
-					</ListBox.ItemTemplate>
-				</ListBox>
-			</StackPanel>
+									<Border  Classes="Data" CornerRadius="13"  Width="220" Height="40" Margin="0 0 120 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>
+								</StackPanel>
+							</DataTemplate>
+						</ListBox.ItemTemplate>
+					</ListBox>
+				</StackPanel>
 			</ScrollViewer>
 		</StackPanel>
 		<!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
@@ -247,4 +251,4 @@
 			</Button>
 		</StackPanel>-->
 	</Grid>
-</UserControl>
+</UserControl>