Skip to content

Commit 25d8c09

Browse files
erossinierossini
authored
Merge pull request #28 from erossini/feature/StringEnum
Add for Line chart Y and Y2 - Add Pie chart options - Introduce StringEnum for Align, LegendAlign, CrossAlign, PointStyle and Poistion
2 parents e4621c0 + 710f8c0 commit 25d8c09

29 files changed

Lines changed: 855 additions & 94 deletions

‎ChartjsDemo/Data/BubbleDataExamples.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ public static class BubbleDataExamples
77
public static List<string> SimpleBubbleText = new List<string>() { "First Dataset" };
88
public static List<BubbleCoords> SimpleBubble = new List<BubbleCoords>() {
99
new BubbleCoords() { R = 15, X = 20, Y = 30 },
10-
new BubbleCoords() { R = 10, X = 40, Y = 10 }
10+
new BubbleCoords() { R = 10, X = 40, Y = 10 },
11+
new BubbleCoords() { R = 14, X = 30, Y = 20 },
1112
};
1213
}
13-
}
14+
}

‎ChartjsDemo/Pages/BarHorizontal.razor‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
@page "/barSimple"
2+
3+
<h3>Bar Simple</h3>
4+
5+
<Chart Config="_config1" @ref="_chart1" Height="400px"></Chart>
6+
7+
<hr/>
8+
9+
<h3>Code</h3>
10+
11+
<p>
12+
This is the component to add in your page.
13+
</p>
14+
15+
<CodeSnippet Language="Language.xml" Style="Style.VisualStudio">
16+
&ltChart Config="_config1" &#64;ref="_chart1">&lt;Chart>
17+
</CodeSnippet>
18+
19+
<p>
20+
Then, in the code section, add the following code:
21+
</p>
22+
23+
<CodeSnippet Language="Language.csharp" Style="Style.VisualStudio" LoadMainScript="false">
24+
private BarChartConfig? _config1;
25+
private Chart? _chart1;
26+
27+
protected override async Task OnInitializedAsync()
28+
{
29+
_config1 = new BarChartConfig()
30+
{
31+
Options = new Options()
32+
{
33+
Responsive = true,
34+
MaintainAspectRatio = false,
35+
Plugins = new Plugins()
36+
{
37+
Legend = new Legend()
38+
{
39+
Align = LegendAlign.Center,
40+
Display = false,
41+
Position = LegendPosition.Right
42+
}
43+
},
44+
Scales = new Dictionary&lt;string, Axis&gt;()
45+
{
46+
{
47+
Scales.XAxisId, new Axis()
48+
{
49+
Stacked = true,
50+
Ticks = new Ticks()
51+
{
52+
MaxRotation = 0,
53+
MinRotation = 0
54+
}
55+
}
56+
},
57+
{
58+
Scales.YAxisId, new Axis()
59+
{
60+
Stacked = true
61+
}
62+
}
63+
}
64+
}
65+
};
66+
67+
_config1.Data.Labels = BarDataExamples.SimpleBarText;
68+
_config1.Data.Datasets.Add(new BarDataset()
69+
{
70+
Label = "Value",
71+
Data = BarDataExamples.SimpleBar.Select(l => l.Value).ToList(),
72+
BackgroundColor = Colors.Palette1,
73+
BorderColor = Colors.PaletteBorder1,
74+
BorderWidth = 1
75+
});
76+
}
77+
</CodeSnippet>
78+
79+
@code {
80+
private BarChartConfig? _config1;
81+
private Chart? _chart1;
82+
83+
protected override async Task OnInitializedAsync()
84+
{
85+
_config1 = new BarChartConfig()
86+
{
87+
Options = new Options()
88+
{
89+
Responsive = true,
90+
MaintainAspectRatio = false,
91+
Plugins = new Plugins()
92+
{
93+
Legend = new Legend()
94+
{
95+
Align = Align.Center,
96+
Display = false,
97+
Position = LegendPosition.Right
98+
}
99+
},
100+
Scales = new Dictionary<string, Axis>()
101+
{
102+
{
103+
Scales.XAxisId, new Axis()
104+
{
105+
Stacked = true,
106+
Ticks = new Ticks()
107+
{
108+
MaxRotation = 0,
109+
MinRotation = 0
110+
}
111+
}
112+
},
113+
{
114+
Scales.YAxisId, new Axis()
115+
{
116+
Stacked = true
117+
}
118+
}
119+
}
120+
}
121+
};
122+
123+
_config1.Data.Labels = BarDataExamples.SimpleBarText;
124+
_config1.Data.Datasets.Add(new BarDataset()
125+
{
126+
Label = "Value",
127+
Data = BarDataExamples.SimpleBar.Select(l => l.Value).ToList(),
128+
BackgroundColor = Colors.Palette1,
129+
BorderColor = Colors.PaletteBorder1,
130+
BorderWidth = 1
131+
});
132+
}
133+
}

‎ChartjsDemo/Pages/BarSimple.razor‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@page "/barSimple"
1+
@page "/barHorizontal"
22

33
<h3>Bar Simple</h3>
44

@@ -13,7 +13,7 @@
1313
</p>
1414

1515
<CodeSnippet Language="Language.xml" Style="Style.VisualStudio">
16-
&ltChart Config="_config1" &#64;ref="_chart1">&lt;Chart>
16+
&ltChart Config="_config1" &#64;ref="_chart1">&lt;Chart>
1717
</CodeSnippet>
1818

1919
<p>
@@ -86,13 +86,14 @@ protected override async Task OnInitializedAsync()
8686
{
8787
Options = new Options()
8888
{
89+
IndexAxis = "y",
8990
Responsive = true,
9091
MaintainAspectRatio = false,
9192
Plugins = new Plugins()
9293
{
9394
Legend = new Legend()
9495
{
95-
Align = LegendAlign.Center,
96+
Align = Align.Center,
9697
Display = false,
9798
Position = LegendPosition.Right
9899
}

‎ChartjsDemo/Pages/LineBar.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected override async Task OnInitializedAsync()
100100
{
101101
Legend = new Legend()
102102
{
103-
Align = LegendAlign.Center,
103+
Align = Align.Center,
104104
Display = false,
105105
Position = LegendPosition.Right
106106
}

‎ChartjsDemo/Pages/LineSimple.razor‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ protected override async Task OnInitializedAsync()
3737
Data = LineDataExamples.SimpleLine.ToList(),
3838
BorderColor = Colors.PaletteBorder1.FirstOrDefault(),
3939
Tension = 0.1M,
40-
Fill = false
40+
Fill = false,
41+
PointRadius= 15,
42+
PointStyle = PointStyle.Cross
4143
});
4244
}
4345
</CodeSnippet>
@@ -59,7 +61,9 @@ protected override async Task OnInitializedAsync()
5961
Data = LineDataExamples.SimpleLine.ToList(),
6062
BorderColor = Colors.PaletteBorder1.FirstOrDefault(),
6163
Tension = 0.1M,
62-
Fill = false
64+
Fill = false,
65+
PointRadius= 15,
66+
PointStyle = PointStyle.Cross
6367
});
6468
}
6569
}

‎ChartjsDemo/Pages/PieGauge.razor‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
@page "/pieGauge"
2+
3+
<h3>Pie Gauge</h3>
4+
5+
<Chart Config="_config1" @ref="_chart1" Height="400px"></Chart>
6+
7+
<hr />
8+
9+
<h3>Code</h3>
10+
11+
<p>
12+
This is the component to add in your page.
13+
</p>
14+
15+
<CodeSnippet Language="Language.xml" Style="Style.VisualStudio">
16+
&ltChart Config="_config1" &#64;ref="_chart1">&lt;Chart>
17+
</CodeSnippet>
18+
19+
<p>
20+
Then, in the code section, add the following code:
21+
</p>
22+
23+
<CodeSnippet Language="Language.csharp" Style="Style.VisualStudio" LoadMainScript="false">
24+
private PieChartConfig? _config1;
25+
private Chart? _chart1;
26+
27+
protected override async Task OnInitializedAsync()
28+
{
29+
_config1 = new PieChartConfig()
30+
{
31+
Options = new PieOptions()
32+
{
33+
Responsive = true,
34+
MaintainAspectRatio = false,
35+
Rotation = -90,
36+
Circumference = 180
37+
}
38+
};
39+
40+
_config1.Data.Labels = PieDataExamples.SimplePieText;
41+
_config1.Data.Datasets.Add(new PieDataset()
42+
{
43+
Label = "My First Dataset",
44+
Data = PieDataExamples.SimplePie.ToList(),
45+
BackgroundColor = Colors.PaletteBorder1,
46+
HoverOffset = 4
47+
});
48+
}
49+
</CodeSnippet>
50+
51+
@code {
52+
private PieChartConfig? _config1;
53+
private Chart? _chart1;
54+
55+
protected override async Task OnInitializedAsync()
56+
{
57+
_config1 = new PieChartConfig()
58+
{
59+
Options = new PieOptions()
60+
{
61+
Responsive = true,
62+
MaintainAspectRatio = false,
63+
Rotation = -90,
64+
Circumference = 180
65+
}
66+
};
67+
68+
_config1.Data.Labels = PieDataExamples.SimplePieText;
69+
_config1.Data.Datasets.Add(new PieDataset()
70+
{
71+
Label = "My First Dataset",
72+
Data = PieDataExamples.SimplePie.ToList(),
73+
BackgroundColor = Colors.PaletteBorder1,
74+
HoverOffset = 4
75+
});
76+
}
77+
}

‎ChartjsDemo/Pages/PieMulti.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ protected override async Task OnInitializedAsync()
6767
{
6868
_config1 = new PieChartConfig()
6969
{
70-
Options = new Options()
70+
Options = new PieOptions()
7171
{
7272
Responsive = true,
7373
MaintainAspectRatio = false

‎ChartjsDemo/Pages/PieSimple.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected override async Task OnInitializedAsync()
4949
{
5050
_config1 = new PieChartConfig()
5151
{
52-
Options = new Options()
52+
Options = new PieOptions()
5353
{
5454
Responsive = true,
5555
MaintainAspectRatio = false

‎ChartjsDemo/Pages/ScatterMultiAxes.razor‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected override async Task OnInitializedAsync()
3838
Scales.YAxisId, new Axis()
3939
{
4040
Type = "linear",
41-
Position = "left",
41+
Position = Position.Left,
4242
Ticks = new Ticks()
4343
{
4444
Color = "rgb(255, 0, 0)"
@@ -49,7 +49,7 @@ protected override async Task OnInitializedAsync()
4949
Scales.Y2AxisId, new Axis()
5050
{
5151
Type = "linear",
52-
Position = "right",
52+
Position = Position.Right,
5353
Ticks = new Ticks()
5454
{
5555
Color = "rgb(0, 0, 255)"
@@ -97,7 +97,7 @@ protected override async Task OnInitializedAsync()
9797
Scales.YAxisId, new Axis()
9898
{
9999
Type = "linear",
100-
Position = "left",
100+
Position = Position.Left,
101101
Ticks = new Ticks()
102102
{
103103
Color = "rgb(255, 0, 0)"
@@ -108,7 +108,7 @@ protected override async Task OnInitializedAsync()
108108
Scales.Y2AxisId, new Axis()
109109
{
110110
Type = "linear",
111-
Position = "right",
111+
Position = Position.Right,
112112
Ticks = new Ticks()
113113
{
114114
Color = "rgb(0, 0, 255)"

‎ChartjsDemo/Shared/NavMenu.razor‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
<span class="oi oi-bar-chart" aria-hidden="true"></span> Bar Simple
2525
</NavLink>
2626
</div>
27+
<div class="nav-item px-3">
28+
<NavLink class="nav-link" href="barHorizontal">
29+
<span class="oi oi-bar-chart" aria-hidden="true"></span> Horizontal Bar
30+
</NavLink>
31+
</div>
2732
<div class="nav-item px-3">
2833
<NavLink class="nav-link" href="lineSimple">
2934
<span class="oi oi-graph" aria-hidden="true"></span> Line Simple
@@ -34,6 +39,11 @@
3439
<span class="oi oi-pie-chart" aria-hidden="true"></span> Pie Simple
3540
</NavLink>
3641
</div>
42+
<div class="nav-item px-3">
43+
<NavLink class="nav-link" href="pieGauge">
44+
<span class="oi oi-pie-chart" aria-hidden="true"></span> Pie Gauge
45+
</NavLink>
46+
</div>
3747
<div class="nav-item px-3">
3848
<NavLink class="nav-link" href="pieMulti">
3949
<span class="oi oi-pie-chart" aria-hidden="true"></span> Pie Multi Series

0 commit comments

Comments
 (0)