From f03bb241c04baf32f726217390c52149968ea21f Mon Sep 17 00:00:00 2001
From: maxnes3 <112558334+maxnes3@users.noreply.github.com>
Date: Fri, 19 May 2023 14:39:49 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82?=
 =?UTF-8?q?,=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=B1=D0=B0=D0=B3=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Specializations.cs            | 13 +++++++++-
 .../CaseAccountingDatabase.cs                 |  4 ++--
 .../Models/Case.cs                            |  1 +
 .../Controllers/CaseController.cs             | 10 ++++++++
 .../Views/Case/Create.cshtml                  |  1 -
 .../Views/Case/Update.cshtml                  |  1 -
 .../Views/Hearing/Create.cshtml               |  1 -
 .../Views/Hearing/Update.cshtml               |  1 -
 .../wwwroot/js/case/case-create.js            | 22 ++++++++---------
 .../wwwroot/js/case/case-update.js            | 22 ++++++++---------
 .../wwwroot/js/hearing/hearing-create.js      | 24 +++++++++----------
 .../wwwroot/js/hearing/hearing-update.js      | 22 ++++++++---------
 .../Controllers/CaseController.cs             | 20 ++++++++++++++--
 .../Controllers/SpecializationController.cs   | 13 ----------
 14 files changed, 88 insertions(+), 67 deletions(-)

diff --git a/CaseAccounting/CaseAccountingCustomerView/Controllers/Specializations.cs b/CaseAccounting/CaseAccountingCustomerView/Controllers/Specializations.cs
index 6872185..be0e49e 100644
--- a/CaseAccounting/CaseAccountingCustomerView/Controllers/Specializations.cs
+++ b/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();
+		}
+
+	}
 }
diff --git a/CaseAccounting/CaseAccountingDataBaseImplement/CaseAccountingDatabase.cs b/CaseAccounting/CaseAccountingDataBaseImplement/CaseAccountingDatabase.cs
index 55243a9..75477ba 100644
--- a/CaseAccounting/CaseAccountingDataBaseImplement/CaseAccountingDatabase.cs
+++ b/CaseAccounting/CaseAccountingDataBaseImplement/CaseAccountingDatabase.cs
@@ -18,8 +18,8 @@ namespace CaseAccountingDataBaseImplement
                     Host=localhost;
                     Port=5432;
                     Database=CaseAccountingDatabase;
-                    Username=postgres;
-                    Password=postgres");
+                    Username=courseuser;
+                    Password=courseuser");
             }
             base.OnConfiguring(optionsBuilder);
         }
diff --git a/CaseAccounting/CaseAccountingDataBaseImplement/Models/Case.cs b/CaseAccounting/CaseAccountingDataBaseImplement/Models/Case.cs
index e5de4e5..de9098b 100644
--- a/CaseAccounting/CaseAccountingDataBaseImplement/Models/Case.cs
+++ b/CaseAccounting/CaseAccountingDataBaseImplement/Models/Case.cs
@@ -139,6 +139,7 @@ namespace CaseAccountingDataBaseImplement.Models
             Annotation = Annotation,
             Date = Date,
             SpecializationId = SpecializationId,
+            Specialization = Specialization.Name,
             UserId = UserId
         };
     }
diff --git a/CaseAccounting/CaseAccountingProviderView/Controllers/CaseController.cs b/CaseAccounting/CaseAccountingProviderView/Controllers/CaseController.cs
index 8ef7313..b8a7fbb 100644
--- a/CaseAccounting/CaseAccountingProviderView/Controllers/CaseController.cs
+++ b/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();
+		}
 	}
 }
diff --git a/CaseAccounting/CaseAccountingProviderView/Views/Case/Create.cshtml b/CaseAccounting/CaseAccountingProviderView/Views/Case/Create.cshtml
index ba66465..629984a 100644
--- a/CaseAccounting/CaseAccountingProviderView/Views/Case/Create.cshtml
+++ b/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">
diff --git a/CaseAccounting/CaseAccountingProviderView/Views/Case/Update.cshtml b/CaseAccounting/CaseAccountingProviderView/Views/Case/Update.cshtml
index fba18ea..ab2d11d 100644
--- a/CaseAccounting/CaseAccountingProviderView/Views/Case/Update.cshtml
+++ b/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">
diff --git a/CaseAccounting/CaseAccountingProviderView/Views/Hearing/Create.cshtml b/CaseAccounting/CaseAccountingProviderView/Views/Hearing/Create.cshtml
index 299b76a..8e914d8 100644
--- a/CaseAccounting/CaseAccountingProviderView/Views/Hearing/Create.cshtml
+++ b/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">
diff --git a/CaseAccounting/CaseAccountingProviderView/Views/Hearing/Update.cshtml b/CaseAccounting/CaseAccountingProviderView/Views/Hearing/Update.cshtml
index 58dff4a..87b7e2f 100644
--- a/CaseAccounting/CaseAccountingProviderView/Views/Hearing/Update.cshtml
+++ b/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">
diff --git a/CaseAccounting/CaseAccountingProviderView/wwwroot/js/case/case-create.js b/CaseAccounting/CaseAccountingProviderView/wwwroot/js/case/case-create.js
index c66b8d4..af048a8 100644
--- a/CaseAccounting/CaseAccountingProviderView/wwwroot/js/case/case-create.js
+++ b/CaseAccounting/CaseAccountingProviderView/wwwroot/js/case/case-create.js
@@ -10,19 +10,19 @@ var specializations = [];
 
 window.addEventListener("load", async () => {
     try {
-        const specializationsResponse = await $.ajax({
-            url: `/specialization/getall`,
+        await $.ajax({
+            url: `/case/getallspecializations`,
             type: "GET",
             contentType: "json"
-        });
-        specializations = specializationsResponse;
-
-        specializations.forEach((specialization) => {
-            const option = document.createElement("option");
-            option.value = specialization.id;
-            option.innerHTML = specialization.name;
-            specializationSelect.appendChild(option);
-            specializationSelect.selectedIndex = -1;
+        }).done((result) => {
+            specializations = result;
+            specializations.forEach((specialization) => {
+                const option = document.createElement("option");
+                option.value = specialization.id;
+                option.innerHTML = specialization.name;
+                specializationSelect.appendChild(option);
+                specializationSelect.selectedIndex = -1;
+            });
         });
     } catch (error) {
         console.error(error);
diff --git a/CaseAccounting/CaseAccountingProviderView/wwwroot/js/case/case-update.js b/CaseAccounting/CaseAccountingProviderView/wwwroot/js/case/case-update.js
index a440e4a..952ab06 100644
--- a/CaseAccounting/CaseAccountingProviderView/wwwroot/js/case/case-update.js
+++ b/CaseAccounting/CaseAccountingProviderView/wwwroot/js/case/case-update.js
@@ -11,19 +11,19 @@ var specializations = [];
 
 window.addEventListener("load", async () => {
     try {
-        const specializationsResponse = await $.ajax({
-            url: `/specialization/getall`,
+        await $.ajax({
+            url: `/case/getallspecializations`,
             type: "GET",
             contentType: "json"
-        });
-        specializations = specializationsResponse;
-
-        specializations.forEach((specialization) => {
-            const option = document.createElement("option");
-            option.value = specialization.id;
-            option.innerHTML = specialization.name;
-            specializationSelect.appendChild(option);
-            specializationSelect.selectedIndex = -1;
+        }).done((result) => {
+            specializations = result;
+            specializations.forEach((specialization) => {
+                const option = document.createElement("option");
+                option.value = specialization.id;
+                option.innerHTML = specialization.name;
+                specializationSelect.appendChild(option);
+                specializationSelect.selectedIndex = -1;
+            });
         });
     } catch (error) {
         console.error(error);
diff --git a/CaseAccounting/CaseAccountingProviderView/wwwroot/js/hearing/hearing-create.js b/CaseAccounting/CaseAccountingProviderView/wwwroot/js/hearing/hearing-create.js
index 623ac26..6a0c41b 100644
--- a/CaseAccounting/CaseAccountingProviderView/wwwroot/js/hearing/hearing-create.js
+++ b/CaseAccounting/CaseAccountingProviderView/wwwroot/js/hearing/hearing-create.js
@@ -7,19 +7,19 @@ var cases = [];
 
 window.addEventListener("load", async () => {
     try {
-        const casesResponse = await $.ajax({
-            url: `/specialization/getall`,
+        $.ajax({
+            url: "/case/getallbyuser",
             type: "GET",
             contentType: "json"
-        });
-        cases = casesResponse;
-
-        cases.forEach((element) => {
-            const option = document.createElement("option");
-            option.value = element.id;
-            option.innerHTML = "Дело №" + element.id;
-            caseSelect.appendChild(option);
-            caseSelect.selectedIndex = -1;
+        }).done((result) => {        
+            cases = result;
+            cases.forEach((element) => {
+                const option = document.createElement("option");
+                option.value = element.id;
+                option.innerHTML = "Дело №" + element.id;
+                caseSelect.appendChild(option);
+                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",
diff --git a/CaseAccounting/CaseAccountingProviderView/wwwroot/js/hearing/hearing-update.js b/CaseAccounting/CaseAccountingProviderView/wwwroot/js/hearing/hearing-update.js
index ab2f5e5..14101ea 100644
--- a/CaseAccounting/CaseAccountingProviderView/wwwroot/js/hearing/hearing-update.js
+++ b/CaseAccounting/CaseAccountingProviderView/wwwroot/js/hearing/hearing-update.js
@@ -8,19 +8,19 @@ var cases = [];
 
 window.addEventListener("load", async () => {
     try {
-        const casesResponse = await $.ajax({
-            url: `/specialization/getall`,
+        $.ajax({
+            url: "/case/getallbyuser",
             type: "GET",
             contentType: "json"
-        });
-        cases = casesResponse;
-
-        cases.forEach((element) => {
-            const option = document.createElement("option");
-            option.value = element.id;
-            option.innerHTML = "Дело №" + element.id;
-            caseSelect.appendChild(option);
-            caseSelect.selectedIndex = -1;
+        }).done((result) => {        
+            cases = result;
+            cases.forEach((element) => {
+                const option = document.createElement("option");
+                option.value = element.id;
+                option.innerHTML = "Дело №" + element.id;
+                caseSelect.appendChild(option);
+                caseSelect.selectedIndex = -1;
+            });
         });
     } catch (error) {
         console.error(error);
diff --git a/CaseAccounting/CaseAccountingRestApi/Controllers/CaseController.cs b/CaseAccounting/CaseAccountingRestApi/Controllers/CaseController.cs
index 28516e6..0e4ee2c 100644
--- a/CaseAccounting/CaseAccountingRestApi/Controllers/CaseController.cs
+++ b/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)
 		{
diff --git a/CaseAccounting/CaseAccountingRestApi/Controllers/SpecializationController.cs b/CaseAccounting/CaseAccountingRestApi/Controllers/SpecializationController.cs
index f001559..07df8ad 100644
--- a/CaseAccounting/CaseAccountingRestApi/Controllers/SpecializationController.cs
+++ b/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)