Merge branch 'main' into SLAendpoint
Tests / frontend-test (pull_request) Successful in 40s
Tests / backend-test (pull_request) Successful in 2m3s

This commit is contained in:
gorbenko.pavel
2026-08-12 17:50:54 +05:00
4 changed files with 9 additions and 4 deletions
@@ -6,5 +6,6 @@ public enum ProjectRole
ProjectManager, ProjectManager,
Planner, Planner,
ManagerHSE, ManagerHSE,
Security Security,
Keeper
} }
@@ -52,6 +52,7 @@ public sealed class HttpTnsuPortalClient(
AddIfPresent(executors, ProjectRole.Planner, project.Planner); AddIfPresent(executors, ProjectRole.Planner, project.Planner);
AddIfPresent(executors, ProjectRole.ManagerHSE, project.ManagerHSE); AddIfPresent(executors, ProjectRole.ManagerHSE, project.ManagerHSE);
AddIfPresent(executors, ProjectRole.Security, project.Security); AddIfPresent(executors, ProjectRole.Security, project.Security);
AddIfPresent(executors, ProjectRole.Keeper, project.Keeper);
return executors; return executors;
} }
@@ -115,5 +116,6 @@ public sealed class HttpTnsuPortalClient(
[property: JsonPropertyName("projectManager")] string? ProjectManager, [property: JsonPropertyName("projectManager")] string? ProjectManager,
[property: JsonPropertyName("planner")] string? Planner, [property: JsonPropertyName("planner")] string? Planner,
[property: JsonPropertyName("managerHSE")] string? ManagerHSE, [property: JsonPropertyName("managerHSE")] string? ManagerHSE,
[property: JsonPropertyName("security")] string? Security); [property: JsonPropertyName("security")] string? Security,
[property: JsonPropertyName("keeper")] string? Keeper);
} }
@@ -13,7 +13,8 @@ export enum ProjectRole {
ProjectManager = 'ProjectManager', ProjectManager = 'ProjectManager',
Planner = 'Planner', Planner = 'Planner',
ManagerHSE = 'ManagerHSE', ManagerHSE = 'ManagerHSE',
Security = 'Security' Security = 'Security',
Keeper = 'Keeper'
} }
export enum HeadType { export enum HeadType {
+2 -1
View File
@@ -22,7 +22,8 @@ export const projectRoleLabels: Record<ProjectRole, string> = {
[ProjectRole.ProjectManager]: 'Руководитель проекта', [ProjectRole.ProjectManager]: 'Руководитель проекта',
[ProjectRole.Planner]: 'Планировщик', [ProjectRole.Planner]: 'Планировщик',
[ProjectRole.ManagerHSE]: 'Менеджер HSE', [ProjectRole.ManagerHSE]: 'Менеджер HSE',
[ProjectRole.Security]: 'Безопасность' [ProjectRole.Security]: 'Безопасность',
[ProjectRole.Keeper]: 'Заведующий склада'
}; };
export const headTypeLabels: Record<HeadType, string> = { export const headTypeLabels: Record<HeadType, string> = {