Code rearrange for services and charting

Core/Charter/CurveDataConverter.cs

@@ -8,10 +8,10 @@ namespace LeafWeb.Core.Charter
 {
 	public static class CurveDataConverter
 	{
-		public static IEnumerable<CurveData> Convert(IEnumerable<LeafGasComparison> cntrlComparison)
+		public static IEnumerable<CurveData> Convert(IEnumerable<LeafGasComparison> leafGasComparison)
 		{
 			var comparisonGroups = 
-				from comparison in cntrlComparison
+				from comparison in leafGasComparison
 				group comparison by comparison.CurveID into curves
 				select new
 				{

Web/Controllers/LeafCharterController.cs

@@ -10,7 +10,7 @@ using System.Web.UI.WebControls;
 using LeafWeb.Core.Charter;
 using LeafWeb.Core.Entities;
 using LeafWeb.Core.Parsers;
-using LeafWeb.Web.Charter;
+using LeafWeb.Web.Services;
 using LeafWeb.Web.ViewModels.LeafCharter;
 
 namespace LeafWeb.Web.Controllers
@@ -80,7 +80,7 @@ namespace LeafWeb.Web.Controllers
 
 		private IEnumerable<Bitmap> GetChartBitmaps(CurveData curveData)
 		{
-			var charts = LeafWebCharter.ProduceCharts(curveData);
+			var charts = LeafGasCharter.ProduceCharts(curveData);
 			
 			foreach (var chart in charts)
 			{

Web/HangfireStartup.cs

@@ -3,6 +3,7 @@ using Hangfire;
 using Microsoft.Owin;
 using LeafWeb.Web;
 using LeafWeb.Web.Services;
+using LeafWeb.Web.Services.PiscalQueue;
 using Owin;
 using ConfigurationManager = System.Configuration.ConfigurationManager;
 

Web/Services/LeafGasCharter.cs

@@ -6,9 +6,9 @@ using System.Web.UI.WebControls;
 using LeafWeb.Core.Charter;
 using LeafWeb.Core.Utility;
 
-namespace LeafWeb.Web.Charter
+namespace LeafWeb.Web.Services
 {
-	public static class LeafWebCharter
+	public static class LeafGasCharter
 	{
 		private static readonly Font TitleFont = new Font(new FontFamily("Times New Roman"), 10, FontStyle.Bold);
 		private static readonly Font AxisFont = new Font(new FontFamily("Times New Roman"), 10, FontStyle.Bold);

Web/Services/PiscalQueue/FinishComplete.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using LeafWeb.Core.Entities;
 
-namespace LeafWeb.Web.Services
+namespace LeafWeb.Web.Services.PiscalQueue
 {
 	public class FinishComplete : PiscalQueueWorker
 	{

Web/Services/PiscalQueue/PiscalQueueBase.cs

@@ -7,7 +7,7 @@ using LeafWeb.Core.Remote;
 using NLog;
 using Polly;
 
-namespace LeafWeb.Web.Services
+namespace LeafWeb.Web.Services.PiscalQueue
 {
 	public abstract class PiscalQueueBase : IDisposable
 	{

Web/Services/PiscalQueue/PiscalQueueManager.cs

@@ -4,7 +4,7 @@ using System.Threading;
 using LeafWeb.Core.Entities;
 using LeafWeb.Core.Remote;
 
-namespace LeafWeb.Web.Services
+namespace LeafWeb.Web.Services.PiscalQueue
 {
 	public class PiscalQueueManager : PiscalQueueBase
 	{

Web/Services/PiscalQueue/PiscalQueueWorker.cs

@@ -2,7 +2,7 @@ using System;
 using LeafWeb.Core.Entities;
 using LeafWeb.Core.Remote;
 
-namespace LeafWeb.Web.Services
+namespace LeafWeb.Web.Services.PiscalQueue
 {
 	public abstract class PiscalQueueWorker : PiscalQueueBase
 	{

Web/Services/PiscalQueue/PiscalService.cs

@@ -3,7 +3,7 @@ using System.Configuration;
 using LeafWeb.Core.Entities;
 using LeafWeb.Core.Remote;
 
-namespace LeafWeb.Web.Services
+namespace LeafWeb.Web.Services.PiscalQueue
 {
 	/// <summary>
 	/// Thin layer over PiscalClient to translate Core entities to Piscal objects

Web/Services/PiscalQueue/StartPending.cs

@@ -1,6 +1,6 @@
 using LeafWeb.Core.Entities;
 
-namespace LeafWeb.Web.Services
+namespace LeafWeb.Web.Services.PiscalQueue
 {
 	public class StartPending : PiscalQueueWorker
 	{

Web/Web.csproj

@@ -960,7 +960,7 @@
     <Compile Include="Backload\Controller\BackloadController.obsolete.cs" />
     <Compile Include="Backload\Helper\ResultCreator.Classic.cs" />
     <Compile Include="Backload\Helper\ResultCreator.cs" />
-    <Compile Include="Charter\LeafWebCharter.cs" />
+    <Compile Include="Services\LeafGasCharter.cs" />
     <Compile Include="Controllers\ControllerBase.cs" />
     <Compile Include="Controllers\FluxnetSiteController.cs" />
     <Compile Include="Controllers\LeafCharterController.cs" />
@@ -973,13 +973,13 @@
     <Compile Include="Attributes\HttpParamActionAttribute.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\EmailNotificationService.cs" />
-    <Compile Include="Services\PiscalQueueBase.cs" />
+    <Compile Include="Services\PiscalQueue\PiscalQueueBase.cs" />
-    <Compile Include="Services\PiscalQueueManager.cs" />
+    <Compile Include="Services\PiscalQueue\PiscalQueueManager.cs" />
-    <Compile Include="Services\PiscalQueueWorker.cs" />
+    <Compile Include="Services\PiscalQueue\PiscalQueueWorker.cs" />
-    <Compile Include="Services\PiscalService.cs" />
+    <Compile Include="Services\PiscalQueue\PiscalService.cs" />
     <Compile Include="HangfireStartup.cs" />
-    <Compile Include="Services\FinishComplete.cs" />
+    <Compile Include="Services\PiscalQueue\FinishComplete.cs" />
-    <Compile Include="Services\StartPending.cs" />
+    <Compile Include="Services\PiscalQueue\StartPending.cs" />
     <Compile Include="Utility\MarkdownHelper.cs" />
     <Compile Include="Utility\Validation.cs" />
     <Compile Include="ViewModels\LeafCharter\LeafCharterViewModel.cs" />