Просмотр исходного кода

avalonia: Fixed Levae Requests time span format

Kenric Nugteren 1 месяц назад
Родитель
Сommit
0dfc6b5895

+ 4 - 4
PRS.Avalonia/PRS.Avalonia/Modules/MyHR/MyHRLeaveRequests/MyHRLeaveRequestsView.axaml

@@ -53,7 +53,7 @@
                                        VerticalContentAlignment="Center"
                                        Foreground="Black"/>
                             </DockPanel>
-                            <DockPanel Grid.Row="1" Grid.Column="1">
+                            <DockPanel Grid.Row="1" Grid.Column="1" LastChildFill="False">
                                 <Label DockPanel.Dock="Left"
                                        Content="{Binding From, StringFormat='{}{0:dd/MM/yy}'}"
                                        FontSize="{StaticResource PrsFontSizeExtraSmall}"
@@ -61,19 +61,19 @@
                                        VerticalContentAlignment="Center"
                                        Foreground="Black"/>
                                 <Label DockPanel.Dock="Left"
-                                       Content="{Binding FromTime, StringFormat='{}{0:hh\:mm}'}"
+                                       Content="{Binding FromTime, StringFormat='{}{0:hh\\:mm}'}"
                                        FontSize="{StaticResource PrsFontSizeExtraSmall}"
                                        VerticalAlignment="Stretch"
                                        VerticalContentAlignment="Center"
                                        Foreground="Black"/>
                                 <Label DockPanel.Dock="Right"
-                                       Content="{Binding To, StringFormat='{}{0:dd/MM/yy}'}"
+                                       Content="{Binding ToTime, StringFormat='{}{0:hh\\:mm}'}"
                                        FontSize="{StaticResource PrsFontSizeExtraSmall}"
                                        VerticalAlignment="Stretch"
                                        VerticalContentAlignment="Center"
                                        Foreground="Black"/>
                                 <Label DockPanel.Dock="Right"
-                                       Content="{Binding ToTime, StringFormat='{}{0:hh\:mm}'}"
+                                       Content="{Binding To, StringFormat='{}{0:dd/MM/yy}'}"
                                        FontSize="{StaticResource PrsFontSizeExtraSmall}"
                                        VerticalAlignment="Stretch"
                                        VerticalContentAlignment="Center"