diff --git a/server/AyaNova/biz/PMBiz.cs b/server/AyaNova/biz/PMBiz.cs index 8e7c658f..90665e87 100644 --- a/server/AyaNova/biz/PMBiz.cs +++ b/server/AyaNova/biz/PMBiz.cs @@ -720,8 +720,11 @@ namespace AyaNova.Biz 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) { -#if (DEBUG) - log.LogInformation("PMBiz - Generating"); -#endif + // #if (DEBUG) + // log.LogInformation("PMBiz - Generating"); + // #endif //Get a list of PM id's ready for conversion now var l = await ct.PM.AsNoTracking() .Where(z => z.GenerateDate < DateTime.UtcNow && (z.StopGeneratingDate == null || z.StopGeneratingDate > DateTime.UtcNow) && z.Active == true) .Select(z => z.Id) .ToListAsync(); #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 //process those items diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index bb0a171f..5bf77537 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -2296,5 +2296,6 @@ "RepeatInterval": "Wiederholungsintervall", "PMNextWoGenerateDate":"Nächstes Generierungsdatum", "ExcludeDaysOfWeek":"Wochentage ausschließen", - "ErrorGenBeforeTooSmall":"Muss kleiner sein als Wiederholungsintervall" + "ErrorGenBeforeTooSmall":"Muss kleiner sein als Wiederholungsintervall", + "ErrorRepeatIntervalTooSmall":"Mindestens eine Stunde" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 852e669c..85686fa4 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -2296,6 +2296,7 @@ "RepeatInterval": "Repeat interval", "PMNextWoGenerateDate":"Next generate event", "ExcludeDaysOfWeek":"Exclude days of week", - "ErrorGenBeforeTooSmall":"Must be smaller than Repeat interval" + "ErrorGenBeforeTooSmall":"Must be smaller than Repeat interval", + "ErrorRepeatIntervalTooSmall":"Minimum one hour" } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index effe7d3e..9278e57a 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -2296,5 +2296,6 @@ "RepeatInterval": "Intervalo de repetición", "PMNextWoGenerateDate":"Siguiente evento de generación", "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" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 4f4f370c..29c70f4e 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -2296,5 +2296,6 @@ "RepeatInterval": "Intervalle de répétition", "PMNextWoGenerateDate":"Prochain événement de génération", "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" } \ No newline at end of file