aa

Views/ProjectsView.axaml

@@ -125,7 +125,7 @@
 						<Setter Property="FontFamily" Value="Roboto"></Setter>
 						<Setter Property="FontWeight" Value="Medium"></Setter>
 						<Setter Property="FontSize" Value="18"></Setter>
-						<Setter Property="Margin" Value="60 0"></Setter>
+						<Setter Property="Margin" Value="90 0"></Setter>
 						<Setter Property="VerticalAlignment" Value="Center"></Setter>
 						<Setter Property="HorizontalAlignment" Value="Center"></Setter>
 					</Style>
@@ -194,14 +194,64 @@
 				</StackPanel>-->
 				<ScrollViewer Height="500">
 					<StackPanel Orientation="Vertical">
-						<ListBox ItemsSource="{Binding ListProjects}">
+						<StackPanel.Styles>
+							<Style Selector="ListBox.filters ListBoxItem:pointerover /template/ ContentPresenter">
+								<Setter Property="Background" Value="#FFF8F8"/>
+							</Style>
+							<Style Selector="ListBox.filters ListBoxItem:focus /template/ ContentPresenter">
+								<Setter Property="Background" Value="#F48288"/>
+							</Style>
+							<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>
+						<ListBox ItemsSource="{Binding ListProjects}" Classes="filters" Background="Transparent" IsTabStop="False">
 							<ListBox.ItemTemplate>
 								<DataTemplate>
 									<StackPanel Orientation="Horizontal" Margin="40 20 0 0">
-										<TextBlock Text="{Binding Projectid}" Classes="TextColumn">ID</TextBlock>
-										<TextBlock Text="{Binding Title}" Classes="TextColumn">Название</TextBlock>
-										<!--<TextBlock Text="{Binding }" Classes="TextColumn" Margin="30 0">Количество продуктов</TextBlock>-->
-										<TextBlock Text="{Binding Numofvisitsperweek}" Classes="TextColumn">Количество посещений в неделю</TextBlock>
+										<Border Classes="TextColumn" Width="90">
+											<TextBlock Text="{Binding Projectid}" Classes="TextColumn">ID</TextBlock>
+										</Border>
+										<Border Classes="TextColumn" Width="280">
+											<TextBlock Text="{Binding Title}" Classes="TextColumn">Название</TextBlock>
+										</Border>
+										<Border Classes="TextColumn" Width="250">
+											<TextBlock Text="1" Classes="TextColumn" Margin="30 0"></TextBlock>
+										</Border>
+										<Border Classes="TextColumn" Width="200" Margin="200 0 0 20">
+											<TextBlock Text="{Binding Numofvisitsperweek}" 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>

Views/VisitsView.axaml

@@ -169,44 +169,49 @@
 				</StackPanel>-->
 				<ScrollViewer Height="500">
 					<StackPanel Orientation="Vertical">
-						
-						<ListBox ItemsSource="{Binding ListVisits}">
+						<StackPanel.Styles>
+							<Style Selector="ListBox.filters ListBoxItem:pointerover /template/ ContentPresenter">
+								<Setter Property="Background" Value="#FFF8F8"/>
+							</Style>
+							<Style Selector="ListBox.filters ListBoxItem:focus /template/ ContentPresenter">
+								<Setter Property="Background" Value="#F48288"/>
+							</Style>
+							<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>
+						<ListBox ItemsSource="{Binding ListVisits}" Classes="filters" Background="Transparent" IsTabStop="False">
 							<ListBox.ItemTemplate>
 								<DataTemplate>
 									<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>
@@ -223,8 +228,7 @@
 											<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>
+											<Image Source="avares://Acosta/Assets/change.png" Width="20"></Image>
 										</Button>
 									</StackPanel>
 								</DataTemplate>