diff --git a/PARR.API/Contracts/V1/Requests/GeneratorTemplateRequest.cs b/PARR.API/Contracts/V1/Requests/GeneratorTemplateRequest.cs
index 554a8d7f..88a7ca25 100644
--- a/PARR.API/Contracts/V1/Requests/GeneratorTemplateRequest.cs
+++ b/PARR.API/Contracts/V1/Requests/GeneratorTemplateRequest.cs
@@ -26,5 +26,15 @@
/// Статус ЭК. 0 - все статусы, 1,2,3,4,5,6,7,9
///
public int Status { get; set; }
+
+ ///
+ /// При создании, активировать шаблон
+ ///
+ public bool? IsActiveTemplate { get; set; }
+
+ ///
+ /// При создании, активировать расписание
+ ///
+ public bool? IsActiveSchedule { get; set; }
}
}
diff --git a/PARR.API/Controllers/V1/GeneratorTemplateController.cs b/PARR.API/Controllers/V1/GeneratorTemplateController.cs
index 663bed66..c621d254 100644
--- a/PARR.API/Controllers/V1/GeneratorTemplateController.cs
+++ b/PARR.API/Controllers/V1/GeneratorTemplateController.cs
@@ -52,7 +52,9 @@ namespace PARR.API.Controllers.V1
ApplicationId = request.ApplicationId,
Ek = request.Ek,
WorkId = request.WorkId,
- StatusEk = request.Status
+ StatusEk = request.Status,
+ IsActiveTemplate = request.IsActiveTemplate,
+ IsActiveSchedule = request.IsActiveSchedule
};
var msg = JsonSerializer.Serialize(obj);
diff --git a/PARR.BLL/Domain/Mq/GeneratorTemplateMq.cs b/PARR.BLL/Domain/Mq/GeneratorTemplateMq.cs
index b34ff976..82bb432d 100644
--- a/PARR.BLL/Domain/Mq/GeneratorTemplateMq.cs
+++ b/PARR.BLL/Domain/Mq/GeneratorTemplateMq.cs
@@ -29,5 +29,15 @@
/// Статус ЭК. Допустимые значения: 0 - все статусы, 1,2,3,4,5,6,7,9
///
public int StatusEk { get; set; }
+
+ ///
+ /// Активировать шаблон
+ ///
+ public bool? IsActiveTemplate { get; set; }
+
+ ///
+ /// Активировать расписание
+ ///
+ public bool? IsActiveSchedule { get; set; }
}
}
diff --git a/PARR.GeneratorTemplates/Services/TemplateManager.cs b/PARR.GeneratorTemplates/Services/TemplateManager.cs
index af550c6e..a513afbc 100644
--- a/PARR.GeneratorTemplates/Services/TemplateManager.cs
+++ b/PARR.GeneratorTemplates/Services/TemplateManager.cs
@@ -113,8 +113,10 @@ namespace PARR.GeneratorTemplates.Services
//TODO:!!!
//Name = TemplateHelpers.GenerateTemplateName("ЗО" ,settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name),
Name = TemplateHelpers.GenerateTemplateNameWithResponseArea(host.ResponseArea!.Name, settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name.ApplyShortcode(Constants.Shortcode.Shortcodes.EK, host.Ek)),
- IsActiveTemplate = true,
- IsActiveSchedule = true,
+ //IsActiveTemplate = true,
+ //IsActiveSchedule = true,
+ IsActiveTemplate = query.IsActiveTemplate ?? false,
+ IsActiveSchedule = query.IsActiveSchedule ?? false,
ApplicationInWorkId = appInWork.Id,
HostId = host.Id
};
@@ -133,6 +135,8 @@ namespace PARR.GeneratorTemplates.Services
public async Task DeactivateTemplates(GeneratorTemplateMq query)
{
+ //TODO: !!! тут не учитываются поля query.IsActiveTemplate, query.IsActiveSchedule, просто все деактивируется. !!!
+
//В таблице AppInWork находим РР, и смотрим ее рабочие группы. Затем по ним будем фильтровать хосты
var appInWorkWg = await applicationsInWorkService.Get()
.Include(t => t.WorkGroups)