Rename Core Models to Core Entities

modified:   Core.Tests/Charter/CurveDataConverterTests.cs
	modified:   Core.Tests/Parsers/CntrlComparisonParserTests.cs
	modified:   Core.Tests/Parsers/LeafInputCsvParserTests.cs
	modified:   Core.Tests/Remote/PiscalSshClientTests.cs
	modified:   Core/Charter/CurveDataConverter.cs
	modified:   Core/Core.csproj
	modified:   Core/DAL/DataService.cs
	modified:   Core/DAL/LeafWebContext.cs
	modified:   Core/DAL/LeafWebInitializer.cs
	renamed:    Core/Models/CntrlComparison.cs -> Core/Entities/CntrlComparison.cs
	renamed:    Core/Models/CntrlComparisonFittingInfo.cs -> Core/Entities/CntrlComparisonFittingInfo.cs
	renamed:    Core/Models/CntrlComparisonPhotosyntheticInfo.cs -> Core/Entities/CntrlComparisonPhotosyntheticInfo.cs
	renamed:    Core/Models/FluxnetSite.cs -> Core/Entities/FluxnetSite.cs
	renamed:    Core/Models/LeafInput.cs -> Core/Entities/LeafInput.cs
	renamed:    Core/Models/LeafInputData.cs -> Core/Entities/LeafInputData.cs
	renamed:    Core/Models/LeafInputFile.cs -> Core/Entities/LeafInputFile.cs
	renamed:    Core/Models/LeafInputInfo.cs -> Core/Entities/LeafInputInfo.cs
	renamed:    Core/Models/LeafInputPhotosynthetic.cs -> Core/Entities/LeafInputPhotosynthetic.cs
	renamed:    Core/Models/LeafInputSite.cs -> Core/Entities/LeafInputSite.cs
	renamed:    Core/Models/LeafInputStatus.cs -> Core/Entities/LeafInputStatus.cs
	renamed:    Core/Models/PhotosynthesisType.cs -> Core/Entities/PhotosynthesisType.cs
	modified:   Core/Parsers/CntrlComparisonParser.cs
	modified:   Core/Parsers/FluxnetSiteCsvParser.cs
	modified:   Core/Parsers/LeafInputCsvParser.cs
	modified:   Web/Controllers/LeafCharterController.cs
	modified:   Web/Controllers/LeafInputController.cs
	modified:   Web/ViewModels/LeafInput/CreateViewModel.cs

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;

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;

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;

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

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

Core/Core.csproj

@@ -67,19 +67,19 @@
     <Compile Include="DAL\DataService.cs" />
     <Compile Include="DAL\LeafWebContext.cs" />
     <Compile Include="DAL\LeafWebInitializer.cs" />
-    <Compile Include="Models\PhotosynthesisType.cs" />
+    <Compile Include="Entities\PhotosynthesisType.cs" />
     <Compile Include="Remote\IPiscalClient.cs" />
-    <Compile Include="Models\CntrlComparison.cs" />
+    <Compile Include="Entities\CntrlComparison.cs" />
-    <Compile Include="Models\CntrlComparisonFittingInfo.cs" />
+    <Compile Include="Entities\CntrlComparisonFittingInfo.cs" />
-    <Compile Include="Models\CntrlComparisonPhotosyntheticInfo.cs" />
+    <Compile Include="Entities\CntrlComparisonPhotosyntheticInfo.cs" />
-    <Compile Include="Models\FluxnetSite.cs" />
+    <Compile Include="Entities\FluxnetSite.cs" />
-    <Compile Include="Models\LeafInput.cs" />
+    <Compile Include="Entities\LeafInput.cs" />
-    <Compile Include="Models\LeafInputInfo.cs" />
+    <Compile Include="Entities\LeafInputInfo.cs" />
-    <Compile Include="Models\LeafInputData.cs" />
+    <Compile Include="Entities\LeafInputData.cs" />
-    <Compile Include="Models\LeafInputFile.cs" />
+    <Compile Include="Entities\LeafInputFile.cs" />
-    <Compile Include="Models\LeafInputPhotosynthetic.cs" />
+    <Compile Include="Entities\LeafInputPhotosynthetic.cs" />
-    <Compile Include="Models\LeafInputSite.cs" />
+    <Compile Include="Entities\LeafInputSite.cs" />
-    <Compile Include="Models\LeafInputStatus.cs" />
+    <Compile Include="Entities\LeafInputStatus.cs" />
     <Compile Include="Parsers\FluxnetSiteCsvParser.cs" />
     <Compile Include="Utility\BoolTypeConverter.cs" />
     <Compile Include="Parsers\CntrlComparisonParser.cs" />

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
 {

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
 {

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;
 

Core/Entities/CntrlComparison.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace LeafWeb.Core.Models
+namespace LeafWeb.Core.Entities
 {
 	/// <summary>
 	/// Part of LeafOutput

Core/Entities/CntrlComparisonFittingInfo.cs

@@ -1,7 +1,6 @@
-using LeafWeb.Core.Parsers;
 using LeafWeb.Core.Utility;
 
-namespace LeafWeb.Core.Models
+namespace LeafWeb.Core.Entities
 {
 	/// <summary>
 	/// First model prediction is calculated at each sampling point.

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
 {
 	/// <summary>
 	/// The second section gives photosynthesis for each of the three limitation states at selected values of intercellular 

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
 	{

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
 	{

Core/Entities/LeafInputData.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using LeafWeb.Core.Utility;
 
-namespace LeafWeb.Core.Models
+namespace LeafWeb.Core.Entities
 {
     /// <summary>
 	/// A/Ci data for a variety of analyses, including photosynthesis, stomatal conductance, internal conductance, water use efficiency.

Core/Entities/LeafInputFile.cs

@@ -1,6 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+namespace LeafWeb.Core.Entities
-
-namespace LeafWeb.Core.Models
 {
 	public class LeafInputFile
 	{

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
 {
 	/// <summary>
 	/// Descriptive information about the investigator, 

Core/Entities/LeafInputPhotosynthetic.cs

@@ -1,8 +1,6 @@
-using System.ComponentModel.DataAnnotations;
+using LeafWeb.Core.Utility;
-using LeafWeb.Core.Parsers;
-using LeafWeb.Core.Utility;
 
-namespace LeafWeb.Core.Models
+namespace LeafWeb.Core.Entities
 {
 	/// <summary>
 	/// Photosynthetic parameters of Leaf Input

Core/Entities/LeafInputSite.cs

@@ -1,8 +1,6 @@
-using System.ComponentModel.DataAnnotations;
+using LeafWeb.Core.Utility;
-using LeafWeb.Core.Parsers;
-using LeafWeb.Core.Utility;
 
-namespace LeafWeb.Core.Models
+namespace LeafWeb.Core.Entities
 {
 	/// <summary>
 	/// Contains info about the site such as elevation, canopy height, site ID, etc

Core/Entities/LeafInputStatus.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace LeafWeb.Core.Models
+namespace LeafWeb.Core.Entities
 {
 	/// <summary>
 	/// Status of processing LeafInput

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
 	{

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

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
 {

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

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

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;
 

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;

Web/ViewModels/LeafInput/CreateViewModel.cs

@@ -41,15 +41,15 @@ namespace LeafWeb.Web.ViewModels.LeafInput
 			var config =
 			new MapperConfiguration(cfg =>
 			{
-				cfg.CreateMap<CreateViewModel, Core.Models.LeafInput>()
+				cfg.CreateMap<CreateViewModel, Core.Entities.LeafInput>()
 					.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);