Merge pull request #7 from TheKornelM/dev

New translations, class data validators
TheKornelM · Nov 20, 2024 · 1044b7b · 1044b7b
2 parents 47843f1 + a1574a9
commit 1044b7b
Show file tree

Hide file tree

Showing 8 changed files with 223 additions and 8 deletions.
diff --git a/SchoolManagerModel/Persistence/SubjectDatabase.cs b/SchoolManagerModel/Persistence/SubjectDatabase.cs
@@ -37,23 +37,43 @@ public async Task AddSubjectAsync(Subject subject)
     public async Task AssignSubjectsToStudentAsync(Student student, List<Subject> subjects)
     {
         var dbStudent = dbContext.Students
-            .Include(x => x.Subjects)
-            .FirstOrDefault(x => x.Id == student.Id);
+            .Where(x => x.Id == student.Id)
+            .Select(x => new
+            {
+                Student = x,
+                Subjects = x.Subjects ?? new List<AssignedSubject>()
+            })
+            .FirstOrDefault();
+
+        if (dbStudent == null)
+            throw new Exception("Student not found");
 
-        if (dbStudent == null) throw new Exception("Student not found");
+        dbStudent.Student.Subjects = dbStudent.Subjects;
 
-        dbStudent.Subjects = dbStudent.Subjects ?? [];
+        // Ensure all subjects are tracked by the DbContext
+        var dbSubjects = await dbContext.Subjects
+            .Where(s => subjects.Select(sub => sub.Id).Contains(s.Id))
+            .ToListAsync();
+
+        foreach (var dbSubject in dbSubjects)
+        {
+            if (dbStudent.Subjects.Any(subject => subject.Subject.Id == dbSubject.Id))
+            {
+                return;
+            }
 
-        foreach (var item in subjects)
             dbStudent.Subjects.Add(new AssignedSubject
             {
-                Subject = item,
-                Student = student
+                Subject = dbSubject,
+                Student = dbStudent.Student
             });
 
+        }
+
         await dbContext.SaveChangesAsync();
     }
 
+
     public async Task<List<Student>> GetSubjectStudentsAsync(Subject subject)
     {
         var students = await dbContext.AssignedSubjects

diff --git a/SchoolManagerModel/Resources/UI.Designer.cs b/SchoolManagerModel/Resources/UI.Designer.cs
diff --git a/SchoolManagerModel/Resources/UI.hu-HU.resx b/SchoolManagerModel/Resources/UI.hu-HU.resx
@@ -253,9 +253,33 @@
     <value>A felhasználó nem található!</value>
   </data>
   <data name="EmailAddress" xml:space="preserve">
-    <value>Email address</value>
+    <value>Email cím</value>
   </data>
   <data name="Administrator" xml:space="preserve">
     <value>Adminisztrátor</value>
   </data>
+  <data name="SelectAll" xml:space="preserve">
+    <value>Összes kiválasztása</value>
+  </data>
+  <data name="UnselectAll" xml:space="preserve">
+    <value>Kijelölések törlése</value>
+  </data>
+  <data name="ID" xml:space="preserve">
+    <value>Azonosító</value>
+  </data>
+  <data name="Name" xml:space="preserve">
+    <value>Név</value>
+  </data>
+  <data name="MustBeALetter" xml:space="preserve">
+    <value>Betűnek kell lennie</value>
+  </data>
+  <data name="CanContainOnly1Letter" xml:space="preserve">
+    <value>Csak 1 betű szerepelhet benne</value>
+  </data>
+  <data name="MustBeNumber" xml:space="preserve">
+    <value>Számnak kell lennie</value>
+  </data>
+  <data name="MustBeGreaterThan0" xml:space="preserve">
+    <value>0-nál nagyobbnak kell lennie</value>
+  </data>
 </root>
diff --git a/SchoolManagerModel/Resources/UI.resx b/SchoolManagerModel/Resources/UI.resx
@@ -258,4 +258,28 @@
   <data name="Administrator" xml:space="preserve">
     <value>Administrator</value>
   </data>
+  <data name="SelectAll" xml:space="preserve">
+    <value>Select all</value>
+  </data>
+  <data name="UnselectAll" xml:space="preserve">
+    <value>Unselect All</value>
+  </data>
+  <data name="ID" xml:space="preserve">
+    <value>ID</value>
+  </data>
+  <data name="Name" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="MustBeALetter" xml:space="preserve">
+    <value>Must be a letter</value>
+  </data>
+  <data name="CanContainOnly1Letter" xml:space="preserve">
+    <value>Cam contain only one letter</value>
+  </data>
+  <data name="MustBeNumber" xml:space="preserve">
+    <value>Must be a number</value>
+  </data>
+  <data name="MustBeGreaterThan0" xml:space="preserve">
+    <value>Must be greater than 0</value>
+  </data>
 </root>
diff --git a/SchoolManagerModel/Validators/CharLetterValidator.cs b/SchoolManagerModel/Validators/CharLetterValidator.cs
@@ -0,0 +1,24 @@
+using FluentValidation;
+using System.Resources;
+
+namespace SchoolManagerModel.Validators;
+
+public class CharLetterValidator : AbstractValidator<string>
+{
+    public CharLetterValidator(ResourceManager resourceManager)
+    {
+        RuleFor(x => x)
+            .Length(1)
+            .WithMessage(resourceManager.GetString("CanContainOnly1Letter")) // Check the length first
+            .DependentRules(() =>
+            {
+                RuleFor(x => x)
+                    .Must(cls => cls.Length == 1 && Char.IsLetter(cls[0]))
+                    .WithMessage(resourceManager.GetString("MustBeALetter"))
+                    .When(cls => cls.Length == 1); // Ensure length is 1 before accessing the character
+            });
+
+
+
+    }
+}
diff --git a/SchoolManagerModel/Validators/ClassStringValidator.cs b/SchoolManagerModel/Validators/ClassStringValidator.cs
@@ -0,0 +1,15 @@
+using FluentValidation;
+using System.Resources;
+
+namespace SchoolManagerModel.Validators;
+
+public class ClassStringValidator : AbstractValidator<(string year, string cls)>
+{
+    public ClassStringValidator(ResourceManager resourceManager)
+    {
+        RuleFor(x => x.year)
+            .SetValidator(new ClassYearStringValidator(resourceManager));
+        RuleFor(x => x.cls)
+            .SetValidator(new CharLetterValidator(resourceManager));
+    }
+}
diff --git a/SchoolManagerModel/Validators/ClassYearStringValidator.cs b/SchoolManagerModel/Validators/ClassYearStringValidator.cs
@@ -0,0 +1,22 @@
+using FluentValidation;
+using System.Resources;
+
+namespace SchoolManagerModel.Validators;
+
+public class ClassYearStringValidator : AbstractValidator<string>
+{
+    public ClassYearStringValidator(ResourceManager resourceManager)
+    {
+        RuleFor(x => x)
+            .SetValidator(new NumberValidator(resourceManager))
+            .DependentRules(() =>
+            {
+                // Check only if it is number
+                RuleFor(x => x)
+                    .Must(x => int.TryParse(x, out var num) && num > 0)
+                    .When(x => int.TryParse(x, out var _))
+                    .WithMessage(resourceManager.GetString("MustBeGreaterThan0"));
+
+            });
+    }
+}
diff --git a/SchoolManagerModel/Validators/NumberValidator.cs b/SchoolManagerModel/Validators/NumberValidator.cs
@@ -0,0 +1,14 @@
+using FluentValidation;
+using System.Resources;
+
+namespace SchoolManagerModel.Validators;
+
+public class NumberValidator : AbstractValidator<string>
+{
+    public NumberValidator(ResourceManager resourceManager)
+    {
+        RuleFor(a => a)
+            .Must(x => int.TryParse(x, out var val))
+            .WithMessage(resourceManager.GetString("MustBeNumber"));
+    }
+}