Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs
===================================================================
diff -u -rfff1d95ef2a08f34f16ac3f7870acc0a0c68eb83 -rb49aec40751eb5693981ed75a823b9993b9ab8ec
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision fff1d95ef2a08f34f16ac3f7870acc0a0c68eb83)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision b49aec40751eb5693981ed75a823b9993b9ab8ec)
@@ -134,20 +134,18 @@
if (macroStabilityInwardsResult.CalculationMessages.Any(cm => cm.ResultType == UpliftVanKernelMessageType.Error))
{
- CalculationServiceHelper.LogMessagesAsError(macroStabilityInwardsResult.CalculationMessages
- .Where(cm => cm.ResultType == UpliftVanKernelMessageType.Error)
- .Select(cm => cm.Message).ToArray());
+ CalculationServiceHelper.LogMessagesAsError(new[]
+ {
+ CreateAggregatedLogMessage(Resources.MacroStabilityInwardsCalculationService_Calculate_Errors_in_MacroStabilityInwards_calculation, macroStabilityInwardsResult)
+ });
}
else
{
if (macroStabilityInwardsResult.CalculationMessages.Any())
{
CalculationServiceHelper.LogMessagesAsWarning(new[]
{
- Resources.MacroStabilityInwardsCalculationService_Calculate_Warnings_in_MacroStabilityInwards_calculation + Environment.NewLine +
- macroStabilityInwardsResult.CalculationMessages
- .Where(cm => cm.ResultType == UpliftVanKernelMessageType.Warning)
- .Aggregate(string.Empty, (current, logMessage) => current + $"* {logMessage.Message}{Environment.NewLine}").Trim()
+ CreateAggregatedLogMessage(Resources.MacroStabilityInwardsCalculationService_Calculate_Warnings_in_MacroStabilityInwards_calculation, macroStabilityInwardsResult)
});
}
@@ -205,5 +203,13 @@
MaximumSliceWidth = inputParameters.MaximumSliceWidth
});
}
+
+ private static string CreateAggregatedLogMessage(string baseMessage, UpliftVanCalculatorResult macroStabilityInwardsResult)
+ {
+ return baseMessage
+ + Environment.NewLine
+ + macroStabilityInwardsResult.CalculationMessages
+ .Aggregate(string.Empty, (current, logMessage) => current + $"* {logMessage.Message}{Environment.NewLine}").Trim();
+ }
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -r4759261683e6d005c01763837c8968c1bec9487a -rb49aec40751eb5693981ed75a823b9993b9ab8ec
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4759261683e6d005c01763837c8968c1bec9487a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b49aec40751eb5693981ed75a823b9993b9ab8ec)
@@ -82,8 +82,18 @@
}
///
- /// Looks up a localized string similar to Er zijn waarschuwingsberichten naar aanleiding van de berekening. Klik op details voor meer informatie..
+ /// Looks up a localized string similar to Er zijn een of meerdere fouten opgetreden. Klik op details voor meer informatie..
///
+ internal static string MacroStabilityInwardsCalculationService_Calculate_Errors_in_MacroStabilityInwards_calculation {
+ get {
+ return ResourceManager.GetString("MacroStabilityInwardsCalculationService_Calculate_Errors_in_MacroStabilityInwards" +
+ "_calculation", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Er zijn een of meerdere waarschuwingsberichten. Klik op details voor meer informatie..
+ ///
internal static string MacroStabilityInwardsCalculationService_Calculate_Warnings_in_MacroStabilityInwards_calculation {
get {
return ResourceManager.GetString("MacroStabilityInwardsCalculationService_Calculate_Warnings_in_MacroStabilityInwar" +
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.resx
===================================================================
diff -u -r4759261683e6d005c01763837c8968c1bec9487a -rb49aec40751eb5693981ed75a823b9993b9ab8ec
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.resx (.../Resources.resx) (revision 4759261683e6d005c01763837c8968c1bec9487a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.resx (.../Resources.resx) (revision b49aec40751eb5693981ed75a823b9993b9ab8ec)
@@ -126,8 +126,11 @@
Kan de waterstand niet afleiden op basis van de invoer.
+
+ Er zijn een of meerdere fouten opgetreden. Klik op details voor meer informatie.
+
- Er zijn waarschuwingsberichten naar aanleiding van de berekening. Klik op details voor meer informatie.
+ Er zijn een of meerdere waarschuwingsberichten. Klik op details voor meer informatie.
Macrostabiliteit binnenwaarts validatie mislukt.