Katya 4 months ago
parent
commit
62e1fab44b
1 changed files with 56 additions and 39 deletions
  1. 56 39
      Views/VisitsView.axaml

+ 56 - 39
Views/VisitsView.axaml

@@ -139,42 +139,11 @@
 						<TextBlock Classes="TextColumns">НАЗВАНИЕ ПРОЕКТА</TextBlock>
 						<TextBlock Classes="TextColumns">ДАТА ВИЗИТА</TextBlock>
 						<TextBlock Classes="TextColumns">ВРЕМЯ ВИЗИТА</TextBlock>
-						<TextBlock Classes="TextColumns">ВИЗИТ ПРИНЯТ</TextBlock>
+						<TextBlock Classes="TextColumns" Margin="20 0 60 0">ВИЗИТ ПРИНЯТ</TextBlock>
 					</StackPanel>
 				</Border>	
 			</StackPanel>
-			<StackPanel.Styles>
-				<Style Selector="TextBlock.TextColumn">
-					<Setter Property="Foreground" Value="Black"></Setter>
-					<Setter Property="FontFamily" Value="Roboto"></Setter>
-					<Setter Property="FontWeight" Value="Medium"></Setter>
-					<Setter Property="FontSize" Value="18"></Setter>
-					<Setter Property="Margin" Value="50 0"></Setter>
-					<Setter Property="VerticalAlignment" Value="Center"></Setter>
-					<Setter Property="HorizontalAlignment" Value="Center"></Setter>
-				</Style>
-				<Style Selector="ComboBox.TextColumn">
-					<Setter Property="Foreground" Value="Black"></Setter>
-					<Setter Property="FontFamily" Value="Roboto"></Setter>
-					<Setter Property="FontWeight" Value="Medium"></Setter>
-					<Setter Property="FontSize" Value="18"></Setter>
-					<Setter Property="VerticalAlignment" Value="Center"></Setter>
-					<Setter Property="HorizontalAlignment" Value="Center"></Setter>
-					<Setter Property="BorderBrush" Value="Transparent"></Setter>
-					<Setter Property="Background" Value="Transparent"></Setter>
-					<Setter Property="Width" Value="180"></Setter>
-				</Style>
-				<Style Selector="Border.TextColumn">
-					<Setter Property="Margin" Value="60 0 0 20"></Setter>
-					<Setter Property="HorizontalAlignment" Value="Center"></Setter>
-					<Setter Property="VerticalAlignment" Value="Center"></Setter>
-					<Setter Property="Background" Value="#FFF8F8"></Setter>
-					<Setter Property="Height" Value="40"></Setter>
-					<Setter Property="BorderBrush" Value="#E40714"></Setter>
-					<Setter Property="BorderThickness" Value="2"></Setter>
-					<Setter Property="CornerRadius" Value="13"></Setter>
-				</Style>
-			</StackPanel.Styles>
+			
 			<StackPanel Orientation="Vertical" Margin="0 30">
 				<!--<StackPanel Orientation="Horizontal">
 					<Border Classes="TextColumn">
@@ -200,15 +169,63 @@
 				</StackPanel>-->
 				<ScrollViewer Height="500">
 					<StackPanel Orientation="Vertical">
+						
 						<ListBox ItemsSource="{Binding ListVisits}">
 							<ListBox.ItemTemplate>
 								<DataTemplate>
-									<StackPanel Orientation="Horizontal" Margin="40 20 0 0">
-										<TextBlock Text="{Binding OutletNavigation.Address}" Classes="TextColumn">Название торговой точки</TextBlock>
-										<TextBlock Text="{Binding ProjectNavigation.Title}" Classes="TextColumn">Название проекта</TextBlock>
-										<TextBlock Text="{Binding Visitdate}" Classes="TextColumn" Margin="30 0">Дата визита</TextBlock>
-										<TextBlock Text="{Binding Visittime}" Classes="TextColumn">Время визита</TextBlock>
-										<TextBlock Text="{Binding AcceptedNavigation.Title}" Classes="TextColumn">Принят</TextBlock>
+									<StackPanel Orientation="Horizontal" Margin="0 20 0 0">
+										<StackPanel.Styles>
+											<Style Selector="TextBlock.TextColumn">
+												<Setter Property="Foreground" Value="Black"></Setter>
+												<Setter Property="FontFamily" Value="Roboto"></Setter>
+												<Setter Property="FontWeight" Value="Medium"></Setter>
+												<Setter Property="FontSize" Value="18"></Setter>
+												<Setter Property="Margin" Value="10 0"></Setter>
+												<Setter Property="VerticalAlignment" Value="Center"></Setter>
+												<Setter Property="HorizontalAlignment" Value="Center"></Setter>
+											</Style>
+											<Style Selector="ComboBox.TextColumn">
+												<Setter Property="Foreground" Value="Black"></Setter>
+												<Setter Property="FontFamily" Value="Roboto"></Setter>
+												<Setter Property="FontWeight" Value="Medium"></Setter>
+												<Setter Property="FontSize" Value="18"></Setter>
+												<Setter Property="VerticalAlignment" Value="Center"></Setter>
+												<Setter Property="HorizontalAlignment" Value="Center"></Setter>
+												<Setter Property="BorderBrush" Value="Transparent"></Setter>
+												<Setter Property="Background" Value="Transparent"></Setter>
+												<Setter Property="Width" Value="180"></Setter>
+											</Style>
+											<Style Selector="Border.TextColumn">
+												<Setter Property="Margin" Value="60 0 0 20"></Setter>
+												<Setter Property="HorizontalAlignment" Value="Center"></Setter>
+												<Setter Property="VerticalAlignment" Value="Center"></Setter>
+												<Setter Property="Background" Value="#FFF8F8"></Setter>
+												<Setter Property="Height" Value="40"></Setter>
+												<Setter Property="BorderBrush" Value="#E40714"></Setter>
+												<Setter Property="BorderThickness" Value="2"></Setter>
+												<Setter Property="CornerRadius" Value="13"></Setter>
+												<Setter Property="Width" Value="150"></Setter>
+											</Style>
+										</StackPanel.Styles>
+										<Border Classes="TextColumn" Width="350">
+											<TextBlock Text="{Binding OutletNavigation.Address}" Classes="TextColumn">Название торговой точки</TextBlock>
+										</Border>
+										<Border Classes="TextColumn" Width="250">
+											<TextBlock Text="{Binding ProjectNavigation.Title}" Classes="TextColumn">Название проекта</TextBlock>
+										</Border>
+										<Border Classes="TextColumn" Width="180">
+											<TextBlock Text="{Binding Visitdate}" Classes="TextColumn" Margin="30 0">Дата визита</TextBlock>
+										</Border>
+										<Border Classes="TextColumn" Width="170">
+											<TextBlock Text="{Binding Visittime}" Classes="TextColumn">Время визита</TextBlock>
+										</Border>
+										<Border Classes="TextColumn">
+											<TextBlock Text="{Binding AcceptedNavigation.Title}" Classes="TextColumn">Принят</TextBlock>
+										</Border>
+										<Button Margin="30 5" FontFamily="Roboto" VerticalAlignment="Top">
+											<Image Source="avares://Acosta/Assets/change.png" Width="20
+												   "></Image>
+										</Button>
 									</StackPanel>
 								</DataTemplate>
 							</ListBox.ItemTemplate>