Александр Кайгородов 2 سال پیش
والد
کامیت
346142c10a
81فایلهای تغییر یافته به همراه3269 افزوده شده و 2374 حذف شده
  1. 20 0
      UnitTestProject1/Properties/AssemblyInfo.cs
  2. 14 0
      UnitTestProject1/UnitTest1.cs
  3. 68 0
      UnitTestProject1/UnitTestProject1.csproj
  4. 5 0
      UnitTestProject1/packages.config
  5. 20 0
      VeloprokatTest/Properties/AssemblyInfo.cs
  6. 85 0
      VeloprokatTest/UnitTest1.cs
  7. 77 0
      VeloprokatTest/VeloprokatTest.csproj
  8. 5 0
      VeloprokatTest/packages.config
  9. 6 0
      veloprokat2.sln
  10. 12 0
      veloprokat2/.xaml
  11. 2 7
      veloprokat2/App.xaml
  12. 2 2
      veloprokat2/Auth.xaml
  13. 12 2
      veloprokat2/Auth.xaml.cs
  14. 0 21
      veloprokat2/Bikes.cs
  15. 24 0
      veloprokat2/Changing_the_type.xaml
  16. 82 0
      veloprokat2/Changing_the_type.xaml.cs
  17. 23 0
      veloprokat2/DeleteBikes.xaml
  18. 111 0
      veloprokat2/DeleteBikes.xaml.cs
  19. 23 0
      veloprokat2/DeleteRab.xaml
  20. 89 0
      veloprokat2/DeleteRab.xaml.cs
  21. 22 0
      veloprokat2/DeleteTest.xaml
  22. 125 0
      veloprokat2/DeleteTest.xaml.cs
  23. 0 27
      veloprokat2/InfoAdm.cs
  24. 25 0
      veloprokat2/InfoBikes.xaml
  25. 88 0
      veloprokat2/InfoBikes.xaml.cs
  26. 0 15
      veloprokat2/InfoProdaji.xaml
  27. 0 39
      veloprokat2/InfoProdaji.xaml.cs
  28. 0 22
      veloprokat2/InfoRab.cs
  29. 23 0
      veloprokat2/InfoTarif.xaml
  30. 81 0
      veloprokat2/InfoTarif.xaml.cs
  31. 23 0
      veloprokat2/Info_prodaji.xaml
  32. 82 0
      veloprokat2/Info_prodaji.xaml.cs
  33. 35 0
      veloprokat2/InsertZakaz.xaml
  34. 194 0
      veloprokat2/InsertZakaz.xaml.cs
  35. 6 2
      veloprokat2/Insert_Bikes.xaml
  36. 98 19
      veloprokat2/Insert_Bikes.xaml.cs
  37. 0 34
      veloprokat2/Insert_zap.xaml
  38. 0 245
      veloprokat2/Insert_zap.xaml.cs
  39. 6 3
      veloprokat2/MainWindowAdm.xaml
  40. 26 15
      veloprokat2/MainWindowAdm.xaml.cs
  41. 6 2
      veloprokat2/MainWindowProd.xaml
  42. 38 1
      veloprokat2/MainWindowProd.xaml.cs
  43. 0 33
      veloprokat2/Model1.Context.cs
  44. 0 636
      veloprokat2/Model1.Context.tt
  45. 0 10
      veloprokat2/Model1.Designer.cs
  46. 0 9
      veloprokat2/Model1.cs
  47. 0 181
      veloprokat2/Model1.edmx
  48. 0 15
      veloprokat2/Model1.edmx.diagram
  49. 0 733
      veloprokat2/Model1.tt
  50. 31 0
      veloprokat2/RedAdmTest.xaml
  51. 283 0
      veloprokat2/RedAdmTest.xaml.cs
  52. 4 6
      veloprokat2/MainWindow.xaml
  53. 44 27
      veloprokat2/MainWindow.xaml.cs
  54. 23 0
      veloprokat2/SpisRab.xaml
  55. 90 0
      veloprokat2/SpisRab.xaml.cs
  56. 14 4
      veloprokat2/SpisokBikes.xaml
  57. 42 4
      veloprokat2/SpisokBikes.xaml.cs
  58. 23 0
      veloprokat2/SpisokProk.xaml
  59. 83 0
      veloprokat2/SpisokProk.xaml.cs
  60. 23 0
      veloprokat2/TestChanginhTheTypexaml.xaml
  61. 93 0
      veloprokat2/TestChanginhTheTypexaml.xaml.cs
  62. 24 0
      veloprokat2/TestInfoBikes.xaml
  63. 124 0
      veloprokat2/TestInfoBikes.xaml.cs
  64. 27 0
      veloprokat2/TestInsertBikes.xaml
  65. 219 0
      veloprokat2/TestInsertBikes.xaml.cs
  66. 24 0
      veloprokat2/TypeIzm.xaml
  67. 80 0
      veloprokat2/TypeIzm.xaml.cs
  68. 22 0
      veloprokat2/ValidTest.xaml
  69. 76 0
      veloprokat2/ValidTest.xaml.cs
  70. 0 22
      veloprokat2/Window1.xaml
  71. 0 55
      veloprokat2/Window1.xaml.cs
  72. 23 0
      veloprokat2/auth_test.xaml
  73. 85 0
      veloprokat2/auth_test.xaml.cs
  74. BIN
      veloprokat2/mountain_bike_sport_icon_123970.ico
  75. 0 1
      veloprokat2/packages.config
  76. 2 1
      veloprokat2/regadm.xaml
  77. 26 103
      veloprokat2/regadm.xaml.cs
  78. 0 23
      veloprokat2/sysdiagrams.cs
  79. 23 0
      veloprokat2/tarif.xaml
  80. 83 0
      veloprokat2/tarif.xaml.cs
  81. 120 55
      veloprokat2/veloprokat2.csproj

+ 20 - 0
UnitTestProject1/Properties/AssemblyInfo.cs

@@ -0,0 +1,20 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("UnitTestProject1")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("UnitTestProject1")]
+[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("24c73866-02ee-4cc3-a177-1466d968e337")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

+ 14 - 0
UnitTestProject1/UnitTest1.cs

@@ -0,0 +1,14 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+
+namespace UnitTestProject1
+{
+    [TestClass]
+    public class UnitTest1
+    {
+        [TestMethod]
+        public void TestMethod1()
+        {
+        }
+    }
+}

+ 68 - 0
UnitTestProject1/UnitTestProject1.csproj

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{24C73866-02EE-4CC3-A177-1466D968E337}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>UnitTestProject1</RootNamespace>
+    <AssemblyName>UnitTestProject1</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="UnitTest1.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их.  Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets'))" />
+  </Target>
+  <Import Project="..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets')" />
+</Project>

+ 5 - 0
UnitTestProject1/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MSTest.TestAdapter" version="2.1.2" targetFramework="net472" />
+  <package id="MSTest.TestFramework" version="2.1.2" targetFramework="net472" />
+</packages>

+ 20 - 0
VeloprokatTest/Properties/AssemblyInfo.cs

@@ -0,0 +1,20 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("VeloprokatTest")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("VeloprokatTest")]
+[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("c3e6363a-0344-495e-bf78-04b2020353a7")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

+ 85 - 0
VeloprokatTest/UnitTest1.cs

@@ -0,0 +1,85 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using veloprokat2;
+
+namespace VeloprokatTest
+{
+    [TestClass]
+    public class UnitTest1
+    {
+        [TestMethod]
+        public void AuthTest()
+        {
+            var test = new auth_test();
+            Assert.IsTrue(test.Reg("admin", "admin-1")); //тест правильных данных
+            Assert.IsTrue(test.Reg("mukha.kirill", "Polka2003"));
+            Assert.IsFalse(test.Reg("admin", "admin"));//тест неправильных данных
+            Assert.IsFalse(test.Reg("kaigorodov", "Rfqujhjljd"));
+            Assert.IsFalse(test.Reg("админ", "админ-1"));
+            Assert.IsFalse(test.Reg("adмиn", "adмин"));
+            Assert.IsFalse(test.Reg("", "")); //тест пустых полей
+        }
+        
+        [TestMethod]
+        public void RegAdmTest()
+        {
+            var test2 = new RedAdmTest();
+            Assert.IsTrue(test2.TestReg("2", "adminn", "admin-1", "admin-1", "Кайгородов", "Александр", "Алексеевич", "aa.kaigorodov@mail.ru", "89833592446", "23.02.2003")); //Правильный формат данных
+            Assert.IsTrue(test2.TestReg("3", "mukha.kiril", "polka2003", "polka2003", "Муха", "Кирилл", "Михайлович", "mukha.kirill@gmail.com", "89833592446", "22022003"));
+            Assert.IsFalse(test2.TestReg("f", "админ", "админ-1", "admin-1", "Kaigorodov", "Alexandr", "Alekseevich", "почта@а.ру", "раздватри", "да")); //Неправильный формат данных
+            Assert.IsFalse(test2.TestReg("л", "муха.кирилл", "полка2003", "полка2003", "mukha", "кирилл", "михайлович", "муха.кирилл@гмаил.ру", "фывапролджй", "22022003"));
+            Assert.IsFalse(test2.TestReg("", "", "", "", "", "", "", "", "", "")); //Пустые поля
+        }
+
+        [TestMethod]
+        public void TestBikes()
+        {
+            var test3 = new TestInfoBikes();
+            Assert.IsTrue(test3.TestVivod()); //Если в таблице выводятся данные, то будет true
+        }
+
+        [TestMethod]
+        public void TestSearch()
+        {
+            var test4 = new TestInfoBikes();
+            Assert.IsTrue(test4.SearchTest("Forward")); //если выводится хотя бы одна строка, то будет true
+            Assert.IsTrue(test4.SearchTest("Stels"));
+            Assert.IsTrue(test4.SearchTest("Гор"));
+            Assert.IsFalse(test4.SearchTest("")); //если выводится 0 строк, то будет false
+            Assert.IsFalse(test4.SearchTest("asdad"));
+            Assert.IsFalse(test4.SearchTest("штер"));
+            Assert.IsFalse(test4.SearchTest("atack"));
+            Assert.IsFalse(test4.SearchTest("вфывфв"));
+        }
+
+        [TestMethod]
+        public void TestChanging()
+        {
+            var test5 = new TestChanginhTheTypexaml();
+            Assert.IsTrue(test5.ChangingType("1","Занят")); //Проверка каждого типа занятости
+            Assert.IsTrue(test5.ChangingType("1","Свободен")); //Проверка каждого типа занятости
+            Assert.IsTrue(test5.ChangingType("1","В тех. обслуживании")); //Проверка каждого типа занятости
+            Assert.IsFalse(test5.ChangingType("","")); //Проверка пустым полем
+        }
+
+        [TestMethod]
+        public void Validation()
+        {
+            var test6 = new ValidTest();
+            Assert.IsTrue(test6.Valid("Кайгородов")); //проверка русскими символами
+            Assert.IsTrue(test6.Valid("Муха"));
+            Assert.IsFalse(test6.Valid("Mukha")); //проверка английскими символами
+            Assert.IsFalse(test6.Valid("")); //проверка пустым полем
+        }
+
+        [TestMethod]
+        public void TestDelete()
+        {
+            var test7 = new DeleteTest();
+            Assert.IsTrue(test7.Delete_test("4"));
+            Assert.IsTrue(test7.Delete_test("5"));
+            Assert.IsFalse(test7.Delete_test("54"));
+            Assert.IsFalse(test7.Delete_test("1"));
+        }
+    }
+}

+ 77 - 0
VeloprokatTest/VeloprokatTest.csproj

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{C3E6363A-0344-495E-BF78-04B2020353A7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>VeloprokatTest</RootNamespace>
+    <AssemblyName>VeloprokatTest</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="UnitTest1.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\veloprokat2\veloprokat2.csproj">
+      <Project>{4f81834d-1580-470a-a6fa-f6532f7f1f16}</Project>
+      <Name>veloprokat2</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их.  Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets'))" />
+  </Target>
+  <Import Project="..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets')" />
+</Project>

+ 5 - 0
VeloprokatTest/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MSTest.TestAdapter" version="2.1.2" targetFramework="net472" />
+  <package id="MSTest.TestFramework" version="2.1.2" targetFramework="net472" />
+</packages>

+ 6 - 0
veloprokat2.sln

@@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.31321.278
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "veloprokat2", "veloprokat2\veloprokat2.csproj", "{4F81834D-1580-470A-A6FA-F6532F7F1F16}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VeloprokatTest", "VeloprokatTest\VeloprokatTest.csproj", "{C3E6363A-0344-495E-BF78-04B2020353A7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{4F81834D-1580-470A-A6FA-F6532F7F1F16}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4F81834D-1580-470A-A6FA-F6532F7F1F16}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F81834D-1580-470A-A6FA-F6532F7F1F16}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3E6363A-0344-495E-BF78-04B2020353A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3E6363A-0344-495E-BF78-04B2020353A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3E6363A-0344-495E-BF78-04B2020353A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3E6363A-0344-495E-BF78-04B2020353A7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 12 - 0
veloprokat2/.xaml

@@ -0,0 +1,12 @@
+<Window x:Class="veloprokat2._"
+        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="_" Height="450" Width="800">
+    <Grid>
+        
+    </Grid>
+</Window>

+ 2 - 7
veloprokat2/App.xaml

@@ -2,15 +2,10 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:veloprokat2"
-             StartupUri="Window1.xaml">
+             StartupUri="auth.xaml">
     <Application.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.DeepPurple.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
-            </ResourceDictionary.MergedDictionaries>
+            
         </ResourceDictionary>
     </Application.Resources>
 </Application>

+ 2 - 2
veloprokat2/Auth.xaml

@@ -6,14 +6,14 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="Авторизация" WindowState="Maximized" WindowStyle="None">
+        Title="Авторизация" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
     <Grid Background="#EAF4F4">
         <Border MinWidth="400" Margin="15" Background="#FFFF" VerticalAlignment="Center" Padding="30" MaxWidth="550" CornerRadius="20">
             <Border.Effect>
                 <DropShadowEffect BlurRadius="30" Color="LightGray" ShadowDepth="0"/>
             </Border.Effect>
             <StackPanel>
-                <TextBlock Text="Компания 'Велопробег'" FontSize="30" FontWeight="Bold" Margin="0 0 20 0" HorizontalAlignment="Center"/>
+                <TextBlock Text="Компания «Велопробег»" FontSize="30" FontWeight="Bold" Margin="0 0 20 0" HorizontalAlignment="Center"/>
                 <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"/>

+ 12 - 2
veloprokat2/Auth.xaml.cs

@@ -21,11 +21,9 @@ namespace veloprokat2
     /// </summary>
     public partial class Auth : Window
     {
-        VeloprokatEntities db;
         public Auth()
         {
             InitializeComponent();
-            db = new VeloprokatEntities();
         }
 
         private void Voyti(object sender, RoutedEventArgs e)
@@ -87,6 +85,18 @@ namespace veloprokat2
             sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
             return dataTable;
         }
+        public DataTable Select1(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
 
     }
 }

+ 0 - 21
veloprokat2/Bikes.cs

@@ -1,21 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан по шаблону.
-//
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace veloprokat2
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class Bikes
-    {
-        public int ID { get; set; }
-        public string Company { get; set; }
-        public string Model { get; set; }
-    }
-}

+ 24 - 0
veloprokat2/Changing_the_type.xaml

@@ -0,0 +1,24 @@
+<Window x:Class="veloprokat2.Changing_the_type"
+        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"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        Title="Изменение занятости" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
+    <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>
+                <TextBlock Text="Изменение занятости велосипеда" FontSize="20" FontWeight="Bold" Margin="0 0 20 0"/>
+                <TextBox Name="NumberOfBikes" materialDesign:HintAssist.Hint="Введите номер велосипеда" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <TextBox Name="Zan" materialDesign:HintAssist.Hint="Введите занятость" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <Button Content="Изменить" Margin="20 10" Click="Izmenenie"/>
+                <Button Content="Отмена" Margin="20 0" Click="Otmena"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>

+ 82 - 0
veloprokat2/Changing_the_type.xaml.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для Changing_the_type.xaml
+    /// </summary>
+    public partial class Changing_the_type : Window
+    {
+        public Changing_the_type()
+        {
+            InitializeComponent();
+        }
+
+        private void Izmenenie(object sender, RoutedEventArgs e)
+        {
+            if(Zan.Text == "Занят")
+            {
+                DataTable InfoAdm = Update("update [dbo].[Bikes] " +
+                                            "Set IDZan = 2" +
+                                            "Where ID =" + NumberOfBikes.Text);
+                InfoBikes SP = new InfoBikes();
+                SP.Show();
+                Close();
+                                         
+            }
+            else if(Zan.Text == "Свободен")
+            {
+                DataTable InfoAdm = Update("update [dbo].[Bikes] " +
+                                            "Set IDZan = 1" +
+                                            "Where ID =" + NumberOfBikes.Text);
+                InfoBikes SP = new InfoBikes();
+                SP.Show();
+                Close();
+            }
+            else if (Zan.Text == "В тех. обслуживании")
+            {
+                DataTable InfoAdm = Update("update [dbo].[Bikes] " +
+                                            "Set IDZan = 3" +
+                                            "Where ID =" + NumberOfBikes.Text);
+                InfoBikes SP = new InfoBikes();
+                SP.Show();
+                Close();
+            }
+            else MessageBox.Show("Неправильный формат, либо пустые поля");
+
+        }
+
+        private void Otmena(object sender, RoutedEventArgs e)
+        {
+            InfoBikes Sp = new InfoBikes();
+            Sp.Show();
+            Close();
+        }
+        public DataTable Update(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
+    }
+}

+ 23 - 0
veloprokat2/DeleteBikes.xaml

@@ -0,0 +1,23 @@
+<Window x:Class="veloprokat2.DeleteBikes"
+        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"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        Title="Удаление записи о велосипеде" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
+    <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>
+                <TextBlock Text="Удаление записи о велосипеде" FontSize="20" FontWeight="Bold" Margin="0 0 20 0"/>
+                <TextBox Name="NumberOfBikes" materialDesign:HintAssist.Hint="Введите номер велосипеда" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <Button Content="Удалить" Margin="20 10" Click="Delete"/>
+                <Button Content="Отмена" Margin="20 0" Click="Otmena"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>

+ 111 - 0
veloprokat2/DeleteBikes.xaml.cs

@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для DeleteBikes.xaml
+    /// </summary>
+    public partial class DeleteBikes : Window
+    {
+        List<string> Numbers = new List<string> {
+            "0","1","2","3","4","5","6","7","8","9"};
+        List<string> symbols = new List<string> {
+            "!","'","#","$","%","&","(",")","*","+",",","-","_",".","/",":",""};
+        public DeleteBikes()
+        {
+            InitializeComponent();
+        }
+
+        private void Delete(object sender, RoutedEventArgs e)
+        {
+            if (MessageBox.Show("Вы действительно хотите удалить данные ", "Удаление", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+            {
+                bool del = false;
+                if (NumberOfBikes.Text != "")
+                {
+                    DataTable table = Select1("select * from [dbo].[Bikes] where id = " + NumberOfBikes.Text);
+                    for (int i = 0; i < NumberOfBikes.Text.Length; i++)
+                    {
+                        if (del)
+                        {
+                            del = false;
+                        }
+                        for (int j = 0; j < Numbers.Count; j++)
+                        {
+                            if (table.Rows.Count > 0 /*&& int.TryParse(NumberOfBikes, out )*/)
+                            {
+                                if (Convert.ToString(NumberOfBikes.Text[i]).Contains(Numbers[j]))
+                                {
+                                    del = true;
+                                    break;
+                                }
+                            }
+                            else
+                            {
+                                MessageBox.Show("Велосипеда с таким номером не существует или вы ввели некорректные данные");
+                                break;
+                            }
+                        }
+                        if (del == false)
+                        {
+                            break;
+                        }
+                    }
+                    if (del)
+                    {
+                        DataTable Bikes = Update("delete Bikes where id = " + NumberOfBikes.Text);
+                        MessageBox.Show("Велосипед с номером " + NumberOfBikes.Text + " удален");
+                        SpisokBikes IB = new SpisokBikes();
+                        IB.Show();
+                        Close();
+                    }
+                }
+            }
+        }
+
+        private void Otmena(object sender, RoutedEventArgs e)
+        {
+            SpisokBikes IB = new SpisokBikes();
+            IB.Show();
+            Close();
+        }
+        public DataTable Update(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
+        public DataTable Select1(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
+    }
+}

+ 23 - 0
veloprokat2/DeleteRab.xaml

@@ -0,0 +1,23 @@
+<Window x:Class="veloprokat2.DeleteRab"
+        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"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        Title="Удаление записи о сотруднике" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
+    <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>
+                <TextBlock Text="Удаление записи о сотруднике" FontSize="20" FontWeight="Bold" Margin="0 0 20 0"/>
+                <TextBox Name="NumberOfRab" materialDesign:HintAssist.Hint="Введите номер сотрудника" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <Button Content="Удалить" Margin="20 10" Click="Delete"/>
+                <Button Content="Отмена" Margin="20 0" Click="Otmena"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>

+ 89 - 0
veloprokat2/DeleteRab.xaml.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для DeleteRab.xaml
+    /// </summary>
+    public partial class DeleteRab : Window
+    {
+        List<string> Numbers = new List<string> {
+            "0","1","2","3","4","5","6","7","8","9"};
+        public DeleteRab()
+        {
+            InitializeComponent();
+        }
+
+        private void Delete(object sender, RoutedEventArgs e)
+        {
+            if (MessageBox.Show("Вы действительно хотите удалить данные ", "Удаление", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+            {
+                bool del = false;
+                if (NumberOfRab.Text != "")
+                {
+                    for (int i = 0; i < NumberOfRab.Text.Length; i++)
+                    {
+                        if (del)
+                        {
+                            del = false;
+                        }
+                        for (int j = 0; j < Numbers.Count; j++)
+                        {
+                            if (Convert.ToString(NumberOfRab.Text[i]).Contains(Numbers[j]))
+                            {
+                                del = true;
+                                break;
+                            }
+                        }
+                        if (del == false)
+                        {
+                            MessageBox.Show("Поле номер велосипеда должен иметь цифры");
+                            break;
+                        }
+                    }
+                    if (del)
+                    {
+                        DataTable Bikes = Update("delete InfoRab where id = " + NumberOfRab.Text);
+                        SpisRab IB = new SpisRab();
+                        IB.Show();
+                        Close();
+                    }
+                }
+            }
+        }
+
+        private void Otmena(object sender, RoutedEventArgs e)
+        {
+            SpisRab SR = new SpisRab();
+            SR.Show();
+            Close();
+        }
+
+        public DataTable Update(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
+    }
+}

+ 22 - 0
veloprokat2/DeleteTest.xaml

@@ -0,0 +1,22 @@
+<Window x:Class="veloprokat2.DeleteTest"
+        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="Удаление записи о велосипеде" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
+    <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>
+                <TextBlock Text="Удаление записи о велосипеде" FontSize="20" FontWeight="Bold" Margin="0 0 20 0"/>
+                <TextBox Name="NumberOfBikes"/>
+                <Button Content="Удалить" Margin="20 10" Click="Delete"/>
+                <Button Content="Отмена" Margin="20 0" Click="Otmena"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>

+ 125 - 0
veloprokat2/DeleteTest.xaml.cs

@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для DeleteTest.xaml
+    /// </summary>
+    public partial class DeleteTest : Window
+    {
+        List<string> Numbers = new List<string> {
+            "0","1","2","3","4","5","6","7","8","9"};
+        public DeleteTest()
+        {
+            InitializeComponent();
+        }
+
+        public bool Delete_test(string id)
+        {
+            NumberOfBikes.Text = id;
+            bool del = false;
+            if (MessageBox.Show("Вы действительно хотите удалить данные ", "Удаление", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+            {
+                if (id != "")
+                {
+                    DataTable table = Select1("select * from [dbo].[Bikes] where id = " + id);
+                    for (int i = 0; i < id.Length; i++)
+                    {
+                        if (del)
+                        {
+                            del = false;
+                        }
+                        for (int j = 0; j < Numbers.Count; j++)
+                        {
+                            if (table.Rows.Count > 0)
+                            {
+                                if (Convert.ToString(id[i]).Contains(Numbers[j]))
+                                {
+                                    del = true;
+                                    break;
+                                }
+                            }
+                            else
+                            {
+                                MessageBox.Show("Велосипеда с таким номером не существует или вы ввели некорректные данные");
+                                return false;
+                            }
+                        }
+                        if (del == false)
+                        {
+                            return false;
+                        }
+                    }
+                    if (del)
+                    {
+                        DataTable Bikes = Update("delete Bikes where id = " + id);
+                        InfoBikes IB = new InfoBikes();
+                        IB.Show();
+                        Close();
+                        return true;
+                    }
+                    else return false;
+                }
+                else
+                {
+                    MessageBox.Show("Поле должно быть заполнено");
+                    return false;
+                }
+            }
+            else
+            {
+                return false;
+            }  
+        }
+
+        public DataTable Update(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
+
+        public DataTable Select1(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
+
+        private void Delete(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Otmena(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}

+ 0 - 27
veloprokat2/InfoAdm.cs

@@ -1,27 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан по шаблону.
-//
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace veloprokat2
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class InfoAdm
-    {
-        public int ID { get; set; }
-        public string Login { get; set; }
-        public string Password { get; set; }
-        public string FName { get; set; }
-        public string MName { get; set; }
-        public string LName { get; set; }
-        public string Email { get; set; }
-        public string Phone { get; set; }
-        public Nullable<System.DateTime> Dr { get; set; }
-    }
-}

+ 25 - 0
veloprokat2/InfoBikes.xaml

@@ -0,0 +1,25 @@
+<Window x:Class="veloprokat2.InfoBikes"
+        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"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        Title="Информация о велосипедах" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
+    <Grid Background="#EAF4F4">
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <DataGrid AutoGenerateColumns="True" Name="prodinfo" Grid.Row="0" Margin="355,10,10,10" Grid.RowSpan="2" Grid.ColumnSpan="2">
+        </DataGrid>
+        <TextBox x:Name="Search" Background="White"  Grid.Row="0" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,10,0,0"/>
+        <Button Content="Поиск" Click="Button_Search"  Grid.Row="0" FontSize="20" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,65,0,0"/>
+        <Button Content="Вернуться" Click="Vixod"  FontSize="20"  Width="250" Height="50" Margin="10,0,0,9.6" VerticalAlignment="Bottom" HorizontalAlignment="Left" RenderTransformOrigin="0.502,1.584"/>
+        <Button Content="Изменить статус" Click="Insert"  FontSize="20"  Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,120,0,0"/>
+    </Grid>
+</Window>

+ 88 - 0
veloprokat2/InfoBikes.xaml.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для InfoBikes.xaml
+    /// </summary>
+    public partial class InfoBikes : Window
+    {
+        public InfoBikes()
+        {
+            InitializeComponent();
+            SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+            connection.Open();
+            string cmd = "Select Bikes.ID as '№ велосипеда', Bikes.Company as 'Компания', Bikes.Title as 'Название',Bikes.[Type] as 'Тип',Zanyatost.Zan as 'Занятость',InfoAdm.Lname as 'Фамилия администратора' from Bikes,Zanyatost, InfoAdm where Bikes.IDZan = Zanyatost.ID and Bikes.IdAdm = InfoAdm.ID";
+            SqlCommand createcommand = new SqlCommand(cmd, connection);
+            createcommand.ExecuteNonQuery();
+
+            SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+            DataTable dt = new DataTable("Bikes");
+            sql.Fill(dt);
+            prodinfo.ItemsSource = dt.DefaultView;
+            connection.Close();
+        }
+
+        private void Button_Search(object sender, RoutedEventArgs e)
+        {
+            if (Search.Text.Length > 0)
+            {
+                SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+                connection.Open();
+                string cmd = "Select Bikes.ID as '№ велосипеда', Bikes.Company as 'Компания', Bikes.Title as 'Название',Bikes.[Type] as 'Тип',Zanyatost.Zan as 'Занятость', InfoAdm.Lname as 'Фамилия администратора' from Bikes,Zanyatost where Bikes.IDZan = Zanyatost.ID and Bikes.IdAdm = InfoAdm.ID" +
+                             " and ( Bikes.ID like '%" + Search.Text + "%' or Bikes.Company like '%" + Search.Text + "%' or Bikes.[Type] like '%" + Search.Text + "%' or Bikes.Title like '%" + Search.Text + "%' or Zanyatost.Zan like '%" + Search.Text + "%' or InfoAdm.Lname like '%" + Search.Text + "%')";
+                SqlCommand createcommand = new SqlCommand(cmd, connection);
+                createcommand.ExecuteNonQuery();
+
+                SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+                DataTable dt = new DataTable("SpisProk");
+                sql.Fill(dt);
+                prodinfo.ItemsSource = dt.DefaultView;
+                connection.Close();
+            }
+            else if (Search.Text.Length == 0)
+            {
+                SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+                connection.Open();
+                string cmd = "Select Bikes.ID as '№ велосипеда', Bikes.Company as 'Компания', Bikes.Title as 'Название',Bikes.[Type] as 'Тип',Zanyatost.Zan as 'Занятость',InfoAdm.Lname as 'Фамилия администратора' from Bikes,Zanyatost, InfoAdm where Bikes.IDZan = Zanyatost.ID and Bikes.IdAdm = InfoAdm.ID";
+                SqlCommand createcommand = new SqlCommand(cmd, connection);
+                createcommand.ExecuteNonQuery();
+
+                SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+                DataTable dt = new DataTable("SpisProk");
+                sql.Fill(dt);
+                prodinfo.ItemsSource = dt.DefaultView;
+                connection.Close();
+            }
+        }
+
+        private void Vixod(object sender, RoutedEventArgs e)
+        {
+            MainWindowProd MWA = new MainWindowProd();
+            MWA.Show();
+            Close();
+        }
+
+        private void Insert(object sender, RoutedEventArgs e)
+        {
+            Changing_the_type CTT = new Changing_the_type();
+            CTT.Show();
+            Close();
+        }
+
+    }
+}

+ 0 - 15
veloprokat2/InfoProdaji.xaml

@@ -1,15 +0,0 @@
-<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>

+ 0 - 39
veloprokat2/InfoProdaji.xaml.cs

@@ -1,39 +0,0 @@
-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)
-        {
-
-        }
-    }
-}

+ 0 - 22
veloprokat2/InfoRab.cs

@@ -1,22 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан по шаблону.
-//
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace veloprokat2
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class InfoRab
-    {
-        public int ID { get; set; }
-        public string Login { get; set; }
-        public string Password { get; set; }
-        public string Email { get; set; }
-    }
-}

+ 23 - 0
veloprokat2/InfoTarif.xaml

@@ -0,0 +1,23 @@
+<Window x:Class="veloprokat2.InfoTarif"
+        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="Информация о тарифах" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
+    <Grid Background="#EAF4F4">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <DataGrid AutoGenerateColumns="True" Name="prodinfo" Grid.Row="0" Margin="355,10,10,10" Grid.RowSpan="2" Grid.ColumnSpan="2"/>
+        <TextBox x:Name="Search" Background="White"  Grid.Row="0" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,10,0,0"/>
+        <Button Content="Поиск" Click="Button_Search"  Grid.Row="0" FontSize="20" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,65,0,0"/>
+        <Button Content="Вернуться" Click="Vixod"  FontSize="20"  Width="250" Height="50" Margin="10,0,0,9.6" VerticalAlignment="Bottom" HorizontalAlignment="Left" Grid.Row="1"/>
+    </Grid>
+</Window>

+ 81 - 0
veloprokat2/InfoTarif.xaml.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для InfoTarif.xaml
+    /// </summary>
+    public partial class InfoTarif : Window
+    {
+        public InfoTarif()
+        {
+            InitializeComponent();
+            SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+            connection.Open();
+            string cmd = "select ID as 'Номер тарифа', NameOfTarif as 'Название тарифа',cast(price as int) as 'Цена' from tarif";
+            SqlCommand createcommand = new SqlCommand(cmd, connection);
+            createcommand.ExecuteNonQuery();
+
+            SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+            DataTable dt = new DataTable("Tarif");
+            sql.Fill(dt);
+            prodinfo.ItemsSource = dt.DefaultView;
+            connection.Close();
+        }
+
+        private void Button_Search(object sender, RoutedEventArgs e)
+        {
+            if (Search.Text.Length > 0)
+            {
+                SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+                connection.Open();
+                string cmd = "select ID as 'Номер тарифа',NameOfTarif as 'Название тарифа',cast(price as int) as 'Цена' from Tarif" +
+                             " where ( ID like '%" + Search.Text + "%' or NameOfTarif like '%" + Search.Text + "%' or Price like '%" + Search.Text + "%' )";
+                SqlCommand createcommand = new SqlCommand(cmd, connection);
+                createcommand.ExecuteNonQuery();
+
+                SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+                DataTable dt = new DataTable("Tarif");
+                sql.Fill(dt);
+                prodinfo.ItemsSource = dt.DefaultView;
+                connection.Close();
+
+            }
+            else if (Search.Text.Length == 0)
+            {
+                SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+                connection.Open();
+                string cmd = "select ID as 'Номер тарифа',NameOfTarif as 'Название тарифа',cast(price as int) as 'Цена' from Tarif";
+                SqlCommand createcommand = new SqlCommand(cmd, connection);
+                createcommand.ExecuteNonQuery();
+
+                SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+                DataTable dt = new DataTable("Tarif");
+                sql.Fill(dt);
+                prodinfo.ItemsSource = dt.DefaultView;
+                connection.Close();
+            }
+        }
+
+        private void Vixod(object sender, RoutedEventArgs e)
+        {
+            MainWindowAdm MWA = new MainWindowAdm();
+            MWA.Show();
+            Close();
+        }
+    }
+}

+ 23 - 0
veloprokat2/Info_prodaji.xaml

@@ -0,0 +1,23 @@
+<Window x:Class="veloprokat2.Info_prodaji"
+        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="Информация о продажах" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
+    <Grid Background="#EAF4F4">
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <DataGrid AutoGenerateColumns="True" Name="prodinfo" Grid.Row="0" Margin="355,10,10,10" Grid.RowSpan="2" Grid.ColumnSpan="2">
+        </DataGrid>
+        <TextBox x:Name="Search" Background="White"  Grid.Row="0" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,10,0,0"/>
+        <Button Content="Поиск" Click="Button_Search"  Grid.Row="0" FontSize="20" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,65,0,0"/>
+        <Button Content="Вернуться" Click="Vixod"  FontSize="20"  Width="250" Height="50" Margin="10,0,0,9.6" VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+    </Grid>
+</Window>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 82 - 0
veloprokat2/Info_prodaji.xaml.cs


+ 35 - 0
veloprokat2/InsertZakaz.xaml

@@ -0,0 +1,35 @@
+<Window x:Class="veloprokat2.InsertZakaz"
+        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"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        Title="Регистрация нового заказа" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
+    <Grid Background="#EAF4F4">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="65*"/>
+            <ColumnDefinition Width="226*"/>
+            <ColumnDefinition Width="469*"/>
+        </Grid.ColumnDefinitions>
+        <Border MinWidth="400" Margin="15,52" Background="#FFFF" VerticalAlignment="Center" Padding="30" MaxWidth="600" CornerRadius="20" Grid.ColumnSpan="3">
+            <Border.Effect>
+                <DropShadowEffect BlurRadius="30" Color="LightGray" ShadowDepth="0"/>
+            </Border.Effect>
+            <StackPanel>
+                <TextBlock Text="Регистрация нового заказа" FontSize="20" FontWeight="Bold" Margin="0 0 20 0"/>
+                <TextBox Name="NumberZakaza" materialDesign:HintAssist.Hint="Введите номер заказа" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <TextBox Name="NumberBikes" materialDesign:HintAssist.Hint="Введите номер велосипеда" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <TextBox Name="NumberTarif" materialDesign:HintAssist.Hint="Введите номер тарифа" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <DatePicker Name="Date" materialDesign:HintAssist.Hint="Введите дату" SelectedDateFormat="Short" Style="{StaticResource MaterialDesignDatePicker}" Height="35"/>
+                <materialDesign:TimePicker Name="Time" materialDesign:HintAssist.Hint="Введите время" SelectedTimeFormat="Long" Is24Hours="True"  Style="{StaticResource MaterialDesignFilledTimePicker}" Height="45"/>
+                <TextBox Name="Count" materialDesign:HintAssist.Hint="Введите количество" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <TextBox Name="Lname" materialDesign:HintAssist.Hint="Введите Фамилию" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <TextBox Name="NumberEmp" materialDesign:HintAssist.Hint="Введите номер сотрудника" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <Button Content="Зарегестрировать" Margin="20 10" Click="Registraciya"/>
+                <Button Content="Отмена" Margin="20 0" Click="Otmena"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>

+ 194 - 0
veloprokat2/InsertZakaz.xaml.cs

@@ -0,0 +1,194 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для InsertZakaz.xaml
+    /// </summary>
+    public partial class InsertZakaz : Window
+    {
+        List<string> Datee = new List<string> {
+            "0","1","2","3","4","5","6","7","8","9","."};
+        List<string> Timee = new List<string> {
+            "0","1","2","3","4","5","6","7","8","9",":"};
+        List<string> Countt = new List<string> {
+            "0","1","2","3","4","5","6","7","8","9"};
+        public InsertZakaz()
+        {
+            InitializeComponent();
+        }
+
+        private void Registraciya(object sender, RoutedEventArgs e)
+        {
+            if (NumberZakaza.Text !="" && NumberBikes.Text !="" && NumberTarif.Text !="" && Date.Text !="" && Time.Text !="" && Count.Text !="")
+            {
+                bool zakaz = false; bool bikes = false; bool tarif = false; bool date = false; bool time = false; bool count = false;
+
+                for(int i=0;i<NumberZakaza.Text.Length;i++)
+                {
+                    if(bikes)
+                    {
+                        bikes = false;
+                    }
+                    for(int j=0;j<Countt.Count;j++)
+                    {
+                        if (Convert.ToString(NumberZakaza.Text[i]).Contains(Countt[j]))
+                        {
+                            bikes = true;
+                            break;
+                        }
+                    }
+                    if (bikes == false)
+                    {
+                        MessageBox.Show("Поле номер заказа должно содержать только цифры");
+                        break;
+                    }
+                }
+                for (int i = 0; i < NumberBikes.Text.Length; i++)
+                {
+                    if (zakaz)
+                    {
+                        zakaz = false;
+                    }
+                    for (int j = 0; j < Countt.Count; j++)
+                    {
+                        if (Convert.ToString(NumberBikes.Text[i]).Contains(Countt[j]))
+                        {
+                            zakaz = true;
+                            break;
+                        }
+                    }
+                    if (zakaz == false)
+                    {
+                        MessageBox.Show("Поле номер велосипеда должно содержать только цифры");
+                        break;
+                    }
+                }
+                for (int i = 0; i < NumberTarif.Text.Length; i++)
+                {
+                    if (tarif)
+                    {
+                        tarif = false;
+                    }
+                    for (int j = 0; j < Countt.Count; j++)
+                    {
+                        if (Convert.ToString(NumberTarif.Text[i]).Contains(Countt[j]))
+                        {
+                            tarif = true;
+                            break;
+                        }
+                    }
+                    if (tarif == false)
+                    {
+                        MessageBox.Show("Поле номер тарифа должно содержать только цифры");
+                        break;
+                    }
+                }
+                for (int i = 0; i < Date.Text.Length; i++)
+                {
+                    if (date)
+                    {
+                        date = false;
+                    }
+                    for (int j = 0; j < Datee.Count; j++)
+                    {
+                        if (Convert.ToString(Date.Text[i]).Contains(Datee[j]))
+                        {
+                            date = true;
+                            break;
+                        }
+                    }
+                    if (date == false)
+                    {
+                        MessageBox.Show("Поле дата должно содержать только цифры и знак '.'");
+                        break;
+                    }
+                }
+                for (int i = 0; i < Time.Text.Length; i++)
+                {
+                    if (time)
+                    {
+                        time = false;
+                    }
+                    for (int j = 0; j < Timee.Count; j++)
+                    {
+                        if (Convert.ToString(Time.Text[i]).Contains(Timee[j]))
+                        {
+                            time = true;
+                            break;
+                        }
+                    }
+                    if (date == false)
+                    {
+                        MessageBox.Show("Поле время должно содержать только цифры и знак ':'");
+                        break;
+                    }
+                }
+                for (int i = 0; i < Count.Text.Length; i++)
+                {
+                    if (count)
+                    {
+                        count = false;
+                    }
+                    for (int j = 0; j < Countt.Count; j++)
+                    {
+                        if (Convert.ToString(Count.Text[i]).Contains(Countt[j]))
+                        {
+                            count = true;
+                            break;
+                        }
+                    }
+                    if (count == false)
+                    {
+                        MessageBox.Show("Поле количество должно содержать только цифры");
+                        break;
+                    }
+                }
+                if (zakaz && bikes && tarif && date && time && count)
+                {
+                    DataTable SpisProk = Insert("insert into [dbo].[SpisProk] values " +
+                                                            "('" + NumberZakaza.Text + "','" + NumberBikes.Text + "','" + NumberTarif.Text +
+                                                              "','" + Date.Text + "','" + Time.Text + "','" + Count.Text + "','" + Lname.Text + "','" + NumberEmp.Text + "')");
+                    MessageBox.Show("Заказ добавлен");
+                    MainWindowProd MWP = new MainWindowProd();
+                    MWP.Show();
+                    Close();
+                }
+            }
+        }
+
+        private void Otmena(object sender, RoutedEventArgs e)
+        {
+            MainWindowProd MWP = new MainWindowProd();
+            MWP.Show();
+            Close();
+        }
+
+        public DataTable Insert(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
+    }
+}

+ 6 - 2
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="Добавление велосипеда" WindowState="Maximized" WindowStyle="None">
+        Title="Добавление велосипеда" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
     <Grid Background="#EAF4F4">
         <Border MinWidth="400" Margin="15" Background="#FFFF" VerticalAlignment="Center" Padding="30" MaxWidth="600" CornerRadius="20">
             <Border.Effect>
@@ -14,8 +14,12 @@
             </Border.Effect>
             <StackPanel>
                 <TextBlock Text="Регистрация нового велосипеда" FontSize="20" FontWeight="Bold" Margin="0 0 20 0"/>
+                <TextBox Name="NumberOfBikes" materialDesign:HintAssist.Hint="Введите номер велосипеда" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
                 <TextBox Name="Company" materialDesign:HintAssist.Hint="Введите компанию" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
-                <TextBox Name="Model" materialDesign:HintAssist.Hint="Введите модель" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <TextBox Name="Title" materialDesign:HintAssist.Hint="Введите модель" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <TextBox Name="Type" materialDesign:HintAssist.Hint="Введите тип" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <TextBox Name="Zan" materialDesign:HintAssist.Hint="Введите занятость" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <TextBox Name="LnameAdm" materialDesign:HintAssist.Hint="Введите № администратора" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
                 <Button Content="Зарегестрировать" Margin="20 10" Click="Registraciya"/>
                 <Button Content="Отмена" Margin="20 0" Click="Otmena"/>
             </StackPanel>

+ 98 - 19
veloprokat2/Insert_Bikes.xaml.cs

@@ -26,6 +26,8 @@ namespace veloprokat2
             "К", "к", "Л", "л", "М", "м", "Н", "н", "О", "о", "П", "п", "Р", "р", "С", "с", "Т", "т", "У", "у", "Ф", "ф",
             "Х", "х", "Ц", "ц", "Ч", "ч", "Ш", "ш", "Щ", "щ", "Ъ", "ъ", "Ы", "ы", "Ь", "ь", "Э", "э", "Ю", "ю", "Я", "я",
             "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "-", "_"};
+        List<string> Number = new List<string> {
+            "0","1","2","3","4","5","6","7","8","9"};
         public Insert_Bikes()
         {
             InitializeComponent();
@@ -33,16 +35,37 @@ namespace veloprokat2
 
         private void Registraciya(object sender, RoutedEventArgs e)
         {
-            if (Company.Text != "" && Model.Text != "")
+            if (Company.Text != "" && Title.Text != "" && NumberOfBikes.Text != "" && Type.Text != "" && Zan.Text != "" && LnameAdm.Text != "")
             {
-                bool Comp = false; bool mod = false;
-                for (int i = 0; i < Company.Text.Length; i++)//проверка логина
+                bool Comp = false, title = false, numbofbike = false, type = false, lname = false;
+                for(int i = 0; i < NumberOfBikes.Text.Length; i++)
+                {
+                    if(numbofbike)
+                    {
+                        numbofbike = false;
+                    }
+                    for(int j  = 0; j < Number.Count; j++)
+                    {
+                        if (Convert.ToString(NumberOfBikes.Text[i]).Contains(Number[j]))
+                        {
+                            numbofbike = true;
+                            break;
+                        }
+
+                    }
+                    if(numbofbike == false)
+                    {
+                        MessageBox.Show("Поле Номер велосипеда должно содержать только цифры");
+                        break;
+                    }
+                }
+                for (int i = 0; i < Company.Text.Length; i++)
                 {
                     if (Comp)
                     {
                         Comp = false;
                     }
-                    if (Company.Text[i] >= 'A' && Company.Text[i] <= 'Z' || Company.Text[i] >= 'a' && Company.Text[i] <= 'z')
+                    if (Company.Text[i] >= 'A' && Company.Text[i] <= 'Z' || Company.Text[i] >= 'a' && Company.Text[i] <= 'z' || Company.Text[i] >= '0' && Company.Text[i] <='9')
                     {
                         Comp = true;
                         break;
@@ -53,35 +76,91 @@ namespace veloprokat2
                         break;
                     }
                 }
-                for (int i = 0; i < Model.Text.Length; i++)//проверка фамилии
+                for (int i = 0; i < Title.Text.Length; i++)
+                {
+                    if (title)
+                    {
+                        title = false;
+                    }
+                    if (Title.Text[i] >= 'A' && Title.Text[i] <= 'Z' || Title.Text[i] >= 'a' && Title.Text[i] <= 'z' || Title.Text[i] >= '0' && Title.Text[i] <='9' || Title.Text[i] == '"' || Title.Text[i] == '\'')
+                    {
+                        title = true;
+                        break;
+                    }
+                    if (title == false)
+                    {
+                        MessageBox.Show("Поле Модель должно содержать только английские символы");
+                        break;
+                    }
+                }
+                for(int i = 0; i<Type.Text.Length;i++)
                 {
-                    if (mod)
+                    if(type)
                     {
-                        mod = false;
+                        type = false;  
                     }
-                    for (int j = 0; j < Alphabetrus.Count; j++)
+                    for(int j=0;j<Alphabetrus.Count;j++)
                     {
-                        if (Convert.ToString(Model.Text[i]).Contains(Alphabetrus[j]))
+                        if (Convert.ToString(Type.Text[i]).Contains(Alphabetrus[j]))
                         {
-                            mod = true;
+                            type = true;
                             break;
                         }
                     }
-                    if (mod == false)
+                    if(type==false)
+                    {
+                        MessageBox.Show("Поле Тип должно содержать только русские символы и цифры");
+                        break;
+                    }
+                }
+                for(int i = 0; i < LnameAdm.Text.Length; i++)
+                {
+                    if(lname)
+                    {
+                        lname = false;
+                    }
+                    for(int j = 0; j < Number.Count; j++)
                     {
-                        MessageBox.Show("Поле Модель должно содержать только русские символы");
+                        lname = true;
+                        break;
+                    }
+                    if(lname == false)
+                    {
+                        MessageBox.Show("Поле № администратора должно иметь только цифры");
                         break;
                     }
                 }
-                if (Comp && mod)
+                if (numbofbike && Comp && title && type && lname)
                 {
-                    DataTable InfoAdm = Insert("insert into [dbo].[Bikes] values " +
-                                                            "('" + Company.Text + "','" + Model.Text +"')");
-                    MessageBox.Show("Велосипед добавлен");
-                    SpisokBikes SB = new SpisokBikes();
-                    SB.Show();
-                    Close();
+                    if (Zan.Text == "Свободен")
+                    {
+                        DataTable InfoAdm = Insert("insert into [dbo].[Bikes] values " +
+                                                           "('" + NumberOfBikes.Text + "','" + Company.Text + "','" + Title.Text + "','" + Type.Text + "', 1 ," + LnameAdm.Text + ")");
+                        MessageBox.Show("Велосипед добавлен");
+                        SpisokBikes SB = new SpisokBikes();
+                        SB.Show();
+                        Close();
+                    }
+                    else if (Zan.Text == "Занят")
+                    {
+                        DataTable InfoAdm = Insert("insert into [dbo].[Bikes] values " +
+                                                           "('" + NumberOfBikes.Text + "','" + Company.Text + "','" + Title.Text + "','" + Type.Text + "', 2 ," + LnameAdm.Text + ")");
+                        MessageBox.Show("Велосипед добавлен");
+                        SpisokBikes SB = new SpisokBikes();
+                        SB.Show();
+                        Close();
+                    }
+                    else if (Zan.Text == "В тех. обслуживании")
+                    {
+                        DataTable InfoAdm = Insert("insert into [dbo].[Bikes] values " +
+                                                           "('" + NumberOfBikes.Text + "','" + Company.Text + "','" + Title.Text + "','" + Type.Text + "', 3 ," + LnameAdm.Text + ")");
+                        MessageBox.Show("Велосипед добавлен");
+                        SpisokBikes SB = new SpisokBikes();
+                        SB.Show();
+                        Close();
+                    }
                 }
+
                 else { MessageBox.Show("Неправильный формат"); }
             }
             else { MessageBox.Show("Все строки должны быть заполнены"); }

+ 0 - 34
veloprokat2/Insert_zap.xaml

@@ -1,34 +0,0 @@
-<Window x:Class="veloprokat2.Insert_zap"
-        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"
-        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        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>
-                <TextBlock Text="Добавление новой записи " FontSize="30" FontWeight="Bold" Margin="0 0 20 0"/>
-
-                <TextBox Name="Login" materialDesign:HintAssist.Hint="Введите логин" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
-                <PasswordBox Name="Pass" materialDesign:HintAssist.Hint="Введите пароль" Style="{StaticResource MaterialDesignFloatingHintPasswordBox}"/>
-                <PasswordBox Name="Pass2"  materialDesign:HintAssist.Hint="Повторите пароль" Style="{StaticResource MaterialDesignFloatingHintPasswordBox}"/>
-                <TextBox Name="Lname" materialDesign:HintAssist.Hint="Введите Фамилию" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
-                <TextBox Name="Fname" materialDesign:HintAssist.Hint="Введите Имя" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
-                <TextBox Name="Mname" materialDesign:HintAssist.Hint="Введите Отчество" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
-                <TextBox Name="Email" materialDesign:HintAssist.Hint="Введите E-mail" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
-                <TextBox Name="Phone" materialDesign:HintAssist.Hint="Введите Номер телефона" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
-                <DatePicker Name="Dr" materialDesign:HintAssist.Hint="Введите дату рождения" SelectedDateFormat="Short" Style="{StaticResource MaterialDesignDatePicker}" Margin=" 0 10 "/>
-                <Button Content="Добавить" Margin="20 10" Click="Registraciya"/>
-                <Button Content="Отмена" Margin="20 20" Click="Otmena"/>
-            </StackPanel>
-
-
-        </Border>
-    </Grid>
-</Window>

+ 0 - 245
veloprokat2/Insert_zap.xaml.cs

@@ -1,245 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-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>
-    /// Логика взаимодействия для Insert_zap.xaml
-    /// </summary>
-    public partial class Insert_zap : Window
-    {
-        List<string> Alphabetrus = new List<string> {
-            "А", "а", "Б", "б", "В", "в", "Г", "г", "Д", "д", "Е", "е", "Ё", "ё", "Ж", "ж", "З", "з", "И", "и", "Й", "й",
-            "К", "к", "Л", "л", "М", "м", "Н", "н", "О", "о", "П", "п", "Р", "р", "С", "с", "Т", "т", "У", "у", "Ф", "ф",
-            "Х", "х", "Ц", "ц", "Ч", "ч", "Ш", "ш", "Щ", "щ", "Ъ", "ъ", "Ы", "ы", "Ь", "ь", "Э", "э", "Ю", "ю", "Я", "я" };
-        List<string> Date = new List<string> {
-            "0","1","2","3","4","5","6","7","8","9","."};
-        List<string> NumberPhone = new List<string> {
-            "0","1","2","3","4","5","6","7","8","9"};
-        public Insert_zap()
-        {
-            InitializeComponent();
-        }
-        public DataTable Insert(string selectSQL) // функция подключения к базе данных и обработка запросов
-        {
-            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
-                                                                            // подключаемся к базе данных
-            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
-            sqlConnection.Open();                                           // открываем базу данных
-            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
-            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
-            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
-            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
-            return dataTable;
-        }
-        private void Registraciya(object sender, RoutedEventArgs e)
-        {
-            if (Login.Text != "" && Pass.Password != "" && Pass2.Password != "" && Lname.Text != "" && Fname.Text != "" && Mname.Text != "" && Email.Text != "" && Phone.Text != "" && Dr.Text != "")
-            {
-                bool fam = false, imya = false, otch = false, data = false, num = false;
-                bool email = false, login = false, pas1 = false, pas2 = false;
-                for (int i = 0; i < Login.Text.Length; i++)//проверка логина
-                {
-                    if (login)
-                    {
-                        login = false;
-                    }
-                    if (Login.Text[i] >= 'A' && Login.Text[i] <= 'Z' || Login.Text[i] >= 'a' && Login.Text[i] <= 'z')
-                    {
-                        login = true;
-                        break;
-                    }
-                    if (login == false)
-                    {
-                        MessageBox.Show("Поле логин должно содержать только английские символы");
-                        break;
-                    }
-                }
-                for (int i = 0; i < Pass.Password.Length; i++)//проверка пароля(англ символы)
-                {
-                    if (pas1)
-                    {
-                        pas1 = false;
-                    }
-                    if (Pass.Password[i] >= 'a' && Pass.Password[i] <= 'z' || Pass.Password[i] >= 'A' && Pass.Password[i] <= 'Z' || Pass.Password[i] >= '0' && Pass.Password[i] <= '9')
-                    {
-                        pas1 = true;
-                        break;
-                    }
-                    if (pas1 == false)
-                    {
-                        MessageBox.Show("Поле пароль должно содержать только английские символы и цифры");
-                        break;
-                    }
-                }
-                for (int i = 0; i < Pass2.Password.Length; i++)//проверка подтверждения пароля
-                {
-                    if (pas2)
-                    {
-                        pas2 = false;
-                    }
-                    if (Pass2.Password[i] == Pass2.Password[i])
-                    {
-                        pas2 = true;
-                        break;
-                    }
-                    if (pas2 == false)
-                    {
-                        MessageBox.Show("Пароль не совпадает или вы не ввели его");
-                        break;
-                    }
-                }
-                for (int i = 0; i < Lname.Text.Length; i++)//проверка фамилии
-                {
-                    if (fam)
-                    {
-                        fam = false;
-                    }
-                    for (int j = 0; j < Alphabetrus.Count; j++)
-                    {
-                        if (Convert.ToString(Lname.Text[i]).Contains(Alphabetrus[j]))
-                        {
-                            fam = true;
-                            break;
-                        }
-                    }
-                    if (fam == false)
-                    {
-                        MessageBox.Show("Поле фамилия должно содержать только русские символы");
-                        break;
-                    }
-                }
-                for (int i = 0; i < Fname.Text.Length; i++)//проверка имени
-                {
-                    if (imya)
-                    {
-                        imya = false;
-                    }
-                    for (int j = 0; j < Alphabetrus.Count; j++)
-                    {
-                        if (Convert.ToString(Fname.Text[i]).Contains(Alphabetrus[j]))
-                        {
-                            imya = true;
-                            break;
-                        }
-                    }
-                    if (imya == false)
-                    {
-                        MessageBox.Show("Поле имя должно содержать только русские символы");
-                        break;
-                    }
-                }
-                for (int i = 0; i < Mname.Text.Length; i++)//проверка отчества
-                {
-                    if (otch)
-                    {
-                        otch = false;
-                    }
-                    for (int j = 0; j < Alphabetrus.Count; j++)
-                    {
-                        if (Convert.ToString(Mname.Text[i]).Contains(Alphabetrus[j]))
-                        {
-                            otch = true;
-                            break;
-                        }
-                    }
-                    if (otch == false)
-                    {
-                        MessageBox.Show("Поле отчество должно содержать только русские символы");
-                        break;
-                    }
-                }
-                for (int i = 0; i < Email.Text.Length; i++)//проверка почту
-                {
-                    if (email)
-                    {
-                        email = false;
-                    }
-                    if (Email.Text[i] >= 'A' && Email.Text[i] <= 'Z' || Email.Text[i] >= 'a' && Email.Text[i] <= 'z' || Email.Text.Contains("@") || Email.Text.Contains("."))
-                    {
-                        email = true;
-                        break;
-                    }
-                    if (email == false)
-                    {
-                        MessageBox.Show("Поле электронная почта должно содержать только английские символы и знаки '@' и '.'");
-                        break;
-                    }
-                }
-                for (int i = 0; i < Phone.Text.Length; i++)//проверка номера телефона
-                {
-                    if (num)
-                    {
-                        num = false;
-                    }
-                    for (int j = 0; j < NumberPhone.Count; j++)
-                    {
-                        if (Convert.ToString(Phone.Text[i]).Contains(NumberPhone[j]))
-                        {
-                            num = true;
-                            break;
-                        }
-                    }
-                    if (num == false)
-                    {
-                        MessageBox.Show("Поле номер телефона  должно содержать только цифры (без знака + и 11 цифр)");
-                        break;
-                    }
-                }
-                for (int i = 0; i < Dr.Text.Length; i++)//проверка даты рождения
-                {
-                    if (data)
-                    {
-                        data = false;
-                    }
-                    for (int j = 0; j < Date.Count; j++)
-                    {
-                        if (Convert.ToString(Dr.Text[i]).Contains(Date[j]))
-                        {
-                            data = true;
-                            break;
-                        }
-                    }
-                    if (data == false)
-                    {
-                        MessageBox.Show("Поле дата рождения должно содержать только цифры и знак '.''");
-                        break;
-                    }
-                }
-                if (fam && imya && otch && data && num && email && login && pas1 && pas2)
-                {
-                    DataTable InfoRab = Insert("insert into [dbo].[InfoRab] values " +
-                                                            "('" + Login.Text + "','" + Pass.Password + "','" + Fname.Text +
-                                                              "','" + Lname.Text + "','" + Mname.Text + "','" + Email.Text +
-                                                              "','" + Phone.Text + "','" + Dr.Text + "')");
-                    MessageBox.Show("Пользователь зарегистирован");
-                    Window1 tablerab = new Window1();
-                    tablerab.Show();
-                    Close();
-                }
-                else { MessageBox.Show("Неправильный формат"); }
-            }
-            else { MessageBox.Show("Все строки должны быть заполнены"); }
-        }
-
-        private void Otmena(object sender, RoutedEventArgs e)
-        {
-            Window1 tablerab = new Window1();
-            tablerab.Show();
-            Close();
-        }
-    }
-}

+ 6 - 3
veloprokat2/MainWindowAdm.xaml

@@ -6,16 +6,19 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="Главное окно админа" WindowState="Maximized" WindowStyle="None">
+        Title="Главное окно админа" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
     <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="InfoProd"/>
-                <Button Content="Зарегистрировать нового администратора" Margin=" 0 0 0 20" Click="NewAdm"/>
                 <Button Content="Информация о продажах" Margin=" 0 0 0 20" Click="Prodaji"/>
+                <Button Content="Информация о сотрудниках" Margin="0 0 0 20" Click="InfoProd"/>
+                <Button Content="Информация о тарифах" Margin=" 0 0 0 20" Click="Tarif"/>
+                <Button Content="Информация о велосипедах" Margin=" 0 0 0 20" Click="Bikes"/>
+                <Button Content="Зарегистрировать нового администратора" Margin=" 0 0 0 20" Click="NewAdm"/>
+                <Button Content="Зарегистрировать нового сотрудника" Margin=" 0 0 0 20" Click="NewRab"/>
                 <Button Content="Отмена" Margin="100 0 100 20" Click="Otmena"/>
             </StackPanel>
         </Border>

+ 26 - 15
veloprokat2/MainWindowAdm.xaml.cs

@@ -24,28 +24,24 @@ namespace veloprokat2
             InitializeComponent();
         }
 
-        private void InfoPolz(object sender, RoutedEventArgs e)
-        {
-
-        }
-
         private void InfoProd(object sender, RoutedEventArgs e)
         {
-            Window1 InfoProd = new Window1();
-            InfoProd.Show();
+            SpisRab SR = new SpisRab();
+            SR.Show();
             Close();
         }
-        private void Registraciya(object sender, RoutedEventArgs e)
+
+        private void NewAdm(object sender, RoutedEventArgs e)
         {
-            MainWindow reg = new MainWindow();
-            reg.Show();
+            regadm RA = new regadm();
+            RA.Show();
             Close();
         }
 
-        private void NewAdm(object sender, RoutedEventArgs e)
+        private void Prodaji(object sender, RoutedEventArgs e)
         {
-            regadm ra = new regadm();
-            ra.Show();
+            Info_prodaji IP = new Info_prodaji();
+            IP.Show();
             Close();
         }
 
@@ -57,18 +53,33 @@ namespace veloprokat2
             MessageBoxImage icon = MessageBoxImage.Warning;
             MessageBoxResult result = MessageBox.Show(messageBoxText, caption, button, icon);
 
-            if(result == MessageBoxResult.Yes)
+            if (result == MessageBoxResult.Yes)
             {
                 Auth au = new Auth();
                 au.Show();
                 Close();
             }
+        }
 
+        private void Tarif(object sender, RoutedEventArgs e)
+        {
+            InfoTarif IT = new InfoTarif();
+            IT.Show();
+            Close();
         }
 
-        private void Prodaji(object sender, RoutedEventArgs e)
+        private void Bikes(object sender, RoutedEventArgs e)
         {
+            SpisokBikes IB = new SpisokBikes();
+            IB.Show();
+            Close();
+        }
 
+        private void NewRab(object sender, RoutedEventArgs e)
+        {
+            Regrab RB = new Regrab();
+            RB.Show();
+            Close();
         }
     }
 }

+ 6 - 2
veloprokat2/MainWindowProd.xaml

@@ -6,14 +6,18 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="Главное окно продавца" WindowState="Maximized" WindowStyle="None">
+        Title="Главное окно сотрудника" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico" >
     <Grid Background="#EAF4F4">
         <Border MinWidth="400" Margin="15" Background="#FFFF" VerticalAlignment="Center" Padding="30" MaxWidth="550" CornerRadius="20">
             <Border.Effect>
                 <DropShadowEffect BlurRadius="30" Color="LightGray" ShadowDepth="0"/>
             </Border.Effect>
             <StackPanel>
-                <Button Content="Список Велосипедов" Click="SpisokBikes"/>
+                <Button Content="Новый заказ" Click="New_Zak"/>
+                <Button Content="Список проката" Click="Spisok_Prok" Margin="0,25,0,0"/>
+                <Button Content="Список Велосипедов" Click="SpisokBikes" Margin="0,25,0,0"/>
+                <Button Content="Список Тарифов" Click="Tarif" Margin="0,25,0,0"/>
+                <Button Content="Отмена" Margin="100 20 100 20" Click="Otmena"/>
             </StackPanel>
         </Border>
     </Grid>

+ 38 - 1
veloprokat2/MainWindowProd.xaml.cs

@@ -26,9 +26,46 @@ namespace veloprokat2
 
         private void SpisokBikes(object sender, RoutedEventArgs e)
         {
-            SpisokBikes SB = new SpisokBikes();
+            InfoBikes SB = new InfoBikes();
             SB.Show();
             Close();
         }
+
+        private void Tarif(object sender, RoutedEventArgs e)
+        {
+            tarif Tarif = new tarif();
+            Tarif.Show();
+            Close();
+        }
+
+        private void New_Zak(object sender, RoutedEventArgs e)
+        {
+            InsertZakaz IZ = new InsertZakaz();
+            IZ.Show();
+            Close();
+        }
+
+        private void Spisok_Prok(object sender, RoutedEventArgs e)
+        {
+            SpisokProk SP = new SpisokProk();
+            SP.Show();
+            Close();
+        }
+
+        private void Otmena(object sender, RoutedEventArgs e)
+        {
+            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();
+            }
+        }
     }
 }

+ 0 - 33
veloprokat2/Model1.Context.cs

@@ -1,33 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан по шаблону.
-//
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace veloprokat2
-{
-    using System;
-    using System.Data.Entity;
-    using System.Data.Entity.Infrastructure;
-    
-    public partial class VeloprokatEntities : DbContext
-    {
-        public VeloprokatEntities()
-            : base("name=VeloprokatEntities")
-        {
-        }
-    
-        protected override void OnModelCreating(DbModelBuilder modelBuilder)
-        {
-            throw new UnintentionalCodeFirstException();
-        }
-    
-        public virtual DbSet<Bikes> Bikes { get; set; }
-        public virtual DbSet<InfoAdm> InfoAdm { get; set; }
-        public virtual DbSet<InfoRab> InfoRab { get; set; }
-        public virtual DbSet<sysdiagrams> sysdiagrams { get; set; }
-    }
-}

+ 0 - 636
veloprokat2/Model1.Context.tt

@@ -1,636 +0,0 @@
-<#@ template language="C#" debug="false" hostspecific="true"#>
-<#@ include file="EF6.Utility.CS.ttinclude"#><#@
- output extension=".cs"#><#
-
-const string inputFile = @"Model1.edmx";
-var textTransform = DynamicTextTransformation.Create(this);
-var code = new CodeGenerationTools(this);
-var ef = new MetadataTools(this);
-var typeMapper = new TypeMapper(code, ef, textTransform.Errors);
-var loader = new EdmMetadataLoader(textTransform.Host, textTransform.Errors);
-var itemCollection = loader.CreateEdmItemCollection(inputFile);
-var modelNamespace = loader.GetModelNamespace(inputFile);
-var codeStringGenerator = new CodeStringGenerator(code, typeMapper, ef);
-
-var container = itemCollection.OfType<EntityContainer>().FirstOrDefault();
-if (container == null)
-{
-    return string.Empty;
-}
-#>
-//------------------------------------------------------------------------------
-// <auto-generated>
-// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine1")#>
-//
-// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine2")#>
-// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine3")#>
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-<#
-
-var codeNamespace = code.VsNamespaceSuggestion();
-if (!String.IsNullOrEmpty(codeNamespace))
-{
-#>
-namespace <#=code.EscapeNamespace(codeNamespace)#>
-{
-<#
-    PushIndent("    ");
-}
-
-#>
-using System;
-using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
-<#
-if (container.FunctionImports.Any())
-{
-#>
-using System.Data.Entity.Core.Objects;
-using System.Linq;
-<#
-}
-#>
-
-<#=Accessibility.ForType(container)#> partial class <#=code.Escape(container)#> : DbContext
-{
-    public <#=code.Escape(container)#>()
-        : base("name=<#=container.Name#>")
-    {
-<#
-if (!loader.IsLazyLoadingEnabled(container))
-{
-#>
-        this.Configuration.LazyLoadingEnabled = false;
-<#
-}
-
-foreach (var entitySet in container.BaseEntitySets.OfType<EntitySet>())
-{
-    // Note: the DbSet members are defined below such that the getter and
-    // setter always have the same accessibility as the DbSet definition
-    if (Accessibility.ForReadOnlyProperty(entitySet) != "public")
-    {
-#>
-        <#=codeStringGenerator.DbSetInitializer(entitySet)#>
-<#
-    }
-}
-#>
-    }
-
-    protected override void OnModelCreating(DbModelBuilder modelBuilder)
-    {
-        throw new UnintentionalCodeFirstException();
-    }
-
-<#
-    foreach (var entitySet in container.BaseEntitySets.OfType<EntitySet>())
-    {
-#>
-    <#=codeStringGenerator.DbSet(entitySet)#>
-<#
-    }
-
-    foreach (var edmFunction in container.FunctionImports)
-    {
-        WriteFunctionImport(typeMapper, codeStringGenerator, edmFunction, modelNamespace, includeMergeOption: false);
-    }
-#>
-}
-<#
-
-if (!String.IsNullOrEmpty(codeNamespace))
-{
-    PopIndent();
-#>
-}
-<#
-}
-#>
-<#+
-
-private void WriteFunctionImport(TypeMapper typeMapper, CodeStringGenerator codeStringGenerator, EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
-{
-    if (typeMapper.IsComposable(edmFunction))
-    {
-#>
-
-    [DbFunction("<#=edmFunction.NamespaceName#>", "<#=edmFunction.Name#>")]
-    <#=codeStringGenerator.ComposableFunctionMethod(edmFunction, modelNamespace)#>
-    {
-<#+
-        codeStringGenerator.WriteFunctionParameters(edmFunction, WriteFunctionParameter);
-#>
-        <#=codeStringGenerator.ComposableCreateQuery(edmFunction, modelNamespace)#>
-    }
-<#+
-    }
-    else
-    {
-#>
-
-    <#=codeStringGenerator.FunctionMethod(edmFunction, modelNamespace, includeMergeOption)#>
-    {
-<#+
-        codeStringGenerator.WriteFunctionParameters(edmFunction, WriteFunctionParameter);
-#>
-        <#=codeStringGenerator.ExecuteFunction(edmFunction, modelNamespace, includeMergeOption)#>
-    }
-<#+
-        if (typeMapper.GenerateMergeOptionFunction(edmFunction, includeMergeOption))
-        {
-            WriteFunctionImport(typeMapper, codeStringGenerator, edmFunction, modelNamespace, includeMergeOption: true);
-        }
-    }
-}
-
-public void WriteFunctionParameter(string name, string isNotNull, string notNullInit, string nullInit)
-{
-#>
-        var <#=name#> = <#=isNotNull#> ?
-            <#=notNullInit#> :
-            <#=nullInit#>;
-
-<#+
-}
-
-public const string TemplateId = "CSharp_DbContext_Context_EF6";
-
-public class CodeStringGenerator
-{
-    private readonly CodeGenerationTools _code;
-    private readonly TypeMapper _typeMapper;
-    private readonly MetadataTools _ef;
-
-    public CodeStringGenerator(CodeGenerationTools code, TypeMapper typeMapper, MetadataTools ef)
-    {
-        ArgumentNotNull(code, "code");
-        ArgumentNotNull(typeMapper, "typeMapper");
-        ArgumentNotNull(ef, "ef");
-
-        _code = code;
-        _typeMapper = typeMapper;
-        _ef = ef;
-    }
-
-    public string Property(EdmProperty edmProperty)
-    {
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} {1} {2} {{ {3}get; {4}set; }}",
-            Accessibility.ForProperty(edmProperty),
-            _typeMapper.GetTypeName(edmProperty.TypeUsage),
-            _code.Escape(edmProperty),
-            _code.SpaceAfter(Accessibility.ForGetter(edmProperty)),
-            _code.SpaceAfter(Accessibility.ForSetter(edmProperty)));
-    }
-
-    public string NavigationProperty(NavigationProperty navProp)
-    {
-        var endType = _typeMapper.GetTypeName(navProp.ToEndMember.GetEntityType());
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} {1} {2} {{ {3}get; {4}set; }}",
-            AccessibilityAndVirtual(Accessibility.ForNavigationProperty(navProp)),
-            navProp.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many ? ("ICollection<" + endType + ">") : endType,
-            _code.Escape(navProp),
-            _code.SpaceAfter(Accessibility.ForGetter(navProp)),
-            _code.SpaceAfter(Accessibility.ForSetter(navProp)));
-    }
-    
-    public string AccessibilityAndVirtual(string accessibility)
-    {
-        return accessibility + (accessibility != "private" ? " virtual" : "");
-    }
-    
-    public string EntityClassOpening(EntityType entity)
-    {
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} {1}partial class {2}{3}",
-            Accessibility.ForType(entity),
-            _code.SpaceAfter(_code.AbstractOption(entity)),
-            _code.Escape(entity),
-            _code.StringBefore(" : ", _typeMapper.GetTypeName(entity.BaseType)));
-    }
-    
-    public string EnumOpening(SimpleType enumType)
-    {
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} enum {1} : {2}",
-            Accessibility.ForType(enumType),
-            _code.Escape(enumType),
-            _code.Escape(_typeMapper.UnderlyingClrType(enumType)));
-        }
-    
-    public void WriteFunctionParameters(EdmFunction edmFunction, Action<string, string, string, string> writeParameter)
-    {
-        var parameters = FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef);
-        foreach (var parameter in parameters.Where(p => p.NeedsLocalVariable))
-        {
-            var isNotNull = parameter.IsNullableOfT ? parameter.FunctionParameterName + ".HasValue" : parameter.FunctionParameterName + " != null";
-            var notNullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", " + parameter.FunctionParameterName + ")";
-            var nullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", typeof(" + TypeMapper.FixNamespaces(parameter.RawClrTypeName) + "))";
-            writeParameter(parameter.LocalVariableName, isNotNull, notNullInit, nullInit);
-        }
-    }
-    
-    public string ComposableFunctionMethod(EdmFunction edmFunction, string modelNamespace)
-    {
-        var parameters = _typeMapper.GetParameters(edmFunction);
-        
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} IQueryable<{1}> {2}({3})",
-            AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)),
-            _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace),
-            _code.Escape(edmFunction),
-            string.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray()));
-    }
-    
-    public string ComposableCreateQuery(EdmFunction edmFunction, string modelNamespace)
-    {
-        var parameters = _typeMapper.GetParameters(edmFunction);
-        
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "return ((IObjectContextAdapter)this).ObjectContext.CreateQuery<{0}>(\"[{1}].[{2}]({3})\"{4});",
-            _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace),
-            edmFunction.NamespaceName,
-            edmFunction.Name,
-            string.Join(", ", parameters.Select(p => "@" + p.EsqlParameterName).ToArray()),
-            _code.StringBefore(", ", string.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray())));
-    }
-    
-    public string FunctionMethod(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
-    {
-        var parameters = _typeMapper.GetParameters(edmFunction);
-        var returnType = _typeMapper.GetReturnType(edmFunction);
-
-        var paramList = String.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray());
-        if (includeMergeOption)
-        {
-            paramList = _code.StringAfter(paramList, ", ") + "MergeOption mergeOption";
-        }
-
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} {1} {2}({3})",
-            AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)),
-            returnType == null ? "int" : "ObjectResult<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">",
-            _code.Escape(edmFunction),
-            paramList);
-    }
-    
-    public string ExecuteFunction(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
-    {
-        var parameters = _typeMapper.GetParameters(edmFunction);
-        var returnType = _typeMapper.GetReturnType(edmFunction);
-
-        var callParams = _code.StringBefore(", ", String.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray()));
-        if (includeMergeOption)
-        {
-            callParams = ", mergeOption" + callParams;
-        }
-        
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction{0}(\"{1}\"{2});",
-            returnType == null ? "" : "<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">",
-            edmFunction.Name,
-            callParams);
-    }
-    
-    public string DbSet(EntitySet entitySet)
-    {
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} virtual DbSet<{1}> {2} {{ get; set; }}",
-            Accessibility.ForReadOnlyProperty(entitySet),
-            _typeMapper.GetTypeName(entitySet.ElementType),
-            _code.Escape(entitySet));
-    }
-
-    public string DbSetInitializer(EntitySet entitySet)
-    {
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} = Set<{1}>();",
-            _code.Escape(entitySet),
-            _typeMapper.GetTypeName(entitySet.ElementType));
-    }
-
-    public string UsingDirectives(bool inHeader, bool includeCollections = true)
-    {
-        return inHeader == string.IsNullOrEmpty(_code.VsNamespaceSuggestion())
-            ? string.Format(
-                CultureInfo.InvariantCulture,
-                "{0}using System;{1}" +
-                "{2}",
-                inHeader ? Environment.NewLine : "",
-                includeCollections ? (Environment.NewLine + "using System.Collections.Generic;") : "",
-                inHeader ? "" : Environment.NewLine)
-            : "";
-    }
-}
-
-public class TypeMapper
-{
-    private const string ExternalTypeNameAttributeName = @"http://schemas.microsoft.com/ado/2006/04/codegeneration:ExternalTypeName";
-
-    private readonly System.Collections.IList _errors;
-    private readonly CodeGenerationTools _code;
-    private readonly MetadataTools _ef;
-
-    public static string FixNamespaces(string typeName)
-    {
-        return typeName.Replace("System.Data.Spatial.", "System.Data.Entity.Spatial.");
-    }
-
-    public TypeMapper(CodeGenerationTools code, MetadataTools ef, System.Collections.IList errors)
-    {
-        ArgumentNotNull(code, "code");
-        ArgumentNotNull(ef, "ef");
-        ArgumentNotNull(errors, "errors");
-
-        _code = code;
-        _ef = ef;
-        _errors = errors;
-    }
-
-    public string GetTypeName(TypeUsage typeUsage)
-    {
-        return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace: null);
-    }
-
-    public string GetTypeName(EdmType edmType)
-    {
-        return GetTypeName(edmType, isNullable: null, modelNamespace: null);
-    }
-
-    public string GetTypeName(TypeUsage typeUsage, string modelNamespace)
-    {
-        return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace);
-    }
-
-    public string GetTypeName(EdmType edmType, string modelNamespace)
-    {
-        return GetTypeName(edmType, isNullable: null, modelNamespace: modelNamespace);
-    }
-
-    public string GetTypeName(EdmType edmType, bool? isNullable, string modelNamespace)
-    {
-        if (edmType == null)
-        {
-            return null;
-        }
-
-        var collectionType = edmType as CollectionType;
-        if (collectionType != null)
-        {
-            return String.Format(CultureInfo.InvariantCulture, "ICollection<{0}>", GetTypeName(collectionType.TypeUsage, modelNamespace));
-        }
-
-        var typeName = _code.Escape(edmType.MetadataProperties
-                                .Where(p => p.Name == ExternalTypeNameAttributeName)
-                                .Select(p => (string)p.Value)
-                                .FirstOrDefault())
-            ?? (modelNamespace != null && edmType.NamespaceName != modelNamespace ?
-                _code.CreateFullName(_code.EscapeNamespace(edmType.NamespaceName), _code.Escape(edmType)) :
-                _code.Escape(edmType));
-
-        if (edmType is StructuralType)
-        {
-            return typeName;
-        }
-
-        if (edmType is SimpleType)
-        {
-            var clrType = UnderlyingClrType(edmType);
-            if (!IsEnumType(edmType))
-            {
-                typeName = _code.Escape(clrType);
-            }
-
-            typeName = FixNamespaces(typeName);
-
-            return clrType.IsValueType && isNullable == true ?
-                String.Format(CultureInfo.InvariantCulture, "Nullable<{0}>", typeName) :
-                typeName;
-        }
-
-        throw new ArgumentException("edmType");
-    }
-    
-    public Type UnderlyingClrType(EdmType edmType)
-    {
-        ArgumentNotNull(edmType, "edmType");
-
-        var primitiveType = edmType as PrimitiveType;
-        if (primitiveType != null)
-        {
-            return primitiveType.ClrEquivalentType;
-        }
-
-        if (IsEnumType(edmType))
-        {
-            return GetEnumUnderlyingType(edmType).ClrEquivalentType;
-        }
-
-        return typeof(object);
-    }
-    
-    public object GetEnumMemberValue(MetadataItem enumMember)
-    {
-        ArgumentNotNull(enumMember, "enumMember");
-        
-        var valueProperty = enumMember.GetType().GetProperty("Value");
-        return valueProperty == null ? null : valueProperty.GetValue(enumMember, null);
-    }
-    
-    public string GetEnumMemberName(MetadataItem enumMember)
-    {
-        ArgumentNotNull(enumMember, "enumMember");
-        
-        var nameProperty = enumMember.GetType().GetProperty("Name");
-        return nameProperty == null ? null : (string)nameProperty.GetValue(enumMember, null);
-    }
-
-    public System.Collections.IEnumerable GetEnumMembers(EdmType enumType)
-    {
-        ArgumentNotNull(enumType, "enumType");
-
-        var membersProperty = enumType.GetType().GetProperty("Members");
-        return membersProperty != null 
-            ? (System.Collections.IEnumerable)membersProperty.GetValue(enumType, null)
-            : Enumerable.Empty<MetadataItem>();
-    }
-    
-    public bool EnumIsFlags(EdmType enumType)
-    {
-        ArgumentNotNull(enumType, "enumType");
-        
-        var isFlagsProperty = enumType.GetType().GetProperty("IsFlags");
-        return isFlagsProperty != null && (bool)isFlagsProperty.GetValue(enumType, null);
-    }
-
-    public bool IsEnumType(GlobalItem edmType)
-    {
-        ArgumentNotNull(edmType, "edmType");
-
-        return edmType.GetType().Name == "EnumType";
-    }
-
-    public PrimitiveType GetEnumUnderlyingType(EdmType enumType)
-    {
-        ArgumentNotNull(enumType, "enumType");
-
-        return (PrimitiveType)enumType.GetType().GetProperty("UnderlyingType").GetValue(enumType, null);
-    }
-
-    public string CreateLiteral(object value)
-    {
-        if (value == null || value.GetType() != typeof(TimeSpan))
-        {
-            return _code.CreateLiteral(value);
-        }
-
-        return string.Format(CultureInfo.InvariantCulture, "new TimeSpan({0})", ((TimeSpan)value).Ticks);
-    }
-    
-    public bool VerifyCaseInsensitiveTypeUniqueness(IEnumerable<string> types, string sourceFile)
-    {
-        ArgumentNotNull(types, "types");
-        ArgumentNotNull(sourceFile, "sourceFile");
-        
-        var hash = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
-        if (types.Any(item => !hash.Add(item)))
-        {
-            _errors.Add(
-                new CompilerError(sourceFile, -1, -1, "6023",
-                    String.Format(CultureInfo.CurrentCulture, CodeGenerationTools.GetResourceString("Template_CaseInsensitiveTypeConflict"))));
-            return false;
-        }
-        return true;
-    }
-    
-    public IEnumerable<SimpleType> GetEnumItemsToGenerate(IEnumerable<GlobalItem> itemCollection)
-    {
-        return GetItemsToGenerate<SimpleType>(itemCollection)
-            .Where(e => IsEnumType(e));
-    }
-    
-    public IEnumerable<T> GetItemsToGenerate<T>(IEnumerable<GlobalItem> itemCollection) where T: EdmType
-    {
-        return itemCollection
-            .OfType<T>()
-            .Where(i => !i.MetadataProperties.Any(p => p.Name == ExternalTypeNameAttributeName))
-            .OrderBy(i => i.Name);
-    }
-
-    public IEnumerable<string> GetAllGlobalItems(IEnumerable<GlobalItem> itemCollection)
-    {
-        return itemCollection
-            .Where(i => i is EntityType || i is ComplexType || i is EntityContainer || IsEnumType(i))
-            .Select(g => GetGlobalItemName(g));
-    }
-
-    public string GetGlobalItemName(GlobalItem item)
-    {
-        if (item is EdmType)
-        {
-            return ((EdmType)item).Name;
-        }
-        else
-        {
-            return ((EntityContainer)item).Name;
-        }
-    }
-
-    public IEnumerable<EdmProperty> GetSimpleProperties(EntityType type)
-    {
-        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type);
-    }
-    
-    public IEnumerable<EdmProperty> GetSimpleProperties(ComplexType type)
-    {
-        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type);
-    }
-    
-    public IEnumerable<EdmProperty> GetComplexProperties(EntityType type)
-    {
-        return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type);
-    }
-    
-    public IEnumerable<EdmProperty> GetComplexProperties(ComplexType type)
-    {
-        return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type);
-    }
-
-    public IEnumerable<EdmProperty> GetPropertiesWithDefaultValues(EntityType type)
-    {
-        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null);
-    }
-    
-    public IEnumerable<EdmProperty> GetPropertiesWithDefaultValues(ComplexType type)
-    {
-        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null);
-    }
-
-    public IEnumerable<NavigationProperty> GetNavigationProperties(EntityType type)
-    {
-        return type.NavigationProperties.Where(np => np.DeclaringType == type);
-    }
-    
-    public IEnumerable<NavigationProperty> GetCollectionNavigationProperties(EntityType type)
-    {
-        return type.NavigationProperties.Where(np => np.DeclaringType == type && np.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many);
-    }
-    
-    public FunctionParameter GetReturnParameter(EdmFunction edmFunction)
-    {
-        ArgumentNotNull(edmFunction, "edmFunction");
-
-        var returnParamsProperty = edmFunction.GetType().GetProperty("ReturnParameters");
-        return returnParamsProperty == null
-            ? edmFunction.ReturnParameter
-            : ((IEnumerable<FunctionParameter>)returnParamsProperty.GetValue(edmFunction, null)).FirstOrDefault();
-    }
-
-    public bool IsComposable(EdmFunction edmFunction)
-    {
-        ArgumentNotNull(edmFunction, "edmFunction");
-
-        var isComposableProperty = edmFunction.GetType().GetProperty("IsComposableAttribute");
-        return isComposableProperty != null && (bool)isComposableProperty.GetValue(edmFunction, null);
-    }
-
-    public IEnumerable<FunctionImportParameter> GetParameters(EdmFunction edmFunction)
-    {
-        return FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef);
-    }
-
-    public TypeUsage GetReturnType(EdmFunction edmFunction)
-    {
-        var returnParam = GetReturnParameter(edmFunction);
-        return returnParam == null ? null : _ef.GetElementType(returnParam.TypeUsage);
-    }
-    
-    public bool GenerateMergeOptionFunction(EdmFunction edmFunction, bool includeMergeOption)
-    {
-        var returnType = GetReturnType(edmFunction);
-        return !includeMergeOption && returnType != null && returnType.EdmType.BuiltInTypeKind == BuiltInTypeKind.EntityType;
-    }
-}
-
-public static void ArgumentNotNull<T>(T arg, string name) where T : class
-{
-    if (arg == null)
-    {
-        throw new ArgumentNullException(name);
-    }
-}
-#>

+ 0 - 10
veloprokat2/Model1.Designer.cs

@@ -1,10 +0,0 @@
-// Создание кода T4 для модели "C:\Users\Александр\source\repos\veloprokat2\veloprokat2\Model1.edmx" включено. 
-// Чтобы включить формирование кода прежних версий, измените значение свойства "Стратегия создания кода" конструктора
-// на "Legacy ObjectContext". Это свойство доступно в окне "Свойства", если модель
-// открыта в конструкторе.
-
-// Если не сформированы контекст и классы сущности, возможная причина в том, что вы создали пустую модель, но
-// еще не выбрали версию Entity Framework для использования. Чтобы сформировать класс контекста и классы сущностей
-// для своей модели, откройте модель в конструкторе, щелкните правой кнопкой область конструктора и
-// выберите "Обновить модель из базы данных", "Сформировать базу данных из модели" или "Добавить элемент формирования
-// кода...".

+ 0 - 9
veloprokat2/Model1.cs

@@ -1,9 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан по шаблону.
-//
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-

+ 0 - 181
veloprokat2/Model1.edmx

@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<edmx:Edmx Version="3.0" xmlns:edmx="http://schemas.microsoft.com/ado/2009/11/edmx">
-  <!-- EF Runtime content -->
-  <edmx:Runtime>
-    <!-- SSDL content -->
-    <edmx:StorageModels>
-      <Schema Namespace="Хранилище VeloprokatModel" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
-        <EntityType Name="Bikes">
-          <Key>
-            <PropertyRef Name="ID" />
-          </Key>
-          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="Company" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="Model" Type="nvarchar" MaxLength="50" Nullable="false" />
-        </EntityType>
-        <EntityType Name="InfoAdm">
-          <Key>
-            <PropertyRef Name="ID" />
-          </Key>
-          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="Login" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="Password" Type="nvarchar" MaxLength="25" Nullable="false" />
-          <Property Name="FName" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="MName" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="LName" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="Email" Type="nvarchar" MaxLength="50" />
-          <Property Name="Phone" Type="nvarchar" MaxLength="15" />
-          <Property Name="Dr" Type="date" />
-        </EntityType>
-        <EntityType Name="InfoRab">
-          <Key>
-            <PropertyRef Name="ID" />
-          </Key>
-          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="Login" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="Password" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="Email" Type="nvarchar" MaxLength="50" />
-        </EntityType>
-        <EntityType Name="sysdiagrams">
-          <Key>
-            <PropertyRef Name="diagram_id" />
-          </Key>
-          <Property Name="name" Type="nvarchar" MaxLength="128" Nullable="false" />
-          <Property Name="principal_id" Type="int" Nullable="false" />
-          <Property Name="diagram_id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="version" Type="int" />
-          <Property Name="definition" Type="varbinary(max)" />
-        </EntityType>
-        <EntityContainer Name="Хранилище VeloprokatModelContainer">
-          <EntitySet Name="Bikes" EntityType="Self.Bikes" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="InfoAdm" EntityType="Self.InfoAdm" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="InfoRab" EntityType="Self.InfoRab" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="sysdiagrams" EntityType="Self.sysdiagrams" Schema="dbo" store:Type="Tables" />
-        </EntityContainer>
-      </Schema>
-    </edmx:StorageModels>
-    <!-- CSDL content -->
-    <edmx:ConceptualModels>
-      <Schema Namespace="VeloprokatModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
-        <EntityType Name="Bikes">
-          <Key>
-            <PropertyRef Name="ID" />
-          </Key>
-          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="Company" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
-          <Property Name="Model" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
-        </EntityType>
-        <EntityType Name="InfoAdm">
-          <Key>
-            <PropertyRef Name="ID" />
-          </Key>
-          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="Login" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
-          <Property Name="Password" Type="String" MaxLength="25" FixedLength="false" Unicode="true" Nullable="false" />
-          <Property Name="FName" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
-          <Property Name="MName" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
-          <Property Name="LName" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
-          <Property Name="Email" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="Phone" Type="String" MaxLength="15" FixedLength="false" Unicode="true" />
-          <Property Name="Dr" Type="DateTime" Precision="0" />
-        </EntityType>
-        <EntityType Name="InfoRab">
-          <Key>
-            <PropertyRef Name="ID" />
-          </Key>
-          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="Login" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
-          <Property Name="Password" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
-          <Property Name="Email" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
-        </EntityType>
-        <EntityType Name="sysdiagrams">
-          <Key>
-            <PropertyRef Name="diagram_id" />
-          </Key>
-          <Property Name="name" Type="String" MaxLength="128" FixedLength="false" Unicode="true" Nullable="false" />
-          <Property Name="principal_id" Type="Int32" Nullable="false" />
-          <Property Name="diagram_id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="version" Type="Int32" />
-          <Property Name="definition" Type="Binary" MaxLength="Max" FixedLength="false" />
-        </EntityType>
-        <EntityContainer Name="VeloprokatEntities" annotation:LazyLoadingEnabled="true">
-          <EntitySet Name="Bikes" EntityType="Self.Bikes" />
-          <EntitySet Name="InfoAdm" EntityType="Self.InfoAdm" />
-          <EntitySet Name="InfoRab" EntityType="Self.InfoRab" />
-          <EntitySet Name="sysdiagrams" EntityType="Self.sysdiagrams" />
-        </EntityContainer>
-      </Schema>
-    </edmx:ConceptualModels>
-    <!-- C-S mapping content -->
-    <edmx:Mappings>
-      <Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs">
-        <EntityContainerMapping StorageEntityContainer="Хранилище VeloprokatModelContainer" CdmEntityContainer="VeloprokatEntities">
-          <EntitySetMapping Name="Bikes">
-            <EntityTypeMapping TypeName="VeloprokatModel.Bikes">
-              <MappingFragment StoreEntitySet="Bikes">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="Company" ColumnName="Company" />
-                <ScalarProperty Name="Model" ColumnName="Model" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
-          <EntitySetMapping Name="InfoAdm">
-            <EntityTypeMapping TypeName="VeloprokatModel.InfoAdm">
-              <MappingFragment StoreEntitySet="InfoAdm">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="Login" ColumnName="Login" />
-                <ScalarProperty Name="Password" ColumnName="Password" />
-                <ScalarProperty Name="FName" ColumnName="FName" />
-                <ScalarProperty Name="MName" ColumnName="MName" />
-                <ScalarProperty Name="LName" ColumnName="LName" />
-                <ScalarProperty Name="Email" ColumnName="Email" />
-                <ScalarProperty Name="Phone" ColumnName="Phone" />
-                <ScalarProperty Name="Dr" ColumnName="Dr" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
-          <EntitySetMapping Name="InfoRab">
-            <EntityTypeMapping TypeName="VeloprokatModel.InfoRab">
-              <MappingFragment StoreEntitySet="InfoRab">
-                <ScalarProperty Name="ID" ColumnName="ID" />
-                <ScalarProperty Name="Login" ColumnName="Login" />
-                <ScalarProperty Name="Password" ColumnName="Password" />
-                <ScalarProperty Name="Email" ColumnName="Email" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
-          <EntitySetMapping Name="sysdiagrams">
-            <EntityTypeMapping TypeName="VeloprokatModel.sysdiagrams">
-              <MappingFragment StoreEntitySet="sysdiagrams">
-                <ScalarProperty Name="name" ColumnName="name" />
-                <ScalarProperty Name="principal_id" ColumnName="principal_id" />
-                <ScalarProperty Name="diagram_id" ColumnName="diagram_id" />
-                <ScalarProperty Name="version" ColumnName="version" />
-                <ScalarProperty Name="definition" ColumnName="definition" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
-        </EntityContainerMapping>
-      </Mapping>
-    </edmx:Mappings>
-  </edmx:Runtime>
-  <!-- EF Designer content (DO NOT EDIT MANUALLY BELOW HERE) -->
-  <Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
-    <Connection>
-      <DesignerInfoPropertySet>
-        <DesignerProperty Name="MetadataArtifactProcessing" Value="EmbedInOutputAssembly" />
-      </DesignerInfoPropertySet>
-    </Connection>
-    <Options>
-      <DesignerInfoPropertySet>
-        <DesignerProperty Name="ValidateOnBuild" Value="true" />
-        <DesignerProperty Name="EnablePluralization" Value="false" />
-        <DesignerProperty Name="IncludeForeignKeysInModel" Value="true" />
-        <DesignerProperty Name="UseLegacyProvider" Value="false" />
-        <DesignerProperty Name="CodeGenerationStrategy" Value="Нет" />
-      </DesignerInfoPropertySet>
-    </Options>
-    <!-- Diagram content (shape and connector positions) -->
-    <Diagrams></Diagrams>
-  </Designer>
-</edmx:Edmx>

+ 0 - 15
veloprokat2/Model1.edmx.diagram

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<edmx:Edmx Version="3.0" xmlns:edmx="http://schemas.microsoft.com/ado/2009/11/edmx">
- <!-- EF Designer content (DO NOT EDIT MANUALLY BELOW HERE) -->
-  <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
-    <!-- Diagram content (shape and connector positions) -->
-    <edmx:Diagrams>
-      <Diagram DiagramId="031794f262f54f4c98db0613b2813419" Name="Diagram1">
-        <EntityTypeShape EntityType="VeloprokatModel.Bikes" Width="1.5" PointX="0.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="VeloprokatModel.InfoAdm" Width="1.5" PointX="2.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="VeloprokatModel.InfoRab" Width="1.5" PointX="4.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="VeloprokatModel.sysdiagrams" Width="1.5" PointX="0.875" PointY="2.875" IsExpanded="true" />
-      </Diagram>
-    </edmx:Diagrams>
-  </edmx:Designer>
-</edmx:Edmx>

+ 0 - 733
veloprokat2/Model1.tt

@@ -1,733 +0,0 @@
-<#@ template language="C#" debug="false" hostspecific="true"#>
-<#@ include file="EF6.Utility.CS.ttinclude"#><#@ 
- output extension=".cs"#><#
-
-const string inputFile = @"Model1.edmx";
-var textTransform = DynamicTextTransformation.Create(this);
-var code = new CodeGenerationTools(this);
-var ef = new MetadataTools(this);
-var typeMapper = new TypeMapper(code, ef, textTransform.Errors);
-var	fileManager = EntityFrameworkTemplateFileManager.Create(this);
-var itemCollection = new EdmMetadataLoader(textTransform.Host, textTransform.Errors).CreateEdmItemCollection(inputFile);
-var codeStringGenerator = new CodeStringGenerator(code, typeMapper, ef);
-
-if (!typeMapper.VerifyCaseInsensitiveTypeUniqueness(typeMapper.GetAllGlobalItems(itemCollection), inputFile))
-{
-    return string.Empty;
-}
-
-WriteHeader(codeStringGenerator, fileManager);
-
-foreach (var entity in typeMapper.GetItemsToGenerate<EntityType>(itemCollection))
-{
-    fileManager.StartNewFile(entity.Name + ".cs");
-    BeginNamespace(code);
-#>
-<#=codeStringGenerator.UsingDirectives(inHeader: false)#>
-<#=codeStringGenerator.EntityClassOpening(entity)#>
-{
-<#
-    var propertiesWithDefaultValues = typeMapper.GetPropertiesWithDefaultValues(entity);
-    var collectionNavigationProperties = typeMapper.GetCollectionNavigationProperties(entity);
-    var complexProperties = typeMapper.GetComplexProperties(entity);
-
-    if (propertiesWithDefaultValues.Any() || collectionNavigationProperties.Any() || complexProperties.Any())
-    {
-#>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-    public <#=code.Escape(entity)#>()
-    {
-<#
-        foreach (var edmProperty in propertiesWithDefaultValues)
-        {
-#>
-        this.<#=code.Escape(edmProperty)#> = <#=typeMapper.CreateLiteral(edmProperty.DefaultValue)#>;
-<#
-        }
-
-        foreach (var navigationProperty in collectionNavigationProperties)
-        {
-#>
-        this.<#=code.Escape(navigationProperty)#> = new HashSet<<#=typeMapper.GetTypeName(navigationProperty.ToEndMember.GetEntityType())#>>();
-<#
-        }
-
-        foreach (var complexProperty in complexProperties)
-        {
-#>
-        this.<#=code.Escape(complexProperty)#> = new <#=typeMapper.GetTypeName(complexProperty.TypeUsage)#>();
-<#
-        }
-#>
-    }
-
-<#
-    }
-
-    var simpleProperties = typeMapper.GetSimpleProperties(entity);
-    if (simpleProperties.Any())
-    {
-        foreach (var edmProperty in simpleProperties)
-        {
-#>
-    <#=codeStringGenerator.Property(edmProperty)#>
-<#
-        }
-    }
-
-    if (complexProperties.Any())
-    {
-#>
-
-<#
-        foreach(var complexProperty in complexProperties)
-        {
-#>
-    <#=codeStringGenerator.Property(complexProperty)#>
-<#
-        }
-    }
-
-    var navigationProperties = typeMapper.GetNavigationProperties(entity);
-    if (navigationProperties.Any())
-    {
-#>
-
-<#
-        foreach (var navigationProperty in navigationProperties)
-        {
-            if (navigationProperty.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many)
-            {
-#>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-<#
-            }
-#>
-    <#=codeStringGenerator.NavigationProperty(navigationProperty)#>
-<#
-        }
-    }
-#>
-}
-<#
-    EndNamespace(code);
-}
-
-foreach (var complex in typeMapper.GetItemsToGenerate<ComplexType>(itemCollection))
-{
-    fileManager.StartNewFile(complex.Name + ".cs");
-    BeginNamespace(code);
-#>
-<#=codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false)#>
-<#=Accessibility.ForType(complex)#> partial class <#=code.Escape(complex)#>
-{
-<#
-    var complexProperties = typeMapper.GetComplexProperties(complex);
-    var propertiesWithDefaultValues = typeMapper.GetPropertiesWithDefaultValues(complex);
-
-    if (propertiesWithDefaultValues.Any() || complexProperties.Any())
-    {
-#>
-    public <#=code.Escape(complex)#>()
-    {
-<#
-        foreach (var edmProperty in propertiesWithDefaultValues)
-        {
-#>
-        this.<#=code.Escape(edmProperty)#> = <#=typeMapper.CreateLiteral(edmProperty.DefaultValue)#>;
-<#
-        }
-
-        foreach (var complexProperty in complexProperties)
-        {
-#>
-        this.<#=code.Escape(complexProperty)#> = new <#=typeMapper.GetTypeName(complexProperty.TypeUsage)#>();
-<#
-        }
-#>
-    }
-
-<#
-    }
-
-    var simpleProperties = typeMapper.GetSimpleProperties(complex);
-    if (simpleProperties.Any())
-    {
-        foreach(var edmProperty in simpleProperties)
-        {
-#>
-    <#=codeStringGenerator.Property(edmProperty)#>
-<#
-        }
-    }
-
-    if (complexProperties.Any())
-    {
-#>
-
-<#
-        foreach(var edmProperty in complexProperties)
-        {
-#>
-    <#=codeStringGenerator.Property(edmProperty)#>
-<#
-        }
-    }
-#>
-}
-<#
-    EndNamespace(code);
-}
-
-foreach (var enumType in typeMapper.GetEnumItemsToGenerate(itemCollection))
-{
-    fileManager.StartNewFile(enumType.Name + ".cs");
-    BeginNamespace(code);
-#>
-<#=codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false)#>
-<#
-    if (typeMapper.EnumIsFlags(enumType))
-    {
-#>
-[Flags]
-<#
-    }
-#>
-<#=codeStringGenerator.EnumOpening(enumType)#>
-{
-<#
-    var foundOne = false;
-    
-    foreach (MetadataItem member in typeMapper.GetEnumMembers(enumType))
-    {
-        foundOne = true;
-#>
-    <#=code.Escape(typeMapper.GetEnumMemberName(member))#> = <#=typeMapper.GetEnumMemberValue(member)#>,
-<#
-    }
-
-    if (foundOne)
-    {
-        this.GenerationEnvironment.Remove(this.GenerationEnvironment.Length - 3, 1);
-    }
-#>
-}
-<#
-    EndNamespace(code);
-}
-
-fileManager.Process();
-
-#>
-<#+
-
-public void WriteHeader(CodeStringGenerator codeStringGenerator, EntityFrameworkTemplateFileManager fileManager)
-{
-    fileManager.StartHeader();
-#>
-//------------------------------------------------------------------------------
-// <auto-generated>
-// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine1")#>
-//
-// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine2")#>
-// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine3")#>
-// </auto-generated>
-//------------------------------------------------------------------------------
-<#=codeStringGenerator.UsingDirectives(inHeader: true)#>
-<#+
-    fileManager.EndBlock();
-}
-
-public void BeginNamespace(CodeGenerationTools code)
-{
-    var codeNamespace = code.VsNamespaceSuggestion();
-    if (!String.IsNullOrEmpty(codeNamespace))
-    {
-#>
-namespace <#=code.EscapeNamespace(codeNamespace)#>
-{
-<#+
-        PushIndent("    ");
-    }
-}
-
-public void EndNamespace(CodeGenerationTools code)
-{
-    if (!String.IsNullOrEmpty(code.VsNamespaceSuggestion()))
-    {
-        PopIndent();
-#>
-}
-<#+
-    }
-}
-
-public const string TemplateId = "CSharp_DbContext_Types_EF6";
-
-public class CodeStringGenerator
-{
-    private readonly CodeGenerationTools _code;
-    private readonly TypeMapper _typeMapper;
-    private readonly MetadataTools _ef;
-
-    public CodeStringGenerator(CodeGenerationTools code, TypeMapper typeMapper, MetadataTools ef)
-    {
-        ArgumentNotNull(code, "code");
-        ArgumentNotNull(typeMapper, "typeMapper");
-        ArgumentNotNull(ef, "ef");
-
-        _code = code;
-        _typeMapper = typeMapper;
-        _ef = ef;
-    }
-
-    public string Property(EdmProperty edmProperty)
-    {
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} {1} {2} {{ {3}get; {4}set; }}",
-            Accessibility.ForProperty(edmProperty),
-            _typeMapper.GetTypeName(edmProperty.TypeUsage),
-            _code.Escape(edmProperty),
-            _code.SpaceAfter(Accessibility.ForGetter(edmProperty)),
-            _code.SpaceAfter(Accessibility.ForSetter(edmProperty)));
-    }
-
-    public string NavigationProperty(NavigationProperty navProp)
-    {
-        var endType = _typeMapper.GetTypeName(navProp.ToEndMember.GetEntityType());
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} {1} {2} {{ {3}get; {4}set; }}",
-            AccessibilityAndVirtual(Accessibility.ForNavigationProperty(navProp)),
-            navProp.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many ? ("ICollection<" + endType + ">") : endType,
-            _code.Escape(navProp),
-            _code.SpaceAfter(Accessibility.ForGetter(navProp)),
-            _code.SpaceAfter(Accessibility.ForSetter(navProp)));
-    }
-    
-    public string AccessibilityAndVirtual(string accessibility)
-    {
-        return accessibility + (accessibility != "private" ? " virtual" : "");
-    }
-    
-    public string EntityClassOpening(EntityType entity)
-    {
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} {1}partial class {2}{3}",
-            Accessibility.ForType(entity),
-            _code.SpaceAfter(_code.AbstractOption(entity)),
-            _code.Escape(entity),
-            _code.StringBefore(" : ", _typeMapper.GetTypeName(entity.BaseType)));
-    }
-    
-    public string EnumOpening(SimpleType enumType)
-    {
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} enum {1} : {2}",
-            Accessibility.ForType(enumType),
-            _code.Escape(enumType),
-            _code.Escape(_typeMapper.UnderlyingClrType(enumType)));
-        }
-    
-    public void WriteFunctionParameters(EdmFunction edmFunction, Action<string, string, string, string> writeParameter)
-    {
-        var parameters = FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef);
-        foreach (var parameter in parameters.Where(p => p.NeedsLocalVariable))
-        {
-            var isNotNull = parameter.IsNullableOfT ? parameter.FunctionParameterName + ".HasValue" : parameter.FunctionParameterName + " != null";
-            var notNullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", " + parameter.FunctionParameterName + ")";
-            var nullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", typeof(" + TypeMapper.FixNamespaces(parameter.RawClrTypeName) + "))";
-            writeParameter(parameter.LocalVariableName, isNotNull, notNullInit, nullInit);
-        }
-    }
-    
-    public string ComposableFunctionMethod(EdmFunction edmFunction, string modelNamespace)
-    {
-        var parameters = _typeMapper.GetParameters(edmFunction);
-        
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} IQueryable<{1}> {2}({3})",
-            AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)),
-            _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace),
-            _code.Escape(edmFunction),
-            string.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray()));
-    }
-    
-    public string ComposableCreateQuery(EdmFunction edmFunction, string modelNamespace)
-    {
-        var parameters = _typeMapper.GetParameters(edmFunction);
-        
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "return ((IObjectContextAdapter)this).ObjectContext.CreateQuery<{0}>(\"[{1}].[{2}]({3})\"{4});",
-            _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace),
-            edmFunction.NamespaceName,
-            edmFunction.Name,
-            string.Join(", ", parameters.Select(p => "@" + p.EsqlParameterName).ToArray()),
-            _code.StringBefore(", ", string.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray())));
-    }
-    
-    public string FunctionMethod(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
-    {
-        var parameters = _typeMapper.GetParameters(edmFunction);
-        var returnType = _typeMapper.GetReturnType(edmFunction);
-
-        var paramList = String.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray());
-        if (includeMergeOption)
-        {
-            paramList = _code.StringAfter(paramList, ", ") + "MergeOption mergeOption";
-        }
-
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} {1} {2}({3})",
-            AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)),
-            returnType == null ? "int" : "ObjectResult<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">",
-            _code.Escape(edmFunction),
-            paramList);
-    }
-    
-    public string ExecuteFunction(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
-    {
-        var parameters = _typeMapper.GetParameters(edmFunction);
-        var returnType = _typeMapper.GetReturnType(edmFunction);
-
-        var callParams = _code.StringBefore(", ", String.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray()));
-        if (includeMergeOption)
-        {
-            callParams = ", mergeOption" + callParams;
-        }
-        
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction{0}(\"{1}\"{2});",
-            returnType == null ? "" : "<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">",
-            edmFunction.Name,
-            callParams);
-    }
-    
-    public string DbSet(EntitySet entitySet)
-    {
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            "{0} virtual DbSet<{1}> {2} {{ get; set; }}",
-            Accessibility.ForReadOnlyProperty(entitySet),
-            _typeMapper.GetTypeName(entitySet.ElementType),
-            _code.Escape(entitySet));
-    }
-
-    public string UsingDirectives(bool inHeader, bool includeCollections = true)
-    {
-        return inHeader == string.IsNullOrEmpty(_code.VsNamespaceSuggestion())
-            ? string.Format(
-                CultureInfo.InvariantCulture,
-                "{0}using System;{1}" +
-                "{2}",
-                inHeader ? Environment.NewLine : "",
-                includeCollections ? (Environment.NewLine + "using System.Collections.Generic;") : "",
-                inHeader ? "" : Environment.NewLine)
-            : "";
-    }
-}
-
-public class TypeMapper
-{
-    private const string ExternalTypeNameAttributeName = @"http://schemas.microsoft.com/ado/2006/04/codegeneration:ExternalTypeName";
-
-    private readonly System.Collections.IList _errors;
-    private readonly CodeGenerationTools _code;
-    private readonly MetadataTools _ef;
-
-    public TypeMapper(CodeGenerationTools code, MetadataTools ef, System.Collections.IList errors)
-    {
-        ArgumentNotNull(code, "code");
-        ArgumentNotNull(ef, "ef");
-        ArgumentNotNull(errors, "errors");
-
-        _code = code;
-        _ef = ef;
-        _errors = errors;
-    }
-
-    public static string FixNamespaces(string typeName)
-    {
-        return typeName.Replace("System.Data.Spatial.", "System.Data.Entity.Spatial.");
-    }
-
-    public string GetTypeName(TypeUsage typeUsage)
-    {
-        return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace: null);
-    }
-
-    public string GetTypeName(EdmType edmType)
-    {
-        return GetTypeName(edmType, isNullable: null, modelNamespace: null);
-    }
-
-    public string GetTypeName(TypeUsage typeUsage, string modelNamespace)
-    {
-        return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace);
-    }
-
-    public string GetTypeName(EdmType edmType, string modelNamespace)
-    {
-        return GetTypeName(edmType, isNullable: null, modelNamespace: modelNamespace);
-    }
-
-    public string GetTypeName(EdmType edmType, bool? isNullable, string modelNamespace)
-    {
-        if (edmType == null)
-        {
-            return null;
-        }
-
-        var collectionType = edmType as CollectionType;
-        if (collectionType != null)
-        {
-            return String.Format(CultureInfo.InvariantCulture, "ICollection<{0}>", GetTypeName(collectionType.TypeUsage, modelNamespace));
-        }
-
-        var typeName = _code.Escape(edmType.MetadataProperties
-                                .Where(p => p.Name == ExternalTypeNameAttributeName)
-                                .Select(p => (string)p.Value)
-                                .FirstOrDefault())
-            ?? (modelNamespace != null && edmType.NamespaceName != modelNamespace ?
-                _code.CreateFullName(_code.EscapeNamespace(edmType.NamespaceName), _code.Escape(edmType)) :
-                _code.Escape(edmType));
-
-        if (edmType is StructuralType)
-        {
-            return typeName;
-        }
-
-        if (edmType is SimpleType)
-        {
-            var clrType = UnderlyingClrType(edmType);
-            if (!IsEnumType(edmType))
-            {
-                typeName = _code.Escape(clrType);
-            }
-
-            typeName = FixNamespaces(typeName);
-
-            return clrType.IsValueType && isNullable == true ?
-                String.Format(CultureInfo.InvariantCulture, "Nullable<{0}>", typeName) :
-                typeName;
-        }
-
-        throw new ArgumentException("edmType");
-    }
-    
-    public Type UnderlyingClrType(EdmType edmType)
-    {
-        ArgumentNotNull(edmType, "edmType");
-
-        var primitiveType = edmType as PrimitiveType;
-        if (primitiveType != null)
-        {
-            return primitiveType.ClrEquivalentType;
-        }
-
-        if (IsEnumType(edmType))
-        {
-            return GetEnumUnderlyingType(edmType).ClrEquivalentType;
-        }
-
-        return typeof(object);
-    }
-    
-    public object GetEnumMemberValue(MetadataItem enumMember)
-    {
-        ArgumentNotNull(enumMember, "enumMember");
-        
-        var valueProperty = enumMember.GetType().GetProperty("Value");
-        return valueProperty == null ? null : valueProperty.GetValue(enumMember, null);
-    }
-    
-    public string GetEnumMemberName(MetadataItem enumMember)
-    {
-        ArgumentNotNull(enumMember, "enumMember");
-        
-        var nameProperty = enumMember.GetType().GetProperty("Name");
-        return nameProperty == null ? null : (string)nameProperty.GetValue(enumMember, null);
-    }
-
-    public System.Collections.IEnumerable GetEnumMembers(EdmType enumType)
-    {
-        ArgumentNotNull(enumType, "enumType");
-
-        var membersProperty = enumType.GetType().GetProperty("Members");
-        return membersProperty != null 
-            ? (System.Collections.IEnumerable)membersProperty.GetValue(enumType, null)
-            : Enumerable.Empty<MetadataItem>();
-    }
-    
-    public bool EnumIsFlags(EdmType enumType)
-    {
-        ArgumentNotNull(enumType, "enumType");
-        
-        var isFlagsProperty = enumType.GetType().GetProperty("IsFlags");
-        return isFlagsProperty != null && (bool)isFlagsProperty.GetValue(enumType, null);
-    }
-
-    public bool IsEnumType(GlobalItem edmType)
-    {
-        ArgumentNotNull(edmType, "edmType");
-
-        return edmType.GetType().Name == "EnumType";
-    }
-
-    public PrimitiveType GetEnumUnderlyingType(EdmType enumType)
-    {
-        ArgumentNotNull(enumType, "enumType");
-
-        return (PrimitiveType)enumType.GetType().GetProperty("UnderlyingType").GetValue(enumType, null);
-    }
-
-    public string CreateLiteral(object value)
-    {
-        if (value == null || value.GetType() != typeof(TimeSpan))
-        {
-            return _code.CreateLiteral(value);
-        }
-
-        return string.Format(CultureInfo.InvariantCulture, "new TimeSpan({0})", ((TimeSpan)value).Ticks);
-    }
-    
-    public bool VerifyCaseInsensitiveTypeUniqueness(IEnumerable<string> types, string sourceFile)
-    {
-        ArgumentNotNull(types, "types");
-        ArgumentNotNull(sourceFile, "sourceFile");
-        
-        var hash = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
-        if (types.Any(item => !hash.Add(item)))
-        {
-            _errors.Add(
-                new CompilerError(sourceFile, -1, -1, "6023",
-                    String.Format(CultureInfo.CurrentCulture, CodeGenerationTools.GetResourceString("Template_CaseInsensitiveTypeConflict"))));
-            return false;
-        }
-        return true;
-    }
-    
-    public IEnumerable<SimpleType> GetEnumItemsToGenerate(IEnumerable<GlobalItem> itemCollection)
-    {
-        return GetItemsToGenerate<SimpleType>(itemCollection)
-            .Where(e => IsEnumType(e));
-    }
-    
-    public IEnumerable<T> GetItemsToGenerate<T>(IEnumerable<GlobalItem> itemCollection) where T: EdmType
-    {
-        return itemCollection
-            .OfType<T>()
-            .Where(i => !i.MetadataProperties.Any(p => p.Name == ExternalTypeNameAttributeName))
-            .OrderBy(i => i.Name);
-    }
-
-    public IEnumerable<string> GetAllGlobalItems(IEnumerable<GlobalItem> itemCollection)
-    {
-        return itemCollection
-            .Where(i => i is EntityType || i is ComplexType || i is EntityContainer || IsEnumType(i))
-            .Select(g => GetGlobalItemName(g));
-    }
-
-    public string GetGlobalItemName(GlobalItem item)
-    {
-        if (item is EdmType)
-        {
-            return ((EdmType)item).Name;
-        }
-        else
-        {
-            return ((EntityContainer)item).Name;
-        }
-    }
-
-    public IEnumerable<EdmProperty> GetSimpleProperties(EntityType type)
-    {
-        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type);
-    }
-    
-    public IEnumerable<EdmProperty> GetSimpleProperties(ComplexType type)
-    {
-        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type);
-    }
-    
-    public IEnumerable<EdmProperty> GetComplexProperties(EntityType type)
-    {
-        return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type);
-    }
-    
-    public IEnumerable<EdmProperty> GetComplexProperties(ComplexType type)
-    {
-        return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type);
-    }
-
-    public IEnumerable<EdmProperty> GetPropertiesWithDefaultValues(EntityType type)
-    {
-        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null);
-    }
-    
-    public IEnumerable<EdmProperty> GetPropertiesWithDefaultValues(ComplexType type)
-    {
-        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null);
-    }
-
-    public IEnumerable<NavigationProperty> GetNavigationProperties(EntityType type)
-    {
-        return type.NavigationProperties.Where(np => np.DeclaringType == type);
-    }
-    
-    public IEnumerable<NavigationProperty> GetCollectionNavigationProperties(EntityType type)
-    {
-        return type.NavigationProperties.Where(np => np.DeclaringType == type && np.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many);
-    }
-    
-    public FunctionParameter GetReturnParameter(EdmFunction edmFunction)
-    {
-        ArgumentNotNull(edmFunction, "edmFunction");
-
-        var returnParamsProperty = edmFunction.GetType().GetProperty("ReturnParameters");
-        return returnParamsProperty == null
-            ? edmFunction.ReturnParameter
-            : ((IEnumerable<FunctionParameter>)returnParamsProperty.GetValue(edmFunction, null)).FirstOrDefault();
-    }
-
-    public bool IsComposable(EdmFunction edmFunction)
-    {
-        ArgumentNotNull(edmFunction, "edmFunction");
-
-        var isComposableProperty = edmFunction.GetType().GetProperty("IsComposableAttribute");
-        return isComposableProperty != null && (bool)isComposableProperty.GetValue(edmFunction, null);
-    }
-
-    public IEnumerable<FunctionImportParameter> GetParameters(EdmFunction edmFunction)
-    {
-        return FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef);
-    }
-
-    public TypeUsage GetReturnType(EdmFunction edmFunction)
-    {
-        var returnParam = GetReturnParameter(edmFunction);
-        return returnParam == null ? null : _ef.GetElementType(returnParam.TypeUsage);
-    }
-    
-    public bool GenerateMergeOptionFunction(EdmFunction edmFunction, bool includeMergeOption)
-    {
-        var returnType = GetReturnType(edmFunction);
-        return !includeMergeOption && returnType != null && returnType.EdmType.BuiltInTypeKind == BuiltInTypeKind.EntityType;
-    }
-}
-
-public static void ArgumentNotNull<T>(T arg, string name) where T : class
-{
-    if (arg == null)
-    {
-        throw new ArgumentNullException(name);
-    }
-}
-#>

+ 31 - 0
veloprokat2/RedAdmTest.xaml

@@ -0,0 +1,31 @@
+<Window x:Class="veloprokat2.RedAdmTest"
+        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="Тестирование регистрации нового администратора" WindowState="Maximized">
+    <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>
+                <TextBlock Text="Регистрация нового администратора" FontSize="20" FontWeight="Bold" Margin="0 0 20 0"/>
+                <TextBox Name="Id"/>
+                <TextBox Name="Login"/>
+                <PasswordBox Name="Pass"/>
+                <PasswordBox Name="Pass2"/>
+                <TextBox Name="Lname"/>
+                <TextBox Name="Fname"/>
+                <TextBox Name="Mname"/>
+                <TextBox Name="Email"/>
+                <TextBox Name="Phone"/>
+                <DatePicker Name="Dr"/>
+                <Button Content="Зарегестрировать" Margin="20 10" Click="Registraciya"/>
+                <Button Content="Отмена" Margin="20 0" Click="Otmena"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>

+ 283 - 0
veloprokat2/RedAdmTest.xaml.cs

@@ -0,0 +1,283 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для RedAdmTest.xaml
+    /// </summary>
+    public partial class RedAdmTest : Window
+    {
+        List<string> Alphabetrus = new List<string> {
+            "А", "а", "Б", "б", "В", "в", "Г", "г", "Д", "д", "Е", "е", "Ё", "ё", "Ж", "ж", "З", "з", "И", "и", "Й", "й",
+            "К", "к", "Л", "л", "М", "м", "Н", "н", "О", "о", "П", "п", "Р", "р", "С", "с", "Т", "т", "У", "у", "Ф", "ф",
+            "Х", "х", "Ц", "ц", "Ч", "ч", "Ш", "ш", "Щ", "щ", "Ъ", "ъ", "Ы", "ы", "Ь", "ь", "Э", "э", "Ю", "ю", "Я", "я" };
+        List<string> Date = new List<string> {
+            "0","1","2","3","4","5","6","7","8","9","."};
+        List<string> NumberPhone = new List<string> {
+            "0","1","2","3","4","5","6","7","8","9"};
+        public RedAdmTest()
+        {
+            InitializeComponent();
+        }
+
+        public bool TestReg(string id, string login, string pass, string pass2, string lname, string fname, string mname, string email, string phone, string dr)
+        {
+            Id.Text = id;
+            Login.Text = login;
+            Pass.Password = pass;
+            Pass2.Password = pass2;
+            Lname.Text = lname;
+            Fname.Text = fname;
+            Mname.Text = mname;
+            Email.Text = email;
+            Phone.Text = phone;
+            Dr.Text = dr;
+
+            if(id != "" && login != "" && pass != "" && pass2 != "" && lname != "" && fname != "" && mname != "" && email != "" && phone != "" && dr != "")
+            {
+                bool ID = false, log = false, pas = false, pas2 = false, lnam = false, fnam = false, mnam = false, mail = false, phon = false, denroj = false;
+                {
+                    for (int i = 0; i < id.Length; i++)
+                    {
+                        if (ID)
+                        {
+                            ID = false;
+                        }
+                        for (int j = 0; j < NumberPhone.Count; j++)
+                        {
+                            if (Convert.ToString(id[i]).Contains(NumberPhone[j]))
+                            {
+                                ID = true;
+                                return true;
+                            }
+                        }
+                        if (ID == false)
+                        {
+                            MessageBox.Show("Поле № администратора должно иметь только цифры");
+                            return false;
+                        }
+                    }
+                    for (int i = 0; i < login.Length; i++)
+                    {
+                        if (log)
+                        {
+                            log = false;
+                        }
+                        if (login[i] >= 'A' && login[i] <= 'Z' || login[i] >= 'a' && login[i] <= 'z')
+                        {
+                            log = true;
+                            break;
+                        }
+                        if (log == false)
+                        {
+                            MessageBox.Show("Поле логин должно содержать английские символы");
+                            return false;
+                        }
+                    }
+                    for(int i = 0; i < pass.Length; i++)
+                    {
+                        if(pas)
+                        {
+                            pas = false;
+                        }
+                        if (pass[i] >= 'a' && pass[i] <= 'z' || pass[i] >= 'A' && pass[i] <= 'Z' || pass[i] >= '0' && pass[i] <= '9')
+                        {
+                            pas = true;
+                            break;
+                        }
+                        if (pas == false)
+                        {
+                            MessageBox.Show("Поле пароль должно содержать только английские символы и цифры");
+                            return false;
+                        }
+                    }
+                    for (int i = 0; i < pass2.Length; i++)
+                    {
+                        if (pas2)
+                        {
+                            pas2 = false;
+                        }
+                        if (pass2[i] == pass[i])
+                        {
+                            pas2 = true;
+                            break;
+                        }
+                        if (pas2 == false)
+                        {
+                            MessageBox.Show("Поле пароль должно содержать только английские символы и цифры");
+                            return false;
+                        }
+                    }
+                    for(int i = 0; i < lname.Length; i++)
+                    {
+                        if (lnam)
+                        {
+                            lnam = false;
+                        }
+                        for(int j = 0; j < Alphabetrus.Count; j++)
+                        {
+                            if (Convert.ToString(lname[i]).Contains(Alphabetrus[j]))
+                            {
+                                lnam = true;
+                                break;
+                            }
+                        }
+                        if (lnam == false)
+                        {
+                            MessageBox.Show("Поле фамилия должно содержать только русские символы");
+                            return false;
+                        }
+                    }
+                    for(int i = 0; i < fname.Length; i++)
+                    {
+                        if(fnam)
+                        {
+                            fnam = false;
+                        }
+                        for (int j = 0; j < Alphabetrus.Count; j++)
+                        {
+                            if (Convert.ToString(fname[i]).Contains(Alphabetrus[j]))
+                            {
+                                fnam = true;
+                                break;
+                            }
+                        }
+                        if (fnam == false)
+                        {
+                            MessageBox.Show("Поле имя должно содержать только русские символы");
+                            return false;
+                        }
+                    }
+                    for (int i = 0; i < mname.Length; i++)
+                    {
+                        if (mnam)
+                        {
+                            mnam = false;
+                        }
+                        for (int j = 0; j < Alphabetrus.Count; j++)
+                        {
+                            if (Convert.ToString(mname[i]).Contains(Alphabetrus[j]))
+                            {
+                                mnam = true;
+                                break;
+                            }
+                        }
+                        if (mnam == false)
+                        {
+                            MessageBox.Show("Поле отчетсво должно содержать только русские символы");
+                            return false;
+                        }
+                    }
+                    for (int i = 0; i < email.Length; i++)
+                    {
+                        if (mail)
+                        {
+                            mail = false;
+                        }
+                        if (email[i] >= 'A' && email[i] <= 'Z' || email[i] >= 'a' && email[i] <= 'z' || email.Contains("@") || email.Contains("."))
+                        {
+                            mail = true;
+                            break;
+                        }
+                        if (mail == false)
+                        {
+                            MessageBox.Show("Поле E-mail должно содержать только английские символы символы");
+                            return false;
+                        }
+                    }
+                    for (int i = 0; i < phone.Length; i++)
+                    {
+                        if (phon)
+                        {
+                            phon = false;
+                        }
+                        for (int j = 0; j < NumberPhone.Count; j++)
+                        {
+                            if (Convert.ToString(phone[i]).Contains(NumberPhone[j]))
+                            {
+                                phon = true;
+                                break;
+                            }
+                        }
+                        if (phon == false)
+                        {
+                            MessageBox.Show("Поле номер телефона должно содержать только цифры");
+                            return false;
+                        }
+                    }
+                    for (int i = 0; i < dr.Length; i++)
+                    {
+                        if (denroj)
+                        {
+                            denroj = false;
+                        }
+                        for (int j = 0; j < Date.Count; j++)
+                        {
+                            if (Convert.ToString(dr[i]).Contains(Date[j]))
+                            {
+                                denroj = true;
+                                break;
+                            }
+                        }
+                        if (denroj == false)
+                        {
+                            MessageBox.Show("Поле дата должно содержать только цифры и знак '.'");
+                            return false;
+                        }
+                    }
+                    if (log && pas && pas2 && lnam && fnam && mnam && mail && phon && denroj)
+                    {
+                        DataTable InfoAdm = Insert("insert into [dbo].[InfoAdm] values " +
+                                                            "('" + Login.Text + "','" + Pass.Password + "','" + Fname.Text +
+                                                              "','" + Lname.Text + "','" + Mname.Text + "','" + Email.Text +
+                                                              "','" + Phone.Text + "','" + Dr.Text + "')");
+                        MessageBox.Show("Пользователь зарегистирован");
+                        MainWindowAdm MWA = new MainWindowAdm();
+                        MWA.Show();
+                        Close();
+                        return true;
+                    }
+                    else { MessageBox.Show("Неправильный формат"); return false; }
+                }
+            }
+            else { MessageBox.Show("Все строки должны быть заполнены "); return false; }
+        }
+
+        public DataTable Insert(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
+
+        private void Registraciya(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Otmena(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}

+ 4 - 6
veloprokat2/MainWindow.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="veloprokat2.MainWindow"
+<Window x:Class="veloprokat2.Regrab"
         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"
@@ -6,15 +6,15 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="Регистрация нового продавца" WindowState="Maximized" WindowStyle="None">
+        Title="Регестрация сотрудника" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
     <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>
-                <TextBlock Text="Регистрация нового продавца" FontSize="30" FontWeight="Bold" Margin="0 0 20 0"/>
-
+                <TextBlock Text="Регистрация нового сотрудника" FontSize="20" FontWeight="Bold" Margin="0 0 20 0"/>
+                <TextBox Name="Id" materialDesign:HintAssist.Hint="Введите № сотрудника" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
                 <TextBox Name="Login" materialDesign:HintAssist.Hint="Введите логин" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
                 <PasswordBox Name="Pass" materialDesign:HintAssist.Hint="Введите пароль" Style="{StaticResource MaterialDesignFloatingHintPasswordBox}"/>
                 <PasswordBox Name="Pass2"  materialDesign:HintAssist.Hint="Повторите пароль" Style="{StaticResource MaterialDesignFloatingHintPasswordBox}"/>
@@ -27,8 +27,6 @@
                 <Button Content="Зарегестрировать" Margin="20 10" Click="Registraciya"/>
                 <Button Content="Отмена" Margin="20 0" Click="Otmena"/>
             </StackPanel>
-
-
         </Border>
     </Grid>
 </Window>

+ 44 - 27
veloprokat2/MainWindow.xaml.cs

@@ -12,15 +12,14 @@ using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
 using System.Windows.Shapes;
 
 namespace veloprokat2
 {
     /// <summary>
-    /// Логика взаимодействия для MainWindow.xaml
+    /// Логика взаимодействия для Regrab.xaml
     /// </summary>
-    public partial class MainWindow : Window
+    public partial class Regrab : Window
     {
         List<string> Alphabetrus = new List<string> {
             "А", "а", "Б", "б", "В", "в", "Г", "г", "Д", "д", "Е", "е", "Ё", "ё", "Ж", "ж", "З", "з", "И", "и", "Й", "й",
@@ -30,31 +29,37 @@ namespace veloprokat2
             "0","1","2","3","4","5","6","7","8","9","."};
         List<string> NumberPhone = new List<string> {
             "0","1","2","3","4","5","6","7","8","9"};
-        VeloprokatEntities db;
-
-        public MainWindow()
+        public Regrab()
         {
             InitializeComponent();
-            db = new VeloprokatEntities();
-        }
-        public DataTable Insert(string selectSQL) // функция подключения к базе данных и обработка запросов
-        {
-            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
-                                                                            // подключаемся к базе данных
-            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
-            sqlConnection.Open();                                           // открываем базу данных
-            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
-            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
-            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
-            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
-            return dataTable;
         }
+
         private void Registraciya(object sender, RoutedEventArgs e)
         {
-            if (Login.Text != "" && Pass.Password != "" && Pass2.Password != "" && Lname.Text != "" && Fname.Text != "" && Mname.Text != "" && Email.Text != "" && Phone.Text != "" && Dr.Text != "")
+            if (Id.Text !="" && Login.Text != "" && Pass.Password != "" && Pass2.Password != "" && Lname.Text != "" && Fname.Text != "" && Mname.Text != "" && Email.Text != "" && Phone.Text != "" && Dr.Text != "")
             {
-                bool fam = false, imya = false, otch = false, data = false, num = false;
+                bool id = false, fam = false, imya = false, otch = false, data = false, num = false;
                 bool email = false, login = false, pas1 = false, pas2 = false;
+                for(int i = 0; i < Id.Text.Length; i++)
+                {
+                    if(id)
+                    {
+                        login = false;
+                    }
+                    for(int j = 0; j < NumberPhone.Count; j++)
+                    {
+                        if(Convert.ToString(Id.Text).Contains(NumberPhone[j]))
+                        {
+                            id = true;
+                            break;
+                        }
+                    }
+                    if(id == false)
+                    {
+                        MessageBox.Show("Поле № сотрудника должно содержать только цифры");
+                        break;
+                    }
+                }
                 for (int i = 0; i < Login.Text.Length; i++)//проверка логина
                 {
                     if (login)
@@ -223,14 +228,14 @@ namespace veloprokat2
                         break;
                     }
                 }
-                if (fam && imya && otch && data && num && email && login && pas1 && pas2)
+                if (id && fam && imya && otch && data && num && email && login && pas1 && pas2)
                 {
-                    DataTable InfoRab = Insert("insert into [dbo].[InfoRab] values " +
-                                                            "('" + Login.Text + "','" + Pass.Password + "','" + Fname.Text +
-                                                              "','" + Lname.Text + "','" + Mname.Text + "','" + Email.Text +
+                    DataTable InfoAdm = Insert("insert into [dbo].[InfoRab] values " +
+                                                            "('" + Id.Text + "','" + Login.Text + "','" + Pass.Password + "','" + Lname.Text +
+                                                              "','" + Fname.Text + "','" + Mname.Text + "','" + Email.Text +
                                                               "','" + Phone.Text + "','" + Dr.Text + "')");
                     MessageBox.Show("Пользователь зарегистирован");
-                    MainWindowAdm  MWA = new MainWindowAdm();
+                    MainWindowAdm MWA = new MainWindowAdm();
                     MWA.Show();
                     Close();
                 }
@@ -241,9 +246,21 @@ namespace veloprokat2
 
         private void Otmena(object sender, RoutedEventArgs e)
         {
-            MainWindowAdm MWA= new MainWindowAdm();
+            MainWindowAdm MWA = new MainWindowAdm();
             MWA.Show();
             Close();
         }
+        public DataTable Insert(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
     }
 }

+ 23 - 0
veloprokat2/SpisRab.xaml

@@ -0,0 +1,23 @@
+<Window x:Class="veloprokat2.SpisRab"
+        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="Список сотрудников" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
+    <Grid Background="#EAF4F4">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <DataGrid AutoGenerateColumns="True" Name="prodinfo" Grid.Row="0" Margin="355,10,10,10" Grid.RowSpan="2" Grid.ColumnSpan="2"/>
+        <TextBox x:Name="Search" Background="White"  Grid.Row="0" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,10,0,0"/>
+        <Button Content="Поиск" Click="Button_Search"  Grid.Row="0" FontSize="20" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,65,0,0"/>
+        <Button Content="Удалить запись" Click="Delete"  Grid.Row="0" FontSize="20" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,120,0,0"/>
+        <Button Content="Вернуться" Click="Vixod"  FontSize="20"  Width="250" Height="50" Margin="10,0,0,9.6" VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+    </Grid>
+</Window>

+ 90 - 0
veloprokat2/SpisRab.xaml.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для Window1.xaml
+    /// </summary>
+    public partial class SpisRab : Window
+    {
+        public SpisRab()
+        {
+            InitializeComponent();
+            SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+            connection.Open();
+            string cmd = "select id as '№  сотрудника', Login as 'Логин',Password as 'Пароль',LName 'Фамилия',Fname 'Имя',Mname 'Отчество',Email 'Почта',Phone 'Телефон',FORMAT(Dr, 'dd/MM/yyyy') as 'День рожджения' from InfoRab";
+            SqlCommand createcommand = new SqlCommand(cmd, connection);
+            createcommand.ExecuteNonQuery();
+
+            SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+            DataTable dt = new DataTable("InfoRab");
+            sql.Fill(dt);
+            prodinfo.ItemsSource = dt.DefaultView;
+            connection.Close();
+
+        }
+
+        private void Vixod(object sender, RoutedEventArgs e)
+        {
+            MainWindowAdm MWA = new MainWindowAdm();
+            MWA.Show();
+            Close();
+        }
+
+
+
+        private void Button_Search(object sender, RoutedEventArgs e)
+        {
+            if (Search.Text.Length > 0)
+            {
+                SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+                connection.Open();
+                string cmd = "select ID as '№ сотрудника', Login as 'Логин',Password as 'Пароль',LName 'Фамилия',Fname 'Имя',Mname 'Отчество',Email 'Почта',Phone 'Телефон',FORMAT(Dr, 'dd/MM/yyyy') as 'День рожджения' from InfoRab" +
+                " where ( Login like '%" + Search.Text + "%' or Password like '%" + Search.Text + "%' or LName like '%" + Search.Text + "%' or FName like '%" + Search.Text + "%' or Mname like '%" + Search.Text + "%' or Email like '%" + Search.Text + "%' or Phone like '%" + Search.Text + "%' or Dr like '%" + Search.Text + "%')";
+                SqlCommand createcommand = new SqlCommand(cmd, connection);
+                createcommand.ExecuteNonQuery();
+
+                SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+                DataTable dt = new DataTable("SpisProk");
+                sql.Fill(dt);
+                prodinfo.ItemsSource = dt.DefaultView;
+                connection.Close();
+            }
+            else if (Search.Text.Length == 0)
+            {
+                SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+                connection.Open();
+                string cmd = "select ID as '№ сотрудника', Login as 'Логин',Password as 'Пароль',LName 'Фамилия',Fname 'Имя',Mname 'Отчество',Email 'Почта',Phone 'Телефон',FORMAT(Dr, 'dd/MM/yyyy') as 'День рожджения' from InfoRab";
+                SqlCommand createcommand = new SqlCommand(cmd, connection);
+                createcommand.ExecuteNonQuery();
+
+                SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+                DataTable dt = new DataTable("SpisProk");
+                sql.Fill(dt);
+                prodinfo.ItemsSource = dt.DefaultView;
+                connection.Close();
+            }
+        }
+
+        private void Delete(object sender, RoutedEventArgs e)
+        {
+            DeleteRab DR = new DeleteRab();
+            DR.Show();
+            Close();
+        }
+    }
+}

+ 14 - 4
veloprokat2/SpisokBikes.xaml

@@ -6,11 +6,21 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="Список Велосипедов" WindowState="Maximized" WindowStyle="None">
+        Title="Информация о велосипедах" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
     <Grid Background="#EAF4F4">
-        <DataGrid   HorizontalAlignment="Right"  Margin="0,10,9.6,0" VerticalAlignment="Top" Width="742" AutoGenerateColumns="True" Name="prodinfo" Height="430">
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <DataGrid AutoGenerateColumns="True" Name="prodinfo" Grid.Row="0" Margin="355,10,10,10" Grid.RowSpan="2" Grid.ColumnSpan="2">
         </DataGrid>
-        <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"/>
+        <TextBox x:Name="Search" Background="White"  Grid.Row="0" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,10,0,0"/>
+        <Button Content="Поиск" Click="Button_Search"  Grid.Row="0" FontSize="20" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,65,0,0"/>
+        <Button Content="Вернуться" Click="Vixod"  FontSize="20"  Width="250" Height="50" Margin="10,0,0,9.6" VerticalAlignment="Bottom" HorizontalAlignment="Left" RenderTransformOrigin="0.502,1.584"/>
+        <Button Content="Новая запись" Click="Insert"  FontSize="20"  Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,120,0,0"/>
+        <Button Content="Удалить запись" Click="Delet"  FontSize="20"  Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,175,0,0"/>
     </Grid>
 </Window>

+ 42 - 4
veloprokat2/SpisokBikes.xaml.cs

@@ -21,13 +21,12 @@ namespace veloprokat2
     /// </summary>
     public partial class SpisokBikes : Window
     {
-        VeloprokatEntities db;
         public SpisokBikes()
         {
             InitializeComponent();
             SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
             connection.Open();
-            string cmd = "select ID, Company as N'Компания', Model as N'Модель' from Bikes";
+            string cmd = "Select Bikes.ID as '№ велосипеда', Bikes.Company as 'Компания', Bikes.Title as 'Название',Bikes.[Type] as 'Тип',Zanyatost.Zan as 'Занятость',InfoAdm.Lname as 'Фамилия администратора' from Bikes,Zanyatost, InfoAdm where Bikes.IDZan = Zanyatost.ID and Bikes.IdAdm = InfoAdm.ID";
             SqlCommand createcommand = new SqlCommand(cmd, connection);
             createcommand.ExecuteNonQuery();
 
@@ -36,12 +35,11 @@ namespace veloprokat2
             sql.Fill(dt);
             prodinfo.ItemsSource = dt.DefaultView;
             connection.Close();
-
         }
 
         private void Vixod(object sender, RoutedEventArgs e)
         {
-            MainWindowProd MWP = new MainWindowProd();
+            MainWindowAdm MWP = new MainWindowAdm();
             MWP.Show();
             Close();
         }
@@ -52,5 +50,45 @@ namespace veloprokat2
             IB.Show();
             Close();
         }
+
+        private void Button_Search(object sender, RoutedEventArgs e)
+        {
+            if (Search.Text.Length > 0)
+            {
+                SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+                connection.Open();
+                string cmd = "Select Bikes.ID as '№ велосипеда', Bikes.Company as 'Компания', Bikes.Title as 'Название',Bikes.[Type] as 'Тип',Zanyatost.Zan as 'Занятость', InfoAdm.Lname as 'Фамилия администратора' from Bikes,Zanyatost, InfoAdm where Bikes.IDZan = Zanyatost.ID and Bikes.IdAdm = InfoAdm.ID" +
+                             " and ( Bikes.ID like '%" + Search.Text + "%' or Bikes.Company like '%" + Search.Text + "%' or Bikes.[Type] like '%" + Search.Text + "%' or Bikes.Title like '%" + Search.Text + "%' or Zanyatost.Zan like '%" + Search.Text + "%' or InfoAdm.Lname like '%" +  Search.Text + "%')";
+                SqlCommand createcommand = new SqlCommand(cmd, connection);
+                createcommand.ExecuteNonQuery();
+
+                SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+                DataTable dt = new DataTable("SpisProk");
+                sql.Fill(dt);
+                prodinfo.ItemsSource = dt.DefaultView;
+                connection.Close();
+            }
+            else if (Search.Text.Length == 0)
+            {
+                SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+                connection.Open();
+                string cmd = "Select Bikes.ID as '№ велосипеда', Bikes.Company as 'Компания', Bikes.Title as 'Название',Bikes.[Type] as 'Тип',Zanyatost.Zan as 'Занятость' from Bikes,Zanyatost, InfoAdm where Bikes.IDZan = Zanyatost.ID";
+                SqlCommand createcommand = new SqlCommand(cmd, connection);
+                createcommand.ExecuteNonQuery();
+
+                SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+                DataTable dt = new DataTable("SpisProk");
+                sql.Fill(dt);
+                prodinfo.ItemsSource = dt.DefaultView;
+                connection.Close();
+            }
+        }
+
+        private void Delet(object sender, RoutedEventArgs e)
+        {
+            DeleteBikes DB = new DeleteBikes();
+            DB.Show();
+            Close();
+        }
     }
 }

+ 23 - 0
veloprokat2/SpisokProk.xaml

@@ -0,0 +1,23 @@
+<Window x:Class="veloprokat2.SpisokProk"
+        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="Список прокатов" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
+    <Grid Background="#EAF4F4">
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <DataGrid AutoGenerateColumns="True" Name="prodinfo" Grid.Row="0" Margin="355,10,10,10" Grid.RowSpan="2" Grid.ColumnSpan="2">
+        </DataGrid>
+        <TextBox x:Name="Search" Background="White"  Grid.Row="0" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,10,0,0"/>
+        <Button Content="Поиск" Click="Button_Search"  Grid.Row="0" FontSize="20" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,65,0,0"/>
+        <Button Content="Вернуться" Click="Vixod"  FontSize="20"  Width="250" Height="50" Margin="10,0,0,9.6" VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+    </Grid>
+</Window>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 83 - 0
veloprokat2/SpisokProk.xaml.cs


+ 23 - 0
veloprokat2/TestChanginhTheTypexaml.xaml

@@ -0,0 +1,23 @@
+<Window x:Class="veloprokat2.TestChanginhTheTypexaml"
+        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="Изменение занятости" WindowState="Maximized">
+    <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>
+                <TextBlock Text="Изменение занятости велосипеда" FontSize="20" FontWeight="Bold" Margin="0 0 20 0"/>
+                <TextBox Name="NumberOfBikes"/>
+                <TextBox Name="Zan"/>
+                <Button Content="Изменить" Margin="20 10" Click="Izmenenie"/>
+                <Button Content="Отмена" Margin="20 0" Click="Otmena"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>

+ 93 - 0
veloprokat2/TestChanginhTheTypexaml.xaml.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для TestChanginhTheTypexaml.xaml
+    /// </summary>
+    public partial class TestChanginhTheTypexaml : Window
+    {
+        public TestChanginhTheTypexaml()
+        {
+            InitializeComponent();
+        }
+
+        public bool ChangingType(string id, string zanyatost)
+        {
+            NumberOfBikes.Text = id;
+            Zan.Text = zanyatost;
+            if (zanyatost == "Занят")
+            {
+                DataTable InfoAdm = Update("update [dbo].[Bikes] " +
+                                            "Set IDZan = 2" +
+                                            "Where ID =" + id);
+                SpisokBikes SP = new SpisokBikes();
+                SP.Show();
+                Close();
+                return true;
+            }
+            else if (zanyatost == "Свободен")
+            {
+                DataTable InfoAdm = Update("update [dbo].[Bikes] " +
+                                            "Set IDZan = 1" +
+                                            "Where ID =" + id);
+                SpisokBikes SP = new SpisokBikes();
+                SP.Show();
+                Close();
+                return true;
+            }
+            else if (zanyatost == "В тех. обслуживании")
+            {
+                DataTable InfoAdm = Update("update [dbo].[Bikes] " +
+                                            "Set IDZan = 3" +
+                                            "Where ID =" + id);
+                SpisokBikes SP = new SpisokBikes();
+                SP.Show();
+                Close();
+                return true;
+            }
+            else
+            {
+                MessageBox.Show("Неправильный формат, либо пустые поля");
+                return false;
+            }
+        }
+
+        private void Izmenenie(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Otmena(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        public DataTable Update(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
+    }
+}

+ 24 - 0
veloprokat2/TestInfoBikes.xaml

@@ -0,0 +1,24 @@
+<Window x:Class="veloprokat2.TestInfoBikes"
+        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="Тест информации о велосипедах" WindowState="Maximized">
+    <Grid Background="#EAF4F4">
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <DataGrid AutoGenerateColumns="True" Name="prodinfo" Grid.Row="0" Margin="355,10,10,10" Grid.RowSpan="2" Grid.ColumnSpan="2">
+        </DataGrid>
+        <TextBox x:Name="Search" Background="White"  Grid.Row="0" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,10,0,0"/>
+        <Button Content="Поиск" Click="Button_Search"  Grid.Row="0" FontSize="20" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,65,0,0"/>
+        <Button Content="Вернуться" Click="Vixod"  FontSize="20"  Width="250" Height="50" Margin="10,0,0,269.6" VerticalAlignment="Bottom" HorizontalAlignment="Left" RenderTransformOrigin="0.502,1.584"/>
+        <Button Content="Изменить статус" Click="Insert"  FontSize="20"  Width="250" Height="50" Margin="10,0,0,325" VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+    </Grid>
+</Window>

+ 124 - 0
veloprokat2/TestInfoBikes.xaml.cs

@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для TestInfoBikes.xaml
+    /// </summary>
+    public partial class TestInfoBikes : Window
+    {
+        public TestInfoBikes()
+        {
+            InitializeComponent();
+            SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+            connection.Open();
+            string cmd = "Select Bikes.ID as '№ велосипеда', Bikes.Company as 'Компания', Bikes.Title as 'Название',Bikes.[Type] as 'Тип',Zanyatost.Zan as 'Занятость' from Bikes,Zanyatost where Bikes.IDZan = Zanyatost.ID";
+            SqlCommand createcommand = new SqlCommand(cmd, connection);
+            createcommand.ExecuteNonQuery();
+
+            SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+            DataTable dt = new DataTable("Bikes");
+            sql.Fill(dt);
+            prodinfo.ItemsSource = dt.DefaultView;
+            connection.Close();
+        }
+
+        public bool SearchTest (string search)
+        {
+            Search.Text = search;
+            if (Search.Text.Length > 0)
+            {
+                SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+                connection.Open();
+                string cmd = "Select Bikes.ID as '№ велосипеда', Bikes.Company as 'Компания', Bikes.Title as 'Название',Bikes.[Type] as 'Тип',Zanyatost.Zan as 'Занятость' from Bikes,Zanyatost where Bikes.IDZan = Zanyatost.ID" +
+                             " and ( Bikes.ID like '%" + Search.Text + "%' or Bikes.Company like '%" + Search.Text + "%' or Bikes.[Type] like '%" + Search.Text + "%' or Bikes.Title like '%" + Search.Text + "%')";
+                SqlCommand createcommand = new SqlCommand(cmd, connection);
+                createcommand.ExecuteNonQuery();
+
+                SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+                DataTable dt = new DataTable("SpisProk");
+                sql.Fill(dt);
+                prodinfo.ItemsSource = dt.DefaultView;
+                connection.Close();
+                if (dt.Rows.Count > 0)
+                {
+                    MessageBox.Show("Тест вывода пройден");
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else if (Search.Text.Length == 0)
+            {
+                SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+                connection.Open();
+                string cmd = "Select Bikes.ID as '№ велосипеда', Bikes.Company as 'Компания', Bikes.Title as 'Название',Bikes.[Type] as 'Тип',Zanyatost.Zan as 'Занятость' from Bikes,Zanyatost where Bikes.IDZan = Zanyatost.ID";
+                SqlCommand createcommand = new SqlCommand(cmd, connection);
+                createcommand.ExecuteNonQuery();
+
+                SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+                DataTable dt = new DataTable("SpisProk");
+                sql.Fill(dt);
+                prodinfo.ItemsSource = dt.DefaultView;
+                connection.Close();
+                return false;
+            }
+            return false;
+        }
+
+        public bool TestVivod ()
+        {
+            SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+            connection.Open();
+            string cmd = "Select Bikes.ID as '№ велосипеда', Bikes.Company as 'Компания', Bikes.Title as 'Название',Bikes.[Type] as 'Тип',Zanyatost.Zan as 'Занятость' from Bikes,Zanyatost where Bikes.IDZan = Zanyatost.ID" +
+                         " and ( Bikes.ID like '%" + Search.Text + "%' or Bikes.Company like '%" + Search.Text + "%' or Bikes.[Type] like '%" + Search.Text + "%' or Bikes.Title like '%" + Search.Text + "%')";
+            SqlCommand createcommand = new SqlCommand(cmd, connection);
+            createcommand.ExecuteNonQuery();
+
+            SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+            DataTable dt = new DataTable("SpisProk");
+            sql.Fill(dt);
+            prodinfo.ItemsSource = dt.DefaultView;
+            connection.Close();
+            if (dt.Rows.Count > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        private void Button_Search(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Vixod(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Insert(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}

+ 27 - 0
veloprokat2/TestInsertBikes.xaml

@@ -0,0 +1,27 @@
+<Window x:Class="veloprokat2.TestInsertBikes"
+        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="Тест добавления велосипеда" WindowState="Maximized">
+    <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>
+                <TextBlock Text="Регистрация нового велосипеда" FontSize="20" FontWeight="Bold" Margin="0 0 20 0"/>
+                <TextBox Name="NumberOfBikes"/>
+                <TextBox Name="Company"/>
+                <TextBox Name="Title"/>
+                <TextBox Name="Type"/>
+                <TextBox Name="Zan"/>
+                <TextBox Name="LnameAdm"/>
+                <Button Content="Зарегестрировать" Margin="20 10" Click="Registraciya"/>
+                <Button Content="Отмена" Margin="20 0" Click="Otmena"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>

+ 219 - 0
veloprokat2/TestInsertBikes.xaml.cs

@@ -0,0 +1,219 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для TestInsertBikes.xaml
+    /// </summary>
+    public partial class TestInsertBikes : Window
+    {
+        List<string> Alphabetrus = new List<string> {
+            "А", "а", "Б", "б", "В", "в", "Г", "г", "Д", "д", "Е", "е", "Ё", "ё", "Ж", "ж", "З", "з", "И", "и", "Й", "й",
+            "К", "к", "Л", "л", "М", "м", "Н", "н", "О", "о", "П", "п", "Р", "р", "С", "с", "Т", "т", "У", "у", "Ф", "ф",
+            "Х", "х", "Ц", "ц", "Ч", "ч", "Ш", "ш", "Щ", "щ", "Ъ", "ъ", "Ы", "ы", "Ь", "ь", "Э", "э", "Ю", "ю", "Я", "я",
+            "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "-", "_"};
+        List<string> Number = new List<string> {
+            "0","1","2","3","4","5","6","7","8","9"};
+        public TestInsertBikes()
+        {
+            InitializeComponent();
+        }
+
+        public bool TestInsert(string numberofbikes, string company, string title, string type, string zan, string idadm)
+        {
+            numberofbikes = NumberOfBikes.Text;
+            company = Company.Text;
+            title = Title.Text;
+            type = Type.Text;
+            zan = Zan.Text;
+            idadm = LnameAdm.Text;
+
+            if (numberofbikes != "" && company != "" && title != "" && type != "" && zan != "" && idadm != "")
+            {
+                bool Comp = false, tit = false, numbofbike = false, tip = false, zAn = false, idAdm = false;
+                for (int i = 0; i < numberofbikes.Length; i++)
+                {
+                    if (numbofbike)
+                    {
+                        numbofbike = false;
+                    }
+                    for (int j = 0; j < Number.Count; j++)
+                    {
+                        if (Convert.ToString(numberofbikes[i]).Contains(Number[j]))
+                        {
+                            numbofbike = true;
+                            break;
+                        }
+
+                    }
+                    if (numbofbike == false)
+                    {
+                        MessageBox.Show("Поле Номер велосипеда должно содержать только цифры");
+                        return false;
+                    }
+                }
+                for (int i = 0; i < company.Length; i++)
+                {
+                    if (Comp)
+                    {
+                        Comp = false;
+                    }
+                    if (company[i] >= 'A' && company[i] <= 'Z' || company[i] >= 'a' && company[i] <= 'z')
+                    {
+                        Comp = true;
+                        break;
+                    }
+                    if (Comp == false)
+                    {
+                        MessageBox.Show("Поле Компания должно содержать только английские символы");
+                        return false;
+                    }
+                }
+                for (int i = 0; i < title.Length; i++)
+                {
+                    if (tit)
+                    {
+                        tit = false;
+                    }
+                    for (int j = 0; j < Alphabetrus.Count; j++)
+                    {
+                        if (title[i] >= 'A' && title[i] <= 'Z' || title[i] >= 'a' && title[i] <= 'z')
+                        {
+                            tit = true;
+                            break;
+                        }
+                    }
+                    if (tit == false)
+                    {
+                        MessageBox.Show("Поле Модель должно содержать только русские символы");
+                        return false;
+                    }
+                }
+                for (int i = 0; i < type.Length; i++)
+                {
+                    if (tip)
+                    {
+                        tip = false;
+                    }
+                    for (int j = 0; j < Alphabetrus.Count; j++)
+                    {
+                        if (Convert.ToString(type[i]).Contains(Alphabetrus[j]))
+                        {
+                            tip = true;
+                            break;
+                        }
+                    }
+                    if (tip == false)
+                    {
+                        MessageBox.Show("Поле Тип должно содержать только русские символы и цифры");
+                        return false;
+                    }
+                }
+                if (zan == "Свободен" || zan == "Занят" || zan == "В тех. обслуживании")
+                {
+                    zAn = true;
+                    return true;
+                }
+                else
+                {
+                    MessageBox.Show("Поле 'занятость должно включать только одно из значений!'");
+                    return false;
+                }
+                for (int i = 0; i < idadm.Length; i++)
+                {
+                    if (idAdm)
+                    {
+                        idAdm = false;
+                    }
+                    for (int j = 0; j < Number.Count; j++)
+                    {
+                        if (Convert.ToString(idadm[i]).Contains(Number[j]))
+                        {
+                            idAdm = true;
+                            break;
+                        }
+
+                    }
+                    if (idAdm == false)
+                    {
+                        MessageBox.Show("Поле Номер велосипеда должно содержать только цифры");
+                        return false;
+                    }
+                }
+                if (numbofbike && Comp && tit && tip && zAn && idAdm)
+                {
+                    if (zan == "Свободен")
+                    {
+                        DataTable InfoAdm = Insert("insert into [dbo].[Bikes] values " +
+                                                           "('" + NumberOfBikes.Text + "','" + Company.Text + "','" + Title.Text + "','" + Type.Text + "', 1)");
+                        MessageBox.Show("Велосипед добавлен");
+                        InfoBikes SB = new InfoBikes();
+                        SB.Show();
+                        Close();
+                        return true;
+                    }
+                    else if (zan == "Занят")
+                    {
+                        DataTable InfoAdm = Insert("insert into [dbo].[Bikes] values " +
+                                                           "('" + NumberOfBikes.Text + "','" + Company.Text + "','" + Title.Text + "','" + Type.Text + "', 2)");
+                        MessageBox.Show("Велосипед добавлен");
+                        InfoBikes SB = new InfoBikes();
+                        SB.Show();
+                        Close();
+                        return true;
+                    }
+                    else if (zan == "В тех. обслуживании")
+                    {
+                        DataTable InfoAdm = Insert("insert into [dbo].[Bikes] values " +
+                                                           "('" + NumberOfBikes.Text + "','" + Company.Text + "','" + Title.Text + "','" + Type.Text + "', 3)");
+                        MessageBox.Show("Велосипед добавлен");
+                        InfoBikes SB = new InfoBikes();
+                        SB.Show();
+                        Close();
+                        return true;
+                    }
+                }
+
+                else { MessageBox.Show("Неправильный формат"); return false; }
+            }
+            else { MessageBox.Show("Все строки должны быть заполнены"); return false; }
+        }
+
+        private void Registraciya(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Otmena(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        public DataTable Insert(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
+    }
+}

+ 24 - 0
veloprokat2/TypeIzm.xaml

@@ -0,0 +1,24 @@
+<Window x:Class="veloprokat2.TypeIzm"
+        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"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        Title="Изменение занятости велосипеда" Height="450" Width="800" Icon="mountain_bike_sport_icon_123970.ico">
+    <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>
+                <TextBlock Text="Изменение занятости велосипеда" FontSize="20" FontWeight="Bold" Margin="0 0 20 0"/>
+                <TextBox Name="NumberOfBikes" materialDesign:HintAssist.Hint="Введите номер велосипеда" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <TextBox Name="Zan" materialDesign:HintAssist.Hint="Введите занятость" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
+                <Button Content="Изменить" Margin="20 10" Click="Izmenenie"/>
+                <Button Content="Отмена" Margin="20 0" Click="Otmena"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>

+ 80 - 0
veloprokat2/TypeIzm.xaml.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для TypeIzm.xaml
+    /// </summary>
+    public partial class TypeIzm : Window
+    {
+        public TypeIzm()
+        {
+            InitializeComponent();
+        }
+
+        private void Izmenenie(object sender, RoutedEventArgs e)
+        {
+            if (Zan.Text == "Занят")
+            {
+                DataTable Bikes = Update("update [dbo].[Bikes] " +
+                                            "Set IDZan = 2" +
+                                            "Where ID =" + NumberOfBikes.Text);
+                InfoBikes Ib = new InfoBikes();
+                Ib.Show();
+                Close();
+
+            }
+            else if (Zan.Text == "Свободен")
+            {
+                DataTable Bikes = Update("update [dbo].[Bikes] " +
+                                            "Set IDZan = 1" +
+                                            "Where ID =" + NumberOfBikes.Text);
+                InfoBikes Ib = new InfoBikes();
+                Ib.Show();
+                Close();
+            }
+            else if (Zan.Text == "В тех. обслуживании")
+            {
+                DataTable Bikes = Update("update [dbo].[Bikes] " +
+                                            "Set IDZan = 3" +
+                                            "Where ID =" + NumberOfBikes.Text);
+                InfoBikes Ib = new InfoBikes();
+                Ib.Show();
+                Close();
+            }
+        }
+
+        private void Otmena(object sender, RoutedEventArgs e)
+        {
+            InfoBikes Ib = new InfoBikes();
+            Ib.Show();
+            Close();
+        }
+        public DataTable Update(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
+    }
+}

+ 22 - 0
veloprokat2/ValidTest.xaml

@@ -0,0 +1,22 @@
+<Window x:Class="veloprokat2.ValidTest"
+        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="Регистрация нового администратора" WindowState="Maximized">
+    <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>
+                <TextBlock Text="Регистрация нового администратора" FontSize="20" FontWeight="Bold" Margin="0 0 20 0"/>
+                <TextBox Name="Lname"/>
+                <Button Content="Зарегестрировать" Margin="20 10" Click="Registraciya"/>
+                <Button Content="Отмена" Margin="20 0" Click="Otmena"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>

+ 76 - 0
veloprokat2/ValidTest.xaml.cs

@@ -0,0 +1,76 @@
+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>
+    /// Логика взаимодействия для ValidTest.xaml
+    /// </summary>
+    public partial class ValidTest : Window
+    {
+        List<string> Alphabetrus = new List<string> {
+            "А", "а", "Б", "б", "В", "в", "Г", "г", "Д", "д", "Е", "е", "Ё", "ё", "Ж", "ж", "З", "з", "И", "и", "Й", "й",
+            "К", "к", "Л", "л", "М", "м", "Н", "н", "О", "о", "П", "п", "Р", "р", "С", "с", "Т", "т", "У", "у", "Ф", "ф",
+            "Х", "х", "Ц", "ц", "Ч", "ч", "Ш", "ш", "Щ", "щ", "Ъ", "ъ", "Ы", "ы", "Ь", "ь", "Э", "э", "Ю", "ю", "Я", "я" };
+        public ValidTest()
+        {
+            InitializeComponent();
+        }
+
+        public bool Valid(string lname)
+        {
+            bool fam = false;
+            Lname.Text = lname;
+            for (int i = 0; i < lname.Length; i++)//проверка фамилии
+            {
+                if (fam)
+                {
+                    fam = false;
+                }
+                for (int j = 0; j < Alphabetrus.Count; j++)
+                {
+                    if (Convert.ToString(lname[i]).Contains(Alphabetrus[j]))
+                    {
+                        fam = true;
+                        break;
+                    }
+                }
+                if (fam == false)
+                {
+                    MessageBox.Show("Поле фамилия должно содержать только русские символы");
+                    return false;
+                }
+            }
+            if (fam)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        private void Registraciya(object sender, RoutedEventArgs e)
+        {
+
+
+        }
+
+        private void Otmena(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}

+ 0 - 22
veloprokat2/Window1.xaml

@@ -1,22 +0,0 @@
-<Window x:Class="veloprokat2.Window1"
-        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="Список продавцов" WindowState="Maximized" WindowStyle="None">
-    <Grid Background="#EAF4F4">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition/>
-            <ColumnDefinition/>
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition/>
-            <RowDefinition/>
-        </Grid.RowDefinitions>
-        <DataGrid AutoGenerateColumns="True" Name="prodinfo"  Grid.Column="1" Grid.Row="0" Margin="0,10,10,10" Grid.RowSpan="2"/>
-        <Button Content="Вернуться" Click="Vixod"  FontSize="20"  Width="250" Height="50" Margin="65,164,65,50"/>
-        <Button Content="Добавить" Click="Insert"  FontSize="20"  Width="250" Height="50" Grid.Column="0" Margin="65,95,65,120"/>
-    </Grid>
-</Window>

+ 0 - 55
veloprokat2/Window1.xaml.cs

@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-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>
-    /// Логика взаимодействия для Window1.xaml
-    /// </summary>
-    public partial class Window1 : Window
-    {
-        public Window1()
-        {
-            InitializeComponent();
-            SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
-            connection.Open();
-            string cmd = "select * from InfoRab";
-            SqlCommand createcommand = new SqlCommand(cmd, connection);
-            createcommand.ExecuteNonQuery();
-
-            SqlDataAdapter sql = new SqlDataAdapter(createcommand);
-            DataTable dt = new DataTable("InfoRab");
-            sql.Fill(dt);
-            prodinfo.ItemsSource = dt.DefaultView;
-            connection.Close();
-
-        }
-
-        private void Vixod(object sender, RoutedEventArgs e)
-        {
-            MainWindowAdm MWA = new MainWindowAdm();
-            MWA.Show();
-            Close();
-        }
-
-        private void Insert(object sender, RoutedEventArgs e)
-        {
-            Insert_zap Insert = new Insert_zap();
-            Insert.Show();
-            Close();
-        }
-    }
-}

+ 23 - 0
veloprokat2/auth_test.xaml

@@ -0,0 +1,23 @@
+<Window x:Class="veloprokat2.auth_test"
+        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="Авторизация тест" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
+    <Grid Background="#EAF4F4">
+        <Border MinWidth="400" Margin="15" Background="#FFFF" VerticalAlignment="Center" Padding="30" MaxWidth="550" CornerRadius="20">
+            <Border.Effect>
+                <DropShadowEffect BlurRadius="30" Color="LightGray" ShadowDepth="0"/>
+            </Border.Effect>
+            <StackPanel>
+                <TextBlock Text="Компания 'Велопробег'" FontSize="30" FontWeight="Bold" Margin="0 0 20 0" HorizontalAlignment="Center"/>
+                <TextBox Name="Login" Text="Введите логин"/>
+                <PasswordBox Name="Pass"/>
+                <Button Content="Войти" Margin="0 20 0 0" Click="Button_click"/>
+                <Button Content="Выйти из программы" Margin="0 20 0 0"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>

+ 85 - 0
veloprokat2/auth_test.xaml.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для auth_test.xaml
+    /// </summary>
+    public partial class auth_test : Window
+    {
+        public auth_test()
+        {
+            InitializeComponent();
+        }
+
+        public bool Reg(string log, string pas)
+        {
+            Login.Text = log;
+            Pass.Password = pas;
+            if (log.Length > 0)
+            {
+                if (pas.Length > 0)
+                {
+                    DataTable InfoAdm = Select("SELECT * FROM [dbo].[InfoAdm] WHERE [Login] = '" + Login.Text + "' AND [Password] = '" + Pass.Password + "'");
+                    DataTable InfoWork = Select("SELECT * FROM [dbo].[InfoRab] WHERE [Login] = '" + Login.Text + "' AND [Password] = '" + Pass.Password + "'");
+                    if (InfoAdm.Rows.Count > 0 || InfoWork.Rows.Count > 0)
+                    {
+                        MessageBox.Show("Авторизация пройдена успешно");
+                        MainWindowAdm MWA = new MainWindowAdm();
+                        MWA.Show();
+                        Close();
+                        return true;
+                    }
+                    else
+                    {
+                        MessageBox.Show("Пользователь не найден");
+                        return false;
+                    }
+                }
+                else
+                {
+                    MessageBox.Show("Введите пароль");
+                    return false;
+                }
+            }
+            else
+            {
+                MessageBox.Show("Введите логин");
+                return false;
+            }
+        }
+
+        public DataTable Select(string selectSQL) // функция подключения к базе данных и обработка запросов
+        {
+            DataTable dataTable = new DataTable("dataBase");                // создаём таблицу в приложении
+                                                                            // подключаемся к базе данных
+            SqlConnection sqlConnection = new SqlConnection("server=mssql;Trusted_Connection=Yes;DataBase=gr692_kaa;");
+            sqlConnection.Open();                                           // открываем базу данных
+            SqlCommand sqlCommand = sqlConnection.CreateCommand();          // создаём команду
+            sqlCommand.CommandText = selectSQL;                             // присваиваем команде текст
+            SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(sqlCommand); // создаём обработчик
+            sqlDataAdapter.Fill(dataTable);                                 // возращаем таблицу с результатом
+            return dataTable;
+        }
+
+        private void Button_click(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}

BIN
veloprokat2/mountain_bike_sport_icon_123970.ico


+ 0 - 1
veloprokat2/packages.config

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.4.4" targetFramework="net472" />
-  <package id="EntityFramework.ru" version="6.2.0" targetFramework="net472" />
   <package id="MaterialDesignColors" version="2.0.3" targetFramework="net472" />
   <package id="MaterialDesignThemes" version="4.2.1" targetFramework="net472" />
   <package id="System.Security.AccessControl" version="6.0.0" targetFramework="net472" />

+ 2 - 1
veloprokat2/regadm.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:veloprokat2"
         mc:Ignorable="d"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        Title="Регистрация нового администратора" WindowState="Maximized" WindowStyle="None">
+        Title="Регистрация нового администратора" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
     <Grid Background="#EAF4F4">
         <Border MinWidth="400" Margin="15" Background="#FFFF" VerticalAlignment="Center" Padding="30" MaxWidth="600" CornerRadius="20">
             <Border.Effect>
@@ -14,6 +14,7 @@
             </Border.Effect>
             <StackPanel>
                 <TextBlock Text="Регистрация нового администратора" FontSize="20" FontWeight="Bold" Margin="0 0 20 0"/>
+                <TextBox Name="Id" materialDesign:HintAssist.Hint="Введите № администратора" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
                 <TextBox Name="Login" materialDesign:HintAssist.Hint="Введите логин" Style="{StaticResource MaterialDesignFloatingHintTextBox}"/>
                 <PasswordBox Name="Pass" materialDesign:HintAssist.Hint="Введите пароль" Style="{StaticResource MaterialDesignFloatingHintPasswordBox}"/>
                 <PasswordBox Name="Pass2"  materialDesign:HintAssist.Hint="Повторите пароль" Style="{StaticResource MaterialDesignFloatingHintPasswordBox}"/>

+ 26 - 103
veloprokat2/regadm.xaml.cs

@@ -22,6 +22,7 @@ namespace veloprokat2
     /// </summary>
     public partial class regadm : Window
     {
+        
         List<string> Alphabetrus = new List<string> {
             "А", "а", "Б", "б", "В", "в", "Г", "г", "Д", "д", "Е", "е", "Ё", "ё", "Ж", "ж", "З", "з", "И", "и", "Й", "й",
             "К", "к", "Л", "л", "М", "м", "Н", "н", "О", "о", "П", "п", "Р", "р", "С", "с", "Т", "т", "У", "у", "Ф", "ф",
@@ -31,11 +32,9 @@ namespace veloprokat2
         List<string> NumberPhone = new List<string> {
             "0","1","2","3","4","5","6","7","8","9"};
 
-        VeloprokatEntities db;
         public regadm()
         {
             InitializeComponent();
-            db = new VeloprokatEntities();
         }
 
         private void Otmena(object sender, RoutedEventArgs e)
@@ -59,10 +58,30 @@ namespace veloprokat2
 
         private void Registraciya(object sender, RoutedEventArgs e)
         {
-            if (Login.Text != "" && Pass.Password != "" && Pass2.Password != "" && Lname.Text != "" && Fname.Text != "" && Mname.Text != "" && Email.Text != "" && Phone.Text != "" && Dr.Text != "")
+            if (Id.Text != "" && Login.Text != "" && Pass.Password != "" && Pass2.Password != "" && Lname.Text != "" && Fname.Text != "" && Mname.Text != "" && Email.Text != "" && Phone.Text != "" && Dr.Text != "")
             {
-                bool fam = false, imya = false, otch = false, data = false, num = false;
+                bool id = false, fam = false, imya = false, otch = false, data = false, num = false;
                 bool email = false, login = false, pas1 = false, pas2 = false;
+                for (int i = 0; i < Id.Text.Length; i++)
+                {
+                    if(id)
+                    {
+                        id = false;
+                    }
+                    for(int j = 0; j < NumberPhone.Count; j++)
+                    {
+                        if(Convert.ToString(Id.Text[i]).Contains(NumberPhone[j]))
+                        {
+                            id = true;
+                            break;
+                        }
+                    }
+                    if(id  == false)
+                    {
+                        MessageBox.Show("Поле № администратора должно иметь только цифры");
+                        break;
+                    }
+                }
                 for (int i = 0; i < Login.Text.Length; i++)//проверка логина
                 {
                     if (login)
@@ -231,11 +250,11 @@ namespace veloprokat2
                         break;
                     }
                 }
-                if (fam && imya && otch && data && num && email && login && pas1 && pas2)
+                if (id && fam && imya && otch && data && num && email && login && pas1 && pas2)
                 {
                     DataTable InfoAdm = Insert("insert into [dbo].[InfoAdm] values " +
-                                                            "('" + Login.Text + "','" + Pass.Password + "','" + Fname.Text +
-                                                              "','" + Lname.Text + "','" + Mname.Text + "','" + Email.Text +
+                                                            "('" + Id.Text + "," + Login.Text + "','" + Pass.Password + "','" + Lname.Text +
+                                                              "','" + Fname.Text + "','" + Mname.Text + "','" + Email.Text +
                                                               "','" + Phone.Text + "','" + Dr.Text + "')");
                     MessageBox.Show("Пользователь зарегистирован");
                     MainWindowAdm MWA = new MainWindowAdm();
@@ -246,102 +265,6 @@ namespace veloprokat2
             }
             else { MessageBox.Show("Все строки должны быть заполнены"); }
         }
-
-
-        /*string login = Login.Text.Trim();
-        string pass = Pass.Password.Trim();
-        string pass2 = Pass2.Password.Trim();
-        string fname = Fname.Text.Trim();
-        string lname = Lname.Text.Trim();
-        string mname = Mname.Text.Trim();
-        string dr = Dr.Text.Trim();
-        string email = Email.Text.ToLower().Trim();
-        string phone = Phone.Text.Trim();
-        InfoAdm newInfoAdm = new InfoAdm()
-        {
-            Login = Login.Text,
-            Password = Pass.Password,
-            LName = Lname.Text,
-            FName = Fname.Text,
-            MName = Mname.Text,
-            Dr = Dr.SelectedDate,
-            Email = Email.Text,
-            Phone = Phone.Text
-        };
-        int count = 0;
-        if (login.Length < 5)
-        {
-            Login.ToolTip = "Логин не должен быть меньше 5-ти символов";
-            Login.Background = Brushes.DarkRed;
-            count += 1;
-        }
-        else if (pass.Length < 5)
-        {
-            Pass.ToolTip = "Пароль не должен быть меньше 5-ти символов";
-            Pass.Background = Brushes.DarkRed;
-            count += 1;
-        }
-        else if (pass != pass2)
-        {
-            Pass2.ToolTip = "Пароль не должен быть меньше 5-ти символов";
-            Pass2.Background = Brushes.DarkRed;
-            count += 1;
-        }
-        else if (lname.Length < 2)
-        {
-            Pass.ToolTip = "Фамилия не должна быть меньше 2-х символов";
-            Pass.Background = Brushes.DarkRed;
-            count += 1;
-        }
-        else if (fname.Length < 2)
-        {
-            Pass.ToolTip = "Имя не должно быть меньше 2-х символов";
-            Pass.Background = Brushes.DarkRed;
-            count += 1;
-        }
-        else if(mname.Length < 5)
-        {
-            Pass.ToolTip = "Отчество не должно быть меньше 5-ти символов";
-            Pass.Background = Brushes.DarkRed;
-            count += 1;
-        }
-        else if(Dr.Text.Length==0)
-        {
-            Dr.ToolTip = "Дата введена не коректно";
-            Dr.Background = Brushes.Gray;
-            count += 1;
-        }
-        else if (email.Length < 5 || !email.Contains("@") || !email.Contains("."))
-        {
-            Email.ToolTip = "Пароль не должен быть меньше 5-ти символов";
-            Email.Background = Brushes.DarkRed;
-            count += 1;
-        }
-        else if(phone.Length <= 10)
-        {
-            Pass.ToolTip = "Номер телефона не должнен быть меньше 11-ти символов";
-            Pass.Background = Brushes.DarkRed;
-            count += 1;
-        }
-        else if (db.InfoRab.Select(item => item.Login).Contains(Login.Text))
-        {
-            MessageBox.Show("Такой логин уже существует в системе");
-            count += 1;
-        }
-        if (count > 10 && count < 0)
-        {
-            MessageBox.Show("Заполните данные коректно");
-            count = 0;
-        }
-        else if (count < 0)
-        {
-            db.InfoAdm.Add(newInfoAdm);
-            db.SaveChanges();
-            MessageBox.Show("Вы успешно зарегестрировались");
-            Auth au = new Auth();
-            au.Show();
-            Close();
-        }*/
     }
     
 }

+ 0 - 23
veloprokat2/sysdiagrams.cs

@@ -1,23 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан по шаблону.
-//
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace veloprokat2
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class sysdiagrams
-    {
-        public string name { get; set; }
-        public int principal_id { get; set; }
-        public int diagram_id { get; set; }
-        public Nullable<int> version { get; set; }
-        public byte[] definition { get; set; }
-    }
-}

+ 23 - 0
veloprokat2/tarif.xaml

@@ -0,0 +1,23 @@
+<Window x:Class="veloprokat2.tarif"
+        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="Список тарифов" WindowState="Maximized" Icon="mountain_bike_sport_icon_123970.ico">
+    <Grid Background="#EAF4F4">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <DataGrid AutoGenerateColumns="True" Name="prodinfo" Grid.Row="0" Margin="355,10,10,10" Grid.RowSpan="2" Grid.ColumnSpan="2"/>
+        <TextBox x:Name="Search" Background="White"  Grid.Row="0" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,10,0,0"/>
+        <Button Content="Поиск" Click="Button_Search"  Grid.Row="0" FontSize="20" Width="250" Height="50" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,65,0,0"/>
+        <Button Content="Вернуться" Click="Vixod"  FontSize="20"  Width="250" Height="50" Margin="10,0,0,9.6" VerticalAlignment="Bottom" HorizontalAlignment="Left" Grid.Row="1"/>
+    </Grid>
+</Window>

+ 83 - 0
veloprokat2/tarif.xaml.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+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>
+    /// Логика взаимодействия для Window2.xaml
+    /// </summary>
+    public partial class tarif : Window
+    {
+        public tarif()
+        {
+            InitializeComponent();
+
+            SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+            connection.Open();
+            string cmd = "select ID as 'Номер тарифа', NameOfTarif as 'Название тарифа',cast(price as int) as 'Цена' from tarif";
+            SqlCommand createcommand = new SqlCommand(cmd, connection);
+            createcommand.ExecuteNonQuery();
+
+            SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+            DataTable dt = new DataTable("Tarif");
+            sql.Fill(dt);
+            prodinfo.ItemsSource = dt.DefaultView;
+            connection.Close();
+
+        }
+
+        private void Vixod(object sender, RoutedEventArgs e)
+        {
+            MainWindowProd MWP = new MainWindowProd();
+            MWP.Show();
+            Close();
+        }
+
+        private void Button_Search(object sender, RoutedEventArgs e)
+        {
+            if (Search.Text.Length > 0)
+            {
+                SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+                connection.Open();
+                string cmd = "select ID as 'Номер тарифа',NameOfTarif as 'Название тарифа',cast(price as int) as 'Цена' from Tarif" +
+                             " where ( ID like '%" + Search.Text + "%' or NameOfTarif like '%" + Search.Text + "%' or Price like '%" + Search.Text + "%' )";
+                SqlCommand createcommand = new SqlCommand(cmd, connection);
+                createcommand.ExecuteNonQuery();
+
+                SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+                DataTable dt = new DataTable("Tarif");
+                sql.Fill(dt);
+                prodinfo.ItemsSource = dt.DefaultView;
+                connection.Close();
+
+            }
+            else if (Search.Text.Length == 0)
+            {
+                SqlConnection connection = new SqlConnection("server=mssql; Trusted_Connection=YES;DataBase=gr692_kaa;");
+                connection.Open();
+                string cmd = "select ID as 'Номер тарифа',NameOfTarif as 'Название тарифа',cast(price as int) as 'Цена' from Tarif";
+                SqlCommand createcommand = new SqlCommand(cmd, connection);
+                createcommand.ExecuteNonQuery();
+
+                SqlDataAdapter sql = new SqlDataAdapter(createcommand);
+                DataTable dt = new DataTable("Tarif");
+                sql.Fill(dt);
+                prodinfo.ItemsSource = dt.DefaultView;
+                connection.Close();
+            }
+        }
+    }
+}

+ 120 - 55
veloprokat2/veloprokat2.csproj

@@ -90,85 +90,130 @@
     <Compile Include="Auth.xaml.cs">
       <DependentUpon>Auth.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Bikes.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
+    <Compile Include="auth_test.xaml.cs">
+      <DependentUpon>auth_test.xaml</DependentUpon>
     </Compile>
-    <Compile Include="InfoAdm.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
+    <Compile Include="Changing_the_type.xaml.cs">
+      <DependentUpon>Changing_the_type.xaml</DependentUpon>
     </Compile>
-    <Compile Include="InfoProdaji.xaml.cs">
-      <DependentUpon>InfoProdaji.xaml</DependentUpon>
+    <Compile Include="DeleteBikes.xaml.cs">
+      <DependentUpon>DeleteBikes.xaml</DependentUpon>
     </Compile>
-    <Compile Include="InfoRab.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
+    <Compile Include="DeleteRab.xaml.cs">
+      <DependentUpon>DeleteRab.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DeleteTest.xaml.cs">
+      <DependentUpon>DeleteTest.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="InfoBikes.xaml.cs">
+      <DependentUpon>InfoBikes.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="InfoTarif.xaml.cs">
+      <DependentUpon>InfoTarif.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Info_prodaji.xaml.cs">
+      <DependentUpon>Info_prodaji.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="InsertZakaz.xaml.cs">
+      <DependentUpon>InsertZakaz.xaml</DependentUpon>
     </Compile>
     <Compile Include="Insert_Bikes.xaml.cs">
       <DependentUpon>Insert_Bikes.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Insert_zap.xaml.cs">
-      <DependentUpon>Insert_zap.xaml</DependentUpon>
-    </Compile>
     <Compile Include="MainWindowAdm.xaml.cs">
       <DependentUpon>MainWindowAdm.xaml</DependentUpon>
     </Compile>
     <Compile Include="MainWindowProd.xaml.cs">
       <DependentUpon>MainWindowProd.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Model1.Context.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Model1.Context.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Model1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Model1.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Model1.edmx</DependentUpon>
+    <Compile Include="RedAdmTest.xaml.cs">
+      <DependentUpon>RedAdmTest.xaml</DependentUpon>
     </Compile>
     <Compile Include="regadm.xaml.cs">
       <DependentUpon>regadm.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Regrab.xaml.cs">
+      <DependentUpon>Regrab.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SpisokBikes.xaml.cs">
       <DependentUpon>SpisokBikes.xaml</DependentUpon>
     </Compile>
-    <Compile Include="sysdiagrams.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
+    <Compile Include="SpisokProk.xaml.cs">
+      <DependentUpon>SpisokProk.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="SpisRab.xaml.cs">
+      <DependentUpon>SpisRab.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="tarif.xaml.cs">
+      <DependentUpon>tarif.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="TestChanginhTheTypexaml.xaml.cs">
+      <DependentUpon>TestChanginhTheTypexaml.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="TestInfoBikes.xaml.cs">
+      <DependentUpon>TestInfoBikes.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Window1.xaml.cs">
-      <DependentUpon>Window1.xaml</DependentUpon>
+    <Compile Include="TestInsertBikes.xaml.cs">
+      <DependentUpon>TestInsertBikes.xaml</DependentUpon>
     </Compile>
+    <Compile Include="TypeIzm.xaml.cs">
+      <DependentUpon>TypeIzm.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ValidTest.xaml.cs">
+      <DependentUpon>ValidTest.xaml</DependentUpon>
+    </Compile>
+    <Page Include=".xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Auth.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="InfoProdaji.xaml">
+    <Page Include="auth_test.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Insert_Bikes.xaml">
+    <Page Include="Changing_the_type.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DeleteBikes.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DeleteRab.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DeleteTest.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="InfoBikes.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Insert_zap.xaml">
+    <Page Include="InfoTarif.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="MainWindow.xaml">
+    <Page Include="Info_prodaji.xaml">
+      <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="InsertZakaz.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Insert_Bikes.xaml">
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
     <Page Include="MainWindowAdm.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -177,15 +222,51 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="RedAdmTest.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="regadm.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Regrab.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SpisokBikes.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Window1.xaml">
+    <Page Include="SpisokProk.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SpisRab.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="tarif.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TestChanginhTheTypexaml.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TestInfoBikes.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TestInsertBikes.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TypeIzm.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ValidTest.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -208,13 +289,6 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EntityDeploy Include="Model1.edmx">
-      <Generator>EntityModelCodeGenerator</Generator>
-      <LastGenOutput>Model1.Designer.cs</LastGenOutput>
-    </EntityDeploy>
-    <None Include="Model1.edmx.diagram">
-      <DependentUpon>Model1.edmx</DependentUpon>
-    </None>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -228,16 +302,7 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Model1.Context.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <DependentUpon>Model1.edmx</DependentUpon>
-      <LastGenOutput>Model1.Context.cs</LastGenOutput>
-    </Content>
-    <Content Include="Model1.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <DependentUpon>Model1.edmx</DependentUpon>
-      <LastGenOutput>Model1.cs</LastGenOutput>
-    </Content>
+    <Resource Include="mountain_bike_sport_icon_123970.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\MaterialDesignThemes.4.2.1\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.4.2.1\build\MaterialDesignThemes.targets')" />