diff --git a/Core.Tests/Charter/CurveDataConverterTests.cs b/Core.Tests/Charter/CurveDataConverterTests.cs index a3f4f5e..d72c8b0 100644 --- a/Core.Tests/Charter/CurveDataConverterTests.cs +++ b/Core.Tests/Charter/CurveDataConverterTests.cs @@ -1,6 +1,6 @@ using System.Linq; using LeafWeb.Core.Charter; -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; using LeafWeb.Core.Parsers; using LeafWeb.Core.Utility; using NUnit.Framework; diff --git a/Core.Tests/Parsers/CntrlComparisonParserTests.cs b/Core.Tests/Parsers/CntrlComparisonParserTests.cs index 1a3c273..9d1c381 100644 --- a/Core.Tests/Parsers/CntrlComparisonParserTests.cs +++ b/Core.Tests/Parsers/CntrlComparisonParserTests.cs @@ -1,4 +1,4 @@ -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; using LeafWeb.Core.Parsers; using LeafWeb.Core.Utility; using NUnit.Framework; diff --git a/Core.Tests/Parsers/LeafInputCsvParserTests.cs b/Core.Tests/Parsers/LeafInputCsvParserTests.cs index 32f2817..7edba5c 100644 --- a/Core.Tests/Parsers/LeafInputCsvParserTests.cs +++ b/Core.Tests/Parsers/LeafInputCsvParserTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; using LeafWeb.Core.Parsers; using LeafWeb.Core.Utility; using NUnit.Framework; diff --git a/Core.Tests/Remote/PiscalSshClientTests.cs b/Core.Tests/Remote/PiscalSshClientTests.cs index be0612f..674e79c 100644 --- a/Core.Tests/Remote/PiscalSshClientTests.cs +++ b/Core.Tests/Remote/PiscalSshClientTests.cs @@ -1,4 +1,4 @@ -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; using NUnit.Framework; namespace LeafWeb.Core.Tests.Remote diff --git a/Core/Charter/CurveDataConverter.cs b/Core/Charter/CurveDataConverter.cs index 024c110..03bd375 100644 --- a/Core/Charter/CurveDataConverter.cs +++ b/Core/Charter/CurveDataConverter.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; using LeafWeb.Core.Utility; namespace LeafWeb.Core.Charter diff --git a/Core/Core.csproj b/Core/Core.csproj index 17fab8e..1e3004a 100644 --- a/Core/Core.csproj +++ b/Core/Core.csproj @@ -67,19 +67,19 @@ - + - - - - - - - - - - - + + + + + + + + + + + diff --git a/Core/DAL/DataService.cs b/Core/DAL/DataService.cs index 45a1252..ec97de9 100644 --- a/Core/DAL/DataService.cs +++ b/Core/DAL/DataService.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Data.Entity; using System.Linq; -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; namespace LeafWeb.Core.DAL { diff --git a/Core/DAL/LeafWebContext.cs b/Core/DAL/LeafWebContext.cs index 480a8df..266386f 100644 --- a/Core/DAL/LeafWebContext.cs +++ b/Core/DAL/LeafWebContext.cs @@ -1,6 +1,6 @@ using System.Data.Entity; using System.Data.Entity.ModelConfiguration.Conventions; -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; namespace LeafWeb.Core.DAL { diff --git a/Core/DAL/LeafWebInitializer.cs b/Core/DAL/LeafWebInitializer.cs index 250f0b7..709473f 100644 --- a/Core/DAL/LeafWebInitializer.cs +++ b/Core/DAL/LeafWebInitializer.cs @@ -1,6 +1,6 @@ using System.Data.Entity; using System.Linq; -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; using LeafWeb.Core.Parsers; using LeafWeb.Core.Utility; diff --git a/Core/Models/CntrlComparison.cs b/Core/Entities/CntrlComparison.cs similarity index 95% rename from Core/Models/CntrlComparison.cs rename to Core/Entities/CntrlComparison.cs index e41a538..67079c9 100644 --- a/Core/Models/CntrlComparison.cs +++ b/Core/Entities/CntrlComparison.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace LeafWeb.Core.Models +namespace LeafWeb.Core.Entities { /// /// Part of LeafOutput diff --git a/Core/Models/CntrlComparisonFittingInfo.cs b/Core/Entities/CntrlComparisonFittingInfo.cs similarity index 98% rename from Core/Models/CntrlComparisonFittingInfo.cs rename to Core/Entities/CntrlComparisonFittingInfo.cs index 4e866fa..c065c6d 100644 --- a/Core/Models/CntrlComparisonFittingInfo.cs +++ b/Core/Entities/CntrlComparisonFittingInfo.cs @@ -1,7 +1,6 @@ -using LeafWeb.Core.Parsers; using LeafWeb.Core.Utility; -namespace LeafWeb.Core.Models +namespace LeafWeb.Core.Entities { /// /// First model prediction is calculated at each sampling point. diff --git a/Core/Models/CntrlComparisonPhotosyntheticInfo.cs b/Core/Entities/CntrlComparisonPhotosyntheticInfo.cs similarity index 94% rename from Core/Models/CntrlComparisonPhotosyntheticInfo.cs rename to Core/Entities/CntrlComparisonPhotosyntheticInfo.cs index 26abc6b..3568bef 100644 --- a/Core/Models/CntrlComparisonPhotosyntheticInfo.cs +++ b/Core/Entities/CntrlComparisonPhotosyntheticInfo.cs @@ -1,7 +1,6 @@ -using LeafWeb.Core.Parsers; -using LeafWeb.Core.Utility; +using LeafWeb.Core.Utility; -namespace LeafWeb.Core.Models +namespace LeafWeb.Core.Entities { /// /// The second section gives photosynthesis for each of the three limitation states at selected values of intercellular diff --git a/Core/Models/FluxnetSite.cs b/Core/Entities/FluxnetSite.cs similarity index 91% rename from Core/Models/FluxnetSite.cs rename to Core/Entities/FluxnetSite.cs index dd5218e..f8da744 100644 --- a/Core/Models/FluxnetSite.cs +++ b/Core/Entities/FluxnetSite.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace LeafWeb.Core.Models +namespace LeafWeb.Core.Entities { public class FluxnetSite { diff --git a/Core/Models/LeafInput.cs b/Core/Entities/LeafInput.cs similarity index 96% rename from Core/Models/LeafInput.cs rename to Core/Entities/LeafInput.cs index b59caa9..4a62416 100644 --- a/Core/Models/LeafInput.cs +++ b/Core/Entities/LeafInput.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace LeafWeb.Core.Models +namespace LeafWeb.Core.Entities { public class LeafInput { diff --git a/Core/Models/LeafInputData.cs b/Core/Entities/LeafInputData.cs similarity index 99% rename from Core/Models/LeafInputData.cs rename to Core/Entities/LeafInputData.cs index 7e5b036..d5b3d9f 100644 --- a/Core/Models/LeafInputData.cs +++ b/Core/Entities/LeafInputData.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using LeafWeb.Core.Utility; -namespace LeafWeb.Core.Models +namespace LeafWeb.Core.Entities { /// /// A/Ci data for a variety of analyses, including photosynthesis, stomatal conductance, internal conductance, water use efficiency. diff --git a/Core/Models/LeafInputFile.cs b/Core/Entities/LeafInputFile.cs similarity index 82% rename from Core/Models/LeafInputFile.cs rename to Core/Entities/LeafInputFile.cs index bbe1e4a..3726235 100644 --- a/Core/Models/LeafInputFile.cs +++ b/Core/Entities/LeafInputFile.cs @@ -1,6 +1,4 @@ -using System.ComponentModel.DataAnnotations; - -namespace LeafWeb.Core.Models +namespace LeafWeb.Core.Entities { public class LeafInputFile { diff --git a/Core/Models/LeafInputInfo.cs b/Core/Entities/LeafInputInfo.cs similarity index 96% rename from Core/Models/LeafInputInfo.cs rename to Core/Entities/LeafInputInfo.cs index 9cf74d3..15b3682 100644 --- a/Core/Models/LeafInputInfo.cs +++ b/Core/Entities/LeafInputInfo.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; using LeafWeb.Core.Utility; -namespace LeafWeb.Core.Models +namespace LeafWeb.Core.Entities { /// /// Descriptive information about the investigator, diff --git a/Core/Models/LeafInputPhotosynthetic.cs b/Core/Entities/LeafInputPhotosynthetic.cs similarity index 90% rename from Core/Models/LeafInputPhotosynthetic.cs rename to Core/Entities/LeafInputPhotosynthetic.cs index d386ce9..896c55d 100644 --- a/Core/Models/LeafInputPhotosynthetic.cs +++ b/Core/Entities/LeafInputPhotosynthetic.cs @@ -1,8 +1,6 @@ -using System.ComponentModel.DataAnnotations; -using LeafWeb.Core.Parsers; -using LeafWeb.Core.Utility; +using LeafWeb.Core.Utility; -namespace LeafWeb.Core.Models +namespace LeafWeb.Core.Entities { /// /// Photosynthetic parameters of Leaf Input diff --git a/Core/Models/LeafInputSite.cs b/Core/Entities/LeafInputSite.cs similarity index 95% rename from Core/Models/LeafInputSite.cs rename to Core/Entities/LeafInputSite.cs index 177a4ee..427348a 100644 --- a/Core/Models/LeafInputSite.cs +++ b/Core/Entities/LeafInputSite.cs @@ -1,8 +1,6 @@ -using System.ComponentModel.DataAnnotations; -using LeafWeb.Core.Parsers; -using LeafWeb.Core.Utility; +using LeafWeb.Core.Utility; -namespace LeafWeb.Core.Models +namespace LeafWeb.Core.Entities { /// /// Contains info about the site such as elevation, canopy height, site ID, etc diff --git a/Core/Models/LeafInputStatus.cs b/Core/Entities/LeafInputStatus.cs similarity index 90% rename from Core/Models/LeafInputStatus.cs rename to Core/Entities/LeafInputStatus.cs index d89209b..bf2263b 100644 --- a/Core/Models/LeafInputStatus.cs +++ b/Core/Entities/LeafInputStatus.cs @@ -1,6 +1,6 @@ using System; -namespace LeafWeb.Core.Models +namespace LeafWeb.Core.Entities { /// /// Status of processing LeafInput diff --git a/Core/Models/PhotosynthesisType.cs b/Core/Entities/PhotosynthesisType.cs similarity index 90% rename from Core/Models/PhotosynthesisType.cs rename to Core/Entities/PhotosynthesisType.cs index 6c14891..5bd5555 100644 --- a/Core/Models/PhotosynthesisType.cs +++ b/Core/Entities/PhotosynthesisType.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace LeafWeb.Core.Models +namespace LeafWeb.Core.Entities { public class PhotosynthesisType { diff --git a/Core/Parsers/CntrlComparisonParser.cs b/Core/Parsers/CntrlComparisonParser.cs index 355399d..91959e0 100644 --- a/Core/Parsers/CntrlComparisonParser.cs +++ b/Core/Parsers/CntrlComparisonParser.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; using LeafWeb.Core.Utility; namespace LeafWeb.Core.Parsers diff --git a/Core/Parsers/FluxnetSiteCsvParser.cs b/Core/Parsers/FluxnetSiteCsvParser.cs index 0446b59..99f5840 100644 --- a/Core/Parsers/FluxnetSiteCsvParser.cs +++ b/Core/Parsers/FluxnetSiteCsvParser.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using CsvHelper; using CsvHelper.Configuration; -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; namespace LeafWeb.Core.Parsers { diff --git a/Core/Parsers/LeafInputCsvParser.cs b/Core/Parsers/LeafInputCsvParser.cs index 287f423..05a269c 100644 --- a/Core/Parsers/LeafInputCsvParser.cs +++ b/Core/Parsers/LeafInputCsvParser.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using CsvHelper; -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; using LeafWeb.Core.Utility; namespace LeafWeb.Core.Parsers diff --git a/Core/Remote/IPiscalClient.cs b/Core/Remote/IPiscalClient.cs index 8de0923..c6a185e 100644 --- a/Core/Remote/IPiscalClient.cs +++ b/Core/Remote/IPiscalClient.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Text; -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; using Renci.SshNet; namespace LeafWeb.Core diff --git a/Web/Controllers/LeafCharterController.cs b/Web/Controllers/LeafCharterController.cs index 68c7b23..4b6f9ea 100644 --- a/Web/Controllers/LeafCharterController.cs +++ b/Web/Controllers/LeafCharterController.cs @@ -6,7 +6,7 @@ using System.Web.Mvc; using System.Web.UI.DataVisualization.Charting; using System.Web.UI.WebControls; using LeafWeb.Core.Charter; -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; using LeafWeb.Core.Parsers; using LeafWeb.Web.Charter; diff --git a/Web/Controllers/LeafInputController.cs b/Web/Controllers/LeafInputController.cs index a913369..678f353 100644 --- a/Web/Controllers/LeafInputController.cs +++ b/Web/Controllers/LeafInputController.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using System.Web; using System.Web.Mvc; -using LeafWeb.Core.Models; +using LeafWeb.Core.Entities; using LeafWeb.Web.Attributes; using LeafWeb.Web.ViewModels; using LeafWeb.Web.ViewModels.LeafInput; diff --git a/Web/ViewModels/LeafInput/CreateViewModel.cs b/Web/ViewModels/LeafInput/CreateViewModel.cs index 5c29ad0..eaedd42 100644 --- a/Web/ViewModels/LeafInput/CreateViewModel.cs +++ b/Web/ViewModels/LeafInput/CreateViewModel.cs @@ -41,15 +41,15 @@ namespace LeafWeb.Web.ViewModels.LeafInput var config = new MapperConfiguration(cfg => { - cfg.CreateMap() + cfg.CreateMap() .ForMember(dest => dest.PhotosynthesisType, opt => opt.Ignore()); }); Mapper = config.CreateMapper(); } - public Core.Models.LeafInput GetFileInput(DataService db) + public Core.Entities.LeafInput GetFileInput(DataService db) { - var leafInput = new Core.Models.LeafInput(); + var leafInput = new Core.Entities.LeafInput(); Mapper.Map(this, leafInput); leafInput.PhotosynthesisType = db.GetPhotosynthesisType(PhotosynthesisType.Selected);