Browse Source

done OutletsView, AddOutletsView and EditOutletsView

GoncharovaNE 4 months ago
parent
commit
59a0c715d8
4 changed files with 577 additions and 24 deletions
  1. 13 2
      ViewModels/MainWindowViewModel.cs
  2. 234 2
      Views/AddOutletsView.axaml
  3. 239 2
      Views/EditOutletsView.axaml
  4. 91 18
      Views/OutletsView.axaml

+ 13 - 2
ViewModels/MainWindowViewModel.cs

@@ -11,7 +11,7 @@ namespace Acosta.ViewModels
 
         public void LoadPersonalAccount()
         {
-            UC = new TradeNetworksView();//PersonalAccountView();
+            UC = new OutletsView();//PersonalAccountView();
         }
         public void ExitFromProfile()
         {
@@ -25,6 +25,17 @@ namespace Acosta.ViewModels
         {
             UC = new TradeNetworksView();
         }
-
+        public void AddOutletsView()
+        {
+            UC = new AddOutletsView();
+        }
+        public void BackOutletsView()
+        {
+            UC = new OutletsView();
+        }
+        public void EditOutletsView()
+        {
+            UC = new EditOutletsView();
+        }
     }
 }

+ 234 - 2
Views/AddOutletsView.axaml

@@ -2,7 +2,239 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             mc:Ignorable="d" d:DesignWidth="1550" d:DesignHeight="800.5"
+			 xmlns:vm="using:Acosta.ViewModels"
+			 x:DataType="vm:MainWindowViewModel"
              x:Class="Acosta.Views.AddOutletsView">
-  Welcome to Avalonia!
+	<Grid>
+		<StackPanel Width="1550" Height="50" Background="#E40714" VerticalAlignment="Top">
+			<StackPanel.Styles>
+				<Style Selector="TextBlock.headerLogo">
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Regular"></Setter>
+					<Setter Property="FontSize" Value="35"></Setter>
+					<Setter Property="Margin" Value="30 0 0 0"></Setter>
+				</Style>
+				<Style Selector="TextBlock.greeting">
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+				</Style>
+				<Style Selector="Button.headerBt">
+					<Setter Property="Background" Value="Transparent"></Setter>
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="Margin" Value="0 5 0 0"></Setter>
+				</Style>
+				<Style Selector="Button.headerBt:pointerover /template/ ContentPresenter">
+					<Setter Property="Background" Value="Transparent"></Setter>
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>	
+					<Setter Property="TextBlock.TextDecorations" Value="Underline"></Setter>	
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+				</Style>
+				<Style Selector="Button.headerBt:pressed">
+					<Setter Property="RenderTransform" Value="none"/>
+				</Style>
+			</StackPanel.Styles>
+			<StackPanel Orientation="Horizontal">
+				<TextBlock Classes="headerLogo">Acosta</TextBlock>
+				<TextBlock Classes="greeting" Margin="670 12 0 0">Добро пожаловать, оператор</TextBlock>
+				<TextBlock Classes="greeting" Margin="7 12 0 0" FontWeight="Bold" Name="FIO">Фамилия И.О.</TextBlock>
+				<TextBlock Classes="greeting" Margin="10 10 0 0">/</TextBlock>
+				<Button Classes="headerBt" Command="">Изменить пароль</Button>
+				<TextBlock Classes="greeting" Margin="0 10 0 0">/</TextBlock>
+				<Button Classes="headerBt" Command="{Binding ExitFromProfile}">Выйти</Button>
+			</StackPanel>			
+		</StackPanel>
+		<StackPanel Orientation="Vertical">
+			<StackPanel.Styles>
+				<Style Selector="TextBlock.TextToTextBox">
+					<Setter Property="Foreground" Value="Black"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Regular"></Setter>
+					<Setter Property="FontSize" Value="18"></Setter>
+					<Setter Property="Margin" Value="200 30 0 0"></Setter>
+				</Style>
+				<Style Selector="TextBox">
+					<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="18"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+				</Style>
+				<Style Selector="TextBox:pointerover /template/ TextBlock#PART_Watermark">
+					<Setter Property="TextBox.BorderBrush" Value="#A10009" />
+				</Style>
+				<Style Selector="TextBox:focus /template/ TextBlock#PART_Watermark">
+					<Setter Property="TextBox.BorderBrush" Value="#A10009" />
+				</Style>
+				<Style Selector="TextBlock.TextBtBack">
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+					<Setter Property="HorizontalAlignment" Value="Center"></Setter>
+					<Setter Property="VerticalAlignment" Value="Center"></Setter>
+				</Style>
+				<Style Selector="TextBlock.Chapter">
+					<Setter Property="Foreground" Value="Black"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+					<Setter Property="Margin" Value="30 85 0 0"></Setter>
+				</Style>
+				<Style Selector="Button.BtBack">
+					<Setter Property="Width" Value="140"></Setter>
+					<Setter Property="Height" Value="40"></Setter>
+					<Setter Property="Margin" Value="30 80 0 0"></Setter>
+					<Setter Property="Background" Value="#E40714"></Setter>
+					<Setter Property="CornerRadius" Value="13"></Setter>
+				</Style>
+				<Style Selector="Button.BtBack:pointerover /template/ ContentPresenter">
+					<Setter Property="Background" Value="#A10009"></Setter>
+				</Style>
+				<Style Selector="Button.BtBack:pressed">
+					<Setter Property="RenderTransform" Value="none"/>
+				</Style>
+				<Style Selector="Button.BtAdd">
+					<Setter Property="Height" Value="35"></Setter>
+					<Setter Property="Margin" Value="620 80 0 0"></Setter>
+					<Setter Property="Background" Value="#E40714"></Setter>
+					<Setter Property="CornerRadius" Value="13"></Setter>
+				</Style>
+				<Style Selector="Button.BtAdd:pointerover /template/ ContentPresenter">
+					<Setter Property="Background" Value="#A10009"></Setter>
+				</Style>
+				<Style Selector="TextBlock.TextBtAdd">
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+					<Setter Property="Margin" Value="20 0 0 0"></Setter>
+					<Setter Property="VerticalAlignment" Value="Center"></Setter>
+				</Style>
+				<Style Selector="ComboBox.TextToComboBox">
+					<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="18"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+				</Style>				
+				<Style Selector="Button.BtAdd:pressed">
+					<Setter Property="RenderTransform" Value="none"/>
+				</Style>
+				<Style Selector="CheckBox.TextToCheckBox">
+					<Setter Property="FontSize" Value="18"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+				</Style>
+				<Style Selector="CheckBox.TextToCheckBox /template/ Border#NormalRectangle">
+					<Setter Property="BorderBrush" Value="#E40714"/>
+					<Setter Property="CornerRadius" Value="5"></Setter>
+				</Style>
+			</StackPanel.Styles>
+			<StackPanel Orientation="Horizontal">
+			<Button Classes="BtBack" Command="{Binding BackOutletsView}">
+				<TextBlock Classes="TextBtBack">Назад</TextBlock>
+			</Button>
+			<TextBlock Classes="Chapter">Добавление торговой точки</TextBlock>					
+			</StackPanel>
+			<StackPanel Orientation="Vertical">
+				<StackPanel Orientation="Horizontal">
+					<TextBlock Classes="TextToTextBox">Торговая сеть:</TextBlock>					
+					<ComboBox Classes="TextToComboBox" SelectedIndex="0" Margin="120 20 0 0" Width="360" Height="40">
+						<ComboBoxItem IsEnabled="False">–––––––––––––</ComboBoxItem>
+						<!--пример-->
+						<ComboBoxItem>Магнит</ComboBoxItem>
+					</ComboBox>					
+				</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>
+				</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="90 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">
+					<TextBlock Classes="TextToTextBox">Проекты:</TextBlock>
+					<CheckBox Classes="TextToCheckBox" Margin="202 10 0 0">
+						<TextBlock>Проект “...”</TextBlock>
+					</CheckBox>
+					<CheckBox Classes="TextToCheckBox" Margin="202 10 0 0">
+						<TextBlock>Проект “...”</TextBlock>
+					</CheckBox>
+					<CheckBox Classes="TextToCheckBox" Margin="202 10 0 0">
+						<TextBlock>Проект “...”</TextBlock>
+					</CheckBox>
+				</StackPanel>
+			</StackPanel>
+			
+		</StackPanel>
+		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+			<StackPanel.Styles>
+				<Style Selector="TextBlock.TextBtDelete">
+					<Setter Property="Foreground" Value="#E40714"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+					<Setter Property="HorizontalAlignment" Value="Center"></Setter>
+					<Setter Property="VerticalAlignment" Value="Center"></Setter>
+				</Style>
+				<Style Selector="Button.BtDelete">
+					<Setter Property="BorderThickness" Value="2"></Setter>
+					<Setter Property="Width" Value="180"></Setter>
+					<Setter Property="Height" Value="38"></Setter>
+					<Setter Property="Margin" Value="0 740 70 20"></Setter>
+					<Setter Property="Background" Value="Transparent"></Setter>
+					<Setter Property="CornerRadius" Value="13"></Setter>
+					<Setter Property="BorderBrush" Value="#E40714"></Setter>
+				</Style>
+				<Style Selector="Button.BtDelete:pointerover /template/ ContentPresenter">
+					<Setter Property="BorderBrush" Value="#A10009"></Setter>
+					<Setter Property="Background" Value="Transparent"></Setter>
+				</Style>
+				<Style Selector="Button.BtDelete:pressed">
+					<Setter Property="RenderTransform" Value="none"/>
+				</Style>
+				
+				<Style Selector="TextBlock.TextBtSave">
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+					<Setter Property="HorizontalAlignment" Value="Center"></Setter>
+					<Setter Property="VerticalAlignment" Value="Center"></Setter>
+				</Style>
+				<Style Selector="Button.BtSave">
+					<Setter Property="Width" Value="180"></Setter>
+					<Setter Property="Height" Value="38"></Setter>
+					<Setter Property="Margin" Value="0 740 30 20"></Setter>
+					<Setter Property="Background" Value="#E40714"></Setter>
+					<Setter Property="CornerRadius" Value="13"></Setter>
+				</Style>
+				<Style Selector="Button.BtSave:pointerover /template/ ContentPresenter">
+					<Setter Property="Background" Value="#A10009"></Setter>
+				</Style>
+				<Style Selector="Button.BtSave:pressed">
+					<Setter Property="RenderTransform" Value="none"/>
+				</Style>
+			</StackPanel.Styles>
+			<Button Classes="BtDelete" Command="">
+				<TextBlock Classes="TextBtDelete">Удалить</TextBlock>
+			</Button>
+			<Button Classes="BtSave" Command="">
+				<TextBlock Classes="TextBtSave">Добавить</TextBlock>
+			</Button>
+		</StackPanel>
+	</Grid>
 </UserControl>

+ 239 - 2
Views/EditOutletsView.axaml

@@ -2,7 +2,244 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             mc:Ignorable="d" d:DesignWidth="1550" d:DesignHeight="800.5"
+			 xmlns:vm="using:Acosta.ViewModels"
+			 x:DataType="vm:MainWindowViewModel"
              x:Class="Acosta.Views.EditOutletsView">
-  Welcome to Avalonia!
+	<Grid>
+		<StackPanel Width="1550" Height="50" Background="#E40714" VerticalAlignment="Top">
+			<StackPanel.Styles>
+				<Style Selector="TextBlock.headerLogo">
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Regular"></Setter>
+					<Setter Property="FontSize" Value="35"></Setter>
+					<Setter Property="Margin" Value="30 0 0 0"></Setter>
+				</Style>
+				<Style Selector="TextBlock.greeting">
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+				</Style>
+				<Style Selector="Button.headerBt">
+					<Setter Property="Background" Value="Transparent"></Setter>
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="Margin" Value="0 5 0 0"></Setter>
+				</Style>
+				<Style Selector="Button.headerBt:pointerover /template/ ContentPresenter">
+					<Setter Property="Background" Value="Transparent"></Setter>
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="TextBlock.TextDecorations" Value="Underline"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+				</Style>
+				<Style Selector="Button.headerBt:pressed">
+					<Setter Property="RenderTransform" Value="none"/>
+				</Style>
+			</StackPanel.Styles>
+			<StackPanel Orientation="Horizontal">
+				<TextBlock Classes="headerLogo">Acosta</TextBlock>
+				<TextBlock Classes="greeting" Margin="670 12 0 0">Добро пожаловать, оператор</TextBlock>
+				<TextBlock Classes="greeting" Margin="7 12 0 0" FontWeight="Bold" Name="FIO">Фамилия И.О.</TextBlock>
+				<TextBlock Classes="greeting" Margin="10 10 0 0">/</TextBlock>
+				<Button Classes="headerBt" Command="">Изменить пароль</Button>
+				<TextBlock Classes="greeting" Margin="0 10 0 0">/</TextBlock>
+				<Button Classes="headerBt" Command="{Binding ExitFromProfile}">Выйти</Button>
+			</StackPanel>
+		</StackPanel>
+		<StackPanel Orientation="Vertical">
+			<StackPanel.Styles>
+				<Style Selector="TextBlock.TextToTextBox">
+					<Setter Property="Foreground" Value="Black"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Regular"></Setter>
+					<Setter Property="FontSize" Value="18"></Setter>
+					<Setter Property="Margin" Value="200 30 0 0"></Setter>
+				</Style>
+				<Style Selector="TextBox">
+					<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="18"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+				</Style>
+				<Style Selector="TextBox:pointerover /template/ TextBlock#PART_Watermark">
+					<Setter Property="TextBox.BorderBrush" Value="#A10009" />
+				</Style>
+				<Style Selector="TextBox:focus /template/ TextBlock#PART_Watermark">
+					<Setter Property="TextBox.BorderBrush" Value="#A10009" />
+				</Style>
+				<Style Selector="TextBlock.TextBtBack">
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+					<Setter Property="HorizontalAlignment" Value="Center"></Setter>
+					<Setter Property="VerticalAlignment" Value="Center"></Setter>
+				</Style>
+				<Style Selector="TextBlock.Chapter">
+					<Setter Property="Foreground" Value="Black"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+					<Setter Property="Margin" Value="30 85 0 0"></Setter>
+				</Style>
+				<Style Selector="Button.BtBack">
+					<Setter Property="Width" Value="140"></Setter>
+					<Setter Property="Height" Value="40"></Setter>
+					<Setter Property="Margin" Value="30 80 0 0"></Setter>
+					<Setter Property="Background" Value="#E40714"></Setter>
+					<Setter Property="CornerRadius" Value="13"></Setter>
+				</Style>
+				<Style Selector="Button.BtBack:pointerover /template/ ContentPresenter">
+					<Setter Property="Background" Value="#A10009"></Setter>
+				</Style>
+				<Style Selector="Button.BtBack:pressed">
+					<Setter Property="RenderTransform" Value="none"/>
+				</Style>
+				<Style Selector="Button.BtAdd">
+					<Setter Property="Height" Value="35"></Setter>
+					<Setter Property="Margin" Value="620 80 0 0"></Setter>
+					<Setter Property="Background" Value="#E40714"></Setter>
+					<Setter Property="CornerRadius" Value="13"></Setter>
+				</Style>
+				<Style Selector="Button.BtAdd:pointerover /template/ ContentPresenter">
+					<Setter Property="Background" Value="#A10009"></Setter>
+				</Style>
+				<Style Selector="TextBlock.TextBtAdd">
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+					<Setter Property="Margin" Value="20 0 0 0"></Setter>
+					<Setter Property="VerticalAlignment" Value="Center"></Setter>
+				</Style>
+				<Style Selector="ComboBox.TextToComboBox">
+					<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="18"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+				</Style>
+				<Style Selector="Button.BtAdd:pressed">
+					<Setter Property="RenderTransform" Value="none"/>
+				</Style>
+				<Style Selector="CheckBox.TextToCheckBox">
+					<Setter Property="FontSize" Value="18"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+				</Style>
+				<Style Selector="CheckBox.TextToCheckBox /template/ Border#NormalRectangle">
+					<Setter Property="BorderBrush" Value="#E40714"/>
+					<Setter Property="CornerRadius" Value="5"></Setter>
+				</Style>
+			</StackPanel.Styles>
+			<StackPanel Orientation="Horizontal">
+				<Button Classes="BtBack" Command="{Binding BackOutletsView}">
+					<TextBlock Classes="TextBtBack">Назад</TextBlock>
+				</Button>
+				<TextBlock Classes="Chapter">Изменение торговой точки</TextBlock>
+			</StackPanel>
+			<StackPanel Orientation="Vertical">
+				<StackPanel Orientation="Horizontal">
+					<TextBlock Classes="TextToTextBox">ID:</TextBlock>
+					<TextBox 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>
+					<ComboBox Classes="TextToComboBox" SelectedIndex="0" Margin="120 20 0 0" Width="360" Height="40">
+						<ComboBoxItem IsEnabled="False">–––––––––––––</ComboBoxItem>
+						<!--пример-->
+						<ComboBoxItem>Магнит</ComboBoxItem>
+					</ComboBox>
+				</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>
+				</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="90 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">
+					<TextBlock Classes="TextToTextBox">Проекты:</TextBlock>
+					<CheckBox Classes="TextToCheckBox" Margin="202 10 0 0">
+						<TextBlock>Проект “...”</TextBlock>
+					</CheckBox>
+					<CheckBox Classes="TextToCheckBox" Margin="202 10 0 0">
+						<TextBlock>Проект “...”</TextBlock>
+					</CheckBox>
+					<CheckBox Classes="TextToCheckBox" Margin="202 10 0 0">
+						<TextBlock>Проект “...”</TextBlock>
+					</CheckBox>
+				</StackPanel>
+			</StackPanel>
+
+		</StackPanel>
+		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+			<StackPanel.Styles>
+				<Style Selector="TextBlock.TextBtDelete">
+					<Setter Property="Foreground" Value="#E40714"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+					<Setter Property="HorizontalAlignment" Value="Center"></Setter>
+					<Setter Property="VerticalAlignment" Value="Center"></Setter>
+				</Style>
+				<Style Selector="Button.BtDelete">
+					<Setter Property="BorderThickness" Value="2"></Setter>
+					<Setter Property="Width" Value="180"></Setter>
+					<Setter Property="Height" Value="38"></Setter>
+					<Setter Property="Margin" Value="0 740 70 20"></Setter>
+					<Setter Property="Background" Value="Transparent"></Setter>
+					<Setter Property="CornerRadius" Value="13"></Setter>
+					<Setter Property="BorderBrush" Value="#E40714"></Setter>
+				</Style>
+				<Style Selector="Button.BtDelete:pointerover /template/ ContentPresenter">
+					<Setter Property="BorderBrush" Value="#A10009"></Setter>
+					<Setter Property="Background" Value="Transparent"></Setter>
+				</Style>
+				<Style Selector="Button.BtDelete:pressed">
+					<Setter Property="RenderTransform" Value="none"/>
+				</Style>
+
+				<Style Selector="TextBlock.TextBtSave">
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+					<Setter Property="HorizontalAlignment" Value="Center"></Setter>
+					<Setter Property="VerticalAlignment" Value="Center"></Setter>
+				</Style>
+				<Style Selector="Button.BtSave">
+					<Setter Property="Width" Value="180"></Setter>
+					<Setter Property="Height" Value="38"></Setter>
+					<Setter Property="Margin" Value="0 740 30 20"></Setter>
+					<Setter Property="Background" Value="#E40714"></Setter>
+					<Setter Property="CornerRadius" Value="13"></Setter>
+				</Style>
+				<Style Selector="Button.BtSave:pointerover /template/ ContentPresenter">
+					<Setter Property="Background" Value="#A10009"></Setter>
+				</Style>
+				<Style Selector="Button.BtSave:pressed">
+					<Setter Property="RenderTransform" Value="none"/>
+				</Style>
+			</StackPanel.Styles>
+			<Button Classes="BtDelete" Command="">
+				<TextBlock Classes="TextBtDelete">Удалить</TextBlock>
+			</Button>
+			<Button Classes="BtSave" Command="">
+				<TextBlock Classes="TextBtSave">Сохранить</TextBlock>
+			</Button>
+		</StackPanel>
+	</Grid>
 </UserControl>

+ 91 - 18
Views/OutletsView.axaml

@@ -70,7 +70,7 @@
 				</Style>
 				<Style Selector="Button.BtBack">
 					<Setter Property="Width" Value="140"></Setter>
-					<Setter Property="Height" Value="35"></Setter>
+					<Setter Property="Height" Value="40"></Setter>
 					<Setter Property="Margin" Value="30 80 0 0"></Setter>
 					<Setter Property="Background" Value="#E40714"></Setter>
 					<Setter Property="CornerRadius" Value="13"></Setter>
@@ -108,7 +108,7 @@
 			</Button>
 			<TextBlock Classes="Chapter">Выберите Торговую точку для изменения</TextBlock>
 			<StackPanel Orientation="Horizontal">
-				<Button Classes="BtAdd" Width="330" Command="{Binding AddTradeNetworksView}">
+				<Button Classes="BtAdd" Width="330" Command="{Binding AddOutletsView}">
 				<TextBlock Classes="TextBtAdd">Добавить торговую точку</TextBlock>				
 				</Button>
 				<Image Source="avares://Acosta/Assets/plus.png" Width="25" Margin="-70 80 0 0"></Image>
@@ -117,12 +117,23 @@
 		</StackPanel>
 		<StackPanel Background="Transparent" Margin="0 150 0 0" HorizontalAlignment="Center">
 			<StackPanel.Styles>
+				<Style Selector="TextBox.EditTextBox">
+					<Setter Property="Foreground" Value="Black"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="15"></Setter>
+					<Setter Property="Background" Value="#FFF8F8"></Setter>
+					<Setter Property="BorderBrush" Value="#E40714"></Setter>
+					<Setter Property="CornerRadius" Value="13"></Setter>
+					<Setter Property="BorderThickness" Value="2"></Setter>
+					<Setter Property="Padding" Value="20 8 0 0"></Setter>
+				</Style>
 				<Style Selector="TextBlock.TextColumns">
 					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
 					<Setter Property="FontFamily" Value="Roboto"></Setter>
 					<Setter Property="FontWeight" Value="Medium"></Setter>
 					<Setter Property="FontSize" Value="20"></Setter>
-					<Setter Property="Margin" Value="40 0 0 0"></Setter>
+					<Setter Property="Margin" Value="40 0 260 0"></Setter>
 					<Setter Property="VerticalAlignment" Value="Center"></Setter>
 				</Style>
 				<Style Selector="Border.TextColumns">
@@ -133,7 +144,6 @@
 					<Setter Property="BorderBrush" Value="#E40714"></Setter>
 					<Setter Property="CornerRadius" Value="13"></Setter>
 					<Setter Property="BorderThickness" Value="2"></Setter>
-					<Setter Property="Margin" Value="0 0 0 15"></Setter>
 				</Style>		
 				<Style Selector="TextBlock.Data">
 					<Setter Property="Background" Value="#FFF8F8"></Setter>		
@@ -142,23 +152,86 @@
 					<Setter Property="FontWeight" Value="Medium"></Setter>
 					<Setter Property="Margin" Value="20 0 0 0"></Setter>
 					<Setter Property="VerticalAlignment" Value="Center"></Setter>
-				</Style>			
+				</Style>
+				<Style Selector="TextBlock.TextBtEdit">
+					<Setter Property="Foreground" Value="Black"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="15"></Setter>
+					<Setter Property="Padding" Value="20 4 0 0"></Setter>
+				</Style>
+				<Style Selector="Button.BtEdit">
+					<Setter Property="BorderThickness" Value="2"></Setter>
+					<Setter Property="Width" Value="180"></Setter>
+					<Setter Property="Height" Value="38"></Setter>
+					<Setter Property="Background" Value="#FFF8F8"></Setter>
+					<Setter Property="CornerRadius" Value="13"></Setter>
+					<Setter Property="BorderBrush" Value="#E40714"></Setter>
+				</Style>
+				<Style Selector="Button.BtEdit:pointerover /template/ ContentPresenter">
+					<Setter Property="Background" Value="#FFF8F8"></Setter>
+					<Setter Property="BorderBrush" Value="#E40714"></Setter>
+				</Style>
+				<Style Selector="Button.BtEdit:pressed">
+					<Setter Property="RenderTransform" Value="none"/>
+				</Style>
 			</StackPanel.Styles>
 			<Border Classes="TextColumns" Background="#80E40714" CornerRadius="13"  Width="1490" Height="40">
-				<TextBlock Classes="TextColumns">НАИМЕНОВАНИЕ</TextBlock>				
-			</Border>	
+					<StackPanel Orientation="Horizontal">
+						<TextBlock Classes="TextColumns">ID</TextBlock>
+						<TextBlock Classes="TextColumns">ТОРГОВАЯ СЕТЬ</TextBlock>
+						<TextBlock Classes="TextColumns">АДРЕС</TextBlock>
+						<TextBlock Classes="TextColumns">МЕСТОПОЛОЖЕНИЕ</TextBlock>
+					</StackPanel>				
+			</Border>					
 			<StackPanel Orientation="Vertical">
-				<Border  Classes="Data" CornerRadius="13"  Width="1400" Height="40">
-					<TextBlock Classes="Data">Типа название торговой сети</TextBlock>
-				</Border>
-				<!--Пример как это должно будет выглядеть в зависимости от количества записей в бд и если хочется можно попробовать сделать скролл только записей-->
-				<Border  Classes="Data" CornerRadius="13"  Width="1400" Height="40">
-					<TextBlock Classes="Data">Типа название торговой сети</TextBlock>
-				</Border>
-				<Border  Classes="Data" CornerRadius="13"  Width="1400" Height="40">
-					<TextBlock Classes="Data">Типа название торговой сети</TextBlock>
-				</Border>			
-			</StackPanel>						
+				<StackPanel Orientation="Horizontal" Margin="40 0 0 0">
+					<Button Classes="BtEdit" Width="180" Height="40" Margin="0 0 140 0" Command="{Binding EditOutletsView}">
+						<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="310" Margin="0 0 140 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="220" Height="40" Margin="0 0 145 0">
+						<TextBlock Classes="Data">Типа  адрес</TextBlock>
+					</Border>
+					<Border  Classes="Data" CornerRadius="13"  Width="280" Height="40">
+						<TextBlock Classes="Data">Типа  местоположение</TextBlock>
+					</Border>
+				</StackPanel>				
+			</StackPanel>			
+		</StackPanel>
+		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+			<StackPanel.Styles>		
+				<Style Selector="TextBlock.TextBtSave">
+					<Setter Property="Foreground" Value="#F5F5F5"></Setter>
+					<Setter Property="FontFamily" Value="Roboto"></Setter>
+					<Setter Property="FontWeight" Value="Medium"></Setter>
+					<Setter Property="FontSize" Value="20"></Setter>
+					<Setter Property="HorizontalAlignment" Value="Center"></Setter>
+					<Setter Property="VerticalAlignment" Value="Center"></Setter>
+				</Style>
+				<Style Selector="Button.BtSave">
+					<Setter Property="Width" Value="180"></Setter>
+					<Setter Property="Height" Value="38"></Setter>
+					<Setter Property="Margin" Value="0 740 30 20"></Setter>
+					<Setter Property="Background" Value="#E40714"></Setter>
+					<Setter Property="CornerRadius" Value="13"></Setter>
+				</Style>
+				<Style Selector="Button.BtSave:pointerover /template/ ContentPresenter">
+					<Setter Property="Background" Value="#A10009"></Setter>
+				</Style>
+				<Style Selector="Button.BtSave:pressed">
+					<Setter Property="RenderTransform" Value="none"/>
+				</Style>
+			</StackPanel.Styles>
+			<Button Classes="BtSave" Command="">
+				<TextBlock Classes="TextBtSave">Сохранить</TextBlock>
+			</Button>
 		</StackPanel>
 	</Grid>
 </UserControl>