on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Merge branch 'dev' into fix/tvd-statistics-data-for-chart

Browse Source
This commit is contained in:
on.nemtina 2023-04-17 11:33:00 +05:00
commit 20ae812363
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AsbCloudWebApi/Controllers/WellOperationController.cs
View File

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

6
AsbCloudWebApi/Properties/PublishProfiles/FolderProfile.pubxml → AsbCloudWebApi/Properties/PublishProfiles/Debug.pubxml
View File

@ -10,13 +10,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration> <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform> <LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider> <PublishProvider>FileSystem</PublishProvider>
<PublishUrl>bin\pubLinuxDebug\</PublishUrl> <PublishUrl>bin\pubDebug\</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod> <WebPublishMethod>FileSystem</WebPublishMethod>
<_TargetId>Folder</_TargetId> <_TargetId>Folder</_TargetId>
<SiteUrlToLaunchAfterPublish /> <SiteUrlToLaunchAfterPublish />
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>
<ProjectGuid>a2768702-47cb-4127-941c-e339d5efcffe</ProjectGuid> <ProjectGuid>a2768702-47cb-4127-941c-e339d5efcffe</ProjectGuid>
<SelfContained>true</SelfContained> <SelfContained>false</SelfContained>
</PropertyGroup> </PropertyGroup>
</Project> </Project>