Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade blazor #1

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

upgrade blazor #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions usa-elections/Pages/ElectionBar.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@

@code {

RenderFragment CreateTooltip(DataContext context)
RenderFragment CreateTooltip(IgbDataContext context)
{
var brush = "";
var votes = "";
Expand Down Expand Up @@ -171,8 +171,8 @@

public List<Candidate> DisplayCandidates { get; set; }

private DataChart BarChart;
public DataChart BarChartRef
private IgbDataChart BarChart;
public IgbDataChart BarChartRef
{
get { return BarChart; }
set { BarChart = value; this.OnChanged(); }
Expand Down Expand Up @@ -236,16 +236,16 @@
base.OnInitialized();
Logger.WriteLine("ElectionBar OnInitialized");

DataChartCoreModule.Register(IgniteUIBlazor); //DataChartCategoryCoreModule.Register(IgniteUIBlazor);
DataChartCategoryModule.Register(IgniteUIBlazor);
DataChartInteractivityModule.Register(IgniteUIBlazor);
DataChartVerticalCategoryModule.Register(IgniteUIBlazor);
NumberAbbreviatorModule.Register(IgniteUIBlazor);
ItemToolTipLayerModule.Register(IgniteUIBlazor);
CategoryToolTipLayerModule.Register(IgniteUIBlazor);
IgbDataChartCoreModule.Register(IgniteUIBlazor); //DataChartCategoryCoreModule.Register(IgniteUIBlazor);
IgbDataChartCategoryModule.Register(IgniteUIBlazor);
IgbDataChartInteractivityModule.Register(IgniteUIBlazor);
IgbDataChartVerticalCategoryModule.Register(IgniteUIBlazor);
IgbNumberAbbreviatorModule.Register(IgniteUIBlazor);
IgbItemToolTipLayerModule.Register(IgniteUIBlazor);
IgbCategoryToolTipLayerModule.Register(IgniteUIBlazor);

LegendModule.Register(IgniteUIBlazor);
ItemLegendModule.Register(IgniteUIBlazor);
IgbLegendModule.Register(IgniteUIBlazor);
IgbItemLegendModule.Register(IgniteUIBlazor);
}

protected override async Task OnInitializedAsync()
Expand Down
12 changes: 6 additions & 6 deletions usa-elections/Pages/ElectionBubbles.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@


private bool IsMapReady = false;
private GeographicSymbolSeries BubbleSeries;
private GeographicMap BubbleMap;
public GeographicMap BubbleMapRef
private IgbGeographicSymbolSeries BubbleSeries;
private IgbGeographicMap BubbleMap;
public IgbGeographicMap BubbleMapRef
{
get { return BubbleMap; }
set { BubbleMap = value; this.OnChanged("BubbleMap"); }
Expand Down Expand Up @@ -112,8 +112,8 @@
{
Logger.WriteLine("ElectionBubbles OnInitialized");

DataChartInteractivityModule.Register(IgniteUIBlazor);
GeographicMapModule.Register(IgniteUIBlazor);
IgbDataChartInteractivityModule.Register(IgniteUIBlazor);
IgbGeographicMapModule.Register(IgniteUIBlazor);
}

public static Dictionary<string, StateLocation> StateLocations { get; set; }
Expand Down Expand Up @@ -183,7 +183,7 @@
this.IsMapReady = true;
if (this.BubbleMap != null)
{
this.BubbleSeries = (GeographicSymbolSeries)this.BubbleMap.ActualSeries[0];
this.BubbleSeries = (IgbGeographicSymbolSeries)this.BubbleMap.ActualSeries[0];
}

OnChanged("RenderAsync");
Expand Down
26 changes: 13 additions & 13 deletions usa-elections/Pages/ElectionChart.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@

@code {

RenderFragment CreateTooltip(DataContext context)
RenderFragment CreateTooltip(IgbDataContext context)
{
var brush = "";
var votes = "";
Expand Down Expand Up @@ -188,8 +188,8 @@
public double DisplayMax { get { return DisplayMode == ElectionDisplayMode.Electoral ?
Election.TotalElectors : Election.TotalVotes; } }

private DataChart BarChart;
public DataChart BarChartRef
private IgbDataChart BarChart;
public IgbDataChart BarChartRef
{
get { return BarChart; }
set { BarChart = value; this.OnChanged(); }
Expand Down Expand Up @@ -229,18 +229,18 @@
base.OnInitialized();
Logger.WriteLine("ElectionChart OnInitialized");

DataChartCoreModule.Register(IgniteUIBlazor);
DataChartCategoryModule.Register(IgniteUIBlazor);
DataChartInteractivityModule.Register(IgniteUIBlazor);
DataChartVerticalCategoryModule.Register(IgniteUIBlazor);
NumberAbbreviatorModule.Register(IgniteUIBlazor);
ItemToolTipLayerModule.Register(IgniteUIBlazor);
CategoryToolTipLayerModule.Register(IgniteUIBlazor);
IgbDataChartCoreModule.Register(IgniteUIBlazor);
IgbDataChartCategoryModule.Register(IgniteUIBlazor);
IgbDataChartInteractivityModule.Register(IgniteUIBlazor);
IgbDataChartVerticalCategoryModule.Register(IgniteUIBlazor);
IgbNumberAbbreviatorModule.Register(IgniteUIBlazor);
IgbItemToolTipLayerModule.Register(IgniteUIBlazor);
IgbCategoryToolTipLayerModule.Register(IgniteUIBlazor);

DataChartScatterModule.Register(IgniteUIBlazor);
IgbDataChartScatterModule.Register(IgniteUIBlazor);

LegendModule.Register(IgniteUIBlazor);
ItemLegendModule.Register(IgniteUIBlazor);
IgbLegendModule.Register(IgniteUIBlazor);
IgbItemLegendModule.Register(IgniteUIBlazor);
}

protected override async Task OnInitializedAsync()
Expand Down
35 changes: 18 additions & 17 deletions usa-elections/Pages/ElectionGrid.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
{
<DataGrid Height="100%" Width="100%"
AutoGenerateColumns="false"
SelectionMode="@GridSelectionMode.SingleRow"
ColumnShowingAnimationMode="@ColumnShowingAnimationMode.None"
ColumnAddingAnimationMode="@ColumnShowingAnimationMode.None"
ColumnMovingAnimationMode="@ColumnMovingAnimationMode.None"
Expand Down Expand Up @@ -91,14 +90,14 @@
private DataSourceSummaryScope GridSummaryScope = DataSourceSummaryScope.Groups;
private GroupSummaryDisplayMode GridGroupSummaryDisplayMode = GroupSummaryDisplayMode.Cells;

private DataGrid Grid;
private DataGrid GridRef
private IgbDataGrid Grid;
private IgbDataGrid GridRef
{
get { return Grid; }
set { Grid = value; this.OnReferenced(); StateHasChanged(); }
}

void OnGridSortChanged(GridSortDescriptionsChangedEventArgs args)
void OnGridSortChanged(IgbGridSortDescriptionsChangedEventArgs args)
{
var sortBy = Grid.SortDescriptions[0];
//Logger.WriteLine("OnGridSortChanged " + sortBy.Name);
Expand All @@ -121,7 +120,7 @@
}
}

void OnCellClicked(GridCellEventArgs args)
void OnCellClicked(IgbDataGridCellEventArgs args)
{
//Logger.WriteLine("OnCellClicked " + args.Type);
}
Expand All @@ -138,7 +137,7 @@
Grid.SortDescriptionsChanged += OnGridSortChanged;
Grid.CellClicked += OnCellClicked;

var ColumnGroup = new ColumnGroupDescription()
var ColumnGroup = new IgbColumnGroupDescription()
{
//Field = "State", DisplayName = "State"
//Field = "CandidateName", DisplayName = "Candidate"
Expand All @@ -148,40 +147,42 @@
this.Grid.IsGroupRowSticky = true;
this.Grid.IsGroupExpandedDefault = false;

var SumVotes = new ColumnSummaryDescription()
var SumVotes = new IgbColumnSummaryDescription()
{
Field = "V", DisplayName = "V", Operand = SummaryOperand.Sum
Field = "V", DisplayName = "V", Operand = DataSourceSummaryOperand.Sum
};
var SumElectors = new ColumnSummaryDescription()
var SumElectors = new IgbColumnSummaryDescription()
{
Field = "E", DisplayName = "E", Operand = SummaryOperand.Sum
Field = "E",
DisplayName = "E",
Operand = DataSourceSummaryOperand.Sum
};
//var SumPercentage = new ColumnSummaryDescription()
//{
// Field = "TotalPercentage", DisplayName = "%", Operand = SummaryOperand.Sum
//};
var SumVotesPerStatePercentage = new ColumnSummaryDescription()
var SumVotesPerStatePercentage = new IgbColumnSummaryDescription()
{
Field = "VotesPerStatePercentage",
Operand = SummaryOperand.Custom,
Operand = DataSourceSummaryOperand.Custom,
ProvideCalculatorScript = "onCalculateVotesTotalPercentage"
};

var CountStates = new ColumnSummaryDescription()
var CountStates = new IgbColumnSummaryDescription()
{
Field = "State",
Operand = SummaryOperand.Custom,
Operand = DataSourceSummaryOperand.Custom,
ProvideCalculatorScript = "onCalculateState"
};
//var CountStates = new ColumnSummaryDescription()
//{
// Field = "State", DisplayName = "State", Operand = SummaryOperand.Count
//};

var SumParty = new ColumnSummaryDescription()
var SumParty = new IgbColumnSummaryDescription()
{
Field = "CandidateParty",
Operand = SummaryOperand.Custom,
Operand = DataSourceSummaryOperand.Custom,
ProvideCalculatorScript = "onCalculateParty"
};
this.Grid.SummaryDescriptions.Add(CountStates);
Expand All @@ -206,7 +207,7 @@
//Logger.WriteLine("App OnInit " + NavManager.BaseUri);
//Logger.WriteLine("App OnInit " + NavManager.Uri);

DataGridModule.Register(IgniteUIBlazor);
IgbDataGridModule.Register(IgniteUIBlazor);
}

protected override async Task OnInitializedAsync()
Expand Down
22 changes: 11 additions & 11 deletions usa-elections/Pages/ElectionHex.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
base.OnInitialized();
Logger.WriteLine("ElectionHex OnInitialized");

GeographicMapModule.Register(IgniteUIBlazor);
DataChartInteractivityModule.Register(IgniteUIBlazor);
IgbGeographicMapModule.Register(IgniteUIBlazor);
IgbDataChartInteractivityModule.Register(IgniteUIBlazor);
}

protected override async Task OnInitializedAsync()
Expand All @@ -42,9 +42,9 @@
await Task.Delay(1);
}

private GeographicMap HexMap;
private GeographicShapeSeries HexSeries;
private ShapeDataSource HexShapes;
private IgbGeographicMap HexMap;
private IgbGeographicShapeSeries HexSeries;
private IgbShapeDataSource HexShapes;
private Dictionary<string, StateInfo> StatesLookup;

protected override Task OnAfterRenderAsync(bool firstRender)
Expand All @@ -55,23 +55,23 @@

if (this.HexMap != null)
{
HexSeries = (GeographicShapeSeries)this.HexMap.ActualSeries[0];
HexSeries = (IgbGeographicShapeSeries)this.HexMap.ActualSeries[0];
HexSeries.ShapefileDataSource = (
new ShapeDataSource() {
new IgbShapeDataSource() {
Name="hexSeries",
//ImportCompletedScript = "onHexImportCompleted",
ShapefileSource = "shapes/usa_states_hex_map.shp",
DatabaseSource = "shapes/usa_states_hex_map.dbf",
ImportCompleted = new EventCallback<AsyncCompletedEventArgs>(null,
(Func<AsyncCompletedEventArgs, Task>)OnImportCompleted)
ImportCompleted = new EventCallback<IgbAsyncCompletedEventArgs>(null,
(Func<IgbAsyncCompletedEventArgs, Task>)OnImportCompleted)
}
);
}
}
return base.OnAfterRenderAsync(firstRender);
}

protected async Task OnImportCompleted(AsyncCompletedEventArgs args)
protected async Task OnImportCompleted(IgbAsyncCompletedEventArgs args)
{
Console.WriteLine("ElectionHex Shapes Importing... done");

Expand Down Expand Up @@ -265,7 +265,7 @@
set { _DisplayMode = value; this.OnChanged("DisplayMode=" + value); }
}

RenderFragment CreateTooltip(DataContext context)
RenderFragment CreateTooltip(IgbDataContext context)
{
return @<div class="ui-tooltip-content" >
<div>name</div>
Expand Down
9 changes: 4 additions & 5 deletions usa-elections/Pages/ElectionSelector.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<DataGrid Height="100%" Width="100%" @ref="@GridRef"
AutoGenerateColumns="false"
DataSource="@Elections"
SelectionMode="@GridSelectionMode.SingleRow"
HeaderHeight="32" RowHeight="40"
IsColumnOptionsEnabled="false"
ColumnMovingMode="@ColumnMovingMode.None"
Expand All @@ -28,7 +27,7 @@

@code {

private DataGrid GridRef;
private IgbDataGrid GridRef;

private List<Election> elections;
[Parameter]
Expand Down Expand Up @@ -56,7 +55,7 @@
base.OnInitialized();
Logger.WriteLine("ElectionSelector OnInitialized");

DataGridModule.Register(IgniteUIBlazor);
IgbDataGridModule.Register(IgniteUIBlazor);

var allElections = new List<Election>();
//allElections.Add(new Election { Year = 2022, Index = -1 } );
Expand Down Expand Up @@ -107,14 +106,14 @@
return base.OnAfterRenderAsync(firstRender);
}

protected void OnSelectedItemsChanged(GridSelectedItemsChangedEventArgs e)
protected void OnSelectedItemsChanged(IgbGridSelectedItemsChangedEventArgs e)
{
var election = e.CurrentItems[0] as Election;
Console.WriteLine("Selector OnElectionChanged " + election.Year);
this.Changed.InvokeAsync(election.Year);
}

protected void OnSelectedCellsChanged(GridSelectedCellsChangedEventArgs e)
protected void OnSelectedCellsChanged(IgbGridSelectedCellsChangedEventArgs e)
{
var election = e.CurrentCells[0].RowItem as Election;
Console.WriteLine("Selector OnElectionChanged " + election.Year);
Expand Down
12 changes: 6 additions & 6 deletions usa-elections/Pages/ElectionTree.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
public bool TooltipVisible { get; set; }
public string TooltipDisplay { get { return TooltipVisible ? "display: flex" : "display: none"; } }

void OnNodePointerOver(TreemapNodePointerEventArgs e)
void OnNodePointerOver(IgbTreemapNodePointerEventArgs e)
{
var position = e.Position;
var x = e.Position.X;
Expand Down Expand Up @@ -101,14 +101,14 @@
//Console.WriteLine("OnNodePointerOver " + item.StateSymbol + " " + TooltipPostion);
}

void OnNodePointerEnter(TreemapNodePointerEventArgs e)
void OnNodePointerEnter(IgbTreemapNodePointerEventArgs e)
{
//if (e.IsOverHeader) return;
//var item = e.Item as ResultsByState;
//Console.WriteLine("OnNodePointerEnter " + item.StateSymbol + " " + e.Position.X);
}

void OnNodePointerLeave(TreemapNodePointerEventArgs e)
void OnNodePointerLeave(IgbTreemapNodePointerEventArgs e)
{
TooltipVisible = false;
StateHasChanged();
Expand All @@ -117,8 +117,8 @@
//Console.WriteLine("OnNodePointerLeave " + item.StateSymbol + " " + e.Position.X);
}

private Treemap Treemap;
public Treemap TreemapRef
private IgbTreemap Treemap;
public IgbTreemap TreemapRef
{
get { return Treemap; }
set { Treemap = value; this.OnTreemap(); }
Expand Down Expand Up @@ -185,7 +185,7 @@
TooltipVisible = false;
Logger.WriteLine("ElectionTree OnInitialized");

TreemapModule.Register(IgniteUIBlazor);
IgbTreemapModule.Register(IgniteUIBlazor);
}

protected override async Task OnInitializedAsync()
Expand Down
Loading
Loading