From 9e9e7a6f5aa178778938ae18b38b206d5e39dc4f Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Tue, 11 Apr 2023 09:25:35 +0500
Subject: [PATCH 1/3] =?UTF-8?q?=D0=98=D0=B5=D1=80=D0=B0=D1=80=D1=85=D0=B8?=
 =?UTF-8?q?=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=B9=20=D1=81=D0=BF=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BE=D0=BA=20=D0=B2=20=D0=BF=D0=BB=D0=B0=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D1=8B=D1=85=20=D0=B8=20=D1=84=D0=B0=D0=BA=D1=82=D0=B8=D1=87?=
 =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=B8=D1=85=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AsbCloudWebApi/Controllers/WellOperationController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AsbCloudWebApi/Controllers/WellOperationController.cs b/AsbCloudWebApi/Controllers/WellOperationController.cs
index ae1943a6..972bcceb 100644
--- a/AsbCloudWebApi/Controllers/WellOperationController.cs
+++ b/AsbCloudWebApi/Controllers/WellOperationController.cs
@@ -58,7 +58,7 @@ namespace AsbCloudWebApi.Controllers
         [ProducesResponseType(typeof(IEnumerable<WellOperationCategoryDto>), (int)System.Net.HttpStatusCode.OK)]
         public IActionResult GetCategories()
         {
-            var result = operationRepository.GetCategories(false);
+            var result = operationRepository.GetCategories(true);
             return Ok(result);
         }
 

From b93c5e4299570aa62c32452052a93e1896f6be58 Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Tue, 11 Apr 2023 10:42:56 +0500
Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82?=
 =?UTF-8?q?=D1=80=20includeParents=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=BB=D0=B5=D1=80=D0=B0=20WellOperationController=20?=
 =?UTF-8?q?=D0=B2=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B5=20GetCategories?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AsbCloudWebApi/Controllers/WellOperationController.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/AsbCloudWebApi/Controllers/WellOperationController.cs b/AsbCloudWebApi/Controllers/WellOperationController.cs
index 972bcceb..153c5ccc 100644
--- a/AsbCloudWebApi/Controllers/WellOperationController.cs
+++ b/AsbCloudWebApi/Controllers/WellOperationController.cs
@@ -51,14 +51,15 @@ namespace AsbCloudWebApi.Controllers
         /// <summary>
         /// Возвращает список имен типов операций на скважине
         /// </summary>
+        /// <param name="includeParents">флаг, нужно ли включать родителей в список</param>
         /// <returns></returns>
         [HttpGet]
         [Route("categories")]
         [Permission]
         [ProducesResponseType(typeof(IEnumerable<WellOperationCategoryDto>), (int)System.Net.HttpStatusCode.OK)]
-        public IActionResult GetCategories()
+        public IActionResult GetCategories(bool includeParents = true)
         {
-            var result = operationRepository.GetCategories(true);
+            var result = operationRepository.GetCategories(includeParents);
             return Ok(result);
         }
 

From cea14deddcb49ffc2e3f6e45881eca14d3a8d677 Mon Sep 17 00:00:00 2001
From: ngfrolov <ng.frolov@autodrilling.ru>
Date: Wed, 12 Apr 2023 13:32:59 +0500
Subject: [PATCH 3/3] Update PublishProfiles

---
 .../PublishProfiles/{FolderProfile.pubxml => Debug.pubxml}  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename AsbCloudWebApi/Properties/PublishProfiles/{FolderProfile.pubxml => Debug.pubxml} (83%)

diff --git a/AsbCloudWebApi/Properties/PublishProfiles/FolderProfile.pubxml b/AsbCloudWebApi/Properties/PublishProfiles/Debug.pubxml
similarity index 83%
rename from AsbCloudWebApi/Properties/PublishProfiles/FolderProfile.pubxml
rename to AsbCloudWebApi/Properties/PublishProfiles/Debug.pubxml
index 9ceab80c..ab9de4b4 100644
--- a/AsbCloudWebApi/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/AsbCloudWebApi/Properties/PublishProfiles/Debug.pubxml
@@ -10,13 +10,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>bin\pubLinuxDebug\</PublishUrl>
+    <PublishUrl>bin\pubDebug\</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <_TargetId>Folder</_TargetId>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>net6.0</TargetFramework>
-    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <ProjectGuid>a2768702-47cb-4127-941c-e339d5efcffe</ProjectGuid>
-    <SelfContained>true</SelfContained>
+    <SelfContained>false</SelfContained>
   </PropertyGroup>
 </Project>
\ No newline at end of file