хоба

kursach_2.0/Windows/Handbooks.xaml

@@ -0,0 +1,32 @@
+<Window x:Class="kursach_2._0.Windows.Handbooks"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        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"
+        xmlns:local="clr-namespace:kursach_2._0.Windows"
+        mc:Ignorable="d"
+        Title="Дилерская компания" Height="450" Width="800" MinHeight="450" MinWidth="800" WindowStartupLocation="CenterScreen" >
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="0.2*"/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="0.2*"/>
+            </Grid.ColumnDefinitions>
+            <Rectangle Fill="#8aabdd" Grid.Row="0" Grid.ColumnSpan="2" Stroke="Gray"/>
+            <Label Content="Справочники" Grid.Row="0" 
+               FontFamily="Montserrat Medium" FontSize="36"
+               Margin="15, 0" VerticalAlignment="Center" />
+            <Image Source="/Images/home.png" Grid.Row="0" Grid.Column="1" Margin="10" 
+                   MouseDown="HomeClick"/>
+        </Grid>
+        <TabControl Grid.Row="1">
+            <TabItem Header="Товары" FontFamily="Montserrat Medium"/>
+            <TabItem Header="Дистрибьюторы" FontFamily="Montserrat Medium"/>
+            <TabItem Header="Сотрудники" FontFamily="Montserrat Medium"/>
+        </TabControl>
+    </Grid>
+</Window>

kursach_2.0/Windows/Handbooks.xaml.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace kursach_2._0.Windows
+{
+    /// <summary>
+    /// Логика взаимодействия для Handbooks.xaml
+    /// </summary>
+    public partial class Handbooks : Window
+    {
+        public Handbooks()
+        {
+            InitializeComponent();
+        }
+
+        private void HomeClick(object sender, MouseButtonEventArgs e)
+        {
+            Windows.Menu menu = new Windows.Menu();
+            menu.Show();
+            Close();
+        }
+    }
+}

kursach_2.0/Windows/Invoices.xaml

@@ -5,8 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:kursach_2._0.Windows"
         mc:Ignorable="d"
-        Title="Дилерская компания" Height="800" Width="600" 
-        MinHeight="400" MinWidth="600" WindowStartupLocation="CenterScreen">
+        Title="Дилерская компания" Height="700" Width="600" 
+        MinHeight="700" MinWidth="600" WindowStartupLocation="CenterScreen">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="0.125*"/>
@@ -21,7 +21,8 @@
         <Label Content="Накладные" Grid.Row="0" 
                FontFamily="Montserrat Medium" FontSize="36"
                Margin="15, 0" VerticalAlignment="Center" />
-            <Image Source="/Images/home.png" Grid.Row="0" Grid.Column="1" Margin="15"/>
+            <Image Source="/Images/home.png" Grid.Row="0" Grid.Column="1" Margin="15" 
+                   MouseDown="HomeClick"/>
         </Grid>
         <TabControl Grid.Row="1">
             <TabItem Header="История" FontFamily="Montserrat Medium" >
@@ -41,7 +42,8 @@
                                FontFamily="Montserrat Light" FontSize="20" 
                                HorizontalAlignment="Right" VerticalAlignment="Center"/>
                         <TextBox Grid.Column="1"
-                                 Margin="20, 30, 70, 30"/>
+                                 Margin="20, 20, 70, 20" 
+                                 FontFamily="Montserrat Light" FontSize="14" VerticalContentAlignment="Center" />
                     </Grid>
                     <TextBlock Grid.Row="1"
                                Text="для просмотра подробной информации нажмите дважды на нужную строку" 
@@ -53,6 +55,7 @@
                             <DataGridTextColumn Header="Тип" Width="*"/>
                             <DataGridTextColumn Header="Дата" Width="*"/>
                             <DataGridTextColumn Header="Сотрудник" Width="*"/>
+                            <DataGridTextColumn Header="Сумма" Width="*"/>
                         </DataGrid.Columns>
                     </DataGrid>
                     <Grid Grid.Row="3">
@@ -61,11 +64,83 @@
                             <ColumnDefinition/>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
+                        <Button x:Name="Export" Content="Экспорт" Grid.Column="1" 
+                                FontFamily="Montserrat Medium" FontSize="16"
+                                Margin="15"/>
                     </Grid>
                 </Grid>
             </TabItem>
-            <TabItem Header="Добавление" FontFamily="Montserrat Medium" >
-                <Grid Background="#FFE5E5E5"/>
+            
+            
+            
+            <TabItem Header="Добавление" FontFamily="Montserrat Medium" Height="19" VerticalAlignment="Top" >
+                <Grid Background="#FFE5E5E5">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="3*"/>
+                        <RowDefinition Height="4.5*"/>
+                        <RowDefinition Height="1.5*"/>
+                    </Grid.RowDefinitions>
+                    <Grid Grid.Row="0">
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="0.5*"/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Label Content="Тип" Grid.Column="0" Grid.Row="0" 
+                               FontFamily="Montserrat Medium" FontSize="22" 
+                               HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                        <Label Content="Дата" Grid.Column="0" Grid.Row="1" 
+                               FontFamily="Montserrat Medium" FontSize="22" 
+                               HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                        <Label Content="Сотрудник" Grid.Column="0" Grid.Row="2" 
+                               FontFamily="Montserrat Medium" FontSize="22" 
+                               HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                        <ComboBox Grid.Column="1" Grid.Row="0" Margin="15, 20, 30, 20" 
+                                  FontFamily="Montserrat Light" >
+                            <ComboBoxItem Content="Приходная"/>
+                            <ComboBoxItem Content="Расходная"/>
+                        </ComboBox>
+                        <DatePicker Grid.Column="1" Grid.Row="1" Margin="15, 20, 30, 20" 
+                                    FontFamily="Montserrat Light"/>
+                        <TextBox Grid.Column="1" Grid.Row="2" Margin="15, 20, 30, 20"/>
+                    </Grid>
+                    <Grid Grid.Row="1">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="0.2*"/>
+                            <RowDefinition/>
+                            <RowDefinition Height="0.1*"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="20*"/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Label Content="Карточка товаров" Grid.Column="1" Grid.Row="0" 
+                               HorizontalAlignment="Center" VerticalAlignment="Bottom" 
+                               FontFamily="Montserrat Medium" FontSize="24" />
+                        <DataGrid Grid.Column="1" Grid.Row="1" AutoGenerateColumns="False">
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Header="Товар" Width="*"/>
+                                <DataGridTextColumn Header="Кол-во" Width="*"/>
+                                <DataGridTextColumn Header="Цена за шт" Width="*"/>
+                            </DataGrid.Columns>
+                        </DataGrid>
+                        <TextBlock Text="всего ___ руб" Grid.Column="1" Grid.Row="2" 
+                                   FontFamily="Montserrat Light" FontSize="16" HorizontalAlignment="Right"/>
+                    </Grid>
+                    <Grid Grid.Row="2">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="1.5*"/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Button Content="Добавить" Grid.Column="1" Margin="30, 20" FontFamily="Montserrat Medium" FontSize="20"/>
+                    </Grid>
+                </Grid>
             </TabItem>
         </TabControl>
     </Grid>

kursach_2.0/Windows/Invoices.xaml.cs

@@ -23,5 +23,12 @@ namespace kursach_2._0.Windows
         {
             InitializeComponent();
         }
+
+        private void HomeClick(object sender, MouseButtonEventArgs e)
+        {
+            Windows.Menu menu = new Windows.Menu();
+            menu.Show();
+            Close();
+        }
     }
 }

kursach_2.0/Windows/Menu.xaml

@@ -27,7 +27,7 @@
         <Button Content="Накладные" Grid.Column="1" Grid.Row="2"
                 Margin="10, 20" FontFamily="Montserrat Light" FontSize="20" Click="InvoicesClick"/>
         <Button Content="Справочники" Grid.Column="1" Grid.Row="3"
-                Margin="10, 20" FontFamily="Montserrat Light" FontSize="20"/>
+                Margin="10, 20" FontFamily="Montserrat Light" FontSize="20" Click="HandbooksClick"/>
         <Button Content="Профиль" Grid.Column="2" Grid.Row="2"
                 Margin="10, 20" FontFamily="Montserrat Light" FontSize="20"/>
         <Button Content="Выход" Grid.Column="2" Grid.Row="3"

kursach_2.0/Windows/Menu.xaml.cs

@@ -30,5 +30,12 @@ namespace kursach_2._0.Windows
             inv.Show();
             Close();
         }
+
+        private void HandbooksClick(object sender, RoutedEventArgs e)
+        {
+            Windows.Handbooks hb = new Windows.Handbooks();
+            hb.Show();
+            Close();
+        }
     }
 }

kursach_2.0/kursach_2.0.csproj

@@ -55,6 +55,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Windows\Handbooks.xaml.cs">
+      <DependentUpon>Handbooks.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Windows\Invoices.xaml.cs">
       <DependentUpon>Invoices.xaml</DependentUpon>
     </Compile>
@@ -73,6 +76,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="Windows\Handbooks.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Windows\Invoices.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>