diff --git a/UniversityDataBaseImplemet/Database.cs b/UniversityDataBaseImplemet/Database.cs index 843e4f7..72262d9 100644 --- a/UniversityDataBaseImplemet/Database.cs +++ b/UniversityDataBaseImplemet/Database.cs @@ -10,7 +10,7 @@ namespace UniversityDataBaseImplemet { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseNpgsql("Host=localhost;Port=5432;Database=UniversityCourseWork;Username=postgres;Password=0000"); + optionsBuilder.UseNpgsql("Host=localhost;Port=5432;Database=UniversityCourseWork;Username=postgres;Password=123"); } base.OnConfiguring(optionsBuilder); } diff --git a/UniversityProvider/wwwroot/js/student/student-create.js b/UniversityProvider/wwwroot/js/student/student-create.js index cd5bc3d..3d8fc09 100644 --- a/UniversityProvider/wwwroot/js/student/student-create.js +++ b/UniversityProvider/wwwroot/js/student/student-create.js @@ -8,19 +8,21 @@ const errorDivShell = document.getElementById("error-div-shell"); students = [] window.addEventListener("load", () => { - const studentsResponse = $.ajax({ - url: `/student/getallbyuser`, + $.ajax({ + url: "/student/getallbyuser", type: "GET", contentType: "json" + }).done((result) => { + students = result; }); - students = studentsResponse; }) const correctData = () => { }; -const validate = () => { +const validate = () => { + console.log(students) var validStudentCard = true if (nameInput.value === "") { errorDivShell.style.gridTemplateRows = "1fr"; @@ -37,11 +39,15 @@ const validate = () => { errorP.innerHTML = "Заполните поле 'Дата рождения'"; return false } - + if (studCardInput.value === "") { + errorDivShell.style.gridTemplateRows = "1fr"; + errorP.innerHTML = "Заполните поле 'Номер студенческого билета'"; + return false + } students.forEach((student) => { if (student.studentCard === parseInt(studCardInput.value)) { errorDivShell.style.gridTemplateRows = "1fr"; - errorP.innerHTML = "Заполните поле 'Дата рождения'"; + errorP.innerHTML = "Заполните поле 'Номер студенческого билета' правильными данными, возможно пользователь с таким номером уже есть"; validStudentCard = false; } }); diff --git a/UniversityProvider/wwwroot/js/student/student-update.js b/UniversityProvider/wwwroot/js/student/student-update.js index 62900f8..953e8a3 100644 --- a/UniversityProvider/wwwroot/js/student/student-update.js +++ b/UniversityProvider/wwwroot/js/student/student-update.js @@ -10,12 +10,13 @@ const errorDivShell = document.getElementById("error-div-shell"); students = [] window.addEventListener("load", () => { - const studentsResponse = $.ajax({ - url: `/student/getallbyuser`, + $.ajax({ + url: "/student/getallbyuser", type: "GET", contentType: "json" + }).done((result) => { + students = result; }); - students = studentsResponse; }) const correctData = () => { @@ -40,11 +41,15 @@ const validate = () => { errorP.innerHTML = "Заполните поле 'Дата рождения'"; return false } - + if (studCardInput.value === "") { + errorDivShell.style.gridTemplateRows = "1fr"; + errorP.innerHTML = "Заполните поле 'Номер студенческого билета'"; + return false + } students.forEach((student) => { if (student.studentCard === parseInt(studCardInput.value)) { errorDivShell.style.gridTemplateRows = "1fr"; - errorP.innerHTML = "Заполните поле 'Дата рождения'"; + errorP.innerHTML = "Заполните поле 'Номер студенческого билета' правильными данными, возможно пользователь с таким номером уже есть"; validStudentCard = false; } });