More improvements to registration, leaf input create, and charting

This commit is contained in:
2020-01-14 14:10:11 -05:00
parent 8452a9cce0
commit 046cda40b4
18 changed files with 180 additions and 77 deletions
+20 -1
View File
@@ -8,6 +8,7 @@ using LeafWeb.Core.Entities;
using LeafWeb.Core.Utility;
using LeafWeb.WebCms.App_Start;
using LeafWeb.WebCms.Models;
using Umbraco.Web;
namespace LeafWeb.WebCms.Controllers
{
@@ -37,6 +38,20 @@ namespace LeafWeb.WebCms.Controllers
if (ModelState.ContainsKey("TermsOfService"))
ModelState["TermsOfService"].Errors.Clear();
var membershipHelper = new Umbraco.Web.Security.MembershipHelper(UmbracoContext.Current);
var member = membershipHelper.GetCurrentMember();
if (member != null)
{
ModelState["Name"].Errors.Clear();
viewModel.Name = member.Name;
ModelState["Email"].Errors.Clear();
viewModel.Email = member.GetProperty("Email").Value as string;
ModelState["EmailConfirm"].Errors.Clear();
viewModel.EmailConfirm = viewModel.Email;
}
if (ModelState.IsValid) // HttpParamMatch indicates it's backing out from Confirm
{
// convert viewModel into Model
@@ -56,7 +71,11 @@ namespace LeafWeb.WebCms.Controllers
var msg = $"A data set has submitted for '{viewModel.Identifier}' from '{viewModel.SiteId}'. " + Environment.NewLine
+ $"When complete, an email will be delivered to {viewModel.Name} <{viewModel.Email}> with results.";
SetStatusMessage(HttpUtility.HtmlEncode(msg), StatusType.Success);
SetStatusMessage(
HttpUtility
.HtmlEncode(msg)
.Replace("\n", "<br/>"),
StatusType.Success);
var logger = LogManager.GetLogger(GetType());
logger.Info($"LeafInput: {leafInput.Id} Added, {leafInput.Identifier}, {leafInput.SiteId}, {leafInput.Email}");