|
@@ -17,6 +17,7 @@ using InABox.WPF;
|
|
using MessageBox = System.Windows.Forms.MessageBox;
|
|
using MessageBox = System.Windows.Forms.MessageBox;
|
|
using TextBox = System.Windows.Controls.TextBox;
|
|
using TextBox = System.Windows.Controls.TextBox;
|
|
using InABox.Wpf.Reports;
|
|
using InABox.Wpf.Reports;
|
|
|
|
+using System.Diagnostics.CodeAnalysis;
|
|
|
|
|
|
namespace InABox.Wpf;
|
|
namespace InABox.Wpf;
|
|
|
|
|
|
@@ -131,19 +132,30 @@ public static class EmailUtils
|
|
};
|
|
};
|
|
}
|
|
}
|
|
|
|
|
|
- private static string GetAddressFromUser()
|
|
|
|
|
|
+ public static string GetAddressFromUser()
|
|
{
|
|
{
|
|
- CoreTable table = new Client<User>().Query(new Filter<User>(x => x.ID).IsEqualTo(ClientFactory.UserGuid)
|
|
|
|
- , new Columns<User>(x => x.EmailAddress));
|
|
|
|
- User user = table.Rows.FirstOrDefault().ToObject<User>();
|
|
|
|
-
|
|
|
|
- if (!string.IsNullOrWhiteSpace(user.EmailAddress))
|
|
|
|
- return user.EmailAddress;
|
|
|
|
|
|
+ if(TryGetAddressFromUser(out var address))
|
|
|
|
+ {
|
|
|
|
+ return address;
|
|
|
|
+ }
|
|
else
|
|
else
|
|
|
|
+ {
|
|
MessageWindow.ShowMessage("Current User Email Address is blank - please fill in (Human Resources -> User Accounts -> Choose your User -> Email Settings -> Email Address", "Error");
|
|
MessageWindow.ShowMessage("Current User Email Address is blank - please fill in (Human Resources -> User Accounts -> Choose your User -> Email Settings -> Email Address", "Error");
|
|
|
|
+ return "";
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ public static string? GetAddressFromUserOrNull()
|
|
|
|
+ {
|
|
|
|
+ TryGetAddressFromUser(out var address);
|
|
|
|
+ return address;
|
|
|
|
+ }
|
|
|
|
+ public static bool TryGetAddressFromUser([NotNullWhen(true)] out string? address)
|
|
|
|
+ {
|
|
|
|
+ var table = Client.Query(new Filter<User>(x => x.ID).IsEqualTo(ClientFactory.UserGuid), new Columns<User>(x => x.EmailAddress));
|
|
|
|
+ var user = table.ToObjects<User>().FirstOrDefault();
|
|
|
|
|
|
- return "";
|
|
|
|
-
|
|
|
|
|
|
+ address = user?.EmailAddress.NotWhiteSpaceOr(null);
|
|
|
|
+ return address is not null;
|
|
}
|
|
}
|
|
|
|
|
|
public static MailMessage AddAttachment(this MailMessage message, string attachmentname, byte[] attachmentdata)
|
|
public static MailMessage AddAttachment(this MailMessage message, string attachmentname, byte[] attachmentdata)
|