Промежутный коммит, исправлены баги

CaseAccounting/CaseAccountingCustomerView/Controllers/Specializations.cs

@@ -79,5 +79,16 @@ namespace CaseAccountingCustomerView.Controllers
             SpecializationViewModel? specialization = APIUser.GetRequest<SpecializationViewModel>($"api/specialization/get?id={id}");
             return specialization;
         }
-    }
+        
+		public List<SpecializationViewModel> GetAll()
+        {
+			if (APIUser.User == null)
+			{
+				return new();
+			}
+			List<SpecializationViewModel>? specializations = APIUser.GetRequest<List<SpecializationViewModel>>($"api/specialization/getall");
+			return specializations ?? new();
+		}
+
+	}
 }

CaseAccounting/CaseAccountingDataBaseImplement/CaseAccountingDatabase.cs

@@ -18,8 +18,8 @@ namespace CaseAccountingDataBaseImplement
                     Host=localhost;
                     Port=5432;
                     Database=CaseAccountingDatabase;
-                    Username=postgres;
+                    Username=courseuser;
-                    Password=postgres");
+                    Password=courseuser");
             }
             base.OnConfiguring(optionsBuilder);
         }

CaseAccounting/CaseAccountingDataBaseImplement/Models/Case.cs

@@ -139,6 +139,7 @@ namespace CaseAccountingDataBaseImplement.Models
             Annotation = Annotation,
             Date = Date,
             SpecializationId = SpecializationId,
+            Specialization = Specialization.Name,
             UserId = UserId
         };
     }

CaseAccounting/CaseAccountingProviderView/Controllers/CaseController.cs

@@ -119,5 +119,15 @@ namespace CaseAccountingProviderView.Controllers
 			CaseViewModel? caseModel = APIUser.GetRequest<CaseViewModel>($"api/case/get?id={id}");
 			return caseModel;
 		}
+
+		public List<SpecializationViewModel> GetAllSpecializations()
+		{
+			if (APIUser.User == null)
+			{
+				return new();
+			}
+			List<SpecializationViewModel>? specializationModel = APIUser.GetRequest<List<SpecializationViewModel>>($"api/case/getallspecializations");
+			return specializationModel ?? new();
+		}
 	}
 }

CaseAccounting/CaseAccountingProviderView/Views/Case/Create.cshtml

@@ -22,7 +22,6 @@
 <input type="text" id="annotation-input" name="annotation" class="form-control mb-3" />
 <p class="mb-0">Специализация:</p>
 <select id="specialization-select" name="specialization" class="form-control mb-3">
-    <option></option>
 </select>
 
 <button id="create-button" type="button" class="btn btn-primary text-button">

CaseAccounting/CaseAccountingProviderView/Views/Case/Update.cshtml

@@ -30,7 +30,6 @@
     <input type="text" id="annotation-input" name="annotation" class="form-control mb-3" />
     <p class="mb-0">Специализация:</p>
     <select id="specialization-select" name="specialization" class="form-control mb-3">
-        <option></option>
     </select>
 
     <button id="update-button" type="button" class="btn btn-primary text-button">

CaseAccounting/CaseAccountingProviderView/Views/Hearing/Create.cshtml

@@ -16,7 +16,6 @@
 <input type="date" id="date-input" name="date" class="form-control mb-3" />
 <p class="mb-0">Дело:</p>
 <select id="case-select" name="case" class="form-control mb-3">
-    <option></option>
 </select>
 
 <button id="create-button" type="button" class="btn btn-primary text-button">

CaseAccounting/CaseAccountingProviderView/Views/Hearing/Update.cshtml

@@ -24,7 +24,6 @@
     <input type="date" id="date-input" name="date" class="form-control mb-3" />
     <p class="mb-0">Дело:</p>
     <select id="case-select" name="case" class="form-control mb-3">
-        <option></option>
     </select>
 
     <button id="update-button" type="button" class="btn btn-primary text-button">

CaseAccounting/CaseAccountingProviderView/wwwroot/js/case/case-create.js

@@ -10,19 +10,19 @@ var specializations = [];
 
 window.addEventListener("load", async () => {
     try {
-        const specializationsResponse = await $.ajax({
+        await $.ajax({
-            url: `/specialization/getall`,
+            url: `/case/getallspecializations`,
             type: "GET",
             contentType: "json"
-        });
+        }).done((result) => {
-        specializations = specializationsResponse;
+            specializations = result;
-
+            specializations.forEach((specialization) => {
-        specializations.forEach((specialization) => {
+                const option = document.createElement("option");
-            const option = document.createElement("option");
+                option.value = specialization.id;
-            option.value = specialization.id;
+                option.innerHTML = specialization.name;
-            option.innerHTML = specialization.name;
+                specializationSelect.appendChild(option);
-            specializationSelect.appendChild(option);
+                specializationSelect.selectedIndex = -1;
-            specializationSelect.selectedIndex = -1;
+            });
         });
     } catch (error) {
         console.error(error);

CaseAccounting/CaseAccountingProviderView/wwwroot/js/case/case-update.js

@@ -11,19 +11,19 @@ var specializations = [];
 
 window.addEventListener("load", async () => {
     try {
-        const specializationsResponse = await $.ajax({
+        await $.ajax({
-            url: `/specialization/getall`,
+            url: `/case/getallspecializations`,
             type: "GET",
             contentType: "json"
-        });
+        }).done((result) => {
-        specializations = specializationsResponse;
+            specializations = result;
-
+            specializations.forEach((specialization) => {
-        specializations.forEach((specialization) => {
+                const option = document.createElement("option");
-            const option = document.createElement("option");
+                option.value = specialization.id;
-            option.value = specialization.id;
+                option.innerHTML = specialization.name;
-            option.innerHTML = specialization.name;
+                specializationSelect.appendChild(option);
-            specializationSelect.appendChild(option);
+                specializationSelect.selectedIndex = -1;
-            specializationSelect.selectedIndex = -1;
+            });
         });
     } catch (error) {
         console.error(error);

CaseAccounting/CaseAccountingProviderView/wwwroot/js/hearing/hearing-create.js

@@ -7,19 +7,19 @@ var cases = [];
 
 window.addEventListener("load", async () => {
     try {
-        const casesResponse = await $.ajax({
+        $.ajax({
-            url: `/specialization/getall`,
+            url: "/case/getallbyuser",
             type: "GET",
             contentType: "json"
-        });
+        }).done((result) => {        
-        cases = casesResponse;
+            cases = result;
-
+            cases.forEach((element) => {
-        cases.forEach((element) => {
+                const option = document.createElement("option");
-            const option = document.createElement("option");
+                option.value = element.id;
-            option.value = element.id;
+                option.innerHTML = "Дело №" + element.id;
-            option.innerHTML = "Дело №" + element.id;
+                caseSelect.appendChild(option);
-            caseSelect.appendChild(option);
+                caseSelect.selectedIndex = -1;
-            caseSelect.selectedIndex = -1;
+            });
         });
     } catch (error) {
         console.error(error);
@@ -51,7 +51,7 @@ createBtn.addEventListener("click", () => {
         "CaseId": parseInt(caseSelect.value),
         "Date": new Date(dateInput.value)
     };
-    console.log(dealModel)
+    console.log(hearingModel)
     $.ajax({
         url: "/hearing/create",
         type: "POST",

CaseAccounting/CaseAccountingProviderView/wwwroot/js/hearing/hearing-update.js

@@ -8,19 +8,19 @@ var cases = [];
 
 window.addEventListener("load", async () => {
     try {
-        const casesResponse = await $.ajax({
+        $.ajax({
-            url: `/specialization/getall`,
+            url: "/case/getallbyuser",
             type: "GET",
             contentType: "json"
-        });
+        }).done((result) => {        
-        cases = casesResponse;
+            cases = result;
-
+            cases.forEach((element) => {
-        cases.forEach((element) => {
+                const option = document.createElement("option");
-            const option = document.createElement("option");
+                option.value = element.id;
-            option.value = element.id;
+                option.innerHTML = "Дело №" + element.id;
-            option.innerHTML = "Дело №" + element.id;
+                caseSelect.appendChild(option);
-            caseSelect.appendChild(option);
+                caseSelect.selectedIndex = -1;
-            caseSelect.selectedIndex = -1;
+            });
         });
     } catch (error) {
         console.error(error);

CaseAccounting/CaseAccountingRestApi/Controllers/CaseController.cs

@@ -1,4 +1,5 @@
-using CaseAccountingContracts.BindingModels;
+using CaseAccountingBusinessLogic.BusinessLogics;
+using CaseAccountingContracts.BindingModels;
 using CaseAccountingContracts.BusinessLogicContracts;
 using CaseAccountingContracts.SearchModels;
 using CaseAccountingContracts.ViewModels;
@@ -11,10 +12,12 @@ namespace CaseAccountingRestApi.Controllers
 	public class CaseController : Controller
 	{
 		private readonly ICaseLogic _logic;
+		private readonly ISpecializationLogic _specializationLogic;
 		
-		public CaseController(ICaseLogic logic)
+		public CaseController(ICaseLogic logic, ISpecializationLogic specializationLogic)
 		{
 			_logic = logic;
+			_specializationLogic = specializationLogic;
 		}
 
 		[HttpGet]
@@ -43,6 +46,19 @@ namespace CaseAccountingRestApi.Controllers
 			}
 		}
 
+		[HttpGet]
+		public List<SpecializationViewModel>? GetAllSpecializations()
+		{
+			try
+			{
+				return _specializationLogic.ReadList(null);
+			}
+			catch (Exception)
+			{
+				throw;
+			}
+		}
+
 		[HttpPost]
 		public void Create(CaseBindingModel model)
 		{

CaseAccounting/CaseAccountingRestApi/Controllers/SpecializationController.cs

@@ -44,19 +44,6 @@ namespace CaseAccountingRestApi.Controllers
             }
         }
 
-        [HttpGet]
-        public List<SpecializationViewModel>? GetAll()
-        {
-            try
-            {
-                return specializationLogic.ReadList(null);
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-        }
-
 
         [HttpPost]
         public void Create(SpecializationBindingModel model)