./q

RaspisKusach/Pages/SchedulePage.xaml.cs

@@ -34,7 +34,7 @@ namespace RaspisKusach.Pages
                     TimeUpdate();
                     TripsUpdate();
                 }));
-                Task.Delay(1000).Wait();
+                Thread.Sleep(1000);
             }
         }
         void TimeUpdate()

RaspisKusach/Pages/SearchForTicketsPage.xaml

@@ -48,23 +48,14 @@
                         </ComboBox>
                     </StackPanel>
 
-                    <Label Content="Дата"
+                    <Label Content="Дата отправления"
                            Margin="0,10,0,10"
                            HorizontalAlignment="Center">
                     </Label>
-                    <StackPanel Orientation="Horizontal"
-                                Grid.Row="0"
-                                HorizontalAlignment="Center"
-                                Height="50">
-                        <DatePicker Margin="5,0,5,0"
-                             Width="80">
-                        </DatePicker>
-
-                        <DatePicker Margin="5,0,5,0"
-                             Width="80">
-                        </DatePicker>
-                    </StackPanel>
-
+                    <DatePicker Name="ArrivalDate"
+                                Width="160"
+                                HorizontalAlignment="Center">
+                    </DatePicker>
                     <Button Content="Поиск"
                             Margin="0,10,0,10"
                             Width="120"
@@ -78,8 +69,9 @@
 
         <ListBox Name="ListBox"
                  Grid.Column="1"
-                 BorderBrush="{x:Null}">
-            <ScrollViewer VerticalScrollBarVisibility="Visible"/>
+                 BorderBrush="{x:Null}"
+                 ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+           temp
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <Border Height="120"
@@ -89,48 +81,51 @@
                     BorderThickness="1.5"
                     BorderBrush="{StaticResource Selection}"
                     Margin="10,2,10,2">
-
-                        <Grid Background="{x:Null}">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                            </Grid.ColumnDefinitions>
+                        
+                        <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="40"/>
                                 <RowDefinition/>
                             </Grid.RowDefinitions>
-
-                            <!--UPLEFT-->
-                            <StackPanel Orientation="Horizontal"
+                            
+                            <!--UP-->
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <!--UPLEFT-->
+                                <StackPanel Orientation="Horizontal"
                             Grid.Column="0">
-                                <Image Width="35"
+                                    <Image Width="35"
                                Height="35"
                                Margin="5"
                                HorizontalAlignment="Left"
                                Source="/Resources/Train.png">
-                                </Image>
-                                <StackPanel>
-                                    <Label Content="{Binding route.IdRoute}"/>
-                                    <Label Content="{Binding str}"
+                                    </Image>
+                                    <StackPanel>
+                                        <Label Content="{Binding route.IdRoute}"/>
+                                        <Label Content="{Binding str}"
                                    Margin="0,-7,0,0"/>
+                                    </StackPanel>
                                 </StackPanel>
-                            </StackPanel>
-                            <!--UPRIGHT-->
-                            <StackPanel Orientation="Horizontal"
+                                <!--UPRIGHT-->
+                                <StackPanel Orientation="Horizontal"
                                 Grid.Column="1"
                                 HorizontalAlignment="Right">
-                                <Image Source="/Resources/Train.png"
+                                    <Image Source="/Resources/Train.png"
                                        Margin="3">
-                                </Image>
-                                <Image Source="/Resources/Train.png"
+                                    </Image>
+                                    <Image Source="/Resources/Train.png"
                                        Margin="3">
-                                </Image>
-                                <Image Source="/Resources/Train.png"
+                                    </Image>
+                                    <Image Source="/Resources/Train.png"
                                        Margin="3">
-                                </Image>
-
-                            </StackPanel>
+                                    </Image>
 
+                                </StackPanel>
+                            </Grid>
+                            
                             <!--DOWNLEFT-->
                             <Grid Grid.Row="1" Grid.Column="0"
                                   Background="{x:Null}">
@@ -162,21 +157,6 @@
                                     </StackPanel>
                                 </Grid>
                             </Grid>
-
-
-                            <!--DOWNRIGHT-->
-                            <ListBox Grid.Row="1" Grid.Column="1"
-                                     Background="{x:Null}"
-                                     BorderBrush="{x:Null}">
-                                <Grid Width="260" Height="20" Background="Black">
-
-                                </Grid>
-                                <Grid Width="260" Height="20" Background="Black">
-
-                                </Grid>
-                                <Grid Width="260" Height="20" Background="Black">
-                                </Grid>
-                            </ListBox>
                         </Grid>
                     </Border>
                 </DataTemplate>

RaspisKusach/Pages/SearchForTicketsPage.xaml.cs

@@ -27,22 +27,25 @@ namespace RaspisKusach.Pages
                 StationArrivalComboBox.Items.Add(station.Key);
                 StationDepartureComboBox.Items.Add(station.Key);
             }
-            UpdateRoutesList();
         }
         private void UpdateRoutesList()
         {
+
             Stations arrivalStation = cnt.db.Stations.Where(item => item.Location == StationArrivalComboBox.Text).FirstOrDefault(),
                 departureStation = cnt.db.Stations.Where(item => item.Location == StationDepartureComboBox.Text).FirstOrDefault();
             if (arrivalStation == null || departureStation == null)
                 return;
+
             List<TripClass> routeList = new List<TripClass>();
 
-            //Переделать
             foreach (Trips trip in cnt.db.Trips)
             {
                 if (cnt.db.RoutesStations.Select(item => item.Stations.Location + " " + item.IdRoute).Contains(arrivalStation.Location + " " + trip.IdRoute)
                     && cnt.db.RoutesStations.Select(item => item.Stations.Location + " " + item.IdRoute).Contains(departureStation.Location + " " + trip.IdRoute)
-                    && Functions.GetArrivalTime(arrivalStation, trip) > Functions.GetDepartureTime(departureStation, trip))
+                    && Functions.GetArrivalTime(arrivalStation, trip) > Functions.GetDepartureTime(departureStation, trip)
+                    && (Functions.GetArrivalTime(arrivalStation, trip).ToShortDateString() == ArrivalDate.Text
+                        || ArrivalDate.Text == null
+                        || ArrivalDate.Text.Trim() == ""))
                 {
                     TripClass rt = new TripClass();
                     rt.trip = trip;
@@ -61,13 +64,6 @@ namespace RaspisKusach.Pages
             ListBox.ItemsSource = routeList;
         }
 
-
-
-        private void Border_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-
-        }
-
         private void FindRoutesButton_Click(object sender, RoutedEventArgs e)
         {
             UpdateRoutesList();

RaspisKusach/Styles/Style.xaml

@@ -31,9 +31,6 @@
                      Color="#392570">
     </SolidColorBrush>
 
-    <Style TargetType="Grid">
-        <Setter Property="Background" Value="White"/>
-    </Style>
 
     <Style TargetType="Label">
         <Setter Property="HorizontalContentAlignment" Value="Center"/>