/

Kusach/EDM.edmx.diagram

@@ -8,11 +8,11 @@
         <EntityTypeShape EntityType="EDMModel.Dispatcher" Width="1.5" PointX="0.75" PointY="13.375" IsExpanded="true" />
         <EntityTypeShape EntityType="EDMModel.Drivers" Width="1.5" PointX="0.75" PointY="6.75" IsExpanded="true" />
         <EntityTypeShape EntityType="EDMModel.DriversList" Width="1.5" PointX="3" PointY="3.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="EDMModel.Points" Width="1.5" PointX="0.75" PointY="1" IsExpanded="true" />
+        <EntityTypeShape EntityType="EDMModel.Points" Width="1.5" PointX="7" PointY="1.125" IsExpanded="true" />
         <EntityTypeShape EntityType="EDMModel.PointsList" Width="1.5" PointX="3" PointY="0.875" IsExpanded="true" />
         <EntityTypeShape EntityType="EDMModel.RouteList" Width="1.5" PointX="3" PointY="6.875" IsExpanded="true" />
         <EntityTypeShape EntityType="EDMModel.Routes" Width="1.5" PointX="0.75" PointY="3.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="EDMModel.sysdiagrams" Width="1.5" PointX="5.75" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="EDMModel.sysdiagrams" Width="1.5" PointX="12.625" PointY="1.625" IsExpanded="true" />
         <EntityTypeShape EntityType="EDMModel.Transport" Width="1.5" PointX="1.5" PointY="10" IsExpanded="true" />
         <AssociationConnector Association="EDMModel.FK__RouteList__IdRou__6383C8BA" ManuallyRouted="false" />
         <AssociationConnector Association="EDMModel.FK__DriversLi__IdDri__0C85DE4D" ManuallyRouted="false" />

Kusach/Functions.cs

@@ -29,9 +29,12 @@ namespace Kusach
                 return false;
         }
         // Валидация дня рождения
-        public static bool IsValidDateOfBirthday(string Date)
+        public static bool IsValidDateOfBirthday(DateTime Date)
         {
-            return true;
+            if (Date > DateTime.Now)
+                return false;
+            else
+                return true;
         }
         // Валидация логина и пароля
         public static bool IsValidLogAndPass(string login, string password)

Kusach/Windows/RegWindow.xaml

@@ -90,7 +90,7 @@
             Height="40" 
             Width="240"/>
             <Label 
-            Content="День рождения:" 
+            Content="Дата рождения:" 
             HorizontalAlignment="Left" 
             VerticalAlignment="Top" 
             Height="40" 

Kusach/Windows/RegWindow.xaml.cs

@@ -26,7 +26,7 @@ namespace Kusach
                     MessageBox.Show("Номер телефона введен неверно.");
                 else if (!Functions.IsValidEmail(EmailBox.Text))
                     MessageBox.Show("Email введен неверно."); 
-                else if (!Functions.IsValidDateOfBirthday(BirthdayBox.Text))
+                else if (!Functions.IsValidDateOfBirthday(Convert.ToDateTime(BirthdayBox.Text)))
                     MessageBox.Show("День рождения введен неверно.");
                 else
                 {

UnitTests/UnitTest1.cs

@@ -9,14 +9,21 @@ namespace UnitTests
         [TestMethod]
         public void IsValidPhoneNumber()
         {
-            string phoneNum = "9999194949";
-            Assert.IsTrue(Functions.IsValidPhoneNumber(phoneNum));
+            Assert.IsTrue(Functions.IsValidPhoneNumber("9999194949"));
+            Assert.IsTrue(Functions.IsValidPhoneNumber("9994443322"));
+            Assert.IsFalse(Functions.IsValidPhoneNumber("99991949499"));
+            Assert.IsFalse(Functions.IsValidPhoneNumber("999919494"));
+            Assert.IsFalse(Functions.IsValidPhoneNumber("My phone number"));
+            Assert.IsFalse(Functions.IsValidPhoneNumber(""));
         }
         [TestMethod]
         public void IsValidEmail()
         {
-            string email = "lalka@gmail.com";
-            Assert.IsTrue(Functions.IsValidEmail(email));
+            Assert.IsTrue(Functions.IsValidEmail("user@gmail.com"));
+            Assert.IsTrue(Functions.IsValidEmail("user@mail.ru"));
+            Assert.IsFalse(Functions.IsValidEmail("usergmail.com"));
+            Assert.IsFalse(Functions.IsValidEmail("usergmailcom"));
+            Assert.IsFalse(Functions.IsValidEmail(""));
         }
         [TestMethod]
         public void PasswordEncryptTest()
@@ -45,6 +52,9 @@ namespace UnitTests
         public void IsLoginAlreadyTaken()
         {
             Assert.IsTrue(Functions.IsLoginAlreadyTaken("qq"));
+            Assert.IsFalse(Functions.IsLoginAlreadyTaken("user23"));
+            Assert.IsFalse(Functions.IsLoginAlreadyTaken("F"));
+            Assert.IsFalse(Functions.IsLoginAlreadyTaken(""));
         }
         [TestMethod]
         public void GetNameOfTransportUsingId()
@@ -100,8 +110,16 @@ namespace UnitTests
         [TestMethod]
         public void IsIdOnlyDigits()
         {
-            string IdTransport = "123";
-            Assert.IsTrue(Functions.IsOnlyDigits(IdTransport));
+            string Id = "123";
+            Assert.IsTrue(Functions.IsOnlyDigits(Id));
+        }
+        [TestMethod]
+        public void IsValidDateOfBirthday()
+        {
+            DateTime date1 =  new DateTime(2000,05,02);
+            DateTime date2 =  new DateTime(2025,02,01);
+            Assert.IsTrue(Functions.IsValidDateOfBirthday(date1));
+            Assert.IsFalse(Functions.IsValidDateOfBirthday(date2));
         }
     }
 }