Skip to content

Changes from igniteui-xplat-examples-output+PRs_2024.1.17.2 #116

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

Merged
merged 1 commit into from
Jan 17, 2024
Merged

Changes from igniteui-xplat-examples-output+PRs_2024.1.17.2 #116

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
2 changes: 2 additions & 0 deletions samples/charts/category-chart/axis-range/src/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
valueType="EnumValue"
dropDownNames="0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100"
dropDownValues="0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100"
primitiveValue="0"
(changed)="this.editorChangeUpdateYAxisMinimumValue($event)">
</igx-property-editor-property-description>
<igx-property-editor-property-description
Expand All @@ -28,6 +29,7 @@
valueType="EnumValue"
dropDownNames="100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200"
dropDownValues="100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200"
primitiveValue="150"
(changed)="this.editorChangeUpdateYAxisMaximumValue($event)">
</igx-property-editor-property-description>
</igx-property-editor-panel>
Expand Down
15 changes: 8 additions & 7 deletions samples/charts/category-chart/format-specifiers/src/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
</div>
<div class="legend">
<igx-data-legend
[target]="chart"
valueFormatMode="Currency"
valueFormatString="${0} Billion"
name="Legend"
#legend>
#legend
[target]="chart"
valueFormatString="{0} Billion"
[valueFormatSpecifiers]="numberFormatSpecifier1">
</igx-data-legend>
</div>
<div class="container fill">
Expand All @@ -19,10 +19,11 @@
chartType="Column"
isHorizontalZoomEnabled="false"
isVerticalZoomEnabled="false"
dataToolTipValueFormatMode="Currency"
dataToolTipValueFormatString="${0} Billion"
finalValueAnnotationsPrecision="2"
dataToolTipValueFormatString="{0} Billion"
[dataToolTipValueFormatSpecifiers]="numberFormatSpecifier3"
yAxisLabelFormat="{0}B"
[yAxisLabelFormatSpecifiers]="numberFormatSpecifier1">
[yAxisLabelFormatSpecifiers]="numberFormatSpecifier5">
</igx-category-chart>
</div>
</div>
43 changes: 39 additions & 4 deletions samples/charts/category-chart/format-specifiers/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AfterViewInit, Component, ViewChild, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
import { ComponentRenderer, PropertyEditorPanelDescriptionModule, DataLegendDescriptionModule, CategoryChartDescriptionModule } from 'igniteui-angular-core';
import { ComponentRenderer, PropertyEditorPanelDescriptionModule, DataLegendDescriptionModule, CategoryChartDescriptionModule, NumberFormatSpecifierDescriptionModule } from 'igniteui-angular-core';
import { HighestGrossingMoviesItem, HighestGrossingMovies } from './HighestGrossingMovies';
import { IgxDataLegendComponent, IgxCategoryChartComponent } from 'igniteui-angular-charts';
import { IgxNumberFormatSpecifier } from 'igniteui-angular-core';
Expand All @@ -16,8 +16,6 @@ export class AppComponent implements AfterViewInit

@ViewChild("legend", { static: true } )
private legend: IgxDataLegendComponent
@ViewChild("chart", { static: true } )
private chart: IgxCategoryChartComponent
private _numberFormatSpecifier1: IgxNumberFormatSpecifier[] | null = null;
public get numberFormatSpecifier1(): IgxNumberFormatSpecifier[] {
if (this._numberFormatSpecifier1 == null)
Expand All @@ -27,13 +25,49 @@ export class AppComponent implements AfterViewInit
numberFormatSpecifier2.style = "currency";
numberFormatSpecifier2.currency = "USD";
numberFormatSpecifier2.currencyDisplay = "symbol";
numberFormatSpecifier2.minimumFractionDigits = 0;
numberFormatSpecifier2.maximumFractionDigits = 2;
numberFormatSpecifier2.minimumFractionDigits = 2;

numberFormatSpecifier1.push(numberFormatSpecifier2)
this._numberFormatSpecifier1 = numberFormatSpecifier1;
}
return this._numberFormatSpecifier1;
}
@ViewChild("chart", { static: true } )
private chart: IgxCategoryChartComponent
private _numberFormatSpecifier3: IgxNumberFormatSpecifier[] | null = null;
public get numberFormatSpecifier3(): IgxNumberFormatSpecifier[] {
if (this._numberFormatSpecifier3 == null)
{
let numberFormatSpecifier3: IgxNumberFormatSpecifier[] = [];
var numberFormatSpecifier4 = new IgxNumberFormatSpecifier();
numberFormatSpecifier4.style = "currency";
numberFormatSpecifier4.currency = "USD";
numberFormatSpecifier4.currencyDisplay = "symbol";
numberFormatSpecifier4.maximumFractionDigits = 2;
numberFormatSpecifier4.minimumFractionDigits = 2;

numberFormatSpecifier3.push(numberFormatSpecifier4)
this._numberFormatSpecifier3 = numberFormatSpecifier3;
}
return this._numberFormatSpecifier3;
}
private _numberFormatSpecifier5: IgxNumberFormatSpecifier[] | null = null;
public get numberFormatSpecifier5(): IgxNumberFormatSpecifier[] {
if (this._numberFormatSpecifier5 == null)
{
let numberFormatSpecifier5: IgxNumberFormatSpecifier[] = [];
var numberFormatSpecifier6 = new IgxNumberFormatSpecifier();
numberFormatSpecifier6.style = "currency";
numberFormatSpecifier6.currency = "USD";
numberFormatSpecifier6.currencyDisplay = "symbol";
numberFormatSpecifier6.minimumFractionDigits = 0;

numberFormatSpecifier5.push(numberFormatSpecifier6)
this._numberFormatSpecifier5 = numberFormatSpecifier5;
}
return this._numberFormatSpecifier5;
}
private _highestGrossingMovies: HighestGrossingMovies = null;
public get highestGrossingMovies(): HighestGrossingMovies {
if (this._highestGrossingMovies == null)
Expand All @@ -51,6 +85,7 @@ export class AppComponent implements AfterViewInit
PropertyEditorPanelDescriptionModule.register(context);
DataLegendDescriptionModule.register(context);
CategoryChartDescriptionModule.register(context);
NumberFormatSpecifierDescriptionModule.register(context);
}
return this._componentRenderer;
}
Expand Down
4 changes: 3 additions & 1 deletion samples/charts/category-chart/format-specifiers/src/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { AppComponent } from "./app.component";

import { IgxPropertyEditorPanelModule } from 'igniteui-angular-layouts';
import { IgxDataLegendModule, IgxCategoryChartModule } from 'igniteui-angular-charts';
import { IgxNumberFormatSpecifierModule } from 'igniteui-angular-core';

@NgModule({
bootstrap: [AppComponent],
Expand All @@ -20,7 +21,8 @@ import { IgxDataLegendModule, IgxCategoryChartModule } from 'igniteui-angular-ch
FormsModule,
IgxPropertyEditorPanelModule,
IgxDataLegendModule,
IgxCategoryChartModule
IgxCategoryChartModule,
IgxNumberFormatSpecifierModule
],
providers: [],
schemas: []
Expand Down
10 changes: 5 additions & 5 deletions samples/charts/data-chart/format-specifiers/src/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
name="Legend"
#legend
[target]="chart"
valueFormatMode="Currency"
valueFormatString="${0} Billion">
valueFormatString="{0} Billion"
[valueFormatSpecifiers]="numberFormatSpecifier1">
</igx-data-legend>
</div>
<div class="container fill">
Expand All @@ -32,7 +32,7 @@
title="Billions of U.S. Dollars"
labelFormat="{0}B"
abbreviateLargeNumbers="false"
[labelFormatSpecifiers]="numberFormatSpecifier1">
[labelFormatSpecifiers]="numberFormatSpecifier3">
</igx-numeric-x-axis>
<igx-bar-series
name="BarSeries1"
Expand All @@ -57,8 +57,8 @@
<igx-data-tool-tip-layer
name="Tooltips"
#tooltips
valueFormatMode="Currency"
valueFormatString="${0} Billion">
valueFormatString="{0} Billion"
[valueFormatSpecifiers]="numberFormatSpecifier5">
</igx-data-tool-tip-layer>
</igx-data-chart>
</div>
Expand Down
48 changes: 41 additions & 7 deletions samples/charts/data-chart/format-specifiers/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ export class AppComponent implements AfterViewInit

@ViewChild("legend", { static: true } )
private legend: IgxDataLegendComponent
@ViewChild("chart", { static: true } )
private chart: IgxDataChartComponent
@ViewChild("yAxis", { static: true } )
private yAxis: IgxCategoryYAxisComponent
@ViewChild("xAxis", { static: true } )
private xAxis: IgxNumericXAxisComponent
private _numberFormatSpecifier1: IgxNumberFormatSpecifier[] | null = null;
public get numberFormatSpecifier1(): IgxNumberFormatSpecifier[] {
if (this._numberFormatSpecifier1 == null)
Expand All @@ -30,19 +24,59 @@ export class AppComponent implements AfterViewInit
numberFormatSpecifier2.style = "currency";
numberFormatSpecifier2.currency = "USD";
numberFormatSpecifier2.currencyDisplay = "symbol";
numberFormatSpecifier2.minimumFractionDigits = 0;
numberFormatSpecifier2.minimumFractionDigits = 2;
numberFormatSpecifier2.maximumFractionDigits = 2;

numberFormatSpecifier1.push(numberFormatSpecifier2)
this._numberFormatSpecifier1 = numberFormatSpecifier1;
}
return this._numberFormatSpecifier1;
}
@ViewChild("chart", { static: true } )
private chart: IgxDataChartComponent
@ViewChild("yAxis", { static: true } )
private yAxis: IgxCategoryYAxisComponent
@ViewChild("xAxis", { static: true } )
private xAxis: IgxNumericXAxisComponent
private _numberFormatSpecifier3: IgxNumberFormatSpecifier[] | null = null;
public get numberFormatSpecifier3(): IgxNumberFormatSpecifier[] {
if (this._numberFormatSpecifier3 == null)
{
let numberFormatSpecifier3: IgxNumberFormatSpecifier[] = [];
var numberFormatSpecifier4 = new IgxNumberFormatSpecifier();
numberFormatSpecifier4.style = "currency";
numberFormatSpecifier4.currency = "USD";
numberFormatSpecifier4.currencyDisplay = "symbol";
numberFormatSpecifier4.minimumFractionDigits = 0;

numberFormatSpecifier3.push(numberFormatSpecifier4)
this._numberFormatSpecifier3 = numberFormatSpecifier3;
}
return this._numberFormatSpecifier3;
}
@ViewChild("barSeries1", { static: true } )
private barSeries1: IgxBarSeriesComponent
@ViewChild("barSeries2", { static: true } )
private barSeries2: IgxBarSeriesComponent
@ViewChild("tooltips", { static: true } )
private tooltips: IgxDataToolTipLayerComponent
private _numberFormatSpecifier5: IgxNumberFormatSpecifier[] | null = null;
public get numberFormatSpecifier5(): IgxNumberFormatSpecifier[] {
if (this._numberFormatSpecifier5 == null)
{
let numberFormatSpecifier5: IgxNumberFormatSpecifier[] = [];
var numberFormatSpecifier6 = new IgxNumberFormatSpecifier();
numberFormatSpecifier6.style = "currency";
numberFormatSpecifier6.currency = "USD";
numberFormatSpecifier6.currencyDisplay = "symbol";
numberFormatSpecifier6.minimumFractionDigits = 2;
numberFormatSpecifier6.maximumFractionDigits = 2;

numberFormatSpecifier5.push(numberFormatSpecifier6)
this._numberFormatSpecifier5 = numberFormatSpecifier5;
}
return this._numberFormatSpecifier5;
}
private _highestGrossingMovies: HighestGrossingMovies = null;
public get highestGrossingMovies(): HighestGrossingMovies {
if (this._highestGrossingMovies == null)
Expand Down
12 changes: 6 additions & 6 deletions samples/charts/financial-chart/format-specifiers/src/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
includedColumns="Close, Change, Value"
excludedColumns="High, Low, Open, Volume"
labelDisplayMode="Hidden"
valueFormatMode="Currency"
valueFormatCulture="en-GB">
valueFormatString="{0}"
[valueFormatSpecifiers]="numberFormatSpecifier1">
</igx-data-legend>
</div>
<div class="container fill">
Expand All @@ -17,14 +17,14 @@
#chart
chartType="Candle"
[dataSource]="multipleStocks"
dataToolTipValueFormatMode="Currency"
dataToolTipValueFormatCulture="en-GB"
dataToolTipLabelDisplayMode="Hidden"
dataToolTipValueFormatString="{0}"
[dataToolTipValueFormatSpecifiers]="numberFormatSpecifier3"
dataToolTipIncludedColumns="Close, Change, Value"
dataToolTipHeaderFormatTime="None"
zoomSliderType="None"
yAxisAbbreviateLargeNumbers="false"
yAxisLabelFormat="{0}"
[yAxisLabelFormatSpecifiers]="numberFormatSpecifier1"
[yAxisLabelFormatSpecifiers]="numberFormatSpecifier5"
xAxisLabelFormat="{0}"
[xAxisLabelFormatSpecifiers]="dateTimeFormatSpecifier1">
</igx-financial-chart>
Expand Down
40 changes: 37 additions & 3 deletions samples/charts/financial-chart/format-specifiers/src/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ export class AppComponent implements AfterViewInit

@ViewChild("legend", { static: true } )
private legend: IgxDataLegendComponent
@ViewChild("chart", { static: true } )
private chart: IgxFinancialChartComponent
private _numberFormatSpecifier1: IgxNumberFormatSpecifier[] | null = null;
public get numberFormatSpecifier1(): IgxNumberFormatSpecifier[] {
if (this._numberFormatSpecifier1 == null)
Expand All @@ -26,13 +24,49 @@ export class AppComponent implements AfterViewInit
numberFormatSpecifier2.currency = "EUR";
numberFormatSpecifier2.style = "currency";
numberFormatSpecifier2.locale = "en-GB";
numberFormatSpecifier2.minimumFractionDigits = 0;
numberFormatSpecifier2.minimumFractionDigits = 2;
numberFormatSpecifier2.maximumFractionDigits = 2;

numberFormatSpecifier1.push(numberFormatSpecifier2)
this._numberFormatSpecifier1 = numberFormatSpecifier1;
}
return this._numberFormatSpecifier1;
}
@ViewChild("chart", { static: true } )
private chart: IgxFinancialChartComponent
private _numberFormatSpecifier3: IgxNumberFormatSpecifier[] | null = null;
public get numberFormatSpecifier3(): IgxNumberFormatSpecifier[] {
if (this._numberFormatSpecifier3 == null)
{
let numberFormatSpecifier3: IgxNumberFormatSpecifier[] = [];
var numberFormatSpecifier4 = new IgxNumberFormatSpecifier();
numberFormatSpecifier4.currency = "EUR";
numberFormatSpecifier4.style = "currency";
numberFormatSpecifier4.locale = "en-GB";
numberFormatSpecifier4.minimumFractionDigits = 2;
numberFormatSpecifier4.maximumFractionDigits = 2;

numberFormatSpecifier3.push(numberFormatSpecifier4)
this._numberFormatSpecifier3 = numberFormatSpecifier3;
}
return this._numberFormatSpecifier3;
}
private _numberFormatSpecifier5: IgxNumberFormatSpecifier[] | null = null;
public get numberFormatSpecifier5(): IgxNumberFormatSpecifier[] {
if (this._numberFormatSpecifier5 == null)
{
let numberFormatSpecifier5: IgxNumberFormatSpecifier[] = [];
var numberFormatSpecifier6 = new IgxNumberFormatSpecifier();
numberFormatSpecifier6.currency = "EUR";
numberFormatSpecifier6.style = "currency";
numberFormatSpecifier6.locale = "en-GB";
numberFormatSpecifier6.minimumFractionDigits = 0;

numberFormatSpecifier5.push(numberFormatSpecifier6)
this._numberFormatSpecifier5 = numberFormatSpecifier5;
}
return this._numberFormatSpecifier5;
}
private _dateTimeFormatSpecifier1: IgxDateTimeFormatSpecifier[] | null = null;
public get dateTimeFormatSpecifier1(): IgxDateTimeFormatSpecifier[] {
if (this._dateTimeFormatSpecifier1 == null)
Expand Down
5 changes: 4 additions & 1 deletion samples/charts/financial-chart/format-specifiers/src/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { AppComponent } from "./app.component";

import { IgxFinancialChartModule, IgxDataChartInteractivityModule, IgxDataLegendModule } from 'igniteui-angular-charts';
import { IgxNumberFormatSpecifierModule, IgxDateTimeFormatSpecifierModule } from 'igniteui-angular-core';

@NgModule({
bootstrap: [AppComponent],
Expand All @@ -19,7 +20,9 @@ import { IgxFinancialChartModule, IgxDataChartInteractivityModule, IgxDataLegend
FormsModule,
IgxFinancialChartModule,
IgxDataChartInteractivityModule,
IgxDataLegendModule
IgxDataLegendModule,
IgxNumberFormatSpecifierModule,
IgxDateTimeFormatSpecifierModule
],
providers: [],
schemas: []
Expand Down