Merge pull request #77 from apexcharts/add-goals

joadan · web-flow · commit 81a0b8a56f0d · 2022-04-10T09:03:20.000+02:00
Add goals
diff --git a/docs/BlazorApexCharts.Docs/Components/ChartTypes/BarCharts/BarCharts.razor b/docs/BlazorApexCharts.Docs/Components/ChartTypes/BarCharts/BarCharts.razor
@@ -2,6 +2,12 @@
 
 <DocExamples Title="Bar Charts">
     
+     <CodeSnippet Title=Markers ClassName=@typeof(Markers).ToString()>
+        <Snippet>
+            <Markers />
+        </Snippet>
+    </CodeSnippet>
+
     <CodeSnippet Title=Basic ClassName=@typeof(Basic).ToString()>
         <Snippet>
             <Basic />
diff --git a/docs/BlazorApexCharts.Docs/Components/ChartTypes/BarCharts/Markers.razor b/docs/BlazorApexCharts.Docs/Components/ChartTypes/BarCharts/Markers.razor
@@ -0,0 +1,78 @@
+﻿<DemoContainer>
+    <ApexChart TItem="Order"
+               Title="Order Net Value">
+
+        <ApexPointSeries TItem="Order"
+                         Items="Orders"
+                         Name="Gross Value"
+                         XValue="@(e => e.Country)"
+                         YAggregate="@(e => e.Sum(e => e.GrossValue))"
+                         OrderByDescending="e=>e.Y"
+                         SeriesType="SeriesType.Bar"
+                         UpdateDataPoint=SetMarkers />
+
+
+    </ApexChart>
+</DemoContainer>
+
+@code {
+    private List<Order> Orders { get; set; } = SampleData.GetOrders();
+
+    private void SetMarkers(DataPoint<Order> datapoint)
+    {
+        datapoint.Goals = new();
+        var goal = new DataPointGoal { Name = "Target" };
+        datapoint.Goals.Add(goal);
+
+        switch (datapoint.X.ToString())
+        {
+            case "France":
+                goal.StrokeColor = "#e3001b";
+                goal.StrokeDashArray = 5;
+                goal.StrokeHeight = 5;
+                goal.Value = 240000;
+                break;
+
+            case "Brazil":
+                goal.StrokeColor = "#145A32";
+                goal.StrokeHeight = 10;
+                goal.StrokeLineCap = StrokeLineCap.Butt;
+                goal.Value = 290000;
+                break;
+
+            default:
+                goal.StrokeColor = "#ffd500";
+                goal.StrokeHeight = 13;
+                goal.StrokeWidth = 0;
+                goal.StrokeLineCap = StrokeLineCap.Round;
+                goal.Value = 200000;
+                break;
+
+        }
+
+        //if (datapoint.X.ToString() == "France")
+        //{
+        //    datapoint.Goals.Add(new DataPointGoal
+        //        {
+        //            Name = "Goal",
+        //            StrokeHeight = 5,
+        //            StrokeDashArray = 5,
+        //            Value = 250000,
+        //            StrokeColor = "#e3001b"
+        //        });
+        //}
+        //else
+        //{
+        //    datapoint.Goals.Add(new DataPointGoal
+        //        {
+        //            Name = "Goal",
+        //            StrokeHeight = 20,
+        //            Value = 200000,
+        //            StrokeColor = "#ffd500"
+        //        });
+        //}
+
+
+        //var test = datapoint;
+    }
+}
diff --git a/src/Blazor-ApexCharts/Extensions/GeneralExtensions.cs b/src/Blazor-ApexCharts/Extensions/GeneralExtensions.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections.Generic;
 
 namespace ApexCharts
 {
@@ -14,12 +15,24 @@ public static DateTimeOffset DayOnly(this DateTimeOffset value)
             return new DateTimeOffset(value.Year, value.Month, value.Day, 0, 0, 0, new TimeSpan());
         }
 
-       
         public static long ToUnixTimeMilliseconds(this DateTime d)
         {
             DateTime epoch = DateTime.UnixEpoch;
             return (long)(d - epoch).TotalMilliseconds;
         }
 
+        public static IList<T> SetValue<T>(this IList<T> items, Action<T> updateMethod)
+        {
+            if(updateMethod == null)
+            {
+                return items;
+            }
+
+            foreach (T item in items)
+            {
+                updateMethod(item);
+            }
+            return items;
+        }
     }
 }
diff --git a/src/Blazor-ApexCharts/Models/DataPoints/DataPoint.cs b/src/Blazor-ApexCharts/Models/DataPoints/DataPoint.cs
@@ -1,22 +1,39 @@
 ﻿using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 
 namespace ApexCharts
 {
-  
+
     public class DataPoint<TItem> : IDataPoint<TItem>
     {
         public string FillColor { get; set; }
         public object X { get; set; }
         
+        public List<DataPointGoal> Goals { get; set; }
+
         [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
         public decimal? Y { get; set; }
 
-
         [JsonIgnore]
         public IEnumerable<TItem> Items { get; set; }
 
     }
-        
+
+    public class DataPointGoal
+    {
+        public string Name { get; set; }
+        public decimal  Value { get; set; }
+        public int? StrokeWidth { get; set; }
+        public int? StrokeHeight { get; set; }
+        public int? StrokeDashArray { get; set; }
+        public string StrokeColor { get; set; }
+        public StrokeLineCap? StrokeLineCap { get; set; }
+    }
+
+    public enum StrokeLineCap
+    {
+        Butt,
+        Round,
+        Square
+    }
 }
diff --git a/src/Blazor-ApexCharts/Series/ApexBaseSeries.cs b/src/Blazor-ApexCharts/Series/ApexBaseSeries.cs
@@ -46,5 +46,20 @@ public string GetPointColor(IEnumerable<TItem> items)
             return PointColor.Invoke(items.First());
         }
 
+
+        public  List<T> UpdateDataPoints<T>(IEnumerable<T> items, Action<T>  updateMethod)
+        {
+            var data = items.ToList();
+            if(updateMethod == null)
+            {
+                return data;
+            }
+
+            foreach (T item in data)
+            {
+                updateMethod(item);
+            }
+            return data;
+        }
     }
 }
diff --git a/src/Blazor-ApexCharts/Series/ApexBoxPlotSeries.cs b/src/Blazor-ApexCharts/Series/ApexBoxPlotSeries.cs
@@ -12,6 +12,8 @@ public class ApexBoxPlotSeries<TItem> : ApexBaseSeries<TItem>, IApexSeries<TItem
         [Parameter] public Func<TItem, decimal?> YValue { get; set; }
         [Parameter] public Func<ListPoint<TItem>, object> OrderBy { get; set; }
         [Parameter] public Func<ListPoint<TItem>, object> OrderByDescending { get; set; }
+        [Parameter] public Action<ListPoint<TItem>> UpdateDataPoint { get; set; }
+
 
         protected override void OnInitialized()
         {
@@ -44,7 +46,7 @@ public IEnumerable<IDataPoint<TItem>> GenerateDataPoints(IEnumerable<TItem> item
                 data = data.OrderByDescending(OrderByDescending);
             }
 
-            return data;
+            return UpdateDataPoints(data, UpdateDataPoint);
         }
 
         public void Dispose()
diff --git a/src/Blazor-ApexCharts/Series/ApexBubbleSeries.cs b/src/Blazor-ApexCharts/Series/ApexBubbleSeries.cs
@@ -13,6 +13,8 @@ public class ApexBubbleSeries<TItem> : ApexBaseSeries<TItem>, IApexSeries<TItem>
         [Parameter] public Func<IEnumerable<TItem>, decimal> ZAggregate { get; set; }
         [Parameter] public Func<BubblePoint<TItem>, object> OrderBy { get; set; }
         [Parameter] public Func<BubblePoint<TItem>, object> OrderByDescending { get; set; }
+        [Parameter] public Action<BubblePoint<TItem>> UpdateDataPoint { get; set; }
+
 
         protected override void OnInitialized()
         {
@@ -45,7 +47,7 @@ public IEnumerable<IDataPoint<TItem>> GenerateDataPoints(IEnumerable<TItem> item
                 data = data.OrderByDescending(OrderByDescending);
             }
 
-            return data;
+            return UpdateDataPoints(data, UpdateDataPoint);
         }
 
         public void Dispose()
diff --git a/src/Blazor-ApexCharts/Series/ApexCandleSeries.cs b/src/Blazor-ApexCharts/Series/ApexCandleSeries.cs
@@ -15,6 +15,8 @@ public class ApexCandleSeries<TItem> : ApexBaseSeries<TItem>, IApexSeries<TItem>
         [Parameter] public Func<TItem, decimal> Close { get; set; }
         [Parameter] public Func<ListPoint<TItem>, object> OrderBy { get; set; }
         [Parameter] public Func<ListPoint<TItem>, object> OrderByDescending { get; set; }
+        [Parameter] public Action<ListPoint<TItem>> UpdateDataPoint { get; set; }
+
 
         protected override void OnInitialized()
         {
@@ -52,7 +54,7 @@ public IEnumerable<IDataPoint<TItem>> GenerateDataPoints(IEnumerable<TItem> item
                 data = data.OrderByDescending(OrderByDescending);
             }
 
-            return data;
+            return UpdateDataPoints(data, UpdateDataPoint);
 
         }
 
diff --git a/src/Blazor-ApexCharts/Series/ApexPointSeries.cs b/src/Blazor-ApexCharts/Series/ApexPointSeries.cs
@@ -10,12 +10,13 @@ namespace ApexCharts
 {
     public class ApexPointSeries<TItem> : ApexBaseSeries<TItem>, IApexSeries<TItem> where TItem : class
     {
-        //[Parameter] public IEnumerable<IDataPoint<TItem>> Data { get; set; }
         [Parameter] public Func<TItem, decimal?> YValue { get; set; }
         [Parameter] public Func<IEnumerable<TItem>, decimal?> YAggregate { get; set; }
         [Parameter] public Func<DataPoint<TItem>, object> OrderBy { get; set; }
         [Parameter] public Func<DataPoint<TItem>, object> OrderByDescending { get; set; }
         [Parameter] public SeriesType SeriesType { get; set; }
+        [Parameter] public Action<DataPoint<TItem>> UpdateDataPoint { get; set; }
+
 
         protected override void OnInitialized()
         {
@@ -97,12 +98,7 @@ public IEnumerable<IDataPoint<TItem>> GenerateDataPoints(IEnumerable<TItem> item
                 data = data.OrderByDescending(OrderByDescending);
             }
 
-            return data;
-        }
-
-        public IEnumerable<IDataPoint<TItem>> GetData()
-        {
-            return GenerateDataPoints(Items);
+            return UpdateDataPoints(data, UpdateDataPoint);
         }
 
         public void Dispose()
diff --git a/src/Blazor-ApexCharts/Series/ApexRangeSeries.cs b/src/Blazor-ApexCharts/Series/ApexRangeSeries.cs
@@ -16,6 +16,7 @@ public class ApexRangeSeries<TItem> : ApexBaseSeries<TItem>, IApexSeries<TItem>
 
         [Parameter] public Func<TItem, decimal> YMinValue { get; set; }
         [Parameter] public Func<TItem, decimal> YMaxValue { get; set; }
+        [Parameter] public Action<ListPoint<TItem>> UpdateDataPoint { get; set; }
 
         protected override void OnInitialized()
         {
@@ -74,7 +75,7 @@ public IEnumerable<IDataPoint<TItem>> GenerateDataPoints(IEnumerable<TItem> item
                 data = data.OrderByDescending(OrderByDescending);
             }
 
-            return data;
+            return UpdateDataPoints(data, UpdateDataPoint);
         }
 
         public IEnumerable<IDataPoint<TItem>> GetData()

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`
`3`	`4`	`namespace ApexCharts`
`4`	`5`	`{`
`@@ -14,12 +15,24 @@ public static DateTimeOffset DayOnly(this DateTimeOffset value)`
`14`	`15`	`return new DateTimeOffset(value.Year, value.Month, value.Day, 0, 0, 0, new TimeSpan());`
`15`	`16`	`}`
`16`	`17`
`17`		`-`
`18`	`18`	`public static long ToUnixTimeMilliseconds(this DateTime d)`
`19`	`19`	`{`
`20`	`20`	`DateTime epoch = DateTime.UnixEpoch;`
`21`	`21`	`return (long)(d - epoch).TotalMilliseconds;`
`22`	`22`	`}`
`23`	`23`
	`24`	`+ public static IList<T> SetValue<T>(this IList<T> items, Action<T> updateMethod)`
	`25`	`+ {`
	`26`	`+ if(updateMethod == null)`
	`27`	`+ {`
	`28`	`+ return items;`
	`29`	`+ }`
	`30`	`+`
	`31`	`+ foreach (T item in items)`
	`32`	`+ {`
	`33`	`+ updateMethod(item);`
	`34`	`+ }`
	`35`	`+ return items;`
	`36`	`+ }`
`24`	`37`	`}`
`25`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ public class ApexBoxPlotSeries<TItem> : ApexBaseSeries<TItem>, IApexSeries<TItem`
`12`	`12`	`[Parameter] public Func<TItem, decimal?> YValue { get; set; }`
`13`	`13`	`[Parameter] public Func<ListPoint<TItem>, object> OrderBy { get; set; }`
`14`	`14`	`[Parameter] public Func<ListPoint<TItem>, object> OrderByDescending { get; set; }`
	`15`	`+ [Parameter] public Action<ListPoint<TItem>> UpdateDataPoint { get; set; }`
	`16`	`+`
`15`	`17`
`16`	`18`	`protected override void OnInitialized()`
`17`	`19`	`{`
`@@ -44,7 +46,7 @@ public IEnumerable<IDataPoint<TItem>> GenerateDataPoints(IEnumerable<TItem> item`
`44`	`46`	`data = data.OrderByDescending(OrderByDescending);`
`45`	`47`	`}`
`46`	`48`
`47`		`- return data;`
	`49`	`+ return UpdateDataPoints(data, UpdateDataPoint);`
`48`	`50`	`}`
`49`	`51`
`50`	`52`	`public void Dispose()`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ public class ApexBubbleSeries<TItem> : ApexBaseSeries<TItem>, IApexSeries<TItem>`
`13`	`13`	`[Parameter] public Func<IEnumerable<TItem>, decimal> ZAggregate { get; set; }`
`14`	`14`	`[Parameter] public Func<BubblePoint<TItem>, object> OrderBy { get; set; }`
`15`	`15`	`[Parameter] public Func<BubblePoint<TItem>, object> OrderByDescending { get; set; }`
	`16`	`+ [Parameter] public Action<BubblePoint<TItem>> UpdateDataPoint { get; set; }`
	`17`	`+`
`16`	`18`
`17`	`19`	`protected override void OnInitialized()`
`18`	`20`	`{`
`@@ -45,7 +47,7 @@ public IEnumerable<IDataPoint<TItem>> GenerateDataPoints(IEnumerable<TItem> item`
`45`	`47`	`data = data.OrderByDescending(OrderByDescending);`
`46`	`48`	`}`
`47`	`49`
`48`		`- return data;`
	`50`	`+ return UpdateDataPoints(data, UpdateDataPoint);`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`public void Dispose()`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ public class ApexCandleSeries<TItem> : ApexBaseSeries<TItem>, IApexSeries<TItem>`
`15`	`15`	`[Parameter] public Func<TItem, decimal> Close { get; set; }`
`16`	`16`	`[Parameter] public Func<ListPoint<TItem>, object> OrderBy { get; set; }`
`17`	`17`	`[Parameter] public Func<ListPoint<TItem>, object> OrderByDescending { get; set; }`
	`18`	`+ [Parameter] public Action<ListPoint<TItem>> UpdateDataPoint { get; set; }`
	`19`	`+`
`18`	`20`
`19`	`21`	`protected override void OnInitialized()`
`20`	`22`	`{`
`@@ -52,7 +54,7 @@ public IEnumerable<IDataPoint<TItem>> GenerateDataPoints(IEnumerable<TItem> item`
`52`	`54`	`data = data.OrderByDescending(OrderByDescending);`
`53`	`55`	`}`
`54`	`56`
`55`		`- return data;`
	`57`	`+ return UpdateDataPoints(data, UpdateDataPoint);`
`56`	`58`
`57`	`59`	`}`
`58`	`60`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,13 @@ namespace ApexCharts`
`10`	`10`	`{`
`11`	`11`	`public class ApexPointSeries<TItem> : ApexBaseSeries<TItem>, IApexSeries<TItem> where TItem : class`
`12`	`12`	`{`
`13`		`- //[Parameter] public IEnumerable<IDataPoint<TItem>> Data { get; set; }`
`14`	`13`	`[Parameter] public Func<TItem, decimal?> YValue { get; set; }`
`15`	`14`	`[Parameter] public Func<IEnumerable<TItem>, decimal?> YAggregate { get; set; }`
`16`	`15`	`[Parameter] public Func<DataPoint<TItem>, object> OrderBy { get; set; }`
`17`	`16`	`[Parameter] public Func<DataPoint<TItem>, object> OrderByDescending { get; set; }`
`18`	`17`	`[Parameter] public SeriesType SeriesType { get; set; }`
	`18`	`+ [Parameter] public Action<DataPoint<TItem>> UpdateDataPoint { get; set; }`
	`19`	`+`
`19`	`20`
`20`	`21`	`protected override void OnInitialized()`
`21`	`22`	`{`
`@@ -97,12 +98,7 @@ public IEnumerable<IDataPoint<TItem>> GenerateDataPoints(IEnumerable<TItem> item`
`97`	`98`	`data = data.OrderByDescending(OrderByDescending);`
`98`	`99`	`}`
`99`	`100`
`100`		`- return data;`
`101`		`- }`
`102`		`-`
`103`		`- public IEnumerable<IDataPoint<TItem>> GetData()`
`104`		`- {`
`105`		`- return GenerateDataPoints(Items);`
	`101`	`+ return UpdateDataPoints(data, UpdateDataPoint);`
`106`	`102`	`}`
`107`	`103`
`108`	`104`	`public void Dispose()`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public class ApexRangeSeries<TItem> : ApexBaseSeries<TItem>, IApexSeries<TItem>`
`16`	`16`
`17`	`17`	`[Parameter] public Func<TItem, decimal> YMinValue { get; set; }`
`18`	`18`	`[Parameter] public Func<TItem, decimal> YMaxValue { get; set; }`
	`19`	`+ [Parameter] public Action<ListPoint<TItem>> UpdateDataPoint { get; set; }`
`19`	`20`
`20`	`21`	`protected override void OnInitialized()`
`21`	`22`	`{`
`@@ -74,7 +75,7 @@ public IEnumerable<IDataPoint<TItem>> GenerateDataPoints(IEnumerable<TItem> item`
`74`	`75`	`data = data.OrderByDescending(OrderByDescending);`
`75`	`76`	`}`
`76`	`77`
`77`		`- return data;`
	`78`	`+ return UpdateDataPoints(data, UpdateDataPoint);`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`public IEnumerable<IDataPoint<TItem>> GetData()`