diff --git a/AsbCloudInfrastructure/Services/DrillingProgramService.cs b/AsbCloudInfrastructure/Services/DrillingProgramService.cs index 298c9666..a5350e90 100644 --- a/AsbCloudInfrastructure/Services/DrillingProgramService.cs +++ b/AsbCloudInfrastructure/Services/DrillingProgramService.cs @@ -93,13 +93,15 @@ namespace AsbCloudInfrastructure.Services private static void CopySheet(XLWorkbook workbookDst, IXLWorksheet sheetSrc) { var newSheetName = sheetSrc.Name; + var suffix = ""; int index = 1; - if (workbookDst.Worksheets.Contains(newSheetName)) + while (workbookDst.Worksheets.Contains(newSheetName)) { - var suffix = $"_{index++}"; + newSheetName = sheetSrc.Name; + suffix = $"_{index++}"; if (newSheetName.Length + suffix.Length >= 31) - newSheetName = sheetSrc.Name.Substring(0, (31 - suffix.Length)); + newSheetName = newSheetName.Substring(0, (31 - suffix.Length)); newSheetName += suffix; } diff --git a/AsbCloudInfrastructure/Services/FileService.cs b/AsbCloudInfrastructure/Services/FileService.cs index cfab3a80..4587d911 100644 --- a/AsbCloudInfrastructure/Services/FileService.cs +++ b/AsbCloudInfrastructure/Services/FileService.cs @@ -101,7 +101,7 @@ namespace AsbCloudInfrastructure.Services int idCategory, CancellationToken token = default) { var entities = await dbSetConfigured - .Where(e => e.IdWell == idWell && e.IdCategory == idCategory) + .Where(e => e.IdWell == idWell && e.IdCategory == idCategory && e.IsDeleted == false) .AsNoTracking() .ToListAsync(token) .ConfigureAwait(false); diff --git a/AsbCloudWebApi/wwwroot/asset-manifest.json b/AsbCloudWebApi/wwwroot/asset-manifest.json index ae1c9c68..5616460f 100644 --- a/AsbCloudWebApi/wwwroot/asset-manifest.json +++ b/AsbCloudWebApi/wwwroot/asset-manifest.json @@ -1,23 +1,23 @@ { "files": { "main.css": "/static/css/main.e92a8ff6.chunk.css", - "main.js": "/static/js/main.edfb453f.chunk.js", - "main.js.map": "/static/js/main.edfb453f.chunk.js.map", - "runtime-main.js": "/static/js/runtime-main.9eaada4e.js", - "runtime-main.js.map": "/static/js/runtime-main.9eaada4e.js.map", - "static/js/2.d92842c3.chunk.js": "/static/js/2.d92842c3.chunk.js", - "static/js/2.d92842c3.chunk.js.map": "/static/js/2.d92842c3.chunk.js.map", - "static/js/3.5f51fb69.chunk.js": "/static/js/3.5f51fb69.chunk.js", - "static/js/3.5f51fb69.chunk.js.map": "/static/js/3.5f51fb69.chunk.js.map", + "main.js": "/static/js/main.fb09e9cb.chunk.js", + "main.js.map": "/static/js/main.fb09e9cb.chunk.js.map", + "runtime-main.js": "/static/js/runtime-main.1100f000.js", + "runtime-main.js.map": "/static/js/runtime-main.1100f000.js.map", + "static/js/2.e611d81c.chunk.js": "/static/js/2.e611d81c.chunk.js", + "static/js/2.e611d81c.chunk.js.map": "/static/js/2.e611d81c.chunk.js.map", + "static/js/3.921d7a03.chunk.js": "/static/js/3.921d7a03.chunk.js", + "static/js/3.921d7a03.chunk.js.map": "/static/js/3.921d7a03.chunk.js.map", "index.html": "/index.html", "static/css/main.e92a8ff6.chunk.css.map": "/static/css/main.e92a8ff6.chunk.css.map", - "static/js/2.d92842c3.chunk.js.LICENSE.txt": "/static/js/2.d92842c3.chunk.js.LICENSE.txt", + "static/js/2.e611d81c.chunk.js.LICENSE.txt": "/static/js/2.e611d81c.chunk.js.LICENSE.txt", "static/media/pointer.e8df778c.svg": "/static/media/pointer.e8df778c.svg" }, "entrypoints": [ - "static/js/runtime-main.9eaada4e.js", - "static/js/2.d92842c3.chunk.js", + "static/js/runtime-main.1100f000.js", + "static/js/2.e611d81c.chunk.js", "static/css/main.e92a8ff6.chunk.css", - "static/js/main.edfb453f.chunk.js" + "static/js/main.fb09e9cb.chunk.js" ] } \ No newline at end of file diff --git a/AsbCloudWebApi/wwwroot/index.html b/AsbCloudWebApi/wwwroot/index.html index 7896c513..8474b9b5 100644 --- a/AsbCloudWebApi/wwwroot/index.html +++ b/AsbCloudWebApi/wwwroot/index.html @@ -1 +1 @@ -АСБ Vision
\ No newline at end of file +АСБ Vision
\ No newline at end of file