This commit is contained in:
2021-07-30 15:26:32 +00:00
parent a1607e1568
commit 6da4108aca
5 changed files with 18 additions and 10 deletions

View File

@@ -720,8 +720,11 @@ namespace AyaNova.Biz
AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "GenerateBeforeInterval", await Translate("ErrorGenBeforeTooSmall")); AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "GenerateBeforeInterval", await Translate("ErrorGenBeforeTooSmall"));
} }
var tsRepeatInterval = dtRepeat - dtNow;
if (tsRepeatInterval.TotalSeconds < 3601)//One hour minimum repeat interval
{
AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "RepeatInterval", await Translate("ErrorRepeatIntervalTooSmall"));
}
@@ -5220,16 +5223,17 @@ namespace AyaNova.Biz
// //
internal static async Task GenerateAsync(AyContext ct, ILogger log) internal static async Task GenerateAsync(AyContext ct, ILogger log)
{ {
#if (DEBUG) // #if (DEBUG)
log.LogInformation("PMBiz - Generating"); // log.LogInformation("PMBiz - Generating");
#endif // #endif
//Get a list of PM id's ready for conversion now //Get a list of PM id's ready for conversion now
var l = await ct.PM.AsNoTracking() var l = await ct.PM.AsNoTracking()
.Where(z => z.GenerateDate < DateTime.UtcNow && (z.StopGeneratingDate == null || z.StopGeneratingDate > DateTime.UtcNow) && z.Active == true) .Where(z => z.GenerateDate < DateTime.UtcNow && (z.StopGeneratingDate == null || z.StopGeneratingDate > DateTime.UtcNow) && z.Active == true)
.Select(z => z.Id) .Select(z => z.Id)
.ToListAsync(); .ToListAsync();
#if (DEBUG) #if (DEBUG)
log.LogInformation($"PMBiz - Found {l.Count} ready to generate PM items"); if (l.Count > 0)
log.LogInformation($"PMBiz - Found {l.Count} ready to generate PM items");
#endif #endif
//process those items //process those items

View File

@@ -2296,5 +2296,6 @@
"RepeatInterval": "Wiederholungsintervall", "RepeatInterval": "Wiederholungsintervall",
"PMNextWoGenerateDate":"Nächstes Generierungsdatum", "PMNextWoGenerateDate":"Nächstes Generierungsdatum",
"ExcludeDaysOfWeek":"Wochentage ausschließen", "ExcludeDaysOfWeek":"Wochentage ausschließen",
"ErrorGenBeforeTooSmall":"Muss kleiner sein als Wiederholungsintervall" "ErrorGenBeforeTooSmall":"Muss kleiner sein als Wiederholungsintervall",
"ErrorRepeatIntervalTooSmall":"Mindestens eine Stunde"
} }

View File

@@ -2296,6 +2296,7 @@
"RepeatInterval": "Repeat interval", "RepeatInterval": "Repeat interval",
"PMNextWoGenerateDate":"Next generate event", "PMNextWoGenerateDate":"Next generate event",
"ExcludeDaysOfWeek":"Exclude days of week", "ExcludeDaysOfWeek":"Exclude days of week",
"ErrorGenBeforeTooSmall":"Must be smaller than Repeat interval" "ErrorGenBeforeTooSmall":"Must be smaller than Repeat interval",
"ErrorRepeatIntervalTooSmall":"Minimum one hour"
} }

View File

@@ -2296,5 +2296,6 @@
"RepeatInterval": "Intervalo de repetición", "RepeatInterval": "Intervalo de repetición",
"PMNextWoGenerateDate":"Siguiente evento de generación", "PMNextWoGenerateDate":"Siguiente evento de generación",
"ExcludeDaysOfWeek":"Excluir días de la semana", "ExcludeDaysOfWeek":"Excluir días de la semana",
"ErrorGenBeforeTooSmall":"Debe ser menor que el intervalo de repetición" "ErrorGenBeforeTooSmall":"Debe ser menor que el intervalo de repetición",
"ErrorRepeatIntervalTooSmall":"Mínimo una hora"
} }

View File

@@ -2296,5 +2296,6 @@
"RepeatInterval": "Intervalle de répétition", "RepeatInterval": "Intervalle de répétition",
"PMNextWoGenerateDate":"Prochain événement de génération", "PMNextWoGenerateDate":"Prochain événement de génération",
"ExcludeDaysOfWeek":"Exclure les jours de la semaine", "ExcludeDaysOfWeek":"Exclure les jours de la semaine",
"ErrorGenBeforeTooSmall":"Doit être inférieur à l'intervalle de répétition" "ErrorGenBeforeTooSmall":"Doit être inférieur à l'intervalle de répétition",
"ErrorRepeatIntervalTooSmall":"Au moins une heure"
} }