From 59dc0b9d5a0a36f37864b03b87b7bb9caed2edda Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Wed, 12 Feb 2025 15:39:18 +1100 Subject: [PATCH] regression bug: csv export was failing --- Disco.Services/Exporting/Exporter.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Disco.Services/Exporting/Exporter.cs b/Disco.Services/Exporting/Exporter.cs index 70a46f38..b2a67a8c 100644 --- a/Disco.Services/Exporting/Exporter.cs +++ b/Disco.Services/Exporting/Exporter.cs @@ -196,15 +196,15 @@ namespace Disco.Services.Exporting public static readonly string DateFormat = "yyyy-MM-dd"; public static readonly string DateTimeFormat = DateFormat + " HH:mm:ss"; - public static Func StringEncoder = (o) => o == null ? null : $"\"{((string)o).Replace("\"", "\"\"")}\""; - public static Func ObjectToStringEncoder = (o) => o == null ? null : o is string s ? StringEncoder(s) : o.ToString(); - public static Func ToStringEncoder = (o) => o == null ? null : o.ToString(); - public static Func CurrencyEncoder = (o) => ((decimal)o).ToString("C"); - public static Func NullableCurrencyEncoder = (o) => ((decimal?)o).HasValue ? ((decimal?)o).Value.ToString("C") : null; - public static Func DateEncoder = (o) => ((DateTime)o).ToString(DateFormat); - public static Func NullableDateEncoder = (o) => ((DateTime?)o).HasValue ? DateEncoder(o) : null; - public static Func DateTimeEncoder = (o) => ((DateTime)o).ToString(DateTimeFormat); - public static Func NullableDateTimeEncoder = (o) => ((DateTime?)o).HasValue ? DateTimeEncoder(o) : null; + public static string StringEncoder(object o) => o == null ? null : $"\"{((string)o).Replace("\"", "\"\"")}\""; + public static string ObjectToStringEncoder(object o) => o == null ? null : o is string s ? StringEncoder(s) : o.ToString(); + public static string ToStringEncoder(object o) => o == null ? null : o.ToString(); + public static string CurrencyEncoder(object o) => ((decimal)o).ToString("C"); + public static string NullableCurrencyEncoder(object o) => ((decimal?)o).HasValue ? ((decimal?)o).Value.ToString("C") : null; + public static string DateEncoder(object o) => ((DateTime)o).ToString(DateFormat); + public static string NullableDateEncoder(object o) => ((DateTime?)o).HasValue ? DateEncoder(o) : null; + public static string DateTimeEncoder(object o) => ((DateTime)o).ToString(DateTimeFormat); + public static string NullableDateTimeEncoder(object o) => ((DateTime?)o).HasValue ? DateTimeEncoder(o) : null; public static Func GetEncoder() => GetEncoder(typeof(T));