Merge pull request #27 from mattosaurus/development

Development
mattosaurus · Mar 29, 2019 · 5731e59 · 5731e59
2 parents a02fcff + 3485f0f
commit 5731e59
Show file tree

Hide file tree

Showing 81 changed files with 100 additions and 381 deletions.
diff --git a/ChartJSCoreTest/Program.cs b/ChartJSCoreTest/Program.cs
@@ -1,12 +1,7 @@
-using ChartJSCore.Helpers;
-using ChartJSCore.Models;
+using ChartJSCore.Models;
 using ChartJSCore.Models.Bar;
-using ChartJSCore.Plugins;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace ChartJSCoreTest
 {
@@ -34,7 +29,7 @@ public static void Main(string[] args)
         public static string GenerateBarChart()
         {
             Chart chart = new Chart();
-            chart.Type = "bar";
+            chart.Type = Enums.ChartType.Bar;
 
             Data data = new Data();
             data.Labels = new List<string>() { "Red", "Blue", "Yellow", "Green", "Purple", "Orange" };
@@ -113,7 +108,7 @@ public static string GenerateBarChart()
         public static string GenerateLineChart()
         {
             Chart chart = new Chart();
-            chart.Type = "line";
+            chart.Type = Enums.ChartType.Line;
 
             Data data = new Data();
             data.Labels = new List<string>() { "January", "February", "March", "April", "May", "June", "July" };
@@ -183,7 +178,7 @@ public static string GenerateLineChart()
         public static string GenerateLineScatterChart()
         {
             Chart chart = new Chart();
-            chart.Type = "line";
+            chart.Type = Enums.ChartType.Line;
 
             Data data = new Data();
 
@@ -247,7 +242,7 @@ public static string GenerateLineScatterChart()
         public static string GenerateRadarChart()
         {
             Chart chart = new Chart();
-            chart.Type = "radar";
+            chart.Type = Enums.ChartType.Radar;
 
             Data data = new Data();
             data.Labels = new List<string>() { "Eating", "Drinking", "Sleeping", "Designing", "Coding", "Cycling", "Running" };
@@ -290,7 +285,7 @@ public static string GenerateRadarChart()
         public static string GeneratePolarChart()
         {
             Chart chart = new Chart();
-            chart.Type = "polarArea";
+            chart.Type = Enums.ChartType.PolarArea;
 
             Data data = new Data();
             data.Labels = new List<string>() { "Red", "Green", "Yellow", "Grey", "Blue" };
@@ -315,7 +310,7 @@ public static string GeneratePolarChart()
         public static string GeneratePieChart()
         {
             Chart chart = new Chart();
-            chart.Type = "pie";
+            chart.Type = Enums.ChartType.Pie;
 
             Data data = new Data();
             data.Labels = new List<string>() { "Red", "Blue", "Yellow" };
@@ -341,7 +336,7 @@ public static string GeneratePieChart()
         public static string GenerateBubbleChart()
         {
             Chart chart = new Chart();
-            chart.Type = "bubble";
+            chart.Type = Enums.ChartType.Bubble;
 
             Data data = new Data();
 

diff --git a/ChartJSCoreTest/Properties/AssemblyInfo.cs b/ChartJSCoreTest/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

diff --git a/src/ChartJSCore/ChartJSCore.csproj b/src/ChartJSCore/ChartJSCore.csproj
@@ -11,15 +11,15 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>1.3.2</Version>
+    <Version>1.4.0</Version>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <RepositoryUrl>https://github.com/mattosaurus/ChartJSCore</RepositoryUrl>
     <PackageTags>Chart.js chart graph chartjs</PackageTags>
     <PackageProjectUrl>https://github.com/mattosaurus/ChartJSCore</PackageProjectUrl>
     <Platforms>AnyCPU;x64</Platforms>
-    <AssemblyVersion>1.3.2.0</AssemblyVersion>
-    <FileVersion>1.3.2.0</FileVersion>
-    <PackageReleaseNotes>Version 1.3.2 - Updated framework targeting</PackageReleaseNotes>
+    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <FileVersion>1.4.0.0</FileVersion>
+    <PackageReleaseNotes>Version 1.4.0 - Breaking change, chart type changed from string to enum</PackageReleaseNotes>
     <Authors>mattosaurus</Authors>
     <PackOnBuild>true</PackOnBuild>
   </PropertyGroup>

diff --git a/src/ChartJSCore/Helpers/BoolIntStringConverter.cs b/src/ChartJSCore/Helpers/BoolIntStringConverter.cs
@@ -1,7 +1,5 @@
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace ChartJSCore.Helpers
 {

diff --git a/src/ChartJSCore/Helpers/CamelcaseContractResolver.cs b/src/ChartJSCore/Helpers/CamelcaseContractResolver.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json.Serialization;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace ChartJSCore.Helpers
 {

diff --git a/src/ChartJSCore/Helpers/DoubleStringConverter.cs b/src/ChartJSCore/Helpers/DoubleStringConverter.cs
@@ -1,7 +1,5 @@
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace ChartJSCore.Helpers
 {

diff --git a/src/ChartJSCore/Helpers/PaddingConverter.cs b/src/ChartJSCore/Helpers/PaddingConverter.cs
@@ -1,8 +1,6 @@
 using ChartJSCore.Models;
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace ChartJSCore.Helpers
 {

diff --git a/src/ChartJSCore/Helpers/PlainJsonStringConverter.cs b/src/ChartJSCore/Helpers/PlainJsonStringConverter.cs
@@ -1,8 +1,5 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace ChartJSCore.Helpers
 {

diff --git a/src/ChartJSCore/Helpers/PluginDynamicConverter.cs b/src/ChartJSCore/Helpers/PluginDynamicConverter.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace ChartJSCore.Helpers
 {

diff --git a/src/ChartJSCore/Helpers/SingleOrArrayConverter.cs b/src/ChartJSCore/Helpers/SingleOrArrayConverter.cs
@@ -2,8 +2,6 @@
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace ChartJSCore.Helpers
 {

diff --git a/src/ChartJSCore/Models/Bar/BarDataset.cs b/src/ChartJSCore/Models/Bar/BarDataset.cs
@@ -1,9 +1,6 @@
 using ChartJSCore.Helpers;
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace ChartJSCore.Models
 {
@@ -12,7 +9,7 @@ public class BarDataset : Dataset
 		/// <summary>
 		/// The type of the dataset
 		/// </summary>
-		public string Type { get; set; } = "bar";
+		public Enums.ChartType Type { get; set; } = Enums.ChartType.Bar;
 
         /// <summary>
         /// The ID of the x axis to plot this dataset on.

diff --git a/src/ChartJSCore/Models/Bar/BarOptions.cs b/src/ChartJSCore/Models/Bar/BarOptions.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace ChartJSCore.Models.Bar
+namespace ChartJSCore.Models.Bar
 {
     public class BarOptions : Options
     {

diff --git a/src/ChartJSCore/Models/Base.cs b/src/ChartJSCore/Models/Base.cs
@@ -1,7 +1,5 @@
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace ChartJSCore.Models
 {

diff --git a/src/ChartJSCore/Models/Bubble/BubbleData.cs b/src/ChartJSCore/Models/Bubble/BubbleData.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace ChartJSCore.Models
+namespace ChartJSCore.Models
 {
     public class BubbleData : Base
     {

diff --git a/src/ChartJSCore/Models/Bubble/BubbleDataset.cs b/src/ChartJSCore/Models/Bubble/BubbleDataset.cs
@@ -1,9 +1,6 @@
 using ChartJSCore.Helpers;
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace ChartJSCore.Models
 {
@@ -12,7 +9,7 @@ public class BubbleDataset : Dataset
 		/// <summary>
 		/// The type of the dataset
 		/// </summary>
-		public string Type { get; set; } = "bubble";
+		public Enums.ChartType Type { get; set; } = Enums.ChartType.Bubble;
 
         /// <summary>
         /// The data to plot in the bubble chart.

diff --git a/src/ChartJSCore/Models/Chart.cs b/src/ChartJSCore/Models/Chart.cs
@@ -1,17 +1,12 @@
 using ChartJSCore.Helpers;
-using ChartJSCore.Plugins;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
+using Newtonsoft.Json.Converters;
 
 namespace ChartJSCore.Models
 {
     public class Chart : Base
     {
-        public string Type { get; set; }
+        public Enums.ChartType Type { get; set; }
 
         public Data Data { get; set; }
 
@@ -26,6 +21,7 @@ public string SerializeBody()
             JsonSerializerSettings settings = new JsonSerializerSettings();
             settings.ContractResolver = new CamelcaseContractResolver();
             settings.NullValueHandling = NullValueHandling.Ignore;
+            settings.Converters.Add(new StringEnumConverter(true));
 
             string json = JsonConvert.SerializeObject(this, settings);
 
@@ -34,17 +30,18 @@ public string SerializeBody()
 
         public string CreateChartCode(string canvasId)
         {
-            string code = "var " + canvasId + "Element = document.getElementById(\"" + canvasId + "\");\r\n";
-            code += "var " + canvasId + " = new Chart(" + canvasId + "Element, ";
+            string code = $"var {canvasId}Element = document.getElementById(\"{canvasId}\");\r\n";
+            code += $"var {canvasId} = new Chart({canvasId}Element, ";
 
             // keys need to be camel case to match data contract so use custom serializer to alter
             JsonSerializerSettings settings = new JsonSerializerSettings();
             settings.ContractResolver = new CamelcaseContractResolver();
             settings.NullValueHandling = NullValueHandling.Ignore;
+            settings.Converters.Add(new StringEnumConverter(true));
 
             string json = JsonConvert.SerializeObject(this, settings);
 
-            code += json + "\r\n";
+            code += $"{json}\r\n";
             code += ");";
 
             return code;

diff --git a/src/ChartJSCore/Models/Data.cs b/src/ChartJSCore/Models/Data.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ChartJSCore.Models
 {

diff --git a/src/ChartJSCore/Models/Dataset.cs b/src/ChartJSCore/Models/Dataset.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ChartJSCore.Models
 {

diff --git a/src/ChartJSCore/Models/Enums.cs b/src/ChartJSCore/Models/Enums.cs
@@ -0,0 +1,16 @@
+namespace ChartJSCore.Models
+{
+    public static class Enums
+    {
+        public enum ChartType : byte
+        {
+            Bar = 0,
+            Bubble = 1,
+            Radar = 2,
+            PolarArea = 3,
+            Pie = 4,
+            Line = 5,
+            Doughnut = 6
+        }
+    }
+}
diff --git a/src/ChartJSCore/Models/Layout/Layout.cs b/src/ChartJSCore/Models/Layout/Layout.cs
@@ -1,9 +1,5 @@
 using ChartJSCore.Helpers;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace ChartJSCore.Models
 {

diff --git a/src/ChartJSCore/Models/Layout/Padding.cs b/src/ChartJSCore/Models/Layout/Padding.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ChartJSCore.Models
+namespace ChartJSCore.Models
 {
     public class Padding : Base
     {

diff --git a/src/ChartJSCore/Models/Layout/PaddingObject.cs b/src/ChartJSCore/Models/Layout/PaddingObject.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ChartJSCore.Models
+namespace ChartJSCore.Models
 {
     public class PaddingObject : Base
     {

diff --git a/src/ChartJSCore/Models/Line/LineDataset.cs b/src/ChartJSCore/Models/Line/LineDataset.cs
@@ -1,18 +1,15 @@
 using ChartJSCore.Helpers;
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace ChartJSCore.Models
 {
     public class LineDataset : Dataset
     {
-		/// <summary>
-		/// The type of the dataset
-		/// </summary>
-		public string Type { get; set; } = "line";
+        /// <summary>
+        /// The type of the dataset
+        /// </summary>
+        public Enums.ChartType Type { get; set; } = Enums.ChartType.Line;
 
         /// <summary>
         /// The ID of the x axis to plot this dataset on.

diff --git a/src/ChartJSCore/Models/Line/LineOptions.cs b/src/ChartJSCore/Models/Line/LineOptions.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace ChartJSCore.Models
+namespace ChartJSCore.Models
 {
     public class LineOptions : Options
     {

diff --git a/src/ChartJSCore/Models/Line/LineScatterData.cs b/src/ChartJSCore/Models/Line/LineScatterData.cs
@@ -1,9 +1,5 @@
 using ChartJSCore.Helpers;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace ChartJSCore.Models
 {

diff --git a/src/ChartJSCore/Models/Line/LineScatterDataset.cs b/src/ChartJSCore/Models/Line/LineScatterDataset.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ChartJSCore.Models
 {