123

SqlQuery_1.sql

@@ -0,0 +1,5 @@
+create table infoadm
+(
+id int primary key identity,
+login nvarchar(25)
+)

veloprokat2/Auth.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="Авторизация" Height="600" Width="800">
+        Title="Авторизация" WindowState="Maximized" WindowStyle="None">
     <Grid Background="#EAF4F4">
         <Border MinWidth="400" Margin="15" Background="#FFFF" VerticalAlignment="Center" Padding="30" MaxWidth="550" CornerRadius="20">
             <Border.Effect>
@@ -17,6 +17,7 @@
                 <TextBox Name="Login" materialDesign:HintAssist.Hint="Введите логин" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
                 <PasswordBox Name="Pass" materialDesign:HintAssist.Hint="Введите пароль" Style="{StaticResource MaterialDesignFloatingHintPasswordBox}"/>
                 <Button Content="Войти" Margin="0 20 0 0" Click="Voyti"/>
+                <Button Content="Выйти из программы" Margin="0 20 0 0" Click="Viyti"/>
             </StackPanel>
         </Border>
     </Grid>

veloprokat2/Auth.xaml.cs

@@ -68,33 +68,12 @@ namespace veloprokat2
                 MessageBox.Show("Введите логин"); // выводим ошибку
                 Login.Background = Brushes.DarkRed;
             }
-            
-
-
-
-
-
-            /*string login = Login.Text.Trim();
-            string pass = Pass.Password.Trim();
-            InfoRab newInfoRab = new InfoRab()
-            {
-                Login = Login.Text,
-                Password = Pass.Password,
-            };
-            if (db.InfoRab.Select(item => item.Login).Contains(Login.Text) && db.InfoRab.Select(item=>item.Password).Contains(Pass.Password))
-            {
-                MainWindowProd MWP = new MainWindowProd();
-                MWP.Show();
-                Close();
-            }
-            else if (db.InfoAdm.Select(item=> item.Login).Contains(Login.Text) && db.InfoAdm.Select(item=>item.Password).Contains(Pass.Password))
-            {
-                MainWindowAdm MWA = new MainWindowAdm();
-                MWA.Show();
-                Close();
-            }*/
         }
 
+        private void Viyti(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
 
         public DataTable Select(string selectSQL) // функция подключения к базе данных и обработка запросов
         {
@@ -108,5 +87,6 @@ namespace veloprokat2
             sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
             return dataTable;
         }
+
     }
 }

veloprokat2/InfoProdaji.xaml

@@ -0,0 +1,15 @@
+<Window x:Class="veloprokat2.InfoProdaji"
+        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:veloprokat2"
+        mc:Ignorable="d"
+        Title="InfoProdaji" WindowState="Maximized" WindowStyle="None">
+    <Grid Background="#EAF4F4">
+        <DataGrid   HorizontalAlignment="Right"  Margin="0,10,9.6,0" VerticalAlignment="Top" Width="742" AutoGenerateColumns="True" Name="prodinfo" Height="430">
+        </DataGrid>
+        <Button Content="Вернуться" Click="Vixod" Margin="521,465,96.6,31.8" FontSize="11" VerticalAlignment="Center" HorizontalAlignment="Center" Width="144"/>
+        <Button Content="Обновить" Click="Vixod" Margin="99,465,518.6,31.8" FontSize="11" VerticalAlignment="Center" HorizontalAlignment="Center" Width="144"/>
+    </Grid>
+</Window>

veloprokat2/InfoProdaji.xaml.cs

@@ -0,0 +1,39 @@
+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 veloprokat2
+{
+    /// <summary>
+    /// Логика взаимодействия для InfoProdaji.xaml
+    /// </summary>
+    public partial class InfoProdaji : Window
+    {
+        public InfoProdaji()
+        {
+            InitializeComponent();
+        }
+
+        private void Vixod(object sender, RoutedEventArgs e)
+        {
+            MainWindowAdm MWA = new MainWindowAdm();
+            MWA.Show();
+            Close();
+        }
+
+        private void Insert(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}

veloprokat2/Insert_Bikes.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="Добавление велосипеда" Height="600" Width="800" WindowStyle="None">
+        Title="Добавление велосипеда" WindowState="Maximized" WindowStyle="None">
     <Grid Background="#EAF4F4">
         <Border MinWidth="400" Margin="15" Background="#FFFF" VerticalAlignment="Center" Padding="30" MaxWidth="600" CornerRadius="20">
             <Border.Effect>

veloprokat2/Insert_zap.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="Добавление новой записи в таблицу" Height="600" Width="800">
+        Title="Добавление новой записи в таблицу" WindowState="Maximized" WindowStyle="None">
     <Grid  Background="#EAF4F4">
         <Border MinWidth="400" Margin="15" Background="#FFFF" VerticalAlignment="Center" Padding="30" MaxWidth="600" CornerRadius="20">
             <Border.Effect>

veloprokat2/MainWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="Регистрация нового продавца" Height="600" Width="800" WindowStyle="ThreeDBorderWindow">
+        Title="Регистрация нового продавца" WindowState="Maximized" WindowStyle="None">
     <Grid Background="#EAF4F4">
         <Border MinWidth="400" Margin="15" Background="#FFFF" VerticalAlignment="Center" Padding="30" MaxWidth="600" CornerRadius="20">
             <Border.Effect>

veloprokat2/MainWindowAdm.xaml

@@ -6,17 +6,16 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="MainWindowAdm" Height="600" Width="800">
+        Title="Главное окно админа" WindowState="Maximized" WindowStyle="None">
     <Grid Background="#EAF4F4">
         <Border MinWidth="400" Margin="15" Background="#FFFF" VerticalAlignment="Center" Padding="30" MaxWidth="600" CornerRadius="20">
             <Border.Effect>
                 <DropShadowEffect BlurRadius="30" Color="LightGray" ShadowDepth="0"/>
             </Border.Effect>
             <StackPanel>
-                <Button Content="Информация о пользователе"  Margin="0 0 0 20" Click="InfoPolz"/>
                 <Button Content="Информация о продавцах" Margin="0 0 0 20" Click="InfoProd"/>
-                <Button Content="Зарегестрировать нового продавца" Margin="0 0 0 20" Click="Registraciya"/>
                 <Button Content="Зарегистрировать нового администратора" Margin=" 0 0 0 20" Click="NewAdm"/>
+                <Button Content="Информация о продажах" Margin=" 0 0 0 20" Click="Prodaji"/>
                 <Button Content="Отмена" Margin="100 0 100 20" Click="Otmena"/>
             </StackPanel>
         </Border>

veloprokat2/MainWindowAdm.xaml.cs

@@ -51,9 +51,24 @@ namespace veloprokat2
 
         private void Otmena(object sender, RoutedEventArgs e)
         {
-            Auth au = new Auth();
-            au.Show();
-            Close();
+            string messageBoxText = "Вы действительно хотите выйти?";
+            string caption = "Выход";
+            MessageBoxButton button = MessageBoxButton.YesNo;
+            MessageBoxImage icon = MessageBoxImage.Warning;
+            MessageBoxResult result = MessageBox.Show(messageBoxText, caption, button, icon);
+
+            if(result == MessageBoxResult.Yes)
+            {
+                Auth au = new Auth();
+                au.Show();
+                Close();
+            }
+
+        }
+
+        private void Prodaji(object sender, RoutedEventArgs e)
+        {
+
         }
     }
 }

veloprokat2/MainWindowProd.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="Основное окно продавца" Height="600" Width="800">
+        Title="Главное окно продавца" WindowState="Maximized" WindowStyle="None">
     <Grid Background="#EAF4F4">
         <Border MinWidth="400" Margin="15" Background="#FFFF" VerticalAlignment="Center" Padding="30" MaxWidth="550" CornerRadius="20">
             <Border.Effect>

veloprokat2/SpisokBikes.xaml

@@ -6,11 +6,11 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="Список Велосипедов" Height="600" Width="800">
+        Title="Список Велосипедов" WindowState="Maximized" WindowStyle="None">
     <Grid Background="#EAF4F4">
-        <DataGrid   HorizontalAlignment="Right"  Margin="0,10,10,0" VerticalAlignment="Top" Width="600" AutoGenerateColumns="True" Name="prodinfo" Height="509">
+        <DataGrid   HorizontalAlignment="Right"  Margin="0,10,9.6,0" VerticalAlignment="Top" Width="742" AutoGenerateColumns="True" Name="prodinfo" Height="430">
         </DataGrid>
-        <Button Content="Вернуться" Click="Vixod" Margin="10,149,639.6,389.4" FontSize="11" VerticalAlignment="Center" HorizontalAlignment="Center" Width="144"/>
-        <Button Content="Добавить" Click="Insert" Margin="10,95,639.6,443.4" FontSize="11" VerticalAlignment="Center" HorizontalAlignment="Center" Width="144"/>
+        <Button Content="Вернуться" Click="Vixod" Margin="499,467,118.6,29.8" FontSize="11" VerticalAlignment="Center" HorizontalAlignment="Center" Width="144"/>
+        <Button Content="Добавить" Click="Insert" Margin="107,467,510.6,29.8" FontSize="11" VerticalAlignment="Center" HorizontalAlignment="Center" Width="144"/>
     </Grid>
 </Window>

veloprokat2/SpisokBikes.xaml.cs

@@ -27,7 +27,7 @@ namespace veloprokat2
             InitializeComponent();
             SqlConnection connection = new SqlConnection("server=DESKTOP-9UG7OCA; Trusted_Connection=YES;DataBase=Veloprokat;");
             connection.Open();
-            string cmd = "select * from Bikes";
+            string cmd = "select ID, Company as N'Компания', Model as N'Модель' from Bikes";
             SqlCommand createcommand = new SqlCommand(cmd, connection);
             createcommand.ExecuteNonQuery();
 

veloprokat2/Window1.xaml

@@ -5,11 +5,11 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
-        Title="Список продавцов" Height="600" Width="800" WindowStyle="None">
+        Title="Список продавцов" WindowState="Maximized" WindowStyle="None">
     <Grid Background="#EAF4F4">
-        <DataGrid   HorizontalAlignment="Right"  Margin="0,10,10,0" VerticalAlignment="Top" Width="600" AutoGenerateColumns="True" Name="prodinfo" Height="509">
+        <DataGrid   HorizontalAlignment="Right"  Margin="-782,10,9.6,0" VerticalAlignment="Top" Width="1534" AutoGenerateColumns="True" Name="prodinfo" Height="430">
         </DataGrid>
-        <Button Content="Вернуться" Click="Vixod" Margin="10,161,639.6,393.6" FontSize="11" VerticalAlignment="Center" HorizontalAlignment="Center" Width="144"/>
-        <Button Content="Добавить" Click="Insert" Margin="10,95,639.6,443.4" FontSize="11" VerticalAlignment="Center" HorizontalAlignment="Center" Width="144"/>
+        <Button Content="Вернуться" Click="Vixod" Margin="542,470,75.6,26.8" FontSize="11" VerticalAlignment="Center" HorizontalAlignment="Center" Width="144"/>
+        <Button Content="Добавить" Click="Insert" Margin="112,470,505.6,26.8" FontSize="11" VerticalAlignment="Center" HorizontalAlignment="Center" Width="144"/>
     </Grid>
 </Window>

veloprokat2/regadm.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="Регистрация нового администратора" Height="600" Width="800">
+        Title="Регистрация нового администратора" WindowState="Maximized" WindowStyle="None">
     <Grid Background="#EAF4F4">
         <Border MinWidth="400" Margin="15" Background="#FFFF" VerticalAlignment="Center" Padding="30" MaxWidth="600" CornerRadius="20">
             <Border.Effect>

veloprokat2/veloprokat2.csproj

@@ -96,6 +96,9 @@
     <Compile Include="InfoAdm.cs">
       <DependentUpon>Model1.tt</DependentUpon>
     </Compile>
+    <Compile Include="InfoProdaji.xaml.cs">
+      <DependentUpon>InfoProdaji.xaml</DependentUpon>
+    </Compile>
     <Compile Include="InfoRab.cs">
       <DependentUpon>Model1.tt</DependentUpon>
     </Compile>
@@ -142,6 +145,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="InfoProdaji.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Insert_Bikes.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>