merge with together

ViewModels/MainWindowViewModel.cs

@@ -37,6 +37,7 @@ namespace Acosta.ViewModels
 
         public void LoadPersonalAccount()
         {
+            UC = new AddEmployeesView();/*PersonalAccountView();*/
             Employee? currentUser = myConnection.Employees.FirstOrDefault(x => x.Email == AuthorizationVM.Login && x.Password == AuthorizationVM.Password);
             if (currentUser == null)
             {

Views/AddEmployeesView.axaml

@@ -153,18 +153,28 @@
 					</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 Watermark="ФИО" Width="360" Margin="195 20 0 0"></TextBox>
+						<TextBlock Classes="TextToTextBox">Фамилия:</TextBlock>
+						<TextBox 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 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 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 Watermark="Почта" Width="360" Margin="185 20 0 0"></TextBox>
+						<TextBox Watermark="Почта" Width="360" Margin="183 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 Watermark="Пароль" Width="360" Margin="175 20 0 0"></TextBox>
+						<TextBox Watermark="Пароль" Width="360" Margin="170 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">
@@ -176,7 +186,7 @@
 						<TextBlock Classes="TextToTextBox">Роль:</TextBlock>
 						<TextBox 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>
+					<Border Background="#969696" CornerRadius="13"  Width="1150" Height="0.5" Margin="197 30 0 10" HorizontalAlignment="Left"></Border>
 					<StackPanel Orientation="Vertical">
 						<TextBlock Classes="TextToTextBox">Проекты:</TextBlock>
 						<CheckBox Classes="TextToCheckBox" Margin="202 10 0 0">

Views/EditEmployeesView.axaml

@@ -153,8 +153,18 @@
 				</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 Watermark="ФИО" Width="360" Margin="195 20 0 0"></TextBox>
+					<TextBlock Classes="TextToTextBox">Фамилия:</TextBlock>
+					<TextBox 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 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 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">
@@ -169,7 +179,7 @@
 				<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 Watermark="Роль" Width="360" Margin="200 20 0 0"></TextBox>
+					<TextBox 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">

Views/EmployeesView.axaml

@@ -133,7 +133,8 @@
 					<Setter Property="FontFamily" Value="Roboto"></Setter>
 					<Setter Property="FontWeight" Value="Medium"></Setter>
 					<Setter Property="FontSize" Value="20"></Setter>
-					<Setter Property="Margin" Value="40 0 185 0"></Setter>
+					<!--<Setter Property="Margin" Value="40 0 185 0"></Setter>-->
+					<Setter Property="Margin" Value="40 0 100 0"></Setter>
 					<Setter Property="VerticalAlignment" Value="Center"></Setter>
 				</Style>
 				<Style Selector="Border.TextColumns">
@@ -179,7 +180,10 @@
 			<Border Classes="TextColumns" Background="#80E40714" CornerRadius="13"  Width="1490" Height="40">
 				<StackPanel Orientation="Horizontal">
 					<TextBlock Classes="TextColumns">ID</TextBlock>
-					<TextBlock Classes="TextColumns">СОТРУДНИКИ</TextBlock>
+					<!--<TextBlock Classes="TextColumns">СОТРУДНИКИ</TextBlock>-->
+					<TextBlock Classes="TextColumns">ФАМИЛИЯ</TextBlock>
+					<TextBlock Classes="TextColumns">ИМЯ</TextBlock>
+					<TextBlock Classes="TextColumns">ОТЧЕСТВО</TextBlock>
 					<TextBlock Classes="TextColumns">РОЛЬ</TextBlock>
 					<TextBlock Classes="TextColumns">ПОЧТА</TextBlock>
 					<TextBlock Classes="TextColumns">ТЕЛЕФОН</TextBlock>
@@ -187,17 +191,18 @@
 			</Border>
 			<ScrollViewer Height="500">
 			<StackPanel Orientation="Vertical">
-				<StackPanel Orientation="Horizontal" Margin="40 0 0 0">
+				<!--СЛИТНОЕ ФИО-->
+				<!--<StackPanel Orientation="Horizontal" Margin="40 0 0 0">
 					<Button Classes="BtEdit" Width="180" Height="40" Margin="0 0 65 0" Command="{Binding EditEmployeesView}">
 						<TextBlock Classes="TextBtEdit">Типа ID</TextBlock>
 					</Button>
-					<!--<Border  Classes="Data" CornerRadius="13"  Width="180" Height="40" Margin="0 0 140 0">
+					--><!--<Border  Classes="Data" CornerRadius="13"  Width="180" Height="40" Margin="0 0 140 0">
 						<TextBlock Classes="Data">Типа ID</TextBlock>
-					</Border>-->
+					</Border>--><!--
 					<TextBox Classes="EditTextBox" Width="230" Margin="0 0 125 0">Типа сотрудник</TextBox>
-					<!--<Border  Classes="Data" CornerRadius="13"  Width="310" Height="40" Margin="0 0 140 0">
+					--><!--<Border  Classes="Data" CornerRadius="13"  Width="310" Height="40" Margin="0 0 140 0">
 						<TextBlock Classes="Data">Типа название торговой сети</TextBlock>
-					</Border>-->
+					</Border>--><!--
 					<Border  Classes="Data" CornerRadius="13"  Width="170" Height="40" Margin="0 0 105 0">
 						<TextBlock Classes="Data">Типа  роль</TextBlock>
 					</Border>
@@ -207,18 +212,22 @@
 					<Border  Classes="Data" CornerRadius="13"  Width="255" Height="40">
 						<TextBlock Classes="Data">Типа  телефон</TextBlock>
 					</Border>
-				</StackPanel>
-				<StackPanel Orientation="Horizontal" Margin="40 20 0 0">
+				</StackPanel>-->
+				<!--<StackPanel Orientation="Horizontal" Margin="40 20 0 0">
 					<Button Classes="BtEdit" Width="180" Height="40" Margin="0 0 65 0" Command="{Binding EditEmployeesView}">
 						<TextBlock Classes="TextBtEdit">Типа ID</TextBlock>
 					</Button>
-					<!--<Border  Classes="Data" CornerRadius="13"  Width="180" Height="40" Margin="0 0 140 0">
+					-->
+				<!--<Border  Classes="Data" CornerRadius="13"  Width="180" Height="40" Margin="0 0 140 0">
 						<TextBlock Classes="Data">Типа ID</TextBlock>
 					</Border>-->
+				<!--
 					<TextBox Classes="EditTextBox" Width="230" Margin="0 0 125 0">Типа сотрудник</TextBox>
-					<!--<Border  Classes="Data" CornerRadius="13"  Width="310" Height="40" Margin="0 0 140 0">
+					-->
+				<!--<Border  Classes="Data" CornerRadius="13"  Width="310" Height="40" Margin="0 0 140 0">
 						<TextBlock Classes="Data">Типа название торговой сети</TextBlock>
 					</Border>-->
+				<!--
 					<Border  Classes="Data" CornerRadius="13"  Width="170" Height="40" Margin="0 0 105 0">
 						<TextBlock Classes="Data">Типа  роль</TextBlock>
 					</Border>
@@ -228,6 +237,56 @@
 					<Border  Classes="Data" CornerRadius="13"  Width="255" Height="40">
 						<TextBlock Classes="Data">Типа  телефон</TextBlock>
 					</Border>
+				</StackPanel>-->
+				<!--РАЗДЕЛЬНОЕ ФИО-->
+				<StackPanel Orientation="Horizontal" Margin="70 0 0 0"><!--Margin="40 0 0 0"-->
+					<Button Classes="BtEdit" Width="90" Height="40" Margin="0 0 70 0" Command="{Binding EditEmployeesView}">
+						<TextBlock Classes="TextBtEdit">ID</TextBlock>
+					</Button>
+					<!--<Border  Classes="Data" CornerRadius="13"  Width="180" Height="40" Margin="0 0 140 0">
+						<TextBlock Classes="Data">Типа ID</TextBlock>
+					</Border>-->
+					<!--<TextBox Classes="EditTextBox" Width="230" Margin="0 0 125 0">Типа сотрудник</TextBox>-->
+					<TextBox Classes="EditTextBox" Width="170" Margin="0 0 70 0">Типа фамилия</TextBox>
+					<TextBox Classes="EditTextBox" Width="130" Margin="0 0 55 0">Типа имя</TextBox>
+					<TextBox Classes="EditTextBox" Width="170" Margin="0 0 70 0">Типа отчество</TextBox>
+					<!--<Border  Classes="Data" CornerRadius="13"  Width="310" Height="40" Margin="0 0 140 0">
+						<TextBlock Classes="Data">Типа название торговой сети</TextBlock>
+					</Border>-->
+					<Border  Classes="Data" CornerRadius="13"  Width="130" Height="40" Margin="0 0 63 0">
+						<TextBlock Classes="Data">Типа  роль</TextBlock>
+					</Border>
+					<Border  Classes="Data" CornerRadius="13"  Width="150" Height="40" Margin="0 0 55 0">
+						<TextBlock Classes="Data">Типа  почта</TextBlock>
+					</Border>
+					<Border  Classes="Data" CornerRadius="13"  Width="170" Height="40">
+						<TextBlock Classes="Data">Типа  телефон</TextBlock>
+					</Border>
+				</StackPanel>
+				<StackPanel Orientation="Horizontal" Margin="70 20 0 0">
+					<!--Margin="40 0 0 0"-->
+					<Button Classes="BtEdit" Width="90" Height="40" Margin="0 0 70 0" Command="{Binding EditEmployeesView}">
+						<TextBlock Classes="TextBtEdit">ID</TextBlock>
+					</Button>
+					<!--<Border  Classes="Data" CornerRadius="13"  Width="180" Height="40" Margin="0 0 140 0">
+						<TextBlock Classes="Data">Типа ID</TextBlock>
+					</Border>-->
+					<!--<TextBox Classes="EditTextBox" Width="230" Margin="0 0 125 0">Типа сотрудник</TextBox>-->
+					<TextBox Classes="EditTextBox" Width="170" Margin="0 0 70 0">Типа фамилия</TextBox>
+					<TextBox Classes="EditTextBox" Width="130" Margin="0 0 55 0">Типа имя</TextBox>
+					<TextBox Classes="EditTextBox" Width="170" Margin="0 0 70 0">Типа отчество</TextBox>
+					<!--<Border  Classes="Data" CornerRadius="13"  Width="310" Height="40" Margin="0 0 140 0">
+						<TextBlock Classes="Data">Типа название торговой сети</TextBlock>
+					</Border>-->
+					<Border  Classes="Data" CornerRadius="13"  Width="130" Height="40" Margin="0 0 63 0">
+						<TextBlock Classes="Data">Типа  роль</TextBlock>
+					</Border>
+					<Border  Classes="Data" CornerRadius="13"  Width="150" Height="40" Margin="0 0 55 0">
+						<TextBlock Classes="Data">Типа  почта</TextBlock>
+					</Border>
+					<Border  Classes="Data" CornerRadius="13"  Width="170" Height="40">
+						<TextBlock Classes="Data">Типа  телефон</TextBlock>
+					</Border>
 				</StackPanel>
 			</StackPanel>			
 			</ScrollViewer>