intermediate commit for Angelica

Views/AddEmployeesView.axaml

@@ -67,6 +67,14 @@
 					<Setter Property="FontSize" Value="18"></Setter>
 					<Setter Property="Margin" Value="200 30 0 0"></Setter>
 				</Style>
+				<Style Selector="ComboBox">
+					<Setter Property="Background" Value="#FFF8F8"></Setter>
+					<Setter Property="BorderBrush" Value="#E40714"></Setter>
+					<Setter Property="CornerRadius" Value="9"></Setter>
+					<Setter Property="BorderThickness" Value="2"></Setter>
+					<Setter Property="FontSize" Value="14"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+				</Style>
 				<Style Selector="TextBox">
 					<Setter Property="Background" Value="#FFF8F8"></Setter>
 					<Setter Property="BorderBrush" Value="#E40714"></Setter>
@@ -166,22 +174,22 @@
 					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
 					<StackPanel Orientation="Horizontal">
 						<TextBlock Classes="TextToTextBox">Отчетсво:</TextBlock>
-						<TextBox Text="{Binding AddEmployeesVM.CurrentUser.Patronymic}" Watermark="Отчетсво" Width="360" Margin="156 20 0 0"></TextBox>
+						<TextBox Text="{Binding AddEmployeesVM.CurrentUser.Patronymic}" Watermark="Отчетсво" Width="360" Margin="160 20 0 0"></TextBox>
 					</StackPanel>
 					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
 					<StackPanel Orientation="Horizontal">
 						<TextBlock Classes="TextToTextBox">Почта:</TextBlock>
-						<TextBox Text="{Binding AddEmployeesVM.CurrentUser.Email}" Watermark="Почта" Width="360" Margin="183 20 0 0"></TextBox>
+						<TextBox Text="{Binding AddEmployeesVM.CurrentUser.Email}" Watermark="Почта" Width="360" Margin="185 20 0 0"></TextBox>
 					</StackPanel>
 					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
 					<StackPanel Orientation="Horizontal">
 						<TextBlock Classes="TextToTextBox">Пароль:</TextBlock>
-						<TextBox Text="{Binding AddEmployeesVM.CurrentUser.Password}" Watermark="Пароль" Width="360" Margin="170 20 0 0"></TextBox>
+						<TextBox Text="{Binding AddEmployeesVM.CurrentUser.Password}" Watermark="Пароль" Width="360" Margin="175 20 0 0"></TextBox>
 					</StackPanel>
 					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
 					<StackPanel Orientation="Horizontal">
 						<TextBlock Classes="TextToTextBox">Телефон:</TextBlock>
-						<TextBox Text="{Binding AddEmployeesVM.CurrentUser.Phonenumber}" Watermark="Телефон" Width="360" Margin="165 20 0 0"></TextBox>
+						<TextBox Text="{Binding AddEmployeesVM.CurrentUser.Phonenumber}" Watermark="Телефон" Width="360" Margin="168 20 0 0"></TextBox>
 					</StackPanel>
 					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
 					<!--<StackPanel Orientation="Horizontal">
@@ -190,7 +198,7 @@
 					</StackPanel>-->
 					<StackPanel Orientation="Horizontal">
 						<TextBlock Classes="TextToTextBox">Роль:</TextBlock>
-						<ComboBox ItemsSource="{Binding AddEmployeesVM.Roles}" SelectedItem="{Binding AddEmployeesVM.CurrentUser.RoleNavigation}">
+						<ComboBox Width="360" Margin="200 27 0 0" ItemsSource="{Binding AddEmployeesVM.Roles}" SelectedItem="{Binding AddEmployeesVM.CurrentUser.RoleNavigation}">
 							<ComboBox.ItemTemplate>
 								<DataTemplate>
 									<TextBlock Text="{Binding Title}"/>

Views/EditEmployeesView.axaml

@@ -58,6 +58,14 @@
 					<Setter Property="FontSize" Value="18"></Setter>
 					<Setter Property="Margin" Value="200 30 0 0"></Setter>
 				</Style>
+				<Style Selector="ComboBox">
+					<Setter Property="Background" Value="#FFF8F8"></Setter>
+					<Setter Property="BorderBrush" Value="#E40714"></Setter>
+					<Setter Property="CornerRadius" Value="9"></Setter>
+					<Setter Property="BorderThickness" Value="2"></Setter>
+					<Setter Property="FontSize" Value="14"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+				</Style>
 				<Style Selector="TextBox">
 					<Setter Property="Background" Value="#FFF8F8"></Setter>
 					<Setter Property="BorderBrush" Value="#E40714"></Setter>
@@ -144,57 +152,60 @@
 				<TextBlock Classes="Chapter">Изменение данных о сотруднике</TextBlock>
 			</StackPanel>
 			<ScrollViewer Height="600">
-			<StackPanel Orientation="Vertical">
-				<StackPanel Orientation="Horizontal">
-					<TextBlock Classes="TextToTextBox">ID:</TextBlock>
-					<TextBox Text="{Binding EditUserVM.CurrentUser.Employeesid}" Watermark="ID" Width="360" Margin="218 20 0 0"></TextBox>
-				</StackPanel>
-				<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
-				<StackPanel Orientation="Horizontal">
-					<TextBlock Classes="TextToTextBox">Фамилия:</TextBlock>
-					<TextBox Text="{Binding EditUserVM.CurrentUser.Surname}" Watermark="Фималия" Width="360" Margin="160 20 0 0"></TextBox>
-				</StackPanel>
-				<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
-				<StackPanel Orientation="Horizontal">
-					<TextBlock Classes="TextToTextBox">Имя:</TextBlock>
-					<TextBox Text="{Binding EditUserVM.CurrentUser.Name}" Watermark="Имя" Width="360" Margin="200 20 0 0"></TextBox>
-				</StackPanel>
-				<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
-				<StackPanel Orientation="Horizontal">
-					<TextBlock Classes="TextToTextBox">Отчетсво:</TextBlock>
-					<TextBox Text="{Binding EditUserVM.CurrentUser.Patronymic}" Watermark="Отчетсво" Width="360" Margin="156 20 0 0"></TextBox>
-				</StackPanel>
-				<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
-				<StackPanel Orientation="Horizontal">
-					<TextBlock Classes="TextToTextBox">Почта:</TextBlock>
-					<TextBox Text="{Binding EditUserVM.CurrentUser.Email}" Watermark="Почта" Width="360" Margin="185 20 0 0"></TextBox>
-				</StackPanel>
-				<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
-				<StackPanel Orientation="Horizontal">
-					<TextBlock Classes="TextToTextBox">Телефон:</TextBlock>
-					<TextBox Text="{Binding EditUserVM.CurrentUser.Phonenumber}" Watermark="Телефон" Width="360" Margin="165 20 0 0"></TextBox>
-				</StackPanel>
-				<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
-				<StackPanel Orientation="Horizontal">
-					<TextBlock Classes="TextToTextBox">Роль:</TextBlock>
-					<TextBox Text="{Binding EditUserVM.CurrentUser.RoleNavigation.Title}" Watermark="Роль" Width="360" Margin="197 20 0 0"></TextBox>
-				</StackPanel>
-				<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
 				<StackPanel Orientation="Vertical">
+					<StackPanel Orientation="Horizontal">
+						<TextBlock Classes="TextToTextBox">Фамилия:</TextBlock>
+						<TextBox Text="{Binding EditUserVM.CurrentUser.Surname}" Watermark="Фамилия" Width="360" Margin="160 20 0 0"></TextBox>
+					</StackPanel>
+					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
+					<StackPanel Orientation="Horizontal">
+						<TextBlock Classes="TextToTextBox">Имя:</TextBlock>
+						<TextBox Text="{Binding EditUserVM.CurrentUser.Name}" Watermark="Имя" Width="360" Margin="200 20 0 0"></TextBox>
+					</StackPanel>
+					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
+					<StackPanel Orientation="Horizontal">
+						<TextBlock Classes="TextToTextBox">Отчетсво:</TextBlock>
+						<TextBox Text="{Binding EditUserVM.CurrentUser.Patronymic}" Watermark="Отчетсво" Width="360" Margin="160 20 0 0"></TextBox>
+					</StackPanel>
+					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
+					<StackPanel Orientation="Horizontal">
+						<TextBlock Classes="TextToTextBox">Почта:</TextBlock>
+						<TextBox Text="{Binding EditUserVM.CurrentUser.Email}" Watermark="Почта" Width="360" Margin="185 20 0 0"></TextBox>
+					</StackPanel>
+					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
+					<StackPanel Orientation="Horizontal">
+						<TextBlock Classes="TextToTextBox">Телефон:</TextBlock>
+						<TextBox Text="{Binding EditUserVM.CurrentUser.Phonenumber}" Watermark="Телефон" Width="360" Margin="168 20 0 0"></TextBox>
+					</StackPanel>
+					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="200 30 0 10" HorizontalAlignment="Left"></Border>
+					<!--<StackPanel Orientation="Horizontal">
+						<TextBlock Classes="TextToTextBox">Роль:</TextBlock>
+						<TextBox Text="{Binding EditUserVM.CurrentUser.Role}" Watermark="Роль" Width="360" Margin="200 20 0 0"></TextBox>
+					</StackPanel>-->
+					<StackPanel Orientation="Horizontal">
+						<TextBlock Classes="TextToTextBox">Роль:</TextBlock>
+						<ComboBox Width="360" Margin="200 27 0 0" ItemsSource="{Binding AddEmployeesVM.Roles}" SelectedItem="{Binding AddEmployeesVM.CurrentUser.RoleNavigation}">
+							<ComboBox.ItemTemplate>
+								<DataTemplate>
+									<TextBlock Text="{Binding Title}"/>
+								</DataTemplate>
+							</ComboBox.ItemTemplate>
+						</ComboBox>
+					</StackPanel>
+					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="197 30 0 10" HorizontalAlignment="Left"></Border>
 					<TextBlock Classes="TextToTextBox">Проекты:</TextBlock>
-					<ListBox ItemsSource="{Binding ListProjects}">
+					<ListBox ItemsSource="{Binding ListProjects}" Background="Transparent" IsTabStop="False" Classes="filters" Width="1150">
 						<ListBox.ItemTemplate>
 							<DataTemplate>
 								<StackPanel Orientation="Vertical">
-									<CheckBox Classes="TextToCheckBox" Margin="202 10 0 0">
+									<CheckBox Classes="TextToCheckBox" Margin="-5 0 0 -10">
 										<TextBlock Text="{Binding Title}"></TextBlock>
 									</CheckBox>
 								</StackPanel>
 							</DataTemplate>
 						</ListBox.ItemTemplate>
-					</ListBox>	
+					</ListBox>
 				</StackPanel>
-			</StackPanel>
 			</ScrollViewer>
 		</StackPanel>
 		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">

Views/PersonalAccountView.axaml

@@ -78,7 +78,6 @@
 						<Setter Property="Background" Value="Transparent"></Setter>
 					</Style>
 				</StackPanel.Styles>
-
 				<Border Classes="field">
 					<Grid>
 						<StackPanel Orientation="Horizontal">