Переглянути джерело

Незначительные изменения визуала

Alexey 6 місяців тому
батько
коміт
588970560f

+ 28 - 10
PP_Ven_MosS/Pages/ApplicationsListAdmin.xaml

@@ -54,7 +54,7 @@
                                     <CheckBox Name="TF" Uid="{Binding Id_application}" Checked="TF_Checked"></CheckBox>
                                 </StackPanel>
                                 <GroupBox Height="40" Header="Дата служебной записки" BorderThickness="2" BorderBrush="#FF0000">
-                                    <TextBlock Text="{Binding Date_app}"/>
+                                    <TextBlock Text="{Binding Date_app,StringFormat=dd.MM.yyyy}"/>
                                 </GroupBox>
                                 <GroupBox Height="40" Header="Место" BorderThickness="2" BorderBrush="#FF0000">
                                     <TextBlock Text="{Binding Place_app}"/>
@@ -93,16 +93,34 @@
                 </ListView.ItemsPanel>
                 <ListView.ItemTemplate>
                     <DataTemplate>
-                        <Border Width="500" Height="170" BorderThickness="1" BorderBrush="Red">
-                            <StackPanel  Width="300" HorizontalAlignment="Left" Orientation="Vertical">
+                        <Border Width="500" Height="300" BorderThickness="1" BorderBrush="Red">
+                            <StackPanel  Width="300" HorizontalAlignment="Center" Orientation="Vertical">
                                 <CheckBox Name="TFE" IsChecked="{Binding status}" Uid="{Binding Id_event}" Checked="TFE_Checked"></CheckBox>
-                                <TextBlock Text="{Binding Date_event}"/>
-                                <TextBlock Text="{Binding Place_for_event}" TextWrapping="Wrap"/>
-                                <TextBlock Text="{Binding Title_event}"/>
-                                <TextBlock Text="{Binding Path=Events_type.Title_events_type}"/>
-                                <TextBlock Text="{Binding Description_event}"/>
-                                <TextBlock Text="{Binding Path=User.Surname}"/>
-                                <TextBlock Text="{Binding Path=Status_event.Title_status_event}" FontWeight="Bold"/>
+                                <GroupBox Height="40" Header="Дата мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                    <TextBlock Text="{Binding Date_event,StringFormat=dd.MM.yyyy}"/>
+                                </GroupBox>
+                                <GroupBox Height="40" Header="Место проведения" BorderThickness="2" BorderBrush="#FF0000">
+                                    <TextBlock Text="{Binding Place_for_event}" TextWrapping="Wrap"/>
+                                </GroupBox>
+                                <GroupBox Height="40" Header="Название " BorderThickness="2" BorderBrush="#FF0000">
+                                    <TextBlock Text="{Binding Title_event}"/>
+                                </GroupBox>
+                                <GroupBox Height="40" Header="Тип мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                    <TextBlock Text="{Binding Path=Events_type.Title_events_type}"/>
+                                </GroupBox>
+                                <GroupBox Height="40" Header="Описание мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                    <TextBlock Text="{Binding Description_event}"/>
+                                </GroupBox>
+                                <GroupBox Height="40" Header="Фамилия" BorderThickness="2" BorderBrush="#FF0000">
+                                    <TextBlock Text="{Binding Path=User.Surname}"/>
+                                </GroupBox>
+                                <GroupBox Height="40" Header="Статус мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                    <TextBlock Text="{Binding Path=Status_event.Title_status_event}" FontWeight="Bold"/>
+                                </GroupBox>
+                               
+                                <GroupBox Height="40" Header="Оценка мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                    <TextBlock  Text="{Binding score}"></TextBlock>
+                                </GroupBox>
                                 <GroupBox Header="Поставить оценку" FontSize="10" Style="{StaticResource GBSt}" HorizontalAlignment="Right">
                                     <ComboBox x:Name="CBCount" Height="20" SelectionChanged="CBCount_SelectionChanged" Uid="{Binding Id_Event}" Loaded="CBCount_Loaded" />
                                 </GroupBox>

+ 28 - 12
PP_Ven_MosS/Pages/ApplicationsListUser.xaml

@@ -53,7 +53,7 @@
                         <Border Width="500" Height="250" BorderThickness="1" BorderBrush="Red">
                             <StackPanel Margin="10,0,0,0" Width="300" Orientation="Vertical" HorizontalAlignment="Center">
                                 <GroupBox Height="40" Header="Дата служебной записки" BorderThickness="2" BorderBrush="#FF0000">
-                                    <TextBlock Text="{Binding Date_app}"/>
+                                    <TextBlock Text="{Binding Date_app,StringFormat=dd.MM.yyyy}"/>
                                 </GroupBox>
                                 <GroupBox Height="40" Header="Место" BorderThickness="2" BorderBrush="#FF0000">
                                     <TextBlock Text="{Binding Place_app}"/>
@@ -92,18 +92,34 @@
                 </ListView.ItemsPanel>
                 <ListView.ItemTemplate>
                     <DataTemplate>
-                        <Border Width="500" Height="150" BorderThickness="1" BorderBrush="Red">
-                            <StackPanel Orientation="Horizontal">
-                            <StackPanel Margin="10,0,0,0" Width="300" Orientation="Vertical" HorizontalAlignment="Left">
-                                    <TextBlock Text="{Binding Date_event,StringFormat=dd.MM.yyyy}"/>
-                                <TextBlock Text="{Binding Place_for_event}" TextWrapping="Wrap"/>
-                                <TextBlock Text="{Binding Title_event}"/>
-                                <TextBlock Text="{Binding Path=Events_type.Title_events_type}"/>
-                                <TextBlock Text="{Binding Description_event}"/>
-                                <TextBlock Text="{Binding Path=User.Surname}"/>
-                                    <TextBlock Text="{Binding Path=Status_event.Title_status_event}" FontWeight="Bold"/>
+                        <Border Width="500" Height="300" BorderThickness="1" BorderBrush="Red">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                            <StackPanel Margin="10,0,0,0" Width="300" Orientation="Vertical" HorizontalAlignment="Center">
+                                    <GroupBox Height="40" Header="Дата мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Date_event,StringFormat=dd.MM.yyyy}"/>
+                                    </GroupBox>
+                                    <GroupBox Height="40" Header="Место проведения" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Place_for_event}" TextWrapping="Wrap"/>
+                                    </GroupBox>
+                                    <GroupBox Height="40" Header="Название " BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Title_event}"/>
+                                    </GroupBox>
+                                    <GroupBox Height="40" Header="Тип мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Path=Events_type.Title_events_type}"/>
+                                    </GroupBox>
+                                    <GroupBox Height="40" Header="Описание мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Description_event}"/>
+                                    </GroupBox>
+                                    <GroupBox Height="40" Header="Фамилия" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Path=User.Surname}"/>
+                                    </GroupBox>
+                                    <GroupBox Height="40" Header="Статус мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Path=Status_event.Title_status_event}" FontWeight="Bold"/>
+                                    </GroupBox>
                                     <TextBlock Uid="{Binding Id_event}" Loaded="TextBlock_Loaded"></TextBlock>
-                                    <TextBlock  Text="{Binding score}"></TextBlock>
+                                    <GroupBox Height="40" Header="Оценка мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock  Text="{Binding score}"></TextBlock>
+                                    </GroupBox>
                                 </StackPanel>
                                 <!--<Button Style="{StaticResource BtnSt}" Name="InfoEv" Click="GoInfoForEvent_Click" Content="Информаия"></Button>-->
                         </StackPanel>

+ 29 - 12
PP_Ven_MosS/Pages/MenuAdmin.xaml

@@ -57,7 +57,7 @@
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                 <StackPanel Margin="10,0,0,0" Width="300" Height="500" Orientation="Vertical" HorizontalAlignment="Center">
                                     <GroupBox Height="40" Header="Дата служебной записки" BorderThickness="2" BorderBrush="#FF0000">
-                                    <TextBlock Text="{Binding Date_app}"/>
+                                        <TextBlock Text="{Binding Date_app,StringFormat=dd.MM.yyyy}"/>
                                     </GroupBox>
                                     <GroupBox Height="40" Header="Место" BorderThickness="2" BorderBrush="#FF0000">
                                         <TextBlock Text="{Binding Place_app}"/>
@@ -100,17 +100,34 @@
                 </ListView.ItemsPanel>
                 <ListView.ItemTemplate>
                     <DataTemplate>
-                        <Border Width="500" Height="140" BorderThickness="1" BorderBrush="Red">
-                            <StackPanel Orientation="Horizontal">
-                                <StackPanel Margin="10,0,0,0" Width="300" HorizontalAlignment="Left" Orientation="Vertical">
-                                    <TextBlock Text="{Binding Date_event}"/>
-                                    <TextBlock Text="{Binding Place_for_event}" TextWrapping="Wrap"/>
-                                    <TextBlock Text="{Binding Title_event}"/>
-                                    <TextBlock Text="{Binding Path=Events_type.Title_events_type}"/>
-                                    <TextBlock Text="{Binding Description_event}"/>
-                                    <TextBlock Text="{Binding Path=User.Surname}"/>
-                                    <TextBlock Text="{Binding Path=Status_event.Title_status_event}" FontWeight="Bold"/>
-                                    <Button Content="Создать отчет" Click="Report_Click" Name="GoToReport" Style="{StaticResource BtnSt}" Uid="{Binding Id_event}"></Button>
+                        <Border Width="500" Height="350" BorderThickness="1" BorderBrush="Red">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                                <StackPanel Margin="10,0,0,0" Width="300" HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Vertical">
+                                    <GroupBox Height="40" Header="Дата мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Date_event,StringFormat=dd.MM.yyyy}"/>
+                                    </GroupBox>
+                                    <GroupBox Height="40" Header="Место проведения" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Place_for_event}" TextWrapping="Wrap"/>
+                                    </GroupBox>
+                                    <GroupBox Height="40" Header="Название " BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Title_event}"/>
+                                    </GroupBox>
+                                    <GroupBox Height="40" Header="Тип мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Path=Events_type.Title_events_type}"/>
+                                    </GroupBox>
+                                    <GroupBox Height="40" Header="Описание мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Description_event}"/>
+                                    </GroupBox>
+                                    <GroupBox Height="40" Header="Фамилия" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Path=User.Surname}"/>
+                                    </GroupBox>
+                                    <GroupBox Height="40" Header="Статус мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock Text="{Binding Path=Status_event.Title_status_event}" FontWeight="Bold"/>
+                                    </GroupBox>
+                                    <GroupBox Height="40" Header="Оценка мероприятия" BorderThickness="2" BorderBrush="#FF0000">
+                                        <TextBlock  Text="{Binding score}"></TextBlock>
+                                    </GroupBox>
+                                    <Button VerticalAlignment="Bottom" HorizontalAlignment="Left" Content="Создать отчет" Click="Report_Click" Name="GoToReport" Style="{StaticResource BtnSt}" Uid="{Binding Id_event}"></Button>
                                 </StackPanel>
                                 <Button VerticalAlignment="Bottom" HorizontalAlignment="Right" Content="Удалить" Name="DeleteBtn" Style="{StaticResource BtnSt}" Click="DeleteBtn_Click" Uid="{Binding Id_event}"></Button>
                             </StackPanel>

+ 7 - 7
PP_Ven_MosS/Pages/Profile.xaml

@@ -19,25 +19,25 @@
         </StackPanel>
         <StackPanel Grid.Row="1" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
             <GroupBox Width="500" Height="50" Header="Фамилия">
-                <TextBox x:Name="txtSurn" MinWidth="500" BorderBrush="#FF6C73E6" BorderThickness="0,0,0,2"/>
+                <TextBox x:Name="txtSurn" MinWidth="500" BorderBrush="#FF0000" BorderThickness="0,0,0,2"/>
             </GroupBox>
             <GroupBox  Width="500" Height="50" Header="Имя">
-                <TextBox x:Name="txtName" MinWidth="500"  BorderBrush="#FF6C73E6" BorderThickness="0,0,0,2"/>
+                <TextBox x:Name="txtName" MinWidth="500"  BorderBrush="#FF0000" BorderThickness="0,0,0,2"/>
             </GroupBox>
             <GroupBox Width="500" Height="50" Header="Отчество">
-                <TextBox x:Name="txtPatron" MinWidth="500" BorderBrush="#FF6C73E6" BorderThickness="0,0,0,2"/>
+                <TextBox x:Name="txtPatron" MinWidth="500" BorderBrush="#FF0000" BorderThickness="0,0,0,2"/>
             </GroupBox>
             <GroupBox Width="500" Height="50" Header="Должность">
-                <TextBox x:Name="txtPost" MinWidth="500" BorderBrush="#FF6C73E6" BorderThickness="0,0,0,2"/>
+                <TextBox x:Name="txtPost" MinWidth="500" BorderBrush="#FF0000" BorderThickness="0,0,0,2"/>
             </GroupBox>
             <GroupBox Width="500" Height="50" Header="Номер телефона">
-                <TextBox x:Name="txtPhone" MinWidth="500" BorderBrush="#FF6C73E6" BorderThickness="0,0,0,2"/>
+                <TextBox x:Name="txtPhone" MinWidth="500" BorderBrush="#FF0000" BorderThickness="0,0,0,2"/>
             </GroupBox>
             <GroupBox Width="500" Height="50" Header="Логин">
-                <TextBox x:Name="txtLog" MinWidth="500" BorderBrush="#FF6C73E6" BorderThickness="0,0,0,2"/>
+                <TextBox x:Name="txtLog" MinWidth="500" BorderBrush="#FF0000" BorderThickness="0,0,0,2"/>
             </GroupBox>
             <GroupBox Width="500" Height="50" Header="Пароль">
-                <TextBox x:Name="txtPass" MinWidth="500" BorderBrush="#FF6C73E6" BorderThickness="0,0,0,2"/>
+                <TextBox x:Name="txtPass" MinWidth="500" BorderBrush="#FF0000" BorderThickness="0,0,0,2"/>
             </GroupBox>
             <GroupBox Width="500" Height="50" Header="Выполненные заявки" Visibility="Hidden" Name="GBApp">
                 <TextBlock x:Name="txtApp" MinWidth="500"/>