Skip to content

2020-11 cleanup #6

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

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

2020-11 cleanup #6

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
23 changes: 12 additions & 11 deletions angular/.idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion angular/src/app/features/data/immutable/immutable.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ export class ImmutableComponent implements OnInit {
this.store.dispatch(fetchCustomersForImmutableData());
}

// You must implement this method for the delta row model
getRowNodeId(customer: Customer): number {
return customer.id;
}
Expand Down
31 changes: 16 additions & 15 deletions angular/src/app/features/styling/cell/cell.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import {
customers,
orderItems,
orders,
products
products,
} from '../../../../../data/data.json';

@Component({
templateUrl: './cell.component.html',
styleUrls: ['./cell.component.scss']
styleUrls: ['./cell.component.scss'],
})
export class CellComponent {
/**
Expand All @@ -24,18 +24,19 @@ export class CellComponent {
headerName: 'Customer Name',
field: 'customer.name',
filter: 'agTextColumnFilter',
cellStyle: { color: '#fff', 'background-color': '#37474f' }
cellStyle: { color: '#fff', 'background-color': '#37474f' },
},
{
headerName: 'Account No',
field: 'account.accountNumber',
filter: 'agNumberColumnFilter'
filter: 'agNumberColumnFilter',
},
{
headerName: 'Date of Order',
field: 'dateOfOrder',
filter: 'agDateColumnFilter',
valueFormatter: ({ value }) => this.datePipe.transform(value, 'shortDate')
valueFormatter: ({ value }) =>
this.datePipe.transform(value, 'shortDate'),
},
{
headerName: 'Total',
Expand All @@ -45,9 +46,9 @@ export class CellComponent {
editable: true,
cellClassRules: {
'cell-value-negative': ({ value }) => value < 0,
'cell-value-positive': ({ value }) => value >= 0
}
}
'cell-value-positive': ({ value }) => value >= 0,
},
},
];

/**
Expand All @@ -56,16 +57,16 @@ export class CellComponent {
*/
rowData: Array<{
[key: string]: boolean | string | number | object;
}> = orders.map(order => ({
}> = orders.map((order) => ({
...order,
dateOfOrder: new Date(`${order.dateOfOrder.slice(0, 10)}T00:00:00.0`),
account: accounts.find(account => account.id === order.accountId),
customer: customers.find(customer => customer.id === order.customerId),
orderItems: orderItems.filter(item => item.orderId === order.id),
account: accounts.find((account) => account.id === order.accountId),
customer: customers.find((customer) => customer.id === order.customerId),
orderItems: orderItems.filter((item) => item.orderId === order.id),
total: orderItems
.filter(item => item.orderId === order.id)
.map(item => products.find(product => product.id === item.productId))
.reduce((prev, current) => prev + Number(current.price), 0)
.filter((item) => item.orderId === order.id)
.map((item) => products.find((product) => product.id === item.productId))
.reduce((prev, current) => prev + Number(current.price), 0),
}));

constructor(
Expand Down
16 changes: 0 additions & 16 deletions angular/src/app/features/styling/css-overrides/css-overrides.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
@import '~ag-grid-community/src/styles/ag-theme-alpine/sass/ag-theme-alpine-mixin';

.ag-theme-alpine {
@include ag-theme-alpine(
(
// use theme parameters where possible
alpine-active-color: deeppink
)
);

.ag-header {
// or write CSS selectors to make customisations beyond what the parameters support
text-shadow: deeppink;
}
}

ag-grid-angular {
height: 500px;
width: 100%;
Expand Down
29 changes: 15 additions & 14 deletions angular/src/app/features/styling/css-overrides/css-overrides.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import {
customers,
orderItems,
orders,
products
products,
} from '../../../../../data/data.json';

@Component({
selector: 'app-css-overrides',
templateUrl: './css-overrides.component.html',
styleUrls: ['./css-overrides.component.scss']
styleUrls: ['./css-overrides.component.scss'],
})
export class CssOverridesComponent {
/**
Expand All @@ -24,26 +24,27 @@ export class CssOverridesComponent {
{
headerName: 'Customer Name',
field: 'customer.name',
filter: 'agTextColumnFilter'
filter: 'agTextColumnFilter',
},
{
headerName: 'Account No',
field: 'account.accountNumber',
filter: 'agNumberColumnFilter'
filter: 'agNumberColumnFilter',
},
{
headerName: 'Date of Order',
field: 'dateOfOrder',
filter: 'agDateColumnFilter',
valueFormatter: ({ value }) => this.datePipe.transform(value, 'shortDate')
valueFormatter: ({ value }) =>
this.datePipe.transform(value, 'shortDate'),
},
{
headerName: 'Total',
field: 'total',
filter: 'agNumberColumnFilter',
valueFormatter: ({ value }) => this.currencyPipe.transform(String(value)),
editable: true
}
editable: true,
},
];

/**
Expand All @@ -52,16 +53,16 @@ export class CssOverridesComponent {
*/
rowData: Array<{
[key: string]: boolean | string | number | object;
}> = orders.map(order => ({
}> = orders.map((order) => ({
...order,
dateOfOrder: new Date(`${order.dateOfOrder.slice(0, 10)}T00:00:00.0`),
account: accounts.find(account => account.id === order.accountId),
customer: customers.find(customer => customer.id === order.customerId),
orderItems: orderItems.filter(item => item.orderId === order.id),
account: accounts.find((account) => account.id === order.accountId),
customer: customers.find((customer) => customer.id === order.customerId),
orderItems: orderItems.filter((item) => item.orderId === order.id),
total: orderItems
.filter(item => item.orderId === order.id)
.map(item => products.find(product => product.id === item.productId))
.reduce((prev, current) => prev + Number(current.price), 0)
.filter((item) => item.orderId === order.id)
.map((item) => products.find((product) => product.id === item.productId))
.reduce((prev, current) => prev + Number(current.price), 0),
}));

constructor(
Expand Down
4 changes: 0 additions & 4 deletions angular/src/app/shared/components/date-editor/date-editor.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,4 @@ export class DateEditorComponent
getValue(): any {
return this.value;
}

isPopup(): boolean {
return false;
}
}
1 change: 0 additions & 1 deletion angular/src/app/shared/components/slider-filter/slider-filter.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
[value]="value"
(input)="onInput($event)"
></mat-slider>
<!-- (change)="onChange($event)" -->
10 changes: 0 additions & 10 deletions angular/src/app/shared/components/slider-filter/slider-filter.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,6 @@ export class SliderFilterComponent
this.min = params.min;
}

onChange(event: MatSliderChange): void {
// const value = event.value;
// this.params.parentFilterInstance((instance: NumberFilter) =>
// instance.onFloatingFilterChanged(
// 'greaterThan',
// value === 0 ? null : value
// )
// );
}

onInput(event: MatSliderChange): void {
const value = event.value;
this.params.parentFilterInstance((instance: NumberFilter) =>
Expand Down