Merge pull request #270 from CAST-projects/develop

AEteve · web-flow · commit f235e9449e2f · 2019-11-15T15:28:29.000+01:00
REPORTGEN-348: fix double.parse in french
diff --git a/CastReporting.Reporting/Block/Text/PortfolioCustomExpression.cs b/CastReporting.Reporting/Block/Text/PortfolioCustomExpression.cs
@@ -48,7 +48,7 @@ public override string Content(ReportData reportData, Dictionary<string, string>
 
             if (_aggregator == "SUM")
             {
-                double sumValues = strValues.Where(val => val != Labels.NoData).Sum(val => double.Parse(val));
+                double sumValues = strValues.Where(val => val != Labels.NoData).Sum(val => double.Parse(val, System.Globalization.CultureInfo.CurrentCulture));
                 return sumValues.ToString(_metricFormat);
             }
             else
@@ -59,7 +59,7 @@ public override string Content(ReportData reportData, Dictionary<string, string>
                 {
                     if (val == Labels.NoData) continue;
                     nbValues++;
-                    sumValues += double.Parse(val);
+                    sumValues += double.Parse(val, System.Globalization.CultureInfo.CurrentCulture);
                 }
                 if (nbValues == 0) return Labels.NoData;
                 var avgValues = sumValues / nbValues;
diff --git a/CastReporting.Reporting/Helper/GenericContent.cs b/CastReporting.Reporting/Helper/GenericContent.cs
@@ -423,7 +423,7 @@ public static TableDefinition Content(ReportData reportData, Dictionary<string,
                                     string curValue = MetricsUtility.CustomExpressionEvaluation(reportData, options, lstParams, reportData.CurrentSnapshot, expr, _metricFormat, null, string.Empty);
                                     string prevValue = reportData.PreviousSnapshot != null ? MetricsUtility.CustomExpressionEvaluation(reportData, options, lstParams, reportData.PreviousSnapshot, expr, _metricFormat, null, string.Empty) : Labels.NoData;
                                     if (positionSnapshots != -1) _posResults[positionSnapshots] = Labels.EvolutionPercent;
-                                    string evolPercentValue = FormatHelper.FormatPercent(double.Parse(MetricsUtility.ComputeExpression(curValue + " - " + prevValue, _metricFormat, false)));
+                                    string evolPercentValue = FormatHelper.FormatPercent(double.Parse(MetricsUtility.ComputeExpression(curValue + " - " + prevValue, _metricFormat, false),System.Globalization.CultureInfo.CurrentCulture));
                                     results.Add(Tuple.Create(_posResults[0], _posResults[1], _posResults[2], _posResults[3]), evolPercentValue);
                                     break;
                                 default:
@@ -633,7 +633,7 @@ public static TableDefinition Content(ReportData reportData, Dictionary<string,
                                         string curValue = MetricsUtility.CustomExpressionEvaluation(reportData, options, lstParams, reportData.CurrentSnapshot, expr, _metricFormat, module, string.Empty);
                                         string prevValue = reportData.PreviousSnapshot != null ? MetricsUtility.CustomExpressionEvaluation(reportData, options, lstParams, reportData.PreviousSnapshot, expr, _metricFormat, module, string.Empty) : Labels.NoData;
                                         if (positionSnapshots != -1) _posResults[positionSnapshots] = Labels.EvolutionPercent;
-                                        string evolPercentValue = FormatHelper.FormatPercent(double.Parse(MetricsUtility.ComputeExpression(curValue + " - " + prevValue, _metricFormat, false)));
+                                        string evolPercentValue = FormatHelper.FormatPercent(double.Parse(MetricsUtility.ComputeExpression(curValue + " - " + prevValue, _metricFormat, false), System.Globalization.CultureInfo.CurrentCulture));
                                         results.Add(Tuple.Create(_posResults[0], _posResults[1], _posResults[2], _posResults[3]), evolPercentValue);
                                         break;
                                     default:
@@ -855,7 +855,7 @@ public static TableDefinition Content(ReportData reportData, Dictionary<string,
                                         string curValue = MetricsUtility.CustomExpressionEvaluation(reportData, options, lstParams, reportData.CurrentSnapshot, expr, _metricFormat, null, techno);
                                         string prevValue = reportData.PreviousSnapshot != null ? MetricsUtility.CustomExpressionEvaluation(reportData, options, lstParams, reportData.PreviousSnapshot, expr, _metricFormat, null, techno) : Labels.NoData;
                                         if (positionSnapshots != -1) _posResults[positionSnapshots] = Labels.EvolutionPercent;
-                                        string evolPercentValue = FormatHelper.FormatPercent(double.Parse(MetricsUtility.ComputeExpression(curValue + " - " + prevValue, _metricFormat, false)));
+                                        string evolPercentValue = FormatHelper.FormatPercent(double.Parse(MetricsUtility.ComputeExpression(curValue + " - " + prevValue, _metricFormat, false), System.Globalization.CultureInfo.CurrentCulture));
                                         results.Add(Tuple.Create(_posResults[0], _posResults[1], _posResults[2], _posResults[3]), evolPercentValue);
                                         break;
                                     default:
@@ -1085,7 +1085,7 @@ public static TableDefinition Content(ReportData reportData, Dictionary<string,
                                             string curValue = MetricsUtility.CustomExpressionEvaluation(reportData, options, lstParams, reportData.CurrentSnapshot, expr, _metricFormat, module, techno);
                                             string prevValue = reportData.PreviousSnapshot != null ? MetricsUtility.CustomExpressionEvaluation(reportData, options, lstParams, reportData.PreviousSnapshot, expr, _metricFormat, module, techno) : Labels.NoData;
                                             if (positionSnapshots != -1) _posResults[positionSnapshots] = Labels.EvolutionPercent;
-                                            string evolPercentValue = FormatHelper.FormatPercent(double.Parse(MetricsUtility.ComputeExpression(curValue + " - " + prevValue, _metricFormat, false)));
+                                            string evolPercentValue = FormatHelper.FormatPercent(double.Parse(MetricsUtility.ComputeExpression(curValue + " - " + prevValue, _metricFormat, false), System.Globalization.CultureInfo.CurrentCulture));
                                             results.Add(Tuple.Create(_posResults[0], _posResults[1], _posResults[2], _posResults[3]), evolPercentValue);
                                             break;
                                         default:
diff --git a/CastReporting.Reporting/Helper/MetricsUtility.cs b/CastReporting.Reporting/Helper/MetricsUtility.cs
@@ -869,7 +869,7 @@ public static string ComputeExpression(string expr, string metricFormat, bool po
             DataTable dt = new DataTable();
             try
             {
-                double? res = double.Parse(dt.Compute(expr, "").ToString());
+                double? res = double.Parse(dt.Compute(expr, "").ToString(), System.Globalization.CultureInfo.CurrentCulture);
                 return res.Value.Equals(double.NaN) ? Labels.NoData : res.Value.ToString(metricFormat);
             }
             catch (EvaluateException e)
@@ -885,7 +885,7 @@ public static string ComputeExpression(string expr, string metricFormat, bool po
             DataTable dt = new DataTable();
             try
             {
-                return double.Parse(dt.Compute(expr, "").ToString());
+                return double.Parse(dt.Compute(expr, "").ToString(), System.Globalization.CultureInfo.CurrentCulture);
             }
             catch (EvaluateException e)
             {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public override string Content(ReportData reportData, Dictionary<string, string>`
`48`	`48`
`49`	`49`	`if (_aggregator == "SUM")`
`50`	`50`	`{`
`51`		`- double sumValues = strValues.Where(val => val != Labels.NoData).Sum(val => double.Parse(val));`
	`51`	`+ double sumValues = strValues.Where(val => val != Labels.NoData).Sum(val => double.Parse(val, System.Globalization.CultureInfo.CurrentCulture));`
`52`	`52`	`return sumValues.ToString(_metricFormat);`
`53`	`53`	`}`
`54`	`54`	`else`
`@@ -59,7 +59,7 @@ public override string Content(ReportData reportData, Dictionary<string, string>`
`59`	`59`	`{`
`60`	`60`	`if (val == Labels.NoData) continue;`
`61`	`61`	`nbValues++;`
`62`		`- sumValues += double.Parse(val);`
	`62`	`+ sumValues += double.Parse(val, System.Globalization.CultureInfo.CurrentCulture);`
`63`	`63`	`}`
`64`	`64`	`if (nbValues == 0) return Labels.NoData;`
`65`	`65`	`var avgValues = sumValues / nbValues;`
Original file line number	Diff line number	Diff line change
`@@ -869,7 +869,7 @@ public static string ComputeExpression(string expr, string metricFormat, bool po`
`869`	`869`	`DataTable dt = new DataTable();`
`870`	`870`	`try`
`871`	`871`	`{`
`872`		`- double? res = double.Parse(dt.Compute(expr, "").ToString());`
	`872`	`+ double? res = double.Parse(dt.Compute(expr, "").ToString(), System.Globalization.CultureInfo.CurrentCulture);`
`873`	`873`	`return res.Value.Equals(double.NaN) ? Labels.NoData : res.Value.ToString(metricFormat);`
`874`	`874`	`}`
`875`	`875`	`catch (EvaluateException e)`
`@@ -885,7 +885,7 @@ public static string ComputeExpression(string expr, string metricFormat, bool po`
`885`	`885`	`DataTable dt = new DataTable();`
`886`	`886`	`try`
`887`	`887`	`{`
`888`		`- return double.Parse(dt.Compute(expr, "").ToString());`
	`888`	`+ return double.Parse(dt.Compute(expr, "").ToString(), System.Globalization.CultureInfo.CurrentCulture);`
`889`	`889`	`}`
`890`	`890`	`catch (EvaluateException e)`
`891`	`891`	`{`