Skip to content

Commit f494441

Browse files
Merge branch '25.1.3+' into 25.1.3_SharedTypes
# Conflicts: # CS/Directory.Packages.props
2 parents 46de7ec + 08b39d9 commit f494441

20 files changed

+143
-349
lines changed

CS/Directory.Packages.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@
6565
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
6666
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.9.0" />
6767
<PackageVersion Include="System.Drawing.Common" Version="8.0.15" />
68+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0" />
6869
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" />
70+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.10.0" />
6971
</ItemGroup>
7072
</Project>
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
@using System.Linq.Expressions
2+
@using DevExpress.ExpressApp.Blazor.Editors
3+
@using DevExpress.ExpressApp.Blazor.Editors.Models
4+
@using DevExpress.ExpressApp.Utils
5+
@using OutlookInspired.Module.BusinessObjects
6+
@using System.Drawing
7+
8+
<DxPieChartSeries ArgumentField="(Opportunity item) => CaptionHelper.GetDisplayText(item.Stage)"
9+
ValueField="Item => Item.Value"
10+
SummaryMethod="items => items.Sum()">
11+
<DxChartSeriesLabel Visible="true" Position="RelativePosition.Outside" ValueFormat="ChartElementFormat.Thousands(1)">
12+
<DxChartSeriesLabelConnector Visible="true" />
13+
</DxChartSeriesLabel>
14+
</DxPieChartSeries>
15+
<DxChartTooltip Enabled="true" Position="RelativePosition.Outside">
16+
<div style="margin: 0.75rem">
17+
<div class="fw-bold">@context.Point.Argument</div>
18+
<div>Sales: @($"${context.Point.Value:#,0.}")</div>
19+
</div>
20+
</DxChartTooltip>
21+
<DxChartLegend HorizontalAlignment="HorizontalAlignment.Center" VerticalAlignment="VerticalEdge.Bottom" Position="RelativePosition.Outside" Orientation="Orientation.Horizontal" />
22+
23+
@code {
24+
[CascadingParameter] public DxChartListEditor ChartEditor { get; set; }
25+
26+
protected override void OnParametersSet()
27+
{
28+
base.OnParametersSet();
29+
if (ChartEditor.ChartModel is DxPieChartModel pieChart)
30+
{
31+
pieChart.SetAttribute("style", "margin-top:100px");
32+
pieChart.Diameter = 1;
33+
pieChart.InnerDiameter = 0.5;
34+
pieChart.StartAngle = 0;
35+
pieChart.SegmentDirection = PieChartSegmentDirection.Clockwise;
36+
pieChart.CustomizeSeriesPoint = e
37+
=> e.PointAppearance.Color = ColorTranslator.FromHtml(e.Point.DataItems.Cast<Opportunity>().First().Stage.Color());
38+
}
39+
}
40+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@using OutlookInspired.Module.BusinessObjects
2+
3+
<DxChartCommonSeries SeriesType="ChartSeriesType.Bar"
4+
ArgumentField="(MapItem item) => item.CustomerName"
5+
NameField="item => item.CustomerName"
6+
ValueField="item => item.Total"
7+
SummaryMethod="items => items.Sum()" />
8+
<DxChartLegend Visible="false" />
9+
<DxChartTooltip Enabled="true" Position="RelativePosition.Outside">
10+
<div style="background-color: #505050;color: white">
11+
@context.Point.SeriesName: @($"{(decimal)context.Point.Value:$0,.#K}")
12+
</div>
13+
</DxChartTooltip>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@using OutlookInspired.Module.BusinessObjects
2+
3+
<DxChartCommonSeries SeriesType="ChartSeriesType.Bar"
4+
ArgumentField="(MapItem item) => item.ProductName"
5+
NameField="item => item.ProductName"
6+
ValueField="item => item.Total"
7+
SummaryMethod="items => items.Sum()" />
8+
<DxChartLegend Visible="false" />
9+
<DxChartTooltip Enabled="true" Position="RelativePosition.Outside">
10+
<div style="background-color: #505050;color: white">
11+
@context.Point.SeriesName: @($"{(decimal)context.Point.Value:$0,.#K}")
12+
</div>
13+
</DxChartTooltip>

CS/OutlookInspired.Blazor.Server/Editors/Charts/DxChartListEditor.cs

Lines changed: 0 additions & 42 deletions
This file was deleted.

CS/OutlookInspired.Blazor.Server/Editors/Charts/DxChartPieListEditor.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

CS/OutlookInspired.Blazor.Server/Editors/Charts/MyDxChart.razor

Lines changed: 0 additions & 37 deletions
This file was deleted.

CS/OutlookInspired.Blazor.Server/Editors/Charts/MyDxChart.razor.cs

Lines changed: 0 additions & 49 deletions
This file was deleted.

CS/OutlookInspired.Blazor.Server/Editors/Charts/MyDxPieChart.razor

Lines changed: 0 additions & 50 deletions
This file was deleted.

CS/OutlookInspired.Blazor.Server/Editors/Charts/MyDxPieChart.razor.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)