Add parsing for LeafInputData after retrieving CleanedInput files
This commit is contained in:
@@ -25,6 +25,12 @@ namespace LeafWeb.Core.Entities
|
||||
/// </summary>
|
||||
[ParseInfo(2, boolEncodedPosition: 1, alternateTitle: "FitRwp|Rch|ha?")] // formerly FitGi
|
||||
public bool FitRwp {get; set;}
|
||||
|
||||
/// <summary>
|
||||
/// TODO? : boolEncodedPosition only able to parse a single value from each cell currently
|
||||
/// </summary>
|
||||
//[ParseInfo(2, boolEncodedPosition: 2, alternateTitle: "FitRwp|Rch|ha?")] // formerly FitGi
|
||||
//public bool FitRch {get; set;}
|
||||
|
||||
/// <summary>
|
||||
/// whether or not the chloroplastic CO2 partial pressure photocompensation point is
|
||||
|
||||
@@ -16,6 +16,7 @@ namespace LeafWeb.Core.Entities
|
||||
public virtual ICollection<LeafOutputFile> OutputFiles { get; set; }
|
||||
public LeafOutputFile OutputErrorMessage => OutputFiles?.FirstOrDefault(f => f.IsErrorMessage);
|
||||
public LeafOutputFile OutputWarningMessage => OutputFiles?.FirstOrDefault(f => f.IsWarningMessage);
|
||||
public virtual ICollection<LeafInputData> LeafInputData { get; set; }
|
||||
|
||||
public LeafInputStatusType CurrentStatus { get; set; }
|
||||
public virtual ICollection<LeafInputStatus> StatusHistory { get; set; }
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using LeafWeb.Core.Utility;
|
||||
|
||||
namespace LeafWeb.Core.Entities
|
||||
@@ -9,11 +10,22 @@ namespace LeafWeb.Core.Entities
|
||||
/// </summary>
|
||||
public class LeafInputData
|
||||
{
|
||||
[ForeignKey("LeafOutputFile")]
|
||||
public int Id { get; set; }
|
||||
|
||||
public virtual LeafInputDataSite Site { get; set; }
|
||||
public virtual LeafInputDataPhotosynthetic Photosynthetic { get; set; }
|
||||
public virtual ICollection<LeafInputDataCurve> Data { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Leaf Input set this data belongs to
|
||||
/// </summary>
|
||||
public virtual LeafInput LeafInput { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Output file this data was parsed from
|
||||
/// </summary>
|
||||
public virtual LeafOutputFile LeafOutputFile { get; set; }
|
||||
|
||||
[ParseInfo(1, exampleValue: "First and last name")]
|
||||
public string InvestigatorName { get; set; }
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace LeafWeb.Core.Entities
|
||||
{
|
||||
public int Id { get; set; }
|
||||
|
||||
public virtual LeafInputData LeafInputInfo { get; set; }
|
||||
public virtual LeafInputData LeafInputData { get; set; }
|
||||
|
||||
public int ListOrder { get; set; }
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using LeafWeb.Core.Utility;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using LeafWeb.Core.Utility;
|
||||
|
||||
namespace LeafWeb.Core.Entities
|
||||
{
|
||||
@@ -7,9 +8,10 @@ namespace LeafWeb.Core.Entities
|
||||
/// </summary>
|
||||
public class LeafInputDataPhotosynthetic
|
||||
{
|
||||
[ForeignKey("LeafInputData")]
|
||||
public int Id { get; set; }
|
||||
|
||||
public virtual LeafInputData LeafInputInfo { get; set; }
|
||||
public virtual LeafInputData LeafInputData { get; set; }
|
||||
|
||||
/// <summary>chloroplastic CO2 photocompensation point</summary>
|
||||
/// <remarks>must be positive</remarks>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using LeafWeb.Core.Utility;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using LeafWeb.Core.Utility;
|
||||
|
||||
namespace LeafWeb.Core.Entities
|
||||
{
|
||||
@@ -7,9 +8,10 @@ namespace LeafWeb.Core.Entities
|
||||
/// </summary>
|
||||
public class LeafInputDataSite
|
||||
{
|
||||
[ForeignKey("LeafInputData")]
|
||||
public int Id { get; set; }
|
||||
|
||||
public virtual LeafInputData LeafInputInfo { get; set; }
|
||||
public virtual LeafInputData LeafInputData { get; set; }
|
||||
|
||||
/// <summary>Site identifier</summary>
|
||||
/// <remarks>do not leave blank between letters</remarks>
|
||||
|
||||
@@ -12,10 +12,18 @@ namespace LeafWeb.Core.Entities
|
||||
|
||||
public virtual LeafInput LeafInput { get; set; }
|
||||
|
||||
public string Filename { get; set; }
|
||||
/// <summary>
|
||||
/// CleanedInput files will be parsed and data stored here
|
||||
/// </summary>
|
||||
public virtual LeafInputData LeafInputData { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// ToUser, NotToUser, CleanedInput
|
||||
/// </summary>
|
||||
public LeafOutputFileType FileType { get; set; }
|
||||
|
||||
public string Filename { get; set; }
|
||||
|
||||
public byte[] Contents { get; set; }
|
||||
|
||||
public bool IsLeafChartFile => Filename?.Contains(Filename_LeafChart) ?? false;
|
||||
|
||||
Reference in New Issue
Block a user