Leaf Input and Submit

This commit is contained in:
2016-12-06 11:53:30 -05:00
parent a3b8b7a881
commit 6fd7e46f5d
74 changed files with 56144 additions and 1291 deletions
+20 -18
View File
@@ -1,5 +1,6 @@
using System.ComponentModel.DataAnnotations;
using AutoMapper;
using LeafWeb.Core.DAL;
namespace LeafWeb.WebCms.Models
{
@@ -10,24 +11,24 @@ namespace LeafWeb.WebCms.Models
[RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Please provide your full name")]
public string Name { get; set; }
//[Display(Name = "Your email address")]
//[Required(ErrorMessage = "An email address is required")]
//[DataType(DataType.EmailAddress)]
//[RegularExpression(@"[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}", ErrorMessage = "Must be an email address")]
//public string Email { get; set; }
[Display(Name = "Your email address")]
[Required(ErrorMessage = "An email address is required")]
[DataType(DataType.EmailAddress)]
[RegularExpression(@"[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}", ErrorMessage = "Must be an email address")]
public string Email { get; set; }
//[Display(Name = "Confirm email address")]
//[Required(ErrorMessage = "Enter email exactly as above")]
//[Compare("Email")]
//public string EmailConfirm { get; set; }
[Display(Name = "Confirm email address")]
[Required(ErrorMessage = "Enter email exactly as above")]
[Compare("Email")]
public string EmailConfirm { get; set; }
//[Display(Name = "A unique identifier for this data")]
//[Required(ErrorMessage = "A unique identifier is required")]
//public string Identifier { get; set; }
[Display(Name = "A unique identifier for this data")]
[Required(ErrorMessage = "A unique identifier is required")]
public string Identifier { get; set; }
//[Display(Name = "The site's name/Fluxnet ID, if known")]
//[Required(ErrorMessage = "The site's name is required")]
//public string SiteId { get; set; }
[Display(Name = "The site's name/Fluxnet ID, if known")]
[Required(ErrorMessage = "The site's name is required")]
public string SiteId { get; set; }
[Display(Name = "Photosynthetic Pathways")]
[Required(ErrorMessage = "A Photosynthetic pathway must be chosen")]
@@ -35,7 +36,7 @@ namespace LeafWeb.WebCms.Models
static LeafInputCreate()
{
Mapper.CreateMap<LeafInputCreate, LeafWeb.Core.Entities.LeafInput>()
Mapper.CreateMap<LeafInputCreate, Core.Entities.LeafInput>()
.ForMember(dest => dest.PhotosynthesisType, opt => opt.Ignore());
}
@@ -44,11 +45,12 @@ namespace LeafWeb.WebCms.Models
//PhotosynthesisType = new SelectListViewModel();
}
public LeafWeb.Core.Entities.LeafInput GetFileInput()
public Core.Entities.LeafInput GetLeafInput(DataService db)
{
var leafInput = new LeafWeb.Core.Entities.LeafInput();
var leafInput = new Core.Entities.LeafInput();
Mapper.Map(this, leafInput);
leafInput.PhotosynthesisType = db.GetPhotosynthesisType(PhotosynthesisType.Selected);
return leafInput;
}
}