julien/adastra_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(deps): upgrade Angular 18 → 19

Browse Source 
- ng update @angular/core@19 @angular/cli@19 @angular/material@19 @angular-eslint/schematics@19
- Migration: remove standalone:true (now default in v19) from 60 components
- Migration: zone.js 0.14 → 0.15
- Fix pre-existing build budget error: raise initial bundle limit to 5mb (app ships large static JSON assets)
This commit is contained in:
Julien Gautier
2026-04-26 06:25:02 +02:00
parent b8eb8a9393
commit 5400294d45
65 changed files with 5875 additions and 4710 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.claude/settings.json
+13 -10
View File
@@ -1,12 +1,15 @@
{
"permissions": {
"allow": [
"Bash(grep \" FAILED$\")",
"Bash(grep -A2 \" FAILED$\")",
"Bash(grep -A3 \" FAILED$\")",
"Bash(grep -v \"Executed\\\\|^--$\")",
"Bash(grep -E \"TOTAL:|FAILED$\")",
"Bash(node -e \"const c = require\\('chart.js'\\); console.log\\(Object.keys\\(c\\).filter\\(k => k.includes\\('Doughnut'\\) || k.includes\\('Controller'\\)\\)\\)\")"
]
}
"permissions": {
"allow": [
"Bash(grep \" FAILED$\")",
"Bash(grep -A2 \" FAILED$\")",
"Bash(grep -A3 \" FAILED$\")",
"Bash(grep -v \"Executed\\\\|^--$\")",
"Bash(grep -E \"TOTAL:|FAILED$\")",
"Bash(node -e \"const c = require\\('chart.js'\\); console.log\\(Object.keys\\(c\\).filter\\(k => k.includes\\('Doughnut'\\) || k.includes\\('Controller'\\)\\)\\)\")",
"Bash(npm list *)",
"Bash(ng update *)",
"Bash(npm run *)"
]
}
}
angular.json
+147 -171
View File
@@ -1,179 +1,155 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"cli": {
"packageManager": "npm",
"analytics": false,
"schematicCollections": [
"@angular-eslint/schematics"
]
},
"newProjectRoot": "projects",
"projects": {
"adastra_angular": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
},
"i18n": {
"sourceLocale": "fr"
},
"root": "",
"sourceRoot": "src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": {
"base": "dist/adastra_angular"
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"cli": {
"packageManager": "npm",
"analytics": false,
"schematicCollections": ["@angular-eslint/schematics"]
},
"newProjectRoot": "projects",
"projects": {
"adastra_angular": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
},
"index": "src/index.html",
"tsConfig": "tsconfig.app.json",
"polyfills": [
"@angular/localize/init",
"zone.js"
],
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets",
"src/manifest.webmanifest",
{
"glob": "_redirects",
"input": "src",
"output": "/"
}
],
"styles": [
"node_modules/chartist/dist/index.scss",
"src/styles/styles.scss"
],
"stylePreprocessorOptions": {
"includePaths": [
"src/styles"
]
"i18n": {
"sourceLocale": "fr"
},
"scripts": [],
"browser": "src/main.ts"
},
"configurations": {
"production": {
"extractLicenses": true,
"namedChunks": false,
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"budgets": [
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
"root": "",
"sourceRoot": "src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": {
"base": "dist/adastra_angular"
},
"index": "src/index.html",
"tsConfig": "tsconfig.app.json",
"polyfills": ["@angular/localize/init", "zone.js"],
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets",
"src/manifest.webmanifest",
{
"glob": "_redirects",
"input": "src",
"output": "/"
}
],
"styles": ["node_modules/chartist/dist/index.scss", "src/styles/styles.scss"],
"stylePreprocessorOptions": {
"includePaths": ["src/styles"]
},
"scripts": [],
"browser": "src/main.ts"
},
"configurations": {
"production": {
"extractLicenses": true,
"namedChunks": false,
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"budgets": [
{
"type": "initial",
"maximumWarning": "3mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kb",
"maximumError": "4kb"
}
]
},
"development": {
"extractLicenses": false,
"namedChunks": true,
"optimization": false,
"sourceMap": true,
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.development.ts"
}
]
},
"local": {
"extractLicenses": false,
"namedChunks": true,
"optimization": false,
"sourceMap": true,
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.local.ts"
}
]
}
},
"defaultConfiguration": "production"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kb",
"maximumError": "4kb"
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"buildTarget": "adastra_angular:build:production"
},
"development": {
"buildTarget": "adastra_angular:build:development"
},
"local": {
"buildTarget": "adastra_angular:build:local"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"buildTarget": "adastra_angular:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"polyfills": ["zone.js", "zone.js/testing"],
"tsConfig": "tsconfig.spec.json",
"inlineStyleLanguage": "scss",
"assets": ["src/favicon.ico", "src/assets", "src/manifest.webmanifest"],
"styles": ["src/styles/styles.scss"],
"scripts": [],
"stylePreprocessorOptions": {
"includePaths": ["src/styles"]
}
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
}
}
]
},
"development": {
"extractLicenses": false,
"namedChunks": true,
"optimization": false,
"sourceMap": true,
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.development.ts"
}
]
},
"local": {
"extractLicenses": false,
"namedChunks": true,
"optimization": false,
"sourceMap": true,
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.local.ts"
}
]
}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"buildTarget": "adastra_angular:build:production"
},
"development": {
"buildTarget": "adastra_angular:build:development"
},
"local": {
"buildTarget": "adastra_angular:build:local"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"buildTarget": "adastra_angular:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"polyfills": [
"zone.js",
"zone.js/testing"
],
"tsConfig": "tsconfig.spec.json",
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets",
"src/manifest.webmanifest"
],
"styles": [
"src/styles/styles.scss"
],
"scripts": [],
"stylePreprocessorOptions": {
"includePaths": [
"src/styles"
]
}
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
}
}
}
}
}
}
package-lock.json
Generated
+2661 -1917
View File
File diff suppressed because it is too large Load Diff
package.json
+20 -20
View File
@@ -21,18 +21,18 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^18.2.14",
"@angular/cdk": "^18.2.14",
"@angular/common": "^18.2.14",
"@angular/compiler": "^18.2.14",
"@angular/core": "^18.2.14",
"@angular/forms": "^18.2.14",
"@angular/animations": "^19.2.21",
"@angular/cdk": "^19.2.19",
"@angular/common": "^19.2.21",
"@angular/compiler": "^19.2.21",
"@angular/core": "^19.2.21",
"@angular/forms": "^19.2.21",
"@angular/google-maps": "^17.3.8",
"@angular/localize": "^18.2.14",
"@angular/material": "^18.2.14",
"@angular/platform-browser": "^18.2.14",
"@angular/platform-browser-dynamic": "^18.2.14",
"@angular/router": "^18.2.14",
"@angular/localize": "^19.2.21",
"@angular/material": "^19.2.19",
"@angular/platform-browser": "^19.2.21",
"@angular/platform-browser-dynamic": "^19.2.21",
"@angular/router": "^19.2.21",
"bootstrap": "^5.3.7",
"chart.js": "^4.4.2",
"chartist": "^1.3.0",
@@ -41,17 +41,17 @@
"ngx-skeleton-loader": "^9.0.0",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "^0.14.10"
"zone.js": "^0.15.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.2.21",
"@angular-eslint/builder": "18.4.3",
"@angular-eslint/eslint-plugin": "18.4.3",
"@angular-eslint/eslint-plugin-template": "18.4.3",
"@angular-eslint/schematics": "18.4.3",
"@angular-eslint/template-parser": "18.4.3",
"@angular/cli": "^18.2.21",
"@angular/compiler-cli": "^18.2.14",
"@angular-devkit/build-angular": "^19.2.24",
"@angular-eslint/builder": "19.8.1",
"@angular-eslint/eslint-plugin": "19.8.1",
"@angular-eslint/eslint-plugin-template": "19.8.1",
"@angular-eslint/schematics": "19.8.1",
"@angular-eslint/template-parser": "19.8.1",
"@angular/cli": "^19.2.24",
"@angular/compiler-cli": "^19.2.21",
"@types/jasmine": "~5.1.0",
"@typescript-eslint/eslint-plugin": "7.2.0",
"@typescript-eslint/parser": "7.2.0",
src/app/app.component.ts
+9 -9
View File
@@ -3,7 +3,7 @@ import { MAT_DATE_LOCALE, MAT_DATE_FORMATS, provideNativeDateAdapter } from '@an
import { Title } from '@angular/platform-browser';
import { FullComponent } from '@components/shared/layout';
import { UserService } from "@services";
import { UserService } from '@services';
export const MY_FORMATS = {
parse: {
@@ -19,23 +19,23 @@ export const MY_FORMATS = {
@Component({
selector: 'app-root',
standalone: true,
imports: [
FullComponent
],
imports: [FullComponent],
providers: [
{ provide: MAT_DATE_LOCALE, useValue: 'fr-FR' },
{ provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },
provideNativeDateAdapter(MY_FORMATS)
provideNativeDateAdapter(MY_FORMATS),
],
templateUrl: './app.component.html',
styleUrl: './app.component.scss'
styleUrl: './app.component.scss',
})
export class AppComponent implements OnInit, AfterContentInit {
public title = 'Ad Astra';
public appClass = 'grayscale';
constructor(private userService: UserService, private titleService: Title) { }
constructor(
private userService: UserService,
private titleService: Title,
) {}
ngOnInit() {
this.userService.populate();
@@ -45,4 +45,4 @@ export class AppComponent implements OnInit, AfterContentInit {
ngAfterContentInit() {
this.appClass = 'colored';
}
}
}
src/app/components/aeronefs/aeronefs.component.ts
+31 -26
View File
@@ -1,7 +1,7 @@
import { DatePipe } from '@angular/common';
import { trigger, state, style, animate, transition } from '@angular/animations';
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { ActivatedRoute } from '@angular/router';
import { MatBadgeModule } from '@angular/material/badge';
import { MatButtonModule } from '@angular/material/button';
@@ -22,28 +22,29 @@ import { AeronefByImat, AeronefByYear } from '@models';
@Component({
selector: 'app-aeronefs',
standalone: true,
imports: [
DatePipe,
MatBadgeModule, MatButtonModule, MatCardModule, MatDividerModule,
MatExpansionModule, MatGridListModule, MatIconModule, MatMenuModule,
BarsChartComponent, HistoryTableComponent, PieChartComponent
MatBadgeModule,
MatButtonModule,
MatCardModule,
MatDividerModule,
MatExpansionModule,
MatGridListModule,
MatIconModule,
MatMenuModule,
BarsChartComponent,
HistoryTableComponent,
PieChartComponent,
],
templateUrl: './aeronefs.component.html',
styleUrl: './aeronefs.component.scss',
animations: [
trigger('flyInOut', [
state('in', style({ transform: 'translateX(0)' })),
transition('void => *', [
style({ transform: 'translateX(-100%)' }),
animate(200)
]),
transition('* => void', [
style({ transform: 'translateX(100%)' }),
animate(200)
])
])
]
transition('void => *', [style({ transform: 'translateX(-100%)' }), animate(200)]),
transition('* => void', [style({ transform: 'translateX(100%)' }), animate(200)]),
]),
],
})
export class AeronefsComponent implements OnInit, OnDestroy {
private _data: Subscription = new Subscription();
@@ -59,27 +60,31 @@ export class AeronefsComponent implements OnInit, OnDestroy {
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[],
borderColor: string[]
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all')
borderColor: this._utilitiesService.getSeriesColors(1, 'all'),
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
constructor(
private route: ActivatedRoute,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems
) { }
public menuItems: MenuItems,
) {}
ngOnInit() {
const data$: Observable<{ aeronefsPageData: AeronefsPageData }> = this.route.data as Observable<{ aeronefsPageData: AeronefsPageData }>;
this._data = data$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((data: { aeronefsPageData: AeronefsPageData }) => {
const pageData: AeronefsPageData = data.aeronefsPageData;
this.lastJump = pageData.lastjump;
this._loadAeronefByImat(pageData);
});
const data$: Observable<{ aeronefsPageData: AeronefsPageData }> = this.route.data as Observable<{
aeronefsPageData: AeronefsPageData;
}>;
this._data = data$
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe((data: { aeronefsPageData: AeronefsPageData }) => {
const pageData: AeronefsPageData = data.aeronefsPageData;
this.lastJump = pageData.lastjump;
this._loadAeronefByImat(pageData);
});
}
ngOnDestroy() {
src/app/components/auth/auth.component.ts
+23 -15
View File
@@ -1,6 +1,15 @@
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { UntypedFormBuilder, UntypedFormGroup, AbstractControl, Validators, ValidatorFn, ValidationErrors, FormsModule, ReactiveFormsModule } from '@angular/forms';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import {
UntypedFormBuilder,
UntypedFormGroup,
AbstractControl,
Validators,
ValidatorFn,
ValidationErrors,
FormsModule,
ReactiveFormsModule,
} from '@angular/forms';
import { Title } from '@angular/platform-browser';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
import { MatButtonModule } from '@angular/material/button';
@@ -15,7 +24,6 @@ import { UserService } from '@services';
import { ListErrorsComponent, ShowAuthedDirective } from '@components/shared';
@Component({
standalone: true,
imports: [
RouterLink,
FormsModule,
@@ -24,11 +32,11 @@ import { ListErrorsComponent, ShowAuthedDirective } from '@components/shared';
MatInputModule,
MatButtonModule,
ListErrorsComponent,
ShowAuthedDirective
ShowAuthedDirective,
],
selector: 'app-auth',
templateUrl: './auth.component.html',
styleUrl: './auth.component.scss'
styleUrl: './auth.component.scss',
})
export class AuthComponent implements OnInit, OnDestroy {
private _url: Subscription = new Subscription();
@@ -46,7 +54,7 @@ export class AuthComponent implements OnInit, OnDestroy {
private router: Router,
private titleService: Title,
private userService: UserService,
private fb: UntypedFormBuilder
private fb: UntypedFormBuilder,
) {
this._resetErrors();
// use FormBuilder to create a form group
@@ -59,7 +67,7 @@ export class AuthComponent implements OnInit, OnDestroy {
licence: '',
poids: '',
password: ['', Validators.required],
confirmPassword: ''
confirmPassword: '',
};
this.authForm = this.fb.group(controlsConfig, { validators: this.checkPasswords });
}
@@ -68,8 +76,7 @@ export class AuthComponent implements OnInit, OnDestroy {
// you would normally unsubscribe from this observable subscription
// the active route observables are exemptions from unsubribe always rule
// see notes on: https://angular.io/guide/router#observable-parammap-and-component-reuse
this.route.url.pipe(take(1))
.subscribe(data => {
this.route.url.pipe(take(1)).subscribe((data) => {
// Get the last piece of the URL (it's either 'login' or 'register')
this.authType = data[data.length - 1].path;
// Set a title for the page accordingly
@@ -104,14 +111,16 @@ export class AuthComponent implements OnInit, OnDestroy {
if (this.authForm.valid) {
this._resetErrors();
const credentials = this.authForm.value;
const user$ = this.userService.attemptAuth(this.authType, credentials).pipe(takeUntilDestroyed(this.destroyRef));
const user$ = this.userService
.attemptAuth(this.authType, credentials)
.pipe(takeUntilDestroyed(this.destroyRef));
this._user = user$.subscribe({
next: () => void this.router.navigateByUrl('/'),
error: (err) => {
console.log(err);
this.errors = err;
this.isSubmitting = false;
}
},
});
}
}
@@ -157,12 +166,11 @@ export class AuthComponent implements OnInit, OnDestroy {
return null;
}
const pass = group.get('password')!.value;
const confirmPass = group.get('confirmPassword')!.value
return (pass === confirmPass && pass !== '') ? null : { notSame: true }
}
const confirmPass = group.get('confirmPassword')!.value;
return pass === confirmPass && pass !== '' ? null : { notSame: true };
};
private _resetErrors(): void {
this.errors = { errors: {} };
}
}
src/app/components/calculator/calculator.component.ts
+61 -49
View File
@@ -18,34 +18,49 @@ import { BaseChartDirective } from 'ng2-charts';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { CalculatorInfo, CalculatorResult, CalculatorState, InputParams, Jump, LineConfig, WeightSizeRange, TableHeader, User, WeightSize, weightSizes } from '@models';
import {
CalculatorInfo,
CalculatorResult,
CalculatorState,
InputParams,
Jump,
LineConfig,
WeightSizeRange,
TableHeader,
User,
WeightSize,
weightSizes,
} from '@models';
import { CalculatorService, JumpsService, UserService, UtilitiesService } from '@services';
@Component({
selector: 'app-calculator',
standalone: true,
imports: [
CommonModule, FormsModule, RouterModule,
MatButtonModule, MatCardModule, MatDividerModule,
MatFormFieldModule, MatInputModule, MatIconModule, MatMenuModule,
MatPaginatorModule, MatProgressBarModule, MatSortModule, MatTableModule,
BaseChartDirective
CommonModule,
FormsModule,
RouterModule,
MatButtonModule,
MatCardModule,
MatDividerModule,
MatFormFieldModule,
MatInputModule,
MatIconModule,
MatMenuModule,
MatPaginatorModule,
MatProgressBarModule,
MatSortModule,
MatTableModule,
BaseChartDirective,
],
templateUrl: './calculator.component.html',
styleUrl: './calculator.component.scss',
animations: [
trigger('flyInOut', [
state('in', style({ transform: 'translateY(0)' })),
transition('void => *', [
style({ transform: 'translateY(-100%)' }),
animate(200)
]),
transition('* => void', [
style({ transform: 'translateY(100%)' }),
animate(200)
])
])
]
transition('void => *', [style({ transform: 'translateY(-100%)' }), animate(200)]),
transition('* => void', [style({ transform: 'translateY(100%)' }), animate(200)]),
]),
],
})
export class CalculatorComponent implements OnInit, OnDestroy {
//private _lastjump!: Subscription; // = new Subscription();
@@ -57,7 +72,7 @@ export class CalculatorComponent implements OnInit, OnDestroy {
public currentRange: WeightSizeRange = {} as WeightSizeRange;
public currentUser: User = {} as User;
public displayedColumns: Array<string> = ['weight'];
public tableHeader: Array<TableHeader> = [<TableHeader>{name: 'Poids nu en kg', active: ''}];
public tableHeader: Array<TableHeader> = [<TableHeader>{ name: 'Poids nu en kg', active: '' }];
public sizesHeader: Array<TableHeader> = [];
public sizesValuesFeet: Array<number> = [];
public sizesMinValuesFeet: Array<number> = [];
@@ -71,41 +86,39 @@ export class CalculatorComponent implements OnInit, OnDestroy {
charges: <CalculatorResult>{ current: 0, min: 0, min11: 0 },
sizesFeet: <CalculatorResult>{ current: 0, min: 0, min11: 0 },
sizesMeter: <CalculatorResult>{ current: 0, min: 0, min11: 0 },
state: <CalculatorState>{ color: 'danger' }
}
state: <CalculatorState>{ color: 'danger' },
};
@Input() canopy_size_table!: MatTableDataSource<WeightSize>;
@Input() inputs: InputParams = <InputParams>{
@Input() inputs: InputParams = (<InputParams>{
jumps: 0,
weight: 60,
gear: 10,
current: 190
} as InputParams;
current: 190,
}) as InputParams;
@ViewChild(MatSort) sort!: MatSort;
@ViewChild(MatPaginator) paginator!: MatPaginator;
constructor(
private _calculatorService: CalculatorService,
private _jumpsService: JumpsService,
private _userService: UserService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems
) { }
public menuItems: MenuItems,
) {}
ngOnInit() {
const currentUser$: Observable<User> = this._userService.currentUser;
const lastjump$: Observable<Jump> = this._jumpsService.getLastJump();
weightSizes[0].ranges.forEach((range: WeightSizeRange) => {
const header: TableHeader = {name: range.label, active: range.active};
this.tableHeader.push(header)
const header: TableHeader = { name: range.label, active: range.active };
this.tableHeader.push(header);
this.sizesHeader.push(header);
this.displayedColumns.push(range.name);
});
this.chartConfig.lineChartData.labels = [...this.sizesHeader.map(
(data: TableHeader): string => data.name
)];
this.chartConfig.lineChartData.labels = [...this.sizesHeader.map((data: TableHeader): string => data.name)];
this.chartConfig.lineChartData.datasets = [
{
label: 'Tailles min -11%',
@@ -114,7 +127,7 @@ export class CalculatorComponent implements OnInit, OnDestroy {
stepped: true,
pointStyle: false,
borderColor: 'rgba(241, 80, 80, 1)',
backgroundColor: 'rgba(241, 80, 80, 0.3)'
backgroundColor: 'rgba(241, 80, 80, 0.3)',
},
{
label: 'Tailles min',
@@ -123,8 +136,8 @@ export class CalculatorComponent implements OnInit, OnDestroy {
stepped: true,
pointStyle: false,
borderColor: 'rgba(32, 182, 252, 1)',
backgroundColor: 'rgba(32, 182, 252, 0.3)'
}
backgroundColor: 'rgba(32, 182, 252, 0.3)',
},
];
this._subscriptions.push(
currentUser$.subscribe((userData: User) => {
@@ -137,9 +150,9 @@ export class CalculatorComponent implements OnInit, OnDestroy {
this.inputs.current = jump.taille!;
this.canopy_size_table = new MatTableDataSource<WeightSize>(weightSizes);
this.refresh();
})
}),
);
})
}),
);
}
@@ -149,7 +162,7 @@ export class CalculatorComponent implements OnInit, OnDestroy {
});
}
public refresh():void {
public refresh(): void {
this._refreshActive();
this._refreshSizes();
}
@@ -159,25 +172,25 @@ export class CalculatorComponent implements OnInit, OnDestroy {
if (this.inputs.weight < 60) {
weight = 60;
}
weightSizes.forEach(element => {
weightSizes.forEach((element) => {
element.active = '';
element.ranges.forEach(range => {
element.ranges.forEach((range) => {
range.active = '';
});
});
this.tableHeader.forEach(element => {
this.tableHeader.forEach((element) => {
element.active = '';
});
if (weight >= 60 && weight <= 110) {
weightSizes[(weight - 60)].active = 'active';
weightSizes[weight - 60].active = 'active';
}
if (this.inputs.jumps >= 0) {
const num = this._calculatorService.getRangeNum(this.inputs.jumps);
this.tableHeader[num].active = 'active';
weightSizes.forEach(element => {
element.ranges[(num-1)].active = 'active';
weightSizes.forEach((element) => {
element.ranges[num - 1].active = 'active';
});
this.currentRange = weightSizes[0].ranges[(num-1)];
this.currentRange = weightSizes[0].ranges[num - 1];
}
}
@@ -200,13 +213,13 @@ export class CalculatorComponent implements OnInit, OnDestroy {
this.info.sizesMeter = {
current: this._calculatorService.convertFeet2Meters(this.inputs.current),
min: this._calculatorService.convertFeet2Meters(this.info.sizesFeet.min),
min11: this._calculatorService.convertFeet2Meters(this.info.sizesFeet.min11)
}
min11: this._calculatorService.convertFeet2Meters(this.info.sizesFeet.min11),
};
this.info.charges = {
current: this._calculatorService.getCharge(this.inputs.current, this.inputs.weight, this.inputs.gear),
min: this._calculatorService.getCharge(this.info.sizesFeet.min, this.inputs.weight, this.inputs.gear),
min11: this._calculatorService.getCharge(this.info.sizesFeet.min11, this.inputs.weight, this.inputs.gear)
}
min11: this._calculatorService.getCharge(this.info.sizesFeet.min11, this.inputs.weight, this.inputs.gear),
};
this.info.state.color = this._calculatorService.getStateColor(this.info.sizesFeet);
this.chartConfig.lineChartData.datasets[0].data = this.sizesMinValuesFeet;
@@ -218,5 +231,4 @@ export class CalculatorComponent implements OnInit, OnDestroy {
this.inputs.weight = weight;
this.refresh();
}
}
src/app/components/canopies/canopies.component.ts
+34 -28
View File
@@ -1,7 +1,7 @@
import { DatePipe } from '@angular/common';
import { trigger, state, style, animate, transition } from '@angular/animations';
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { ActivatedRoute } from '@angular/router';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
@@ -21,28 +21,28 @@ import { CanopyBySize, CanopyByYear, CanopyModelBySize, CanopyModelByYear } from
@Component({
selector: 'app-canopies',
standalone: true,
imports: [
DatePipe,
MatButtonModule, MatCardModule, MatDividerModule, MatExpansionModule,
MatGridListModule, MatIconModule, MatMenuModule,
HistoryTableComponent, BarsChartComponent, PieChartComponent
MatButtonModule,
MatCardModule,
MatDividerModule,
MatExpansionModule,
MatGridListModule,
MatIconModule,
MatMenuModule,
HistoryTableComponent,
BarsChartComponent,
PieChartComponent,
],
templateUrl: './canopies.component.html',
styleUrl: './canopies.component.scss',
animations: [
trigger('flyInOut', [
state('in', style({ transform: 'translateX(0)' })),
transition('void => *', [
style({ transform: 'translateX(-100%)' }),
animate(200)
]),
transition('* => void', [
style({ transform: 'translateX(100%)' }),
animate(200)
])
])
]
transition('void => *', [style({ transform: 'translateX(-100%)' }), animate(200)]),
transition('* => void', [style({ transform: 'translateX(100%)' }), animate(200)]),
]),
],
})
export class CanopiesComponent implements OnInit, OnDestroy {
private _data: Subscription = new Subscription();
@@ -64,28 +64,32 @@ export class CanopiesComponent implements OnInit, OnDestroy {
public seriesSizeValue: number[] = [];
public seriesSizeRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[],
borderColor: string[]
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all')
borderColor: this._utilitiesService.getSeriesColors(1, 'all'),
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
constructor(
private route: ActivatedRoute,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems
) { }
public menuItems: MenuItems,
) {}
ngOnInit() {
const data$: Observable<{ canopiesPageData: CanopiesPageData }> = this.route.data as Observable<{ canopiesPageData: CanopiesPageData }>;
this._data = data$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((data: { canopiesPageData: CanopiesPageData }) => {
const pageData: CanopiesPageData = data.canopiesPageData;
this.lastJump = pageData.lastjump;
this._loadCanopyBySize(pageData);
this._loadCanopyModelBySize(pageData);
});
const data$: Observable<{ canopiesPageData: CanopiesPageData }> = this.route.data as Observable<{
canopiesPageData: CanopiesPageData;
}>;
this._data = data$
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe((data: { canopiesPageData: CanopiesPageData }) => {
const pageData: CanopiesPageData = data.canopiesPageData;
this.lastJump = pageData.lastjump;
this._loadCanopyBySize(pageData);
this._loadCanopyModelBySize(pageData);
});
}
ngOnDestroy() {
@@ -134,7 +138,9 @@ export class CanopiesComponent implements OnInit, OnDestroy {
const voile: string = row.voile;
const taille: string = row.taille.toString();
const year: string = row.year.toString();
this.seriesModelRow[this.seriesModelName.indexOf(`${taille} - ${voile}`)][this.seriesModelHeader.indexOf(year)] = row.count;
this.seriesModelRow[this.seriesModelName.indexOf(`${taille} - ${voile}`)][
this.seriesModelHeader.indexOf(year)
] = row.count;
return row;
});
this.displayCharts = true;
src/app/components/dashboard/dashboard.component.ts
+30 -14
View File
@@ -7,29 +7,46 @@ import { ActivatedRoute, Data, Router } from '@angular/router';
import { Observable, Subscription } from 'rxjs';
import { take } from 'rxjs/operators';
import { Aeronef, AeronefByImat, Canopy, CanopyModelBySize, DropZone, DropZoneByYear, Errors, Jump, User } from '@models';
import {
Aeronef,
AeronefByImat,
Canopy,
CanopyModelBySize,
DropZone,
DropZoneByYear,
Errors,
Jump,
User,
} from '@models';
//import { AeronefsService, CanopiesService, DropZonesService, UserService } from '@services';
import { JumpsService, UserService } from '@services';
import { ShowAuthedDirective } from '@components/shared/show-authed.directive';
import {
AeronefsPieComponent, AeronefsBarComponent,
CanopiesModelsComponent, CanopiesSizesComponent,
DropzonesPieComponent, DropzonesBarComponent,
JumpsByMonthComponent
AeronefsPieComponent,
AeronefsBarComponent,
CanopiesModelsComponent,
CanopiesSizesComponent,
DropzonesPieComponent,
DropzonesBarComponent,
JumpsByMonthComponent,
} from '@components/shared/dashboard-components';
@Component({
standalone: true,
imports: [
DatePipe, ShowAuthedDirective, MatDividerModule,
AeronefsPieComponent, AeronefsBarComponent,
CanopiesModelsComponent, CanopiesSizesComponent,
DropzonesPieComponent, DropzonesBarComponent,
JumpsByMonthComponent
DatePipe,
ShowAuthedDirective,
MatDividerModule,
AeronefsPieComponent,
AeronefsBarComponent,
CanopiesModelsComponent,
CanopiesSizesComponent,
DropzonesPieComponent,
DropzonesBarComponent,
JumpsByMonthComponent,
],
selector: 'app-dashboard',
templateUrl: './dashboard.component.html',
styleUrl: './dashboard.component.scss'
styleUrl: './dashboard.component.scss',
})
export class DashboardComponent implements OnInit, OnDestroy {
private _currentUser: Subscription = new Subscription();
@@ -61,7 +78,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
private router: Router,
private titleService: Title,
private _userService: UserService,
private _jumpsService: JumpsService
private _jumpsService: JumpsService,
/*
private aeronefsService: AeronefsService,
private canopiesService: CanopiesService,
@@ -95,7 +112,6 @@ export class DashboardComponent implements OnInit, OnDestroy {
this._loadCanopies();
this._loadDropzones();
*/
}
ngOnDestroy() {
src/app/components/demo/demo.component.ts
+73 -19
View File
@@ -1,5 +1,5 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import {CdkDragDrop, CdkDropList, CdkDrag, CdkDragPlaceholder, moveItemInArray} from '@angular/cdk/drag-drop';
import { CdkDragDrop, CdkDropList, CdkDrag, CdkDragPlaceholder, moveItemInArray } from '@angular/cdk/drag-drop';
import { Title } from '@angular/platform-browser';
import { RouterLink } from '@angular/router';
import { MatButtonModule } from '@angular/material/button';
@@ -17,30 +17,85 @@ import { ListErrorsComponent } from '@components/shared';
@Component({
selector: 'app-demo',
standalone: true,
imports: [
CdkDropList, CdkDrag, CdkDragPlaceholder, RouterLink,
MatButtonModule, MatCardModule, MatDividerModule,
MatIconModule, MatProgressBarModule, MatSliderModule,
ListErrorsComponent
CdkDropList,
CdkDrag,
CdkDragPlaceholder,
RouterLink,
MatButtonModule,
MatCardModule,
MatDividerModule,
MatIconModule,
MatProgressBarModule,
MatSliderModule,
ListErrorsComponent,
],
templateUrl: './demo.component.html',
styleUrl: './demo.component.scss'
styleUrl: './demo.component.scss',
})
export class DemoComponent implements OnInit, OnDestroy {
private _user: Subscription = new Subscription();
private _colors: string[] = [
"primary", "accent", "warn", "secondary", "megna", "raspberry", "success", "info",
"warning", "danger", "red", "orange", "yellow", "green", "teal", "turquoise", "cyan",
"blue", "navy", "navy-light", "pink", "magenta", "purple", "purple-light", "grey", "muted"
'primary',
'accent',
'warn',
'secondary',
'megna',
'raspberry',
'success',
'info',
'warning',
'danger',
'red',
'orange',
'yellow',
'green',
'teal',
'turquoise',
'cyan',
'blue',
'navy',
'navy-light',
'pink',
'magenta',
'purple',
'purple-light',
'grey',
'muted',
];
private _icons: string[] = [
'mode_edit', 'delete', 'bookmark', 'settings', 'home', 'person',
'share', 'account_circle', 'public', 'search', 'favorite', 'done',
'numbers', 'attach_file', 'insert_comment', 'format_list_bulleted',
'filter', 'crop', 'edit_attributes', 'upload', 'download', 'expand_less',
'expand_more', 'chevron_left', 'chevron_right', 'sync', 'power',
'power_off', 'notifications', 'emoji_emotions', 'person_add', 'block'
'mode_edit',
'delete',
'bookmark',
'settings',
'home',
'person',
'share',
'account_circle',
'public',
'search',
'favorite',
'done',
'numbers',
'attach_file',
'insert_comment',
'format_list_bulleted',
'filter',
'crop',
'edit_attributes',
'upload',
'download',
'expand_less',
'expand_more',
'chevron_left',
'chevron_right',
'sync',
'power',
'power_off',
'notifications',
'emoji_emotions',
'person_add',
'block',
];
title = 'Demo';
@@ -51,8 +106,8 @@ export class DemoComponent implements OnInit, OnDestroy {
constructor(
private titleService: Title,
private userService: UserService
) { }
private userService: UserService,
) {}
ngOnInit() {
this.titleService.setTitle(`Ad Astra - ${this.title}`);
@@ -79,5 +134,4 @@ export class DemoComponent implements OnInit, OnDestroy {
drop(event: CdkDragDrop<string[]>) {
moveItemInArray(this._colors, event.previousIndex, event.currentIndex);
}
}
src/app/components/dropzones/dropzones.component.ts
+36 -30
View File
@@ -1,8 +1,8 @@
import { DatePipe } from '@angular/common';
import { trigger, state, style, animate, transition } from '@angular/animations';
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { GoogleMap, MapKmlLayer} from '@angular/google-maps';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { GoogleMap, MapKmlLayer } from '@angular/google-maps';
import { ActivatedRoute } from '@angular/router';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
@@ -23,29 +23,31 @@ import { UtilitiesService } from '@services';
@Component({
selector: 'app-dropzones',
standalone: true,
imports: [
DatePipe, GoogleMap, MapKmlLayer,
MatButtonModule, MatCardModule, MatDividerModule, MatExpansionModule,
MatGridListModule, MatIconModule, MatMenuModule,
DatePipe,
GoogleMap,
MapKmlLayer,
MatButtonModule,
MatCardModule,
MatDividerModule,
MatExpansionModule,
MatGridListModule,
MatIconModule,
MatMenuModule,
//ChartistModule,
HistoryTableComponent, BarsChartComponent, PieChartComponent
HistoryTableComponent,
BarsChartComponent,
PieChartComponent,
],
templateUrl: './dropzones.component.html',
styleUrl: './dropzones.component.scss',
animations: [
trigger('flyInOut', [
state('in', style({ transform: 'translateX(0)' })),
transition('void => *', [
style({ transform: 'translateX(-100%)' }),
animate(200)
]),
transition('* => void', [
style({ transform: 'translateX(100%)' }),
animate(200)
])
])
]
transition('void => *', [style({ transform: 'translateX(-100%)' }), animate(200)]),
transition('* => void', [style({ transform: 'translateX(100%)' }), animate(200)]),
]),
],
})
export class DropzonesComponent implements OnInit, OnDestroy {
private _data: Subscription = new Subscription();
@@ -62,16 +64,16 @@ export class DropzonesComponent implements OnInit, OnDestroy {
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[],
borderColor: string[]
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all')
borderColor: this._utilitiesService.getSeriesColors(1, 'all'),
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
//public chartBarConfig: Configuration = this._utilitiesService.getBarConfig();
public center: google.maps.LatLngLiteral = {lat: 44.596408, lng: -1.115958};
public center: google.maps.LatLngLiteral = { lat: 44.596408, lng: -1.115958 };
public zoom = 16;
public kmlUrl = 'https://rampeur.com/assets/kmls/dropzones.kml?v=6';
//public mapTypeId: google.maps.MapTypeId = google.maps.MapTypeId.SATELLITE;
@@ -82,7 +84,7 @@ export class DropzonesComponent implements OnInit, OnDestroy {
mapTypeId: 'satellite',
disableDoubleClickZoom: true,
maxZoom: 20,
minZoom: 3
minZoom: 3,
};
// Arcachon : 44.596408,-1.115958
// La Réole : 44.566309,-0.054606
@@ -98,16 +100,20 @@ export class DropzonesComponent implements OnInit, OnDestroy {
constructor(
private route: ActivatedRoute,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems
) { }
public menuItems: MenuItems,
) {}
ngOnInit() {
const data$: Observable<{ dropZonesPageData: DropZonesPageData }> = this.route.data as Observable<{ dropZonesPageData: DropZonesPageData }>;
this._data = data$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((data: { dropZonesPageData: DropZonesPageData }) => {
const pageData: DropZonesPageData = data.dropZonesPageData;
this.lastJump = pageData.lastjump;
this._loadDropZoneByOaci(pageData);
});
const data$: Observable<{ dropZonesPageData: DropZonesPageData }> = this.route.data as Observable<{
dropZonesPageData: DropZonesPageData;
}>;
this._data = data$
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe((data: { dropZonesPageData: DropZonesPageData }) => {
const pageData: DropZonesPageData = data.dropZonesPageData;
this.lastJump = pageData.lastjump;
this._loadDropZoneByOaci(pageData);
});
}
ngOnDestroy() {
src/app/components/herowars-guildraid/herowars-guildraid.component.ts
-1
View File
@@ -23,7 +23,6 @@ export class GuildRaidStepperIntl extends MatStepperIntl {
}
@Component({
selector: 'app-herowars-guildraid',
standalone: true,
providers: [
{
provide: STEPPER_GLOBAL_OPTIONS,
src/app/components/herowars-guildwar/herowars-guildwar.component.ts
+27 -20
View File
@@ -11,7 +11,12 @@ import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { MatTabsModule } from '@angular/material/tabs';
import { CardContainerComponent, ListErrorsComponent, GuildwarAttackComponent, GuildwarDefenceComponent } from '@components/shared';
import {
CardContainerComponent,
ListErrorsComponent,
GuildwarAttackComponent,
GuildwarDefenceComponent,
} from '@components/shared';
import { CardColors, Errors, HWActivityStat, HWGuildClan, HWMember } from '@models';
import { ClanViewModel, MembersViewModel } from '@viewmodels/herowars';
import { HWClanService, HWMemberService, UtilitiesService } from '@services';
@@ -22,28 +27,31 @@ import guildStatistics from '@data/hw-guild-statistics.json'; // page Overview -
@Component({
selector: 'app-herowars-guildwar',
standalone: true,
imports: [
DatePipe, DecimalPipe, FormsModule, CardContainerComponent, ListErrorsComponent,
MatButtonModule, MatCardModule, MatDividerModule, MatFormFieldModule,
MatIconModule, MatInputModule, MatTabsModule,
GuildwarAttackComponent, GuildwarDefenceComponent
DatePipe,
DecimalPipe,
FormsModule,
CardContainerComponent,
ListErrorsComponent,
MatButtonModule,
MatCardModule,
MatDividerModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
MatTabsModule,
GuildwarAttackComponent,
GuildwarDefenceComponent,
],
templateUrl: './herowars-guildwar.component.html',
styleUrl: './herowars-guildwar.component.scss',
animations: [
trigger('flyInOut', [
state('in', style({ transform: 'translateY(0)' })),
transition('void => *', [
style({ transform: 'translateY(-100%)' }),
animate(200)
]),
transition('* => void', [
style({ transform: 'translateY(100%)' }),
animate(200)
])
])
]
transition('void => *', [style({ transform: 'translateY(-100%)' }), animate(200)]),
transition('* => void', [style({ transform: 'translateY(100%)' }), animate(200)]),
]),
],
})
export class HerowarsGuildwarComponent implements OnInit {
public destroyRef = inject(DestroyRef);
@@ -67,8 +75,8 @@ export class HerowarsGuildwarComponent implements OnInit {
private _titleService: Title,
private _utilitiesService: UtilitiesService,
private _clanService: HWClanService,
private _memberService: HWMemberService
) { }
private _memberService: HWMemberService,
) {}
ngOnInit() {
this._titleService.setTitle(this.title);
@@ -103,7 +111,7 @@ export class HerowarsGuildwarComponent implements OnInit {
this._guildClan = this._clanService.loadClan();
this._guildMembers = this._memberService.loadMembers(this._guildClan);
this._guildClan = this._clanService.loadClanStats(this._guildClan, this._guildMembers);
this.daysToWarn = (parseInt(this._guildClan.daysToKick) / 2);
this.daysToWarn = parseInt(this._guildClan.daysToKick) / 2;
this.clanViewModel = new ClanViewModel(this._guildClan);
this.clanLoaded = true;
this.membersViewModel = new MembersViewModel(this._guildMembers);
@@ -132,5 +140,4 @@ export class HerowarsGuildwarComponent implements OnInit {
console.log(this._guildMembers);
console.log(guildStatistics);
}
}
src/app/components/herowars/herowars.component.ts
+25 -22
View File
@@ -10,8 +10,13 @@ import { MatTabsModule } from '@angular/material/tabs';
import {
ListErrorsComponent,
GuildCardComponent, GuildraidsLogComponent, GuildwarChampionsComponent,
GuildwarAttackComponent, GuildwarDefenceComponent, GuildwarTeamsComponent, MembersStatisticsComponent
GuildCardComponent,
GuildraidsLogComponent,
GuildwarChampionsComponent,
GuildwarAttackComponent,
GuildwarDefenceComponent,
GuildwarTeamsComponent,
MembersStatisticsComponent,
} from '@components/shared';
import { Errors, HWMember } from '@models';
import guildData from 'src/files-data/hw-guild-data.json'; // page Membres
@@ -21,29 +26,30 @@ import guildData from 'src/files-data/hw-guild-data.json'; // page Membres
@Component({
selector: 'app-herowars',
standalone: true,
imports: [
DatePipe,
MatCardModule, MatDividerModule, MatIconModule, MatTabsModule,
MatCardModule,
MatDividerModule,
MatIconModule,
MatTabsModule,
ListErrorsComponent,
GuildCardComponent, GuildraidsLogComponent, GuildwarChampionsComponent,
GuildwarAttackComponent, GuildwarDefenceComponent, GuildwarTeamsComponent, MembersStatisticsComponent
GuildCardComponent,
GuildraidsLogComponent,
GuildwarChampionsComponent,
GuildwarAttackComponent,
GuildwarDefenceComponent,
GuildwarTeamsComponent,
MembersStatisticsComponent,
],
templateUrl: './herowars.component.html',
styleUrl: './herowars.component.scss',
animations: [
trigger('flyInOut', [
state('in', style({ transform: 'translateY(0)' })),
transition('void => *', [
style({ transform: 'translateY(-100%)' }),
animate(200)
]),
transition('* => void', [
style({ transform: 'translateY(100%)' }),
animate(200)
])
])
]
transition('void => *', [style({ transform: 'translateY(-100%)' }), animate(200)]),
transition('* => void', [style({ transform: 'translateY(100%)' }), animate(200)]),
]),
],
})
export class HerowarsComponent implements OnInit {
public title = 'HeroWars GM Tools';
@@ -53,9 +59,7 @@ export class HerowarsComponent implements OnInit {
public now = new Date();
private _guildMembers: HWMember[] = [];
constructor(
private _titleService: Title
) { }
constructor(private _titleService: Title) {}
ngOnInit() {
try {
@@ -68,8 +72,8 @@ export class HerowarsComponent implements OnInit {
} else {
member.champion = false;
}
member.heroes = { power: 0, teams: []};
member.titans = { power: 0, teams: []};
member.heroes = { power: 0, teams: [] };
member.titans = { power: 0, teams: [] };
this._guildMembers.push(member);
}
} catch (error) {
@@ -80,5 +84,4 @@ export class HerowarsComponent implements OnInit {
getMembers(): HWMember[] {
return this._guildMembers;
}
}
src/app/components/home/home.component.ts
+7 -19
View File
@@ -12,31 +12,20 @@ import { Errors } from '@models';
//import { UserService } from '@services';
@Component({
selector: 'app-home',
standalone: true,
imports: [
DatePipe,
MatCardModule, MatDividerModule, MatIconModule,
ListErrorsComponent
],
imports: [DatePipe, MatCardModule, MatDividerModule, MatIconModule, ListErrorsComponent],
templateUrl: './home.component.html',
styleUrl: './home.component.scss',
animations: [
trigger('flyInOut', [
state('in', style({ transform: 'translateY(0)' })),
transition('void => *', [
style({ transform: 'translateY(-100%)' }),
animate(200)
]),
transition('* => void', [
style({ transform: 'translateY(100%)' }),
animate(200)
])
])
]
transition('void => *', [style({ transform: 'translateY(-100%)' }), animate(200)]),
transition('* => void', [style({ transform: 'translateY(100%)' }), animate(200)]),
]),
],
})
export class HomeComponent implements OnInit {
public title = 'Shop bientôt disponible!';
public description = 'Encore un peu de patience, notre shop sera mis en ligne d\'ici peu.';
public description = "Encore un peu de patience, notre shop sera mis en ligne d'ici peu.";
public errors: Errors = { errors: {} };
public destroyRef = inject(DestroyRef);
public now = new Date();
@@ -45,10 +34,9 @@ export class HomeComponent implements OnInit {
private _titleService: Title,
//private _utilitiesService: UtilitiesService
//private _userService: UserService
) { }
) {}
ngOnInit() {
this._titleService.setTitle(this.title);
/*
type CreateArrayWithLengthX<
src/app/components/jump/jump.component.ts
+13 -9
View File
@@ -1,5 +1,5 @@
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { DatePipe, DecimalPipe } from '@angular/common';
import { ActivatedRoute, RouterLink } from '@angular/router';
import { MatButtonModule } from '@angular/material/button';
@@ -14,15 +14,19 @@ import { Errors, Jump, JumpPageData } from '@models';
@Component({
selector: 'app-jump',
standalone: true,
imports: [
DatePipe, DecimalPipe, RouterLink,
MatButtonModule, MatCardModule,
MatDividerModule, MatIconModule, MatMenuModule,
ListErrorsComponent
DatePipe,
DecimalPipe,
RouterLink,
MatButtonModule,
MatCardModule,
MatDividerModule,
MatIconModule,
MatMenuModule,
ListErrorsComponent,
],
templateUrl: './jump.component.html',
styleUrl: './jump.component.scss'
styleUrl: './jump.component.scss',
})
export class JumpComponent implements OnInit, OnDestroy {
private _data: Subscription = new Subscription();
@@ -35,8 +39,8 @@ export class JumpComponent implements OnInit, OnDestroy {
constructor(
private route: ActivatedRoute,
public menuItems: MenuItems
) { }
public menuItems: MenuItems,
) {}
ngOnInit() {
const data$: Observable<{ pageData: JumpPageData }> = this.route.data as Observable<{ pageData: JumpPageData }>;
src/app/components/jumps/jumps.component.ts
+68 -49
View File
@@ -1,6 +1,6 @@
import { trigger, state, style, animate, transition } from '@angular/animations';
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { ActivatedRoute } from '@angular/router';
import { CommonModule } from '@angular/common';
import { MatButtonModule } from '@angular/material/button';
@@ -13,34 +13,39 @@ import { MatMenuModule } from '@angular/material/menu';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { BarsChartComponent, CircleChartComponent, LineChartComponent, LineAreaChartComponent } from '@components/shared/helpers-chart';
import {
BarsChartComponent,
CircleChartComponent,
LineChartComponent,
LineAreaChartComponent,
} from '@components/shared/helpers-chart';
import { UtilitiesService } from '@services';
import { Jump, JumpByCategorie, JumpByDate, JumpByDateByModule, JumpByModule, JumpsPageData, JumpYears } from '@models';
@Component({
selector: 'app-jumps',
standalone: true,
imports: [
CommonModule,
MatButtonModule, MatCardModule, MatDividerModule,
MatExpansionModule, MatIconModule, MatMenuModule,
BarsChartComponent, CircleChartComponent, LineChartComponent, LineAreaChartComponent
MatButtonModule,
MatCardModule,
MatDividerModule,
MatExpansionModule,
MatIconModule,
MatMenuModule,
BarsChartComponent,
CircleChartComponent,
LineChartComponent,
LineAreaChartComponent,
],
templateUrl: './jumps.component.html',
styleUrl: './jumps.component.scss',
animations: [
trigger('flyInOut', [
state('in', style({ transform: 'translateX(0)' })),
transition('void => *', [
style({ transform: 'translateX(-100%)' }),
animate(200)
]),
transition('* => void', [
style({ transform: 'translateX(100%)' }),
animate(200)
])
])
]
transition('void => *', [style({ transform: 'translateX(-100%)' }), animate(200)]),
transition('* => void', [style({ transform: 'translateX(100%)' }), animate(200)]),
]),
],
})
export class JumpsComponent implements OnInit, OnDestroy {
private _data: Subscription = new Subscription();
@@ -61,22 +66,22 @@ export class JumpsComponent implements OnInit, OnDestroy {
public seriesName: string[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[],
borderColor: string[]
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all')
borderColor: this._utilitiesService.getSeriesColors(1, 'all'),
};
public seriesTypesHeader: string[] = [];
public seriesTypesName: string[] = [];
public seriesTypesRow: Array<Array<number>> = [];
public seriesTypesRowCumulated: Array<Array<number>> = [];
public seriesTypesColor: {
backgroundColor: string[],
borderColor: string[]
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'pastels'),
borderColor: this._utilitiesService.getSeriesColors(1, 'pastels')
borderColor: this._utilitiesService.getSeriesColors(1, 'pastels'),
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public seriesRowTotal: number[] = [];
@@ -89,11 +94,13 @@ export class JumpsComponent implements OnInit, OnDestroy {
constructor(
private route: ActivatedRoute,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems
) { }
public menuItems: MenuItems,
) {}
ngOnInit() {
const data$: Observable<{ pageData: JumpsPageData }> = this.route.data as Observable<{ pageData: JumpsPageData }>;
const data$: Observable<{ pageData: JumpsPageData }> = this.route.data as Observable<{
pageData: JumpsPageData;
}>;
this._data = data$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((data: { pageData: JumpsPageData }) => {
const pageData: JumpsPageData = data.pageData;
this.lastJump = pageData.lastjump;
@@ -104,7 +111,7 @@ export class JumpsComponent implements OnInit, OnDestroy {
const modules: Array<string> = [...verticals, ...others];
const minoration = 2; // -2 pour ne pas compter la première année
this.min = pageData.jumpsByYears[0].year;
this.max = pageData.jumpsByYears[(pageData.jumpsByYears.length-1)].year;
this.max = pageData.jumpsByYears[pageData.jumpsByYears.length - 1].year;
this.seriesHeader = this._utilitiesService.getMonthsList();
const values: Array<number> = this.seriesHeader.map(() => 0);
@@ -117,13 +124,13 @@ export class JumpsComponent implements OnInit, OnDestroy {
});
this._jumpsByDate = pageData.jumpsByDate.map((row: JumpByDate) => {
this.seriesRow[(row.year-this.min)][(row.month-1)] = row.count;
this.seriesColTotal[(row.month-1)] += row.count;
this.seriesRow[row.year - this.min][row.month - 1] = row.count;
this.seriesColTotal[row.month - 1] += row.count;
if (row.year < currentYear) {
this.seriesColTotalClosed[(row.month-1)] += row.count;
this.seriesColTotalClosed[row.month - 1] += row.count;
}
if (row.year >= (currentYear-3) && row.year < currentYear) {
this.seriesColTotalLastYears[(row.month-1)] += row.count;
if (row.year >= currentYear - 3 && row.year < currentYear) {
this.seriesColTotalLastYears[row.month - 1] += row.count;
}
return row;
});
@@ -132,17 +139,20 @@ export class JumpsComponent implements OnInit, OnDestroy {
this.seriesRowTotal.push(total);
});
this.seriesColTotalClosed.forEach((row: number) => {
const value: number = (row/(this.seriesName.length-minoration));
const value: number = row / (this.seriesName.length - minoration);
this.seriesRowAvg.push(parseInt(value.toFixed(0)));
});
this.seriesColTotalLastYears.forEach((row: number) => {
const value: number = (row/3); // Les 3 dernières années
const value: number = row / 3; // Les 3 dernières années
this.seriesRowAvgLastYears.push(parseInt(value.toFixed(0)));
});
this.grandAvg = this.seriesRowAvg.reduce((partialSum, accumulated) => partialSum + accumulated, 0);
this.grandAvgLastYears = this.seriesRowAvgLastYears.reduce((partialSum, accumulated) => partialSum + accumulated, 0);
this.grandAvgLastYears = this.seriesRowAvgLastYears.reduce(
(partialSum, accumulated) => partialSum + accumulated,
0,
);
this.grandTotal = this.seriesColTotal.reduce((partialSum, accumulated) => partialSum + accumulated, 0);
pageData.jumpsByCategory.forEach((row: JumpByCategorie) => {
if (types.indexOf(row.categorie) !== -1) {
this._jumpsByCategorie.push(row);
@@ -150,8 +160,8 @@ export class JumpsComponent implements OnInit, OnDestroy {
});
//const focus: Array<string> = ['FF', 'Solo']; // ['FF']
let verticalCount:number = 0;
let otherCount:number = 0;
let verticalCount: number = 0;
let otherCount: number = 0;
pageData.jumpsByModule.forEach((row: JumpByModule) => {
//if (focus.indexOf(row.categorie) !== -1 && modules.indexOf(row.module) !== -1) {
if (modules.indexOf(row.module) !== -1) {
@@ -163,25 +173,25 @@ export class JumpsComponent implements OnInit, OnDestroy {
}
});
if (verticalCount > 0) {
const row:JumpByModule = {
const row: JumpByModule = {
categorie: 'FF',
module: 'Vertical',
count: verticalCount
}
count: verticalCount,
};
this._jumpsByModule.push(row);
}
if (otherCount > 0) {
const row:JumpByModule = {
const row: JumpByModule = {
categorie: 'FF',
module: 'Track/Trace',
count: otherCount
}
count: otherCount,
};
this._jumpsByModule.push(row);
}
for (let year = 0; year < pageData.jumpsByYears.length; year++) {
for (let index = 0; index < 12; index++) {
const month: string = ((index+1) < 10) ? `0${(index+1)}` : `${(index+1)}`;
const month: string = index + 1 < 10 ? `0${index + 1}` : `${index + 1}`;
this.seriesTypesHeader.push(`${month}-${pageData.jumpsByYears[year].year}`);
}
}
@@ -193,7 +203,7 @@ export class JumpsComponent implements OnInit, OnDestroy {
pageData.jumpsByDateByModule.forEach((row: JumpByDateByModule) => {
const indexOf: number = this.seriesTypesName.indexOf(row.categorie);
if (indexOf !== -1) {
this.seriesTypesRow[indexOf][(((row.year-this.min)*12)+row.month-1)] += row.count;
this.seriesTypesRow[indexOf][(row.year - this.min) * 12 + row.month - 1] += row.count;
}
});
this.seriesTypesRowCumulated = this.seriesTypesRow.map((row: Array<number>) => {
@@ -203,12 +213,21 @@ export class JumpsComponent implements OnInit, OnDestroy {
return accumulated;
});
});
this.seriesTypesHeader = this.seriesTypesHeader.slice((pageData.jumpsByDateByModule[0].month+1), -(pageData.jumpsByDateByModule[(pageData.jumpsByDateByModule.length-1)].month));
this.seriesTypesHeader = this.seriesTypesHeader.slice(
pageData.jumpsByDateByModule[0].month + 1,
-pageData.jumpsByDateByModule[pageData.jumpsByDateByModule.length - 1].month,
);
this.seriesTypesRow = this.seriesTypesRow.map((row: Array<number>) => {
return row.slice((pageData.jumpsByDateByModule[0].month+1), -(pageData.jumpsByDateByModule[(pageData.jumpsByDateByModule.length-1)].month));
return row.slice(
pageData.jumpsByDateByModule[0].month + 1,
-pageData.jumpsByDateByModule[pageData.jumpsByDateByModule.length - 1].month,
);
});
this.seriesTypesRowCumulated = this.seriesTypesRowCumulated.map((row: Array<number>) => {
return row.slice((pageData.jumpsByDateByModule[0].month+1), -(pageData.jumpsByDateByModule[(pageData.jumpsByDateByModule.length-1)].month));
return row.slice(
pageData.jumpsByDateByModule[0].month + 1,
-pageData.jumpsByDateByModule[pageData.jumpsByDateByModule.length - 1].month,
);
});
/*
console.log('this.min', this.min);
@@ -244,6 +263,6 @@ export class JumpsComponent implements OnInit, OnDestroy {
}
public getModuleColor(index: number): number {
return (this._jumpsByCategorie.length + index);
return this._jumpsByCategorie.length + index;
}
}
src/app/components/logbook/dialogs/jump-add.dialog.ts
+125 -75
View File
@@ -14,29 +14,38 @@ import { MatSelectModule } from '@angular/material/select';
import { Observable, Subscription } from 'rxjs';
import { map, startWith, take } from 'rxjs/operators';
import { AeronefByImat, CanopyModelBySize, DropZoneByOaci, Errors, Jump, JumpAddParams, JumpByModule, JumpFile, JumpFileType } from '@models';
import {
AeronefByImat,
CanopyModelBySize,
DropZoneByOaci,
Errors,
Jump,
JumpAddParams,
JumpByModule,
JumpFile,
JumpFileType,
} from '@models';
import { AeronefsService, CanopiesService, DropZonesService, JumpsService } from '@services';
@Component({
selector: 'app-jump-add-dialog',
templateUrl: 'jump-add.dialog.html',
standalone: true,
imports: [
AsyncPipe,
DatePipe,
FormsModule,
ReactiveFormsModule,
MatAutocompleteModule,
MatButtonModule,
MatCheckboxModule,
MatDatepickerModule,
MatDialogModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
MatSelectModule,
MatOptionModule
]
AsyncPipe,
DatePipe,
FormsModule,
ReactiveFormsModule,
MatAutocompleteModule,
MatButtonModule,
MatCheckboxModule,
MatDatepickerModule,
MatDialogModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
MatSelectModule,
MatOptionModule,
],
})
export class JumpAddDialogComponent implements OnDestroy {
private _formChanges: Array<Subscription> = [];
@@ -46,7 +55,7 @@ export class JumpAddDialogComponent implements OnDestroy {
private _dropZoneByOaci: Subscription = new Subscription();
private _jumpByModule: Subscription = new Subscription();
public errors!: Errors;
public tagField = new FormControl<string>('', { nonNullable: true});
public tagField = new FormControl<string>('', { nonNullable: true });
public jumpForm: FormGroup;
public jump: Jump;
public lastJump: Jump;
@@ -73,7 +82,7 @@ export class JumpAddDialogComponent implements OnDestroy {
dropzone: false,
groupe: false,
programme: false,
voile: false
voile: false,
};
public inputOptions: {
aeronefs: Array<AeronefByImat>;
@@ -99,17 +108,17 @@ export class JumpAddDialogComponent implements OnDestroy {
private _canopiesService: CanopiesService,
private _dropZonesService: DropZonesService,
private _jumpsService: JumpsService,
@Inject(MAT_DIALOG_DATA) public data: {jump: Jump, lastJump: Jump}
@Inject(MAT_DIALOG_DATA) public data: { jump: Jump; lastJump: Jump },
) {
this.inputOptions = { aeronefs: [], canopies: [], dropzones: [], categories: [] };
//this.filteredOptions.aeronefs = this._aeronefsService.getAllByImat();
this.jump = data.jump;
this.lastJump = data.lastJump;
this.nextJump = (this.lastJump.numero + 1);
this.nextJump = this.lastJump.numero + 1;
this.params = {
numeros: this.nextJump.toString(),
date: '',
video: true
video: true,
};
this.jump.numero = this.nextJump;
const controlsConfig = {
@@ -131,7 +140,7 @@ export class JumpAddDialogComponent implements OnDestroy {
accessoires: '',
zone: '',
dossier: '',
video: ''
video: '',
};
this.jumpForm = this.fb.group(controlsConfig);
this.filename = this._computeFilename();
@@ -142,7 +151,7 @@ export class JumpAddDialogComponent implements OnDestroy {
}),
this.jumpForm.controls['numero'].valueChanges.subscribe(() => {
this.filename = this._computeFilename();
})
}),
);
/*
this.filteredAeronefOptions = this.jumpForm.controls['aeronef'].valueChanges.pipe(
@@ -164,60 +173,60 @@ export class JumpAddDialogComponent implements OnDestroy {
this.filteredOptions = {
aeronefs: this.jumpForm.controls['aeronef'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const aeronef = typeof value === 'string' ? value : value?.aeronef;
return aeronef ? this._filterImat(aeronef as string) : this.inputOptions.aeronefs.slice();
}),
),
imats: this.jumpForm.controls['imat'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const imat = typeof value === 'string' ? value : value?.imat;
return imat ? this._filterImat(imat as string) : this.inputOptions.aeronefs.slice();
}),
),
canopies: this.jumpForm.controls['voile'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const voile = typeof value === 'string' ? value : value?.voile;
return voile ? this._filterTaille(voile as string) : this.inputOptions.canopies.slice();
}),
),
tailles: this.jumpForm.controls['taille'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const taille = typeof value === 'string' ? value : value?.taille.toString();
return taille ? this._filterTaille(taille as string) : this.inputOptions.canopies.slice();
}),
),
dropzones: this.jumpForm.controls['lieu'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const lieu = typeof value === 'string' ? value : value?.lieu;
return lieu ? this._filterOaci(lieu as string) : this.inputOptions.dropzones.slice();
}),
),
oaci: this.jumpForm.controls['oaci'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const oaci = typeof value === 'string' ? value : value?.oaci;
return oaci ? this._filterOaci(oaci as string) : this.inputOptions.dropzones.slice();
}),
),
categories: this.jumpForm.controls['categorie'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const category = typeof value === 'string' ? value : value?.categorie;
return category ? this._filterModule(category as string) : this.inputOptions.categories.slice();
}),
),
modules: this.jumpForm.controls['module'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const module = typeof value === 'string' ? value : value?.module;
return module ? this._filterModule(module as string) : this.inputOptions.categories.slice();
}),
)
),
};
this._loadAeronefByImat();
this._loadCanopyModelBySize();
@@ -244,7 +253,7 @@ export class JumpAddDialogComponent implements OnDestroy {
const timestamp: number = Date.parse(this.jumpForm.controls['date'].value);
if (isNaN(timestamp) == false) {
const date: Date = new Date(timestamp);
file += `${(date.getFullYear() + '').padStart(2, '0')}-${((date.getMonth() + 1) + '').padStart(2, '0')}-${(date.getDate() + '').padStart(2, '0')}_`;
file += `${(date.getFullYear() + '').padStart(2, '0')}-${(date.getMonth() + 1 + '').padStart(2, '0')}-${(date.getDate() + '').padStart(2, '0')}_`;
}
if (numero !== undefined) {
numero = (numero + '').padStart(5, '0');
@@ -261,7 +270,10 @@ export class JumpAddDialogComponent implements OnDestroy {
let path: string = '/Volumes/Storage/Skydive/Videos/';
if (this.jumpForm.controls['module'].value != '') {
//path += `${this.jumpForm.controls['module'].value}/`;
path += typeof this.jumpForm.controls['module'].value === 'string' ? `${this.jumpForm.controls['module'].value}/` : `${this.jumpForm.controls['module'].value?.module}/`;
path +=
typeof this.jumpForm.controls['module'].value === 'string'
? `${this.jumpForm.controls['module'].value}/`
: `${this.jumpForm.controls['module'].value?.module}/`;
}
this.jumpForm.controls['dossier'].setValue(path);
@@ -270,35 +282,48 @@ export class JumpAddDialogComponent implements OnDestroy {
private _isLastForAllSections() {
return (
this.useLast.aeronef
&& this.useLast.altitude
&& this.useLast.discipline
&& this.useLast.divers
&& this.useLast.dropzone
&& this.useLast.groupe
&& this.useLast.programme
&& this.useLast.voile
this.useLast.aeronef &&
this.useLast.altitude &&
this.useLast.discipline &&
this.useLast.divers &&
this.useLast.dropzone &&
this.useLast.groupe &&
this.useLast.programme &&
this.useLast.voile
);
}
private _filterImat(imat: string): Array<AeronefByImat> {
const filterValue = imat.toLowerCase();
return this.inputOptions.aeronefs.filter(option => (option.aeronef.toLowerCase().includes(filterValue) || option.imat.toLowerCase().includes(filterValue)));
return this.inputOptions.aeronefs.filter(
(option) =>
option.aeronef.toLowerCase().includes(filterValue) || option.imat.toLowerCase().includes(filterValue),
);
}
private _filterModule(module: string): Array<JumpByModule> {
const filterValue = module.toLowerCase();
return this.inputOptions.categories.filter(option => (option.categorie.toLowerCase().includes(filterValue) || option.module.toLowerCase().includes(filterValue)));
return this.inputOptions.categories.filter(
(option) =>
option.categorie.toLowerCase().includes(filterValue) ||
option.module.toLowerCase().includes(filterValue),
);
}
private _filterOaci(oaci: string): Array<DropZoneByOaci> {
const filterValue = oaci.toLowerCase();
return this.inputOptions.dropzones.filter(option => (option.lieu.toLowerCase().includes(filterValue) || option.oaci.toLowerCase().includes(filterValue)));
return this.inputOptions.dropzones.filter(
(option) =>
option.lieu.toLowerCase().includes(filterValue) || option.oaci.toLowerCase().includes(filterValue),
);
}
private _filterTaille(taille: string): Array<CanopyModelBySize> {
const filterValue = taille.toLowerCase();
return this.inputOptions.canopies.filter(option => (option.voile.toLowerCase().includes(filterValue) || option.taille.toString().includes(filterValue)));
return this.inputOptions.canopies.filter(
(option) =>
option.voile.toLowerCase().includes(filterValue) || option.taille.toString().includes(filterValue),
);
}
private _loadAeronefByImat(): void {
@@ -376,7 +401,7 @@ export class JumpAddDialogComponent implements OnDestroy {
if (tag != null && tag.trim() !== '') {
if (tag.includes(',') === true) {
const tags = tag.split(',');
tags.forEach(sautant => {
tags.forEach((sautant) => {
if (this.jump.sautants.indexOf(sautant.trim()) < 0) {
this.jump.sautants.push(sautant.trim());
}
@@ -386,7 +411,7 @@ export class JumpAddDialogComponent implements OnDestroy {
}
}
this.tagField.reset('');
const participants = (this.jump.sautants.length + 1);
const participants = this.jump.sautants.length + 1;
this.jumpForm.controls['participants'].setValue(participants);
}
@@ -562,7 +587,7 @@ export class JumpAddDialogComponent implements OnDestroy {
this.useLast.groupe = false;
this.useLast.all = this._isLastForAllSections();
this.jump.sautants = this.jump.sautants.filter((sautant) => sautant !== index);
const participants = (this.jump.sautants.length + 1);
const participants = this.jump.sautants.length + 1;
this.jumpForm.controls['participants'].setValue(participants);
}
@@ -737,7 +762,7 @@ export class JumpAddDialogComponent implements OnDestroy {
}
submitForm(): void {
/*
/*
* Création d'un tableau de saut contenant de 1 à n saut en fonction
* de la valeur du champ numero du formulaire jumpForm
*/
@@ -766,17 +791,17 @@ export class JumpAddDialogComponent implements OnDestroy {
const elements: string[] = this.jumpForm.controls['numero'].value.split(';');
elements.forEach((element: string) => {
if (element == '') {
jumpNum ++;
jumpNum++;
element = jumpNum.toString();
}
const values: string[] = element.split('-');
if (values.length == 2) {
const start: number = parseInt(values[0]);
const stop: number = parseInt(values[1]);
const diff: number = (stop - start);
const diff: number = stop - start;
/* Ajout de saut par plage */
for (let index = 0; index <= diff; index++) {
jumpNum = (start + index);
jumpNum = start + index;
numeros.push(jumpNum);
}
} else {
@@ -785,7 +810,7 @@ export class JumpAddDialogComponent implements OnDestroy {
/* Ajout de sauts par quantité */
//const start: number = jumpNum;
for (let index = 1; index <= parseInt(quantity[1]); index++) {
jumpNum ++;
jumpNum++;
numeros.push(jumpNum);
}
} else {
@@ -802,14 +827,38 @@ export class JumpAddDialogComponent implements OnDestroy {
/* Valeurs communes aux 1 à n saut(s) à ajouter */
jump.date = date.toISOString();
jump.lieu = typeof this.jumpForm.controls['lieu'].value === 'string' ? this.jumpForm.controls['lieu'].value : this.jumpForm.controls['lieu'].value.lieu;
jump.oaci = typeof this.jumpForm.controls['oaci'].value === 'string' ? this.jumpForm.controls['oaci'].value : this.jumpForm.controls['oaci'].value.oaci;
jump.aeronef = typeof this.jumpForm.controls['aeronef'].value === 'string' ? this.jumpForm.controls['aeronef'].value : this.jumpForm.controls['aeronef'].value.aeronef;
jump.imat = typeof this.jumpForm.controls['imat'].value === 'string' ? this.jumpForm.controls['imat'].value : this.jumpForm.controls['imat'].value.imat;
jump.voile = typeof this.jumpForm.controls['voile'].value === 'string' ? this.jumpForm.controls['voile'].value : this.jumpForm.controls['voile'].value.voile;
jump.taille = typeof this.jumpForm.controls['taille'].value === 'string' ? this.jumpForm.controls['taille'].value : this.jumpForm.controls['taille'].value.taille;
jump.categorie = typeof this.jumpForm.controls['categorie'].value === 'string' ? this.jumpForm.controls['categorie'].value : this.jumpForm.controls['categorie'].value.categorie;
jump.module = typeof this.jumpForm.controls['module'].value === 'string' ? this.jumpForm.controls['module'].value : this.jumpForm.controls['module'].value.module;
jump.lieu =
typeof this.jumpForm.controls['lieu'].value === 'string'
? this.jumpForm.controls['lieu'].value
: this.jumpForm.controls['lieu'].value.lieu;
jump.oaci =
typeof this.jumpForm.controls['oaci'].value === 'string'
? this.jumpForm.controls['oaci'].value
: this.jumpForm.controls['oaci'].value.oaci;
jump.aeronef =
typeof this.jumpForm.controls['aeronef'].value === 'string'
? this.jumpForm.controls['aeronef'].value
: this.jumpForm.controls['aeronef'].value.aeronef;
jump.imat =
typeof this.jumpForm.controls['imat'].value === 'string'
? this.jumpForm.controls['imat'].value
: this.jumpForm.controls['imat'].value.imat;
jump.voile =
typeof this.jumpForm.controls['voile'].value === 'string'
? this.jumpForm.controls['voile'].value
: this.jumpForm.controls['voile'].value.voile;
jump.taille =
typeof this.jumpForm.controls['taille'].value === 'string'
? this.jumpForm.controls['taille'].value
: this.jumpForm.controls['taille'].value.taille;
jump.categorie =
typeof this.jumpForm.controls['categorie'].value === 'string'
? this.jumpForm.controls['categorie'].value
: this.jumpForm.controls['categorie'].value.categorie;
jump.module =
typeof this.jumpForm.controls['module'].value === 'string'
? this.jumpForm.controls['module'].value
: this.jumpForm.controls['module'].value.module;
jump.hauteur = this.jumpForm.controls['hauteur'].value;
jump.deploiement = this.jumpForm.controls['deploiement'].value;
jump.participants = this.jumpForm.controls['participants'].value;
@@ -832,20 +881,21 @@ export class JumpAddDialogComponent implements OnDestroy {
const file: JumpFile = {
name: item.video,
path: item.dossier,
type: JumpFileType.VIDEO
type: JumpFileType.VIDEO,
} as JumpFile;
this._subscriptions.push(
this._jumpsService.saveFile(item.slug, file)
.pipe(take(1))
.subscribe({
next: (file) => {
item.files.push(file);
console.log(`Le fichier ${file.name} a été ajouté au saut n°${item.numero} !`, 'OK');
},
error: (err) => {
this.errors = err;
}
})
this._jumpsService
.saveFile(item.slug, file)
.pipe(take(1))
.subscribe({
next: (file) => {
item.files.push(file);
console.log(`Le fichier ${file.name} a été ajouté au saut n°${item.numero} !`, 'OK');
},
error: (err) => {
this.errors = err;
},
}),
);
}
jumps.push(item);
src/app/components/logbook/dialogs/jump-delete.dialog.ts
+3 -7
View File
@@ -9,17 +9,13 @@ import { Jump } from '@models';
@Component({
selector: 'app-jump-delete-dialog',
templateUrl: 'jump-delete.dialog.html',
standalone: true,
imports: [
DatePipe,
MatDialogModule, MatButtonModule, MatIconModule
]
imports: [DatePipe, MatDialogModule, MatButtonModule, MatIconModule],
})
export class JumpDeleteDialogComponent {
constructor(
public dialogRef: MatDialogRef<JumpDeleteDialogComponent>,
@Inject(MAT_DIALOG_DATA) public jump: Jump
) { }
@Inject(MAT_DIALOG_DATA) public jump: Jump,
) {}
closeDialog(): void {
this.dialogRef.close();
src/app/components/logbook/dialogs/jump-edit.dialog.ts
+78 -42
View File
@@ -20,30 +20,29 @@ import { AeronefsService, CanopiesService, DropZonesService, JumpsService } from
@Component({
selector: 'app-jump-edit-dialog',
templateUrl: 'jump-edit.dialog.html',
standalone: true,
imports: [
AsyncPipe,
DatePipe,
FormsModule,
ReactiveFormsModule,
MatAutocompleteModule,
MatButtonModule,
MatCheckboxModule,
MatDatepickerModule,
MatDialogModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
MatSelectModule,
MatOptionModule
]
AsyncPipe,
DatePipe,
FormsModule,
ReactiveFormsModule,
MatAutocompleteModule,
MatButtonModule,
MatCheckboxModule,
MatDatepickerModule,
MatDialogModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
MatSelectModule,
MatOptionModule,
],
})
export class JumpEditDialogComponent implements OnDestroy {
private _aeronefByImat: Subscription = new Subscription();
private _canopyModelBySize: Subscription = new Subscription();
private _dropZoneByOaci: Subscription = new Subscription();
private _jumpByModule: Subscription = new Subscription();
public tagField = new FormControl<string>('', { nonNullable: true});
public tagField = new FormControl<string>('', { nonNullable: true });
public jumpForm: FormGroup;
public inputOptions: {
aeronefs: Array<AeronefByImat>;
@@ -69,7 +68,7 @@ export class JumpEditDialogComponent implements OnDestroy {
private _canopiesService: CanopiesService,
private _dropZonesService: DropZonesService,
private _jumpsService: JumpsService,
@Inject(MAT_DIALOG_DATA) public jump: Jump
@Inject(MAT_DIALOG_DATA) public jump: Jump,
) {
this.inputOptions = { aeronefs: [], canopies: [], dropzones: [], categories: [] };
const controlsConfig = {
@@ -91,67 +90,67 @@ export class JumpEditDialogComponent implements OnDestroy {
accessoires: this.jump.accessoires,
zone: this.jump.zone,
dossier: this.jump.dossier,
video: this.jump.video
video: this.jump.video,
};
this.jumpForm = this.fb.group(controlsConfig);
this.filteredOptions = {
aeronefs: this.jumpForm.controls['aeronef'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const aeronef = typeof value === 'string' ? value : value?.aeronef;
return aeronef ? this._filterImat(aeronef as string) : this.inputOptions.aeronefs.slice();
}),
),
imats: this.jumpForm.controls['imat'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const imat = typeof value === 'string' ? value : value?.imat;
return imat ? this._filterImat(imat as string) : this.inputOptions.aeronefs.slice();
}),
),
canopies: this.jumpForm.controls['voile'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const voile = typeof value === 'string' ? value : value?.voile;
return voile ? this._filterTaille(voile as string) : this.inputOptions.canopies.slice();
}),
),
tailles: this.jumpForm.controls['taille'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const taille = typeof value === 'string' ? value : value?.taille.toString();
return taille ? this._filterTaille(taille as string) : this.inputOptions.canopies.slice();
}),
),
dropzones: this.jumpForm.controls['lieu'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const lieu = typeof value === 'string' ? value : value?.lieu;
return lieu ? this._filterOaci(lieu as string) : this.inputOptions.dropzones.slice();
}),
),
oaci: this.jumpForm.controls['oaci'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const oaci = typeof value === 'string' ? value : value?.oaci;
return oaci ? this._filterOaci(oaci as string) : this.inputOptions.dropzones.slice();
}),
),
categories: this.jumpForm.controls['categorie'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const category = typeof value === 'string' ? value : value?.categorie;
return category ? this._filterModule(category as string) : this.inputOptions.categories.slice();
}),
),
modules: this.jumpForm.controls['module'].valueChanges.pipe(
startWith(''),
map(value => {
map((value) => {
const module = typeof value === 'string' ? value : value?.module;
return module ? this._filterModule(module as string) : this.inputOptions.categories.slice();
}),
)
),
};
this._loadAeronefByImat();
this._loadCanopyModelBySize();
@@ -168,22 +167,35 @@ export class JumpEditDialogComponent implements OnDestroy {
private _filterImat(imat: string): Array<AeronefByImat> {
const filterValue = imat.toLowerCase();
return this.inputOptions.aeronefs.filter(option => (option.aeronef.toLowerCase().includes(filterValue) || option.imat.toLowerCase().includes(filterValue)));
return this.inputOptions.aeronefs.filter(
(option) =>
option.aeronef.toLowerCase().includes(filterValue) || option.imat.toLowerCase().includes(filterValue),
);
}
private _filterModule(module: string): Array<JumpByModule> {
const filterValue = module.toLowerCase();
return this.inputOptions.categories.filter(option => (option.categorie.toLowerCase().includes(filterValue) || option.module.toLowerCase().includes(filterValue)));
return this.inputOptions.categories.filter(
(option) =>
option.categorie.toLowerCase().includes(filterValue) ||
option.module.toLowerCase().includes(filterValue),
);
}
private _filterOaci(oaci: string): Array<DropZoneByOaci> {
const filterValue = oaci.toLowerCase();
return this.inputOptions.dropzones.filter(option => (option.lieu.toLowerCase().includes(filterValue) || option.oaci.toLowerCase().includes(filterValue)));
return this.inputOptions.dropzones.filter(
(option) =>
option.lieu.toLowerCase().includes(filterValue) || option.oaci.toLowerCase().includes(filterValue),
);
}
private _filterTaille(taille: string): Array<CanopyModelBySize> {
const filterValue = taille.toLowerCase();
return this.inputOptions.canopies.filter(option => (option.voile.toLowerCase().includes(filterValue) || option.taille.toString().includes(filterValue)));
return this.inputOptions.canopies.filter(
(option) =>
option.voile.toLowerCase().includes(filterValue) || option.taille.toString().includes(filterValue),
);
}
private _loadAeronefByImat(): void {
@@ -219,7 +231,7 @@ export class JumpEditDialogComponent implements OnDestroy {
if (tag != null && tag.trim() !== '' && this.jump.sautants.indexOf(tag) < 0) {
this.jump.sautants.push(tag);
}
const participants = (this.jump.sautants.length + 1);
const participants = this.jump.sautants.length + 1;
this.jumpForm.controls['participants'].setValue(participants);
this.tagField.reset('');
}
@@ -382,21 +394,45 @@ export class JumpEditDialogComponent implements OnDestroy {
removeSautant(index: string): void {
this.jump.sautants = this.jump.sautants.filter((sautant) => sautant !== index);
const participants = (this.jump.sautants.length + 1);
const participants = this.jump.sautants.length + 1;
this.jumpForm.controls['participants'].setValue(participants);
}
submitForm(): void {
// update the model
this.updateJump(this.jumpForm.value);
this.jump.lieu = typeof this.jumpForm.controls['lieu'].value === 'string' ? this.jumpForm.controls['lieu'].value : this.jumpForm.controls['lieu'].value.lieu;
this.jump.oaci = typeof this.jumpForm.controls['oaci'].value === 'string' ? this.jumpForm.controls['oaci'].value : this.jumpForm.controls['oaci'].value.oaci;
this.jump.aeronef = typeof this.jumpForm.controls['aeronef'].value === 'string' ? this.jumpForm.controls['aeronef'].value : this.jumpForm.controls['aeronef'].value.aeronef;
this.jump.imat = typeof this.jumpForm.controls['imat'].value === 'string' ? this.jumpForm.controls['imat'].value : this.jumpForm.controls['imat'].value.imat;
this.jump.voile = typeof this.jumpForm.controls['voile'].value === 'string' ? this.jumpForm.controls['voile'].value : this.jumpForm.controls['voile'].value.voile;
this.jump.taille = typeof this.jumpForm.controls['taille'].value === 'string' ? this.jumpForm.controls['taille'].value : this.jumpForm.controls['taille'].value.taille;
this.jump.categorie = typeof this.jumpForm.controls['categorie'].value === 'string' ? this.jumpForm.controls['categorie'].value : this.jumpForm.controls['categorie'].value.categorie;
this.jump.module = typeof this.jumpForm.controls['module'].value === 'string' ? this.jumpForm.controls['module'].value : this.jumpForm.controls['module'].value.module;
this.jump.lieu =
typeof this.jumpForm.controls['lieu'].value === 'string'
? this.jumpForm.controls['lieu'].value
: this.jumpForm.controls['lieu'].value.lieu;
this.jump.oaci =
typeof this.jumpForm.controls['oaci'].value === 'string'
? this.jumpForm.controls['oaci'].value
: this.jumpForm.controls['oaci'].value.oaci;
this.jump.aeronef =
typeof this.jumpForm.controls['aeronef'].value === 'string'
? this.jumpForm.controls['aeronef'].value
: this.jumpForm.controls['aeronef'].value.aeronef;
this.jump.imat =
typeof this.jumpForm.controls['imat'].value === 'string'
? this.jumpForm.controls['imat'].value
: this.jumpForm.controls['imat'].value.imat;
this.jump.voile =
typeof this.jumpForm.controls['voile'].value === 'string'
? this.jumpForm.controls['voile'].value
: this.jumpForm.controls['voile'].value.voile;
this.jump.taille =
typeof this.jumpForm.controls['taille'].value === 'string'
? this.jumpForm.controls['taille'].value
: this.jumpForm.controls['taille'].value.taille;
this.jump.categorie =
typeof this.jumpForm.controls['categorie'].value === 'string'
? this.jumpForm.controls['categorie'].value
: this.jumpForm.controls['categorie'].value.categorie;
this.jump.module =
typeof this.jumpForm.controls['module'].value === 'string'
? this.jumpForm.controls['module'].value
: this.jumpForm.controls['module'].value.module;
// close the dialog with result
this.dialogRef.close(this.jump);
}
src/app/components/logbook/dialogs/jump-view.dialog.ts
+3 -9
View File
@@ -10,19 +10,13 @@ import { Jump } from '@models';
@Component({
selector: 'app-jump-view-dialog',
templateUrl: 'jump-view.dialog.html',
standalone: true,
imports: [
DatePipe, DecimalPipe,
MatButtonModule, MatDialogModule,
MatDividerModule, MatIconModule
]
imports: [DatePipe, DecimalPipe, MatButtonModule, MatDialogModule, MatDividerModule, MatIconModule],
})
export class JumpViewDialogComponent {
constructor(
public dialogRef: MatDialogRef<JumpViewDialogComponent>,
@Inject(MAT_DIALOG_DATA) public jump: Jump
) { }
@Inject(MAT_DIALOG_DATA) public jump: Jump,
) {}
closeDialog(): void {
// close the dialog without result
src/app/components/logbook/logbook.component.ts
+169 -140
View File
@@ -12,7 +12,13 @@ import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { MatMenuModule } from '@angular/material/menu';
import { MatSliderModule } from '@angular/material/slider';
import { MatSnackBar, MatSnackBarConfig, MatSnackBarHorizontalPosition, MatSnackBarModule, MatSnackBarVerticalPosition } from '@angular/material/snack-bar';
import {
MatSnackBar,
MatSnackBarConfig,
MatSnackBarHorizontalPosition,
MatSnackBarModule,
MatSnackBarVerticalPosition,
} from '@angular/material/snack-bar';
import { Observable, Subscription } from 'rxjs';
import { take } from 'rxjs/operators';
@@ -24,13 +30,21 @@ import data from 'src/jumps.json';
//import data from 'src/jumps_02.json';
@Component({
standalone: true,
imports: [
CommonModule, RouterModule, FormsModule,
MatButtonModule, MatCardModule, MatDividerModule, MatExpansionModule,
MatIconModule, MatInputModule, MatMenuModule, MatDialogModule,
MatSliderModule, MatSnackBarModule,
JumpTableComponent
CommonModule,
RouterModule,
FormsModule,
MatButtonModule,
MatCardModule,
MatDividerModule,
MatExpansionModule,
MatIconModule,
MatInputModule,
MatMenuModule,
MatDialogModule,
MatSliderModule,
MatSnackBarModule,
JumpTableComponent,
],
selector: 'app-logbook',
templateUrl: './logbook.component.html',
@@ -38,16 +52,10 @@ import data from 'src/jumps.json';
animations: [
trigger('flyInOut', [
state('in', style({ transform: 'translateY(0)' })),
transition('void => *', [
style({ transform: 'translateY(-100%)' }),
animate(200)
]),
transition('* => void', [
style({ transform: 'translateY(100%)' }),
animate(200)
])
])
]
transition('void => *', [style({ transform: 'translateY(-100%)' }), animate(200)]),
transition('* => void', [style({ transform: 'translateY(100%)' }), animate(200)]),
]),
],
})
export class LogbookComponent implements OnInit, OnDestroy, AfterContentChecked {
private _currentUser: Subscription = new Subscription();
@@ -77,11 +85,11 @@ export class LogbookComponent implements OnInit, OnDestroy, AfterContentChecked
hauteur: Range;
year: Range;
} = {
numero: {start: 1, end: 100000},
taille: {start: 1, end: 400},
participants: {start: 1, end: 200},
hauteur: {start: 0, end: 10000},
year: {start: 1970, end: 2020}
numero: { start: 1, end: 100000 },
taille: { start: 1, end: 400 },
participants: { start: 1, end: 200 },
hauteur: { start: 0, end: 10000 },
year: { start: 1970, end: 2020 },
};
constructor(
@@ -92,13 +100,16 @@ export class LogbookComponent implements OnInit, OnDestroy, AfterContentChecked
private _jumpsService: JumpsService,
private _jumpTableService: JumpTableService,
private _userService: UserService,
public menuItems: MenuItems
) { }
public menuItems: MenuItems,
) {}
ngOnInit() {
//this.importJumps();
const data$: Observable<{isAuthenticated: boolean, lastjump: Jump}> = this.route.data as Observable<{isAuthenticated: boolean, lastjump: Jump}>;
this._data = data$.subscribe((data: {isAuthenticated: boolean, lastjump: Jump}) => {
const data$: Observable<{ isAuthenticated: boolean; lastjump: Jump }> = this.route.data as Observable<{
isAuthenticated: boolean;
lastjump: Jump;
}>;
this._data = data$.subscribe((data: { isAuthenticated: boolean; lastjump: Jump }) => {
this.isAuthenticated = data.isAuthenticated;
if (!this.isAuthenticated) {
this.router.navigateByUrl('/login');
@@ -114,24 +125,24 @@ export class LogbookComponent implements OnInit, OnDestroy, AfterContentChecked
const currentYear: number = new Date().getFullYear();
this.lastJump = data['lastjump'];
this.rangesMinMax = {
numero: {start: 1, end: data.lastjump.numero},
taille: {start: data.lastjump.taille!, end: 230},
participants: {start: 1, end: 20},
hauteur: {start: 1000, end: 8000},
year: {start: 2018, end: currentYear}
}
numero: { start: 1, end: data.lastjump.numero },
taille: { start: data.lastjump.taille!, end: 230 },
participants: { start: 1, end: 20 },
hauteur: { start: 1000, end: 8000 },
year: { start: 2018, end: currentYear },
};
this.listConfig.filters.numeroRangeStart = this.rangesMinMax.numero.start;
this.listConfig.filters.numeroRangeEnd = this.rangesMinMax.numero.end;
this.listConfig.filters.tailleRangeStart = this.rangesMinMax.taille.start;
this.listConfig.filters.tailleRangeEnd = this.rangesMinMax.taille.end;
this.listConfig.filters.participantsRangeStart = this.rangesMinMax.participants.start;
this.listConfig.filters.participantsRangeEnd = (this.rangesMinMax.participants.end / 2);
this.listConfig.filters.participantsRangeEnd = this.rangesMinMax.participants.end / 2;
this.listConfig.filters.hauteurRangeStart = this.rangesMinMax.hauteur.start;
this.listConfig.filters.hauteurRangeEnd = this.rangesMinMax.hauteur.end;
this.listConfig.filters.yearRangeStart = this.rangesMinMax.year.start;
this.listConfig.filters.yearRangeEnd = this.rangesMinMax.year.end;
this.jumpsSinceHundred = computed(() => (this.lastJump.numero % 100));
this.jumpsToHundred = computed(() => (100 - this.jumpsSinceHundred()));
this.jumpsSinceHundred = computed(() => this.lastJump.numero % 100);
this.jumpsToHundred = computed(() => 100 - this.jumpsSinceHundred());
/*
this._lastjump$ = this._jumpsService.getLastJump();
this._lastjump = this._lastjump$.subscribe((jump) => {
@@ -165,7 +176,7 @@ export class LogbookComponent implements OnInit, OnDestroy, AfterContentChecked
this._data.unsubscribe();
this._currentUser.unsubscribe();
this._lastjump.unsubscribe();
this._subscriptions.forEach(subscription => {
this._subscriptions.forEach((subscription) => {
subscription.unsubscribe();
});
}
@@ -185,17 +196,18 @@ export class LogbookComponent implements OnInit, OnDestroy, AfterContentChecked
try {
data.forEach((entry) => {
Object.assign(this.jump, entry);
this._jumpsService.save(this.jump)
.pipe(take(1))
.subscribe({
next: (jump) => {
console.log(`Le saut n°${jump.numero} a été ajouté !`, 'OK');
},
error: (err) => {
console.log(`Le saut n'a pas été ajouté !`, 'Error', err);
this.errors = err;
}
});
this._jumpsService
.save(this.jump)
.pipe(take(1))
.subscribe({
next: (jump) => {
console.log(`Le saut n°${jump.numero} a été ajouté !`, 'OK');
},
error: (err) => {
console.log(`Le saut n'a pas été ajouté !`, 'Error', err);
this.errors = err;
},
});
});
} catch (error) {
console.error(error);
@@ -204,19 +216,21 @@ export class LogbookComponent implements OnInit, OnDestroy, AfterContentChecked
openAddDialog(): void {
this.jump = <Jump>{};
this.jump.numero = (this.lastJump.numero + 1);
this.jump.numero = this.lastJump.numero + 1;
this.jump.sautants = [];
this.jump.participants = 1;
const dialogRef = this.dialog.open(JumpAddDialogComponent, {
width: '70vw',
data: {jump: this.jump, lastJump: this.lastJump}
});
dialogRef.afterClosed().pipe(take(1))
.subscribe(result => {
if (result != undefined) {
this._onEntry(result);
}
data: { jump: this.jump, lastJump: this.lastJump },
});
dialogRef
.afterClosed()
.pipe(take(1))
.subscribe((result) => {
if (result != undefined) {
this._onEntry(result);
}
});
}
setTotalResults(value: number): void {
@@ -229,112 +243,128 @@ export class LogbookComponent implements OnInit, OnDestroy, AfterContentChecked
config.filters.offset = 0;
config.filters.dateRangeStart = `${jumps[0].date!.substring(0, 10)} 00:00:00`;
config.filters.dateRangeEnd = `${jumps[0].date!.substring(0, 10)} 23:59:59`;
const subscription: Subscription = this._jumpsService.getAllFromSkydiverIdApi(config)
.pipe(take(1))
.subscribe({
next: (data) => {
if (data.items.length) {
const diff = jumps.length - data.items.length;
if (diff < 0) {
console.error(`${diff} ${diff > 1 ? 'données' : 'donnée'} altimètre de trop le ${jumps[0].date!.substring(0, 10)}`);
const subscription: Subscription = this._jumpsService
.getAllFromSkydiverIdApi(config)
.pipe(take(1))
.subscribe({
next: (data) => {
if (data.items.length) {
const diff = jumps.length - data.items.length;
if (diff < 0) {
console.error(
`${diff} ${diff > 1 ? 'données' : 'donnée'} altimètre de trop le ${jumps[0].date!.substring(0, 10)}`,
);
}
if (diff > 0) {
console.error(
`${diff}/${jumps.length} ${diff > 1 ? 'données altimètre manquantes' : 'donnée altimètre manquante'} le ${jumps[0].date!.substring(0, 10)}`,
jumps,
data.items,
);
}
console.log(
`${jumps.length} ${jumps.length > 1 ? 'sauts' : 'saut'} le ${data.items[0].date!.substring(0, 10)}`,
jumps.sort((a, b) => b.numero! - a.numero!),
data.items,
);
this._addX2Data(data.items, jumps);
} else {
console.info('Aucune données altimètre pour le ', jumps[0].date!.substring(0, 10));
}
if (diff > 0) {
console.error(`${diff}/${jumps.length} ${diff > 1 ? 'données altimètre manquantes' : 'donnée altimètre manquante'} le ${jumps[0].date!.substring(0, 10)}`, jumps, data.items);
}
console.log(`${jumps.length} ${jumps.length > 1 ? 'sauts' : 'saut'} le ${data.items[0].date!.substring(0, 10)}`, jumps.sort((a, b) => b.numero! - a.numero!), data.items);
this._addX2Data(data.items, jumps);
} else {
console.info('Aucune données altimètre pour le ', jumps[0].date!.substring(0, 10));
}
},
error: (err) => {
console.error('getAllFromSkydiverIdApi error');
this.errors = err;
}
});
},
error: (err) => {
console.error('getAllFromSkydiverIdApi error');
this.errors = err;
},
});
this._subscriptions.push(subscription);
}
private _addJump(jumps: Array<Jump>, index: number = 0) {
this._jumpsService.save(jumps[index])
.pipe(take(1))
.subscribe({
next: (jump) => {
jumps[index] = jump;
console.log('Ajout du saut', jump.numero);
Object.assign(this.jump, jump);
this._openSnackBar(`Le saut n°${jump.numero} a été ajouté !`, 'Annuler');
this._resetErrors();
if (jumps.length == (index + 1)) {
this._loadSkydiverIdJumps(jumps);
} else {
this._addJump(jumps, (index + 1));
}
},
error: (err) => {
this.errors = err;
this.isSubmitting = false;
}
});
this._jumpsService
.save(jumps[index])
.pipe(take(1))
.subscribe({
next: (jump) => {
jumps[index] = jump;
console.log('Ajout du saut', jump.numero);
Object.assign(this.jump, jump);
this._openSnackBar(`Le saut n°${jump.numero} a été ajouté !`, 'Annuler');
this._resetErrors();
if (jumps.length == index + 1) {
this._loadSkydiverIdJumps(jumps);
} else {
this._addJump(jumps, index + 1);
}
},
error: (err) => {
this.errors = err;
this.isSubmitting = false;
},
});
}
private _addX2Data(x2data: Array<X2Data>, jumps: Array<Jump>, index: number = 0) {
const file: JumpFile = {
name: x2data[index].name,
path: `/Volumes/Storage/Skydive/X2_Logs/${x2data[index].date!.substring(0, 4)}/`,
type: JumpFileType.CSV
type: JumpFileType.CSV,
} as JumpFile;
this._subscriptions.push(
this._jumpsService.saveX2Data(jumps[index].slug!, file, x2data[index])
.pipe(take(1))
.subscribe({
next: (jump) => {
jumps[index] = jump;
console.log(`Le fichier ${file.name} a été ajouté au saut n°${jump.numero} !`, 'OK');
if (jumps.length == (index + 1) || x2data.length == (index + 1)) {
this._addKmlFile(jumps);
} else {
this._addX2Data(x2data, jumps, (index + 1));
}
},
error: (err) => {
this.errors = err;
}
})
this._jumpsService
.saveX2Data(jumps[index].slug!, file, x2data[index])
.pipe(take(1))
.subscribe({
next: (jump) => {
jumps[index] = jump;
console.log(`Le fichier ${file.name} a été ajouté au saut n°${jump.numero} !`, 'OK');
if (jumps.length == index + 1 || x2data.length == index + 1) {
this._addKmlFile(jumps);
} else {
this._addX2Data(x2data, jumps, index + 1);
}
},
error: (err) => {
this.errors = err;
},
}),
);
}
private _addKmlFile(jumps: Array<Jump>, index: number = 0) {
if (jumps[index].x2data !== null) {
//console.log(`Le fichier ${jump.x2data.name} existe pour le saut n°${jump.numero} !`, `https://skydiver.id/api/jump/${jump.x2data.id}/kml`);
const file: JumpFile = {
name: jumps[index].x2data.name.substring(0, -4) + '.kml',
path: `/Volumes/Storage/Skydive/X2_Kmls/${jumps[index].date.substring(0, 4)}/`,
type: JumpFileType.KML
type: JumpFileType.KML,
} as JumpFile;
this._subscriptions.push(
this._jumpsService.saveKml(jumps[index].slug, file)
.pipe(take(1))
.subscribe({
next: (file) => {
console.log(`Le fichier ${file.path}${file.name} a été ajouté au saut n°${jumps[index].numero} !`, 'OK');
if (jumps.length == (index + 1)) {
this._resetErrors();
this.jumpRefresh = !this.jumpRefresh;
this._jumpTableService.updateJumpRefresh(this.jumpRefresh);
this._lastjump$ = this._jumpsService.getLastJump();
this._lastjump = this._lastjump$.subscribe((jump) => {
this.lastJump = jump;
});
} else {
this._addKmlFile(jumps, (index + 1));
}
},
error: (err) => {
this.errors = err;
}
})
this._jumpsService
.saveKml(jumps[index].slug, file)
.pipe(take(1))
.subscribe({
next: (file) => {
console.log(
`Le fichier ${file.path}${file.name} a été ajouté au saut n°${jumps[index].numero} !`,
'OK',
);
if (jumps.length == index + 1) {
this._resetErrors();
this.jumpRefresh = !this.jumpRefresh;
this._jumpTableService.updateJumpRefresh(this.jumpRefresh);
this._lastjump$ = this._jumpsService.getLastJump();
this._lastjump = this._lastjump$.subscribe((jump) => {
this.lastJump = jump;
});
} else {
this._addKmlFile(jumps, index + 1);
}
},
error: (err) => {
this.errors = err;
},
}),
);
}
}
@@ -387,7 +417,7 @@ export class LogbookComponent implements OnInit, OnDestroy, AfterContentChecked
const config: MatSnackBarConfig = {
horizontalPosition: <MatSnackBarHorizontalPosition>'end',
verticalPosition: <MatSnackBarVerticalPosition>'bottom',
duration: 4000
duration: 4000,
};
this.snackBar.open(content, title, config);
}
@@ -395,5 +425,4 @@ export class LogbookComponent implements OnInit, OnDestroy, AfterContentChecked
private _resetErrors(): void {
this.errors = { errors: {} };
}
}
src/app/components/page/page.component.ts
+21 -28
View File
@@ -1,7 +1,7 @@
import { Title } from '@angular/platform-browser';
import { trigger, state, style, animate, transition } from '@angular/animations';
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { DatePipe } from '@angular/common';
import { ActivatedRoute, RouterLink } from '@angular/router';
import { MatCardModule } from '@angular/material/card';
@@ -9,54 +9,47 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { Observable, Subscription } from 'rxjs';
import { ListErrorsComponent, } from '@components/shared';
import { ListErrorsComponent } from '@components/shared';
import { Errors, Article, ArticlePageData } from '@models';
@Component({
selector: 'app-page',
standalone: true,
imports: [
DatePipe, RouterLink,
MatCardModule, MatDividerModule, MatIconModule,
ListErrorsComponent
],
imports: [DatePipe, RouterLink, MatCardModule, MatDividerModule, MatIconModule, ListErrorsComponent],
templateUrl: './page.component.html',
styleUrl: './page.component.scss',
animations: [
trigger('flyInOut', [
state('in', style({ transform: 'translateY(0)' })),
transition('void => *', [
style({ transform: 'translateY(-100%)' }),
animate(200)
]),
transition('* => void', [
style({ transform: 'translateY(100%)' }),
animate(200)
])
])
]
transition('void => *', [style({ transform: 'translateY(-100%)' }), animate(200)]),
transition('* => void', [style({ transform: 'translateY(100%)' }), animate(200)]),
]),
],
})
export class PageComponent implements OnInit, OnDestroy {
private _data: Subscription = new Subscription();
public title = 'Shop bientôt disponible!';
public description = 'Encore un peu de patience, notre shop sera mis en ligne d\'ici peu.';
public description = "Encore un peu de patience, notre shop sera mis en ligne d'ici peu.";
public errors: Errors = { errors: {} };
public destroyRef = inject(DestroyRef);
public article: Article = {} as Article;
constructor(
private route: ActivatedRoute,
private titleService: Title
) { }
private titleService: Title,
) {}
ngOnInit() {
const data$: Observable<{ pageData: ArticlePageData }> = this.route.data as Observable<{ pageData: ArticlePageData }>;
this._data = data$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((data: { pageData: ArticlePageData }) => {
this.article = data.pageData.article;
this.title = this.article.title;
this.titleService.setTitle(this.article.title);
console.log(this.article);
});
const data$: Observable<{ pageData: ArticlePageData }> = this.route.data as Observable<{
pageData: ArticlePageData;
}>;
this._data = data$
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe((data: { pageData: ArticlePageData }) => {
this.article = data.pageData.article;
this.title = this.article.title;
this.titleService.setTitle(this.article.title);
console.log(this.article);
});
}
ngOnDestroy() {
src/app/components/pages/pages.component.ts
+5 -8
View File
@@ -1,12 +1,9 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-pages',
standalone: true,
imports: [],
templateUrl: './pages.component.html',
styleUrl: './pages.component.scss'
selector: 'app-pages',
imports: [],
templateUrl: './pages.component.html',
styleUrl: './pages.component.scss',
})
export class PagesComponent {
}
export class PagesComponent {}
src/app/components/product/product.component.ts
+22 -29
View File
@@ -1,7 +1,7 @@
import { Title } from '@angular/platform-browser';
import { trigger, state, style, animate, transition } from '@angular/animations';
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { DatePipe, DecimalPipe } from '@angular/common';
import { ActivatedRoute, RouterLink } from '@angular/router';
import { MatCardModule } from '@angular/material/card';
@@ -9,55 +9,48 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { Observable, Subscription } from 'rxjs';
import { ListErrorsComponent, } from '@components/shared';
import { ListErrorsComponent } from '@components/shared';
import { Errors, Product, ProductPageData } from '@models';
@Component({
selector: 'app-product',
standalone: true,
imports: [
DatePipe, DecimalPipe, RouterLink,
MatCardModule, MatDividerModule, MatIconModule,
ListErrorsComponent
],
imports: [DatePipe, DecimalPipe, RouterLink, MatCardModule, MatDividerModule, MatIconModule, ListErrorsComponent],
templateUrl: './product.component.html',
styleUrl: './product.component.scss',
animations: [
trigger('flyInOut', [
state('in', style({ transform: 'translateY(0)' })),
transition('void => *', [
style({ transform: 'translateY(-100%)' }),
animate(200)
]),
transition('* => void', [
style({ transform: 'translateY(100%)' }),
animate(200)
])
])
]
transition('void => *', [style({ transform: 'translateY(-100%)' }), animate(200)]),
transition('* => void', [style({ transform: 'translateY(100%)' }), animate(200)]),
]),
],
})
export class ProductComponent implements OnInit, OnDestroy {
private _data: Subscription = new Subscription();
public title = 'Ad Astra - Produit';
public description = 'Encore un peu de patience, notre shop sera mis en ligne d\'ici peu.';
public description = "Encore un peu de patience, notre shop sera mis en ligne d'ici peu.";
public errors: Errors = { errors: {} };
public destroyRef = inject(DestroyRef);
public product: Product = {} as Product;
constructor(
private route: ActivatedRoute,
private titleService: Title
) { }
private titleService: Title,
) {}
ngOnInit() {
const data$: Observable<{ pageData: ProductPageData }> = this.route.data as Observable<{ pageData: ProductPageData }>;
this._data = data$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((data: { pageData: ProductPageData }) => {
this.product = data.pageData.product;
this.title = this.product.name;
this.description = this.product.description;
this.titleService.setTitle(this.product.name);
console.log(this.product);
});
const data$: Observable<{ pageData: ProductPageData }> = this.route.data as Observable<{
pageData: ProductPageData;
}>;
this._data = data$
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe((data: { pageData: ProductPageData }) => {
this.product = data.pageData.product;
this.title = this.product.name;
this.description = this.product.description;
this.titleService.setTitle(this.product.name);
console.log(this.product);
});
}
ngOnDestroy() {
src/app/components/products/products.component.ts
+32 -31
View File
@@ -1,7 +1,7 @@
import { Title } from '@angular/platform-browser';
import { trigger, state, style, animate, transition } from '@angular/animations';
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { DatePipe, DecimalPipe } from '@angular/common';
import { ActivatedRoute, RouterLink } from '@angular/router';
import { MatButtonModule } from '@angular/material/button';
@@ -10,37 +10,35 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { Observable, Subscription } from 'rxjs';
import { ListErrorsComponent, } from '@components/shared';
import { ListErrorsComponent } from '@components/shared';
import { Errors, Product, ProductsPageData } from '@models';
@Component({
selector: 'app-products',
standalone: true,
imports: [
DatePipe, DecimalPipe, RouterLink,
MatButtonModule, MatCardModule, MatDividerModule, MatIconModule,
ListErrorsComponent
DatePipe,
DecimalPipe,
RouterLink,
MatButtonModule,
MatCardModule,
MatDividerModule,
MatIconModule,
ListErrorsComponent,
],
templateUrl: './products.component.html',
styleUrl: './products.component.scss',
animations: [
trigger('flyInOut', [
state('in', style({ transform: 'translateY(0)' })),
transition('void => *', [
style({ transform: 'translateY(-100%)' }),
animate(200)
]),
transition('* => void', [
style({ transform: 'translateY(100%)' }),
animate(200)
])
])
]
transition('void => *', [style({ transform: 'translateY(-100%)' }), animate(200)]),
transition('* => void', [style({ transform: 'translateY(100%)' }), animate(200)]),
]),
],
})
export class ProductsComponent implements OnInit, OnDestroy {
private _data: Subscription = new Subscription();
public title = 'Ad Astra - Produit';
public description = 'Encore un peu de patience, notre shop sera mis en ligne d\'ici peu.';
public description = "Encore un peu de patience, notre shop sera mis en ligne d'ici peu.";
public errors: Errors = { errors: {} };
public destroyRef = inject(DestroyRef);
public products: Array<Product> = [];
@@ -48,25 +46,28 @@ export class ProductsComponent implements OnInit, OnDestroy {
constructor(
private route: ActivatedRoute,
private titleService: Title
) { }
private titleService: Title,
) {}
ngOnInit() {
const data$: Observable<{ pageData: ProductsPageData }> = this.route.data as Observable<{ pageData: ProductsPageData }>;
this._data = data$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((data: { pageData: ProductsPageData }) => {
this.products = data.pageData.products;
this.productsCount = data.pageData.count;
//this.title = 'Fleurs CBD';
this.title = data.pageData.products[0].productCategories[0]!.name;
this.description = data.pageData.products[0].productCategories[0]!.description;
this.titleService.setTitle(this.title);
console.log(data.pageData);
console.log(this.products);
});
const data$: Observable<{ pageData: ProductsPageData }> = this.route.data as Observable<{
pageData: ProductsPageData;
}>;
this._data = data$
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe((data: { pageData: ProductsPageData }) => {
this.products = data.pageData.products;
this.productsCount = data.pageData.count;
//this.title = 'Fleurs CBD';
this.title = data.pageData.products[0].productCategories[0]!.name;
this.description = data.pageData.products[0].productCategories[0]!.description;
this.titleService.setTitle(this.title);
console.log(data.pageData);
console.log(this.products);
});
}
ngOnDestroy() {
this._data.unsubscribe();
}
}
src/app/components/profile/profile.component.ts
+4 -10
View File
@@ -13,15 +13,10 @@ import { UserService } from '@services';
import { ListErrorsComponent } from '@components/shared';
@Component({
standalone: true,
imports: [
RouterLink,
MatButtonModule, MatCardModule, MatDividerModule, MatIconModule,
ListErrorsComponent
],
imports: [RouterLink, MatButtonModule, MatCardModule, MatDividerModule, MatIconModule, ListErrorsComponent],
selector: 'app-profile',
templateUrl: './profile.component.html',
styleUrl: './profile.component.scss'
styleUrl: './profile.component.scss',
})
export class ProfileComponent implements OnInit, OnDestroy {
private _user: Subscription = new Subscription();
@@ -33,8 +28,8 @@ export class ProfileComponent implements OnInit, OnDestroy {
constructor(
private titleService: Title,
private userService: UserService
) { }
private userService: UserService,
) {}
ngOnInit() {
this.titleService.setTitle(`Ad Astra - ${this.title}`);
@@ -49,5 +44,4 @@ export class ProfileComponent implements OnInit, OnDestroy {
ngOnDestroy() {
this._user.unsubscribe();
}
}
src/app/components/qcm/qcm.component.ts
+47 -36
View File
@@ -1,5 +1,5 @@
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { /*FormControl,*/ FormGroup, FormBuilder, FormArray, FormsModule, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';
import { MatButtonModule } from '@angular/material/button';
@@ -22,16 +22,22 @@ import data from 'src/qcm-bpa.json';
@Component({
selector: 'app-qcm',
standalone: true,
imports: [
FormsModule, ReactiveFormsModule,
MatButtonModule, MatCardModule, MatDividerModule, MatExpansionModule,
MatIconModule, MatMenuModule, MatProgressBarModule, MatRadioModule,
FormsModule,
ReactiveFormsModule,
MatButtonModule,
MatCardModule,
MatDividerModule,
MatExpansionModule,
MatIconModule,
MatMenuModule,
MatProgressBarModule,
MatRadioModule,
MatSelectModule,
ListErrorsComponent
ListErrorsComponent,
],
templateUrl: './qcm.component.html',
styleUrl: './qcm.component.scss'
styleUrl: './qcm.component.scss',
})
export class QcmComponent implements OnInit, OnDestroy {
private _currentUser: Subscription = new Subscription();
@@ -53,17 +59,17 @@ export class QcmComponent implements OnInit, OnDestroy {
public totalAnswer = 0;
public timeProgress = 0;
public timeProgressColor = 'primary';
public timeMax = (60*45);
public timeMax = 60 * 45;
constructor(
private route: ActivatedRoute,
private fb: FormBuilder,
private _qcmService: QcmService,
private _userService: UserService,
public menuItems: MenuItems
public menuItems: MenuItems,
) {
this.qcmForm = this.fb.group({
questions: this.fb.array([])
questions: this.fb.array([]),
});
}
@@ -87,9 +93,9 @@ export class QcmComponent implements OnInit, OnDestroy {
this.subtitle = `Préparation au questionnaire du brevet ${this.qcm.name.toUpperCase()}`;
}
//console.log(this.title, this.qcm);
this.qcm.categories.forEach(category => {
this.qcm.categories.forEach((category) => {
this.questionsCount += category.questions.length;
category.questions.forEach(question => {
category.questions.forEach((question) => {
this.addQuestion(question);
});
});
@@ -113,11 +119,14 @@ export class QcmComponent implements OnInit, OnDestroy {
.pipe(take(this.timeMax))
.subscribe(() => {
this.timeProgress++;
if (this.timeProgress > (this.timeMax/100*70) && this.timeProgress <= (this.timeMax/100*90)) {
if (this.timeProgress > (this.timeMax / 100) * 70 && this.timeProgress <= (this.timeMax / 100) * 90) {
this.timeProgressColor = 'warning';
} else if (this.timeProgress > (this.timeMax/100*90) && this.timeProgress <= (this.timeMax/100*98)) {
} else if (
this.timeProgress > (this.timeMax / 100) * 90 &&
this.timeProgress <= (this.timeMax / 100) * 98
) {
this.timeProgressColor = 'danger';
} else if (this.timeProgress > (this.timeMax/100*98)) {
} else if (this.timeProgress > (this.timeMax / 100) * 98) {
this.timeProgressColor = 'purple';
}
if (this.timeProgress >= this.timeMax) {
@@ -130,7 +139,7 @@ export class QcmComponent implements OnInit, OnDestroy {
addQuestion(question: QcmQuestion) {
const item = this.fb.group({
id: [question.num],
choice: ['']
choice: [''],
});
this.answers.push(QcmQuestionState.UNANSWERED);
this.questions.push(item);
@@ -145,19 +154,19 @@ export class QcmComponent implements OnInit, OnDestroy {
if (this.timeProgress === 0) {
this._starTimer();
}
this.qcm.categories[(category.num-1)].questions[(question.num-1)].choices.forEach(choice => {
this.qcm.categories[category.num - 1].questions[question.num - 1].choices.forEach((choice) => {
if (choice.index === value) {
if (choice.correct) {
this.answers[(question.num-1)] = QcmQuestionState.VALID;
this.answers[question.num - 1] = QcmQuestionState.VALID;
console.log(`Réponse à la question ${question.num} de la catégorie ${category.num} : correcte`);
} else {
this.answers[(question.num-1)] = QcmQuestionState.ERROR;
this.answers[question.num - 1] = QcmQuestionState.ERROR;
console.log(`Réponse à la question ${question.num} de la catégorie ${category.num} : incorrecte`);
}
}
});
this.totalAnswer++;
this.questions.controls[(question.num-1)].disable();
this.questions.controls[question.num - 1].disable();
//console.log(this.questions.controls[(question.num-1)].disabled);
}
@@ -168,20 +177,21 @@ export class QcmComponent implements OnInit, OnDestroy {
private _importChoices() {
try {
data.categories.forEach((category) => {
category.questions.forEach(question => {
this._qcmService.saveChoices(question)
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe({
next: (question) => {
console.log('question : ', question);
//console.log(`Le saut n°${jump.numero} a été ajouté !`, 'OK');
},
error: (err) => {
console.log('err : ', err);
//console.log(`Le saut n'a pas été ajouté !`, 'Error', err);
this.errors = err;
}
});
category.questions.forEach((question) => {
this._qcmService
.saveChoices(question)
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe({
next: (question) => {
console.log('question : ', question);
//console.log(`Le saut n°${jump.numero} a été ajouté !`, 'OK');
},
error: (err) => {
console.log('err : ', err);
//console.log(`Le saut n'a pas été ajouté !`, 'Error', err);
this.errors = err;
},
});
});
});
} catch (error) {
@@ -193,7 +203,8 @@ export class QcmComponent implements OnInit, OnDestroy {
try {
data.categories.forEach((category) => {
//Object.assign(this.jump, category);
this._qcmService.saveQuestions(category)
this._qcmService
.saveQuestions(category)
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe({
next: (category) => {
@@ -204,7 +215,7 @@ export class QcmComponent implements OnInit, OnDestroy {
console.log('err : ', err);
//console.log(`Le saut n'a pas été ajouté !`, 'Error', err);
this.errors = err;
}
},
});
});
} catch (error) {
src/app/components/settings/credentials/credentials.component.ts
+36 -18
View File
@@ -1,6 +1,15 @@
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { AbstractControl, FormsModule, ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup, Validators, ValidatorFn, ValidationErrors } from '@angular/forms';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import {
AbstractControl,
FormsModule,
ReactiveFormsModule,
UntypedFormBuilder,
UntypedFormGroup,
Validators,
ValidatorFn,
ValidationErrors,
} from '@angular/forms';
import { Router, RouterLink } from '@angular/router';
import { Title } from '@angular/platform-browser';
import { MatButtonModule } from '@angular/material/button';
@@ -17,14 +26,19 @@ import { ListErrorsComponent } from '@components/shared';
@Component({
selector: 'app-credentials',
standalone: true,
imports: [
RouterLink, FormsModule, ReactiveFormsModule,
MatButtonModule, MatIconModule, MatFormFieldModule, MatInputModule, MatDividerModule,
ListErrorsComponent
RouterLink,
FormsModule,
ReactiveFormsModule,
MatButtonModule,
MatIconModule,
MatFormFieldModule,
MatInputModule,
MatDividerModule,
ListErrorsComponent,
],
templateUrl: './credentials.component.html',
styleUrl: './credentials.component.scss'
styleUrl: './credentials.component.scss',
})
export class CredentialsComponent implements OnInit, OnDestroy {
private _user: Subscription = new Subscription();
@@ -42,12 +56,15 @@ export class CredentialsComponent implements OnInit, OnDestroy {
private router: Router,
private titleService: Title,
private userService: UserService,
private fb: UntypedFormBuilder
private fb: UntypedFormBuilder,
) {
this.credentialsForm = this.fb.group({
password: ['', Validators.required],
confirmPassword: ['', Validators.required]
}, { validators: this.checkPasswords });
this.credentialsForm = this.fb.group(
{
password: ['', Validators.required],
confirmPassword: ['', Validators.required],
},
{ validators: this.checkPasswords },
);
}
get f() {
@@ -72,13 +89,15 @@ export class CredentialsComponent implements OnInit, OnDestroy {
submitForm() {
this.isSubmitting = true;
this.updateUser(this.credentialsForm.value);
const user$: Observable<{ user: User }> = this.userService.update(this.user).pipe(takeUntilDestroyed(this.destroyRef));
const user$: Observable<{ user: User }> = this.userService
.update(this.user)
.pipe(takeUntilDestroyed(this.destroyRef));
this._user = user$.subscribe({
next: ({ user }) => void this.router.navigateByUrl('/profile/' + user.username),
error: (err) => {
this.errors = err;
this.isSubmitting = false;
}
},
});
}
@@ -88,8 +107,7 @@ export class CredentialsComponent implements OnInit, OnDestroy {
checkPasswords: ValidatorFn = (group: AbstractControl): ValidationErrors | null => {
const pass = group.get('password')!.value;
const confirmPass = group.get('confirmPassword')!.value
return pass === confirmPass ? null : { notSame: true }
}
const confirmPass = group.get('confirmPassword')!.value;
return pass === confirmPass ? null : { notSame: true };
};
}
src/app/components/settings/settings.component.ts
+34 -19
View File
@@ -1,5 +1,5 @@
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormsModule, ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { Router, RouterLink } from '@angular/router';
import { Title } from '@angular/platform-browser';
@@ -18,14 +18,20 @@ import { ListErrorsComponent } from '@components/shared';
@Component({
selector: 'app-settings-page',
standalone: true,
imports: [
RouterLink, FormsModule, ReactiveFormsModule,
MatButtonModule, MatIconModule, MatDividerModule, MatFormFieldModule, MatInputModule, MatSelectModule,
ListErrorsComponent
RouterLink,
FormsModule,
ReactiveFormsModule,
MatButtonModule,
MatIconModule,
MatDividerModule,
MatFormFieldModule,
MatInputModule,
MatSelectModule,
ListErrorsComponent,
],
styleUrl: './settings.component.scss',
templateUrl: './settings.component.html'
templateUrl: './settings.component.html',
})
export class SettingsComponent implements OnInit, OnDestroy {
private _user: Subscription = new Subscription();
@@ -42,21 +48,29 @@ export class SettingsComponent implements OnInit, OnDestroy {
imgPath = '/assets/images/avatars/';
imgExt = '.jpg';
avatars = [
`${this.imgPath}animal_001${this.imgExt}`, `${this.imgPath}animal_002${this.imgExt}`,
`${this.imgPath}animal_003${this.imgExt}`, `${this.imgPath}animal_004${this.imgExt}`,
`${this.imgPath}animal_005${this.imgExt}`, `${this.imgPath}animal_006${this.imgExt}`,
`${this.imgPath}animal_007${this.imgExt}`, `${this.imgPath}animal_008${this.imgExt}`,
`${this.imgPath}animal_009${this.imgExt}`, `${this.imgPath}animal_010${this.imgExt}`,
`${this.imgPath}animal_011${this.imgExt}`, `${this.imgPath}animal_012${this.imgExt}`,
`${this.imgPath}animal_013${this.imgExt}`, `${this.imgPath}animal_014${this.imgExt}`,
`${this.imgPath}animal_015${this.imgExt}`, `${this.imgPath}animal_016${this.imgExt}`
`${this.imgPath}animal_001${this.imgExt}`,
`${this.imgPath}animal_002${this.imgExt}`,
`${this.imgPath}animal_003${this.imgExt}`,
`${this.imgPath}animal_004${this.imgExt}`,
`${this.imgPath}animal_005${this.imgExt}`,
`${this.imgPath}animal_006${this.imgExt}`,
`${this.imgPath}animal_007${this.imgExt}`,
`${this.imgPath}animal_008${this.imgExt}`,
`${this.imgPath}animal_009${this.imgExt}`,
`${this.imgPath}animal_010${this.imgExt}`,
`${this.imgPath}animal_011${this.imgExt}`,
`${this.imgPath}animal_012${this.imgExt}`,
`${this.imgPath}animal_013${this.imgExt}`,
`${this.imgPath}animal_014${this.imgExt}`,
`${this.imgPath}animal_015${this.imgExt}`,
`${this.imgPath}animal_016${this.imgExt}`,
];
constructor(
private router: Router,
private titleService: Title,
private userService: UserService,
private fb: UntypedFormBuilder
private fb: UntypedFormBuilder,
) {
// create form group using the form builder
this.settingsForm = this.fb.group({
@@ -65,7 +79,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
firstname: ['', Validators.required],
lastname: ['', Validators.required],
phone: ['', Validators.required],
image: ''
image: '',
});
// Optional: subscribe to changes on the form :
// this.settingsForm.valueChanges.pipe(this._scavenger.collect()).subscribe(values => this.updateUser(values));
@@ -110,18 +124,19 @@ export class SettingsComponent implements OnInit, OnDestroy {
}
this.updateUser(this.settingsForm.value);
const user$: Observable<{ user: User }> = this.userService.update(this.user).pipe(takeUntilDestroyed(this.destroyRef));
const user$: Observable<{ user: User }> = this.userService
.update(this.user)
.pipe(takeUntilDestroyed(this.destroyRef));
this._user = user$.subscribe({
next: ({ user }) => void this.router.navigateByUrl('/profile/' + user.username),
error: (err) => {
this.errors = err;
this.isSubmitting = false;
}
},
});
}
updateUser(values: NonNullable<unknown>) {
Object.assign(this.user, values);
}
}
src/app/components/shared/card-container/card-container.component.ts
+3 -4
View File
@@ -1,5 +1,5 @@
import { Component, Input } from '@angular/core';
import { NgForOf, NgIf } from "@angular/common";
import { NgForOf, NgIf } from '@angular/common';
import { MatCardModule } from '@angular/material/card';
import { CardColors } from 'src/app/core';
@@ -7,12 +7,11 @@ import { CardColors } from 'src/app/core';
@Component({
selector: 'app-card-container',
templateUrl: './card-container.component.html',
standalone: true,
imports: [NgIf, NgForOf, MatCardModule]
imports: [NgIf, NgForOf, MatCardModule],
})
export class CardContainerComponent {
errorList: string[] = [];
@Input() colors: CardColors = { background: 'bg-megna', text: 'text-bg-primary' };
@Input() title: string = 'Title';
@Input() subtitle: string = 'Subtitle';
}
}
src/app/components/shared/dashboard-components/aeronefs-bar/aeronefs-bar.component.ts
+104 -95
View File
@@ -1,95 +1,104 @@
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { BarHorizontalChartComponent } from '@components/shared/helpers-chart';
import { HistoryTableComponent } from '@components/shared/helpers-jump';
import { UtilitiesService, AeronefsService } from '@services';
import { AeronefByImat, AeronefByYear } from '@models';
@Component({
selector: 'app-aeronefs-bar',
standalone: true,
imports: [
MatButtonModule, MatCardModule, MatDividerModule,
MatExpansionModule, MatIconModule, MatMenuModule,
BarHorizontalChartComponent, HistoryTableComponent
],
templateUrl: './aeronefs-bar.component.html'
})
export class AeronefsBarComponent implements OnInit, OnDestroy {
private _aeronefByImat: Subscription = new Subscription();
private _aeronefByYear: Subscription = new Subscription();
private _aeronefsByImat!: Array<AeronefByImat>;
private _aeronefsByYear!: Array<AeronefByYear>;
public title: string = 'Aéronefs';
public subtitle: string = 'Nombre total de sauts par aéronef';
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[],
borderColor: string[]
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all')
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public displayCharts = false;
public destroyRef = inject(DestroyRef);
constructor(
private _aeronefsService: AeronefsService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems
) { }
ngOnInit() {
this._loadAeronefByImat();
}
ngOnDestroy() {
this._aeronefByImat.unsubscribe();
this._aeronefByYear.unsubscribe();
}
private _loadAeronefByImat(): void {
const aeronefs$: Observable<Array<AeronefByImat>> = this._aeronefsService.getAllByImat().pipe(takeUntilDestroyed(this.destroyRef));
this._aeronefByImat = aeronefs$.subscribe((aggregate: Array<AeronefByImat>) => {
this._aeronefsByImat = aggregate.map((row: AeronefByImat) => {
//this.chartConfig.barChartData.labels!.push(`${row.aeronef} ${row.imat}`);
this.seriesName.push(`${row.aeronef} ${row.imat}`);
this.seriesValue.push(row.count);
return row;
});
this._loadAeronefByYear();
});
}
private _loadAeronefByYear(): void {
this.seriesHeader = ['2018', '2019', '2020', '2021', '2022', '2023', '2024'];
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesName.forEach(() => {
this.seriesRow.push([...values]);
});
const dropzones$: Observable<Array<AeronefByYear>> = this._aeronefsService.getAllByImatByYear().pipe(takeUntilDestroyed(this.destroyRef));
this._aeronefByYear = dropzones$.subscribe((aggregate: Array<AeronefByYear>) => {
this._aeronefsByYear = aggregate.map((row: AeronefByYear) => {
const aeronef: string = row.aeronef;
const imat: string = row.imat;
const year: string = row.year.toString();
this.seriesRow[this.seriesName.indexOf(`${aeronef} ${imat}`)][this.seriesHeader.indexOf(year)] = row.count;
return row;
});
this.displayCharts = true;
});
}
}
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { BarHorizontalChartComponent } from '@components/shared/helpers-chart';
import { HistoryTableComponent } from '@components/shared/helpers-jump';
import { UtilitiesService, AeronefsService } from '@services';
import { AeronefByImat, AeronefByYear } from '@models';
@Component({
selector: 'app-aeronefs-bar',
imports: [
MatButtonModule,
MatCardModule,
MatDividerModule,
MatExpansionModule,
MatIconModule,
MatMenuModule,
BarHorizontalChartComponent,
HistoryTableComponent,
],
templateUrl: './aeronefs-bar.component.html',
})
export class AeronefsBarComponent implements OnInit, OnDestroy {
private _aeronefByImat: Subscription = new Subscription();
private _aeronefByYear: Subscription = new Subscription();
private _aeronefsByImat!: Array<AeronefByImat>;
private _aeronefsByYear!: Array<AeronefByYear>;
public title: string = 'Aéronefs';
public subtitle: string = 'Nombre total de sauts par aéronef';
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all'),
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public displayCharts = false;
public destroyRef = inject(DestroyRef);
constructor(
private _aeronefsService: AeronefsService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems,
) {}
ngOnInit() {
this._loadAeronefByImat();
}
ngOnDestroy() {
this._aeronefByImat.unsubscribe();
this._aeronefByYear.unsubscribe();
}
private _loadAeronefByImat(): void {
const aeronefs$: Observable<Array<AeronefByImat>> = this._aeronefsService
.getAllByImat()
.pipe(takeUntilDestroyed(this.destroyRef));
this._aeronefByImat = aeronefs$.subscribe((aggregate: Array<AeronefByImat>) => {
this._aeronefsByImat = aggregate.map((row: AeronefByImat) => {
//this.chartConfig.barChartData.labels!.push(`${row.aeronef} ${row.imat}`);
this.seriesName.push(`${row.aeronef} ${row.imat}`);
this.seriesValue.push(row.count);
return row;
});
this._loadAeronefByYear();
});
}
private _loadAeronefByYear(): void {
this.seriesHeader = ['2018', '2019', '2020', '2021', '2022', '2023', '2024'];
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesName.forEach(() => {
this.seriesRow.push([...values]);
});
const dropzones$: Observable<Array<AeronefByYear>> = this._aeronefsService
.getAllByImatByYear()
.pipe(takeUntilDestroyed(this.destroyRef));
this._aeronefByYear = dropzones$.subscribe((aggregate: Array<AeronefByYear>) => {
this._aeronefsByYear = aggregate.map((row: AeronefByYear) => {
const aeronef: string = row.aeronef;
const imat: string = row.imat;
const year: string = row.year.toString();
this.seriesRow[this.seriesName.indexOf(`${aeronef} ${imat}`)][this.seriesHeader.indexOf(year)] =
row.count;
return row;
});
this.displayCharts = true;
});
}
}
src/app/components/shared/dashboard-components/aeronefs-pie/aeronefs-pie.component.ts
+103 -93
View File
@@ -1,93 +1,103 @@
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { MatBadgeModule } from '@angular/material/badge';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { HistoryTableComponent } from '@components/shared/helpers-jump';
import { PieChartComponent } from '@components/shared/helpers-chart';
import { UtilitiesService, AeronefsService } from '@services';
import { AeronefByImat, AeronefByYear } from '@models';
@Component({
selector: 'app-aeronefs-pie',
standalone: true,
imports: [
MatBadgeModule, MatButtonModule, MatCardModule, MatDividerModule,
MatExpansionModule, MatIconModule, MatMenuModule,
HistoryTableComponent, PieChartComponent
],
templateUrl: './aeronefs-pie.component.html'
})
export class AeronefsPieComponent implements OnInit, OnDestroy {
private _aeronefByImat: Subscription = new Subscription();
private _aeronefByYear: Subscription = new Subscription();
private _aeronefsByImat!: Array<AeronefByImat>;
private _aeronefsByYear!: Array<AeronefByYear>;
public title: string = 'Aéronefs';
public subtitle: string = 'Nombre total de sauts par aéronef';
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[],
borderColor: string[]
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all')
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public destroyRef = inject(DestroyRef);
constructor(
private _aeronefsService: AeronefsService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems
) { }
ngOnInit() {
this._loadAeronefByImat();
}
ngOnDestroy() {
this._aeronefByImat.unsubscribe();
this._aeronefByYear.unsubscribe();
}
private _loadAeronefByImat(): void {
const aeronefs$: Observable<Array<AeronefByImat>> = this._aeronefsService.getAllByImat().pipe(takeUntilDestroyed(this.destroyRef));
this._aeronefByImat = aeronefs$.subscribe((aggregate: Array<AeronefByImat>) => {
this._aeronefsByImat = aggregate.map((row: AeronefByImat) => {
this.seriesName.push(`${row.aeronef} ${row.imat}`);
this.seriesValue.push(row.count);
return row;
});
this._loadAeronefByYear();
});
}
private _loadAeronefByYear(): void {
this.seriesHeader = ['2018', '2019', '2020', '2021', '2022', '2023', '2024'];
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesName.forEach(() => {
this.seriesRow.push([...values]);
});
const dropzones$: Observable<Array<AeronefByYear>> = this._aeronefsService.getAllByImatByYear().pipe(takeUntilDestroyed(this.destroyRef));
this._aeronefByYear = dropzones$.subscribe((aggregate: Array<AeronefByYear>) => {
this._aeronefsByYear = aggregate.map((row: AeronefByYear) => {
const aeronef: string = row.aeronef;
const imat: string = row.imat;
const year: string = row.year.toString();
this.seriesRow[this.seriesName.indexOf(`${aeronef} ${imat}`)][this.seriesHeader.indexOf(year)] = row.count;
return row;
});
});
}
}
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatBadgeModule } from '@angular/material/badge';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { HistoryTableComponent } from '@components/shared/helpers-jump';
import { PieChartComponent } from '@components/shared/helpers-chart';
import { UtilitiesService, AeronefsService } from '@services';
import { AeronefByImat, AeronefByYear } from '@models';
@Component({
selector: 'app-aeronefs-pie',
imports: [
MatBadgeModule,
MatButtonModule,
MatCardModule,
MatDividerModule,
MatExpansionModule,
MatIconModule,
MatMenuModule,
HistoryTableComponent,
PieChartComponent,
],
templateUrl: './aeronefs-pie.component.html',
})
export class AeronefsPieComponent implements OnInit, OnDestroy {
private _aeronefByImat: Subscription = new Subscription();
private _aeronefByYear: Subscription = new Subscription();
private _aeronefsByImat!: Array<AeronefByImat>;
private _aeronefsByYear!: Array<AeronefByYear>;
public title: string = 'Aéronefs';
public subtitle: string = 'Nombre total de sauts par aéronef';
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all'),
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public destroyRef = inject(DestroyRef);
constructor(
private _aeronefsService: AeronefsService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems,
) {}
ngOnInit() {
this._loadAeronefByImat();
}
ngOnDestroy() {
this._aeronefByImat.unsubscribe();
this._aeronefByYear.unsubscribe();
}
private _loadAeronefByImat(): void {
const aeronefs$: Observable<Array<AeronefByImat>> = this._aeronefsService
.getAllByImat()
.pipe(takeUntilDestroyed(this.destroyRef));
this._aeronefByImat = aeronefs$.subscribe((aggregate: Array<AeronefByImat>) => {
this._aeronefsByImat = aggregate.map((row: AeronefByImat) => {
this.seriesName.push(`${row.aeronef} ${row.imat}`);
this.seriesValue.push(row.count);
return row;
});
this._loadAeronefByYear();
});
}
private _loadAeronefByYear(): void {
this.seriesHeader = ['2018', '2019', '2020', '2021', '2022', '2023', '2024'];
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesName.forEach(() => {
this.seriesRow.push([...values]);
});
const dropzones$: Observable<Array<AeronefByYear>> = this._aeronefsService
.getAllByImatByYear()
.pipe(takeUntilDestroyed(this.destroyRef));
this._aeronefByYear = dropzones$.subscribe((aggregate: Array<AeronefByYear>) => {
this._aeronefsByYear = aggregate.map((row: AeronefByYear) => {
const aeronef: string = row.aeronef;
const imat: string = row.imat;
const year: string = row.year.toString();
this.seriesRow[this.seriesName.indexOf(`${aeronef} ${imat}`)][this.seriesHeader.indexOf(year)] =
row.count;
return row;
});
});
}
}
src/app/components/shared/dashboard-components/canopies-models/canopies-models.component.ts
+101 -92
View File
@@ -1,92 +1,101 @@
import { Component, DestroyRef, inject, OnInit, OnDestroy} from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { PieChartComponent } from '@components/shared/helpers-chart';
import { HistoryTableComponent } from '@components/shared/helpers-jump';
import { UtilitiesService, CanopiesService } from '@services';
import { CanopyModelBySize, CanopyModelByYear } from '@models';
@Component({
selector: 'app-canopies-models',
standalone: true,
imports: [
MatButtonModule, MatCardModule, MatDividerModule,
MatExpansionModule, MatIconModule, MatMenuModule,
PieChartComponent, HistoryTableComponent
],
templateUrl: './canopies-models.component.html'
})
export class CanopiesModelsComponent implements OnInit, OnDestroy {
private _canopyBySize: Subscription = new Subscription();
private _canopyByYear: Subscription = new Subscription();
private _canopiesBySize!: Array<CanopyModelBySize>;
private _canopiesByYear!: Array<CanopyModelByYear>;
public title: string = 'Modèles de voile';
public subtitle: string = 'Nombre total de sauts par modèle';
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[],
borderColor: string[]
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all')
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public destroyRef = inject(DestroyRef);
constructor(
private _canopiesService: CanopiesService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems
) { }
ngOnInit() {
this._loadCanopyModelBySize();
}
ngOnDestroy() {
this._canopyBySize.unsubscribe();
this._canopyByYear.unsubscribe();
}
private _loadCanopyModelBySize(): void {
const canopies$: Observable<Array<CanopyModelBySize>> = this._canopiesService.getAllBySizeByModel().pipe(takeUntilDestroyed(this.destroyRef));
this._canopyBySize = canopies$.subscribe((aggregate: Array<CanopyModelBySize>) => {
this._canopiesBySize = aggregate.map((row: CanopyModelBySize) => {
this.seriesName.push(`${row.taille.toString()} - ${row.voile}`);
this.seriesValue.push(row.count);
return row;
});
this._loadCanopyModelByYear();
});
}
private _loadCanopyModelByYear(): void {
this.seriesHeader = ['2018', '2019', '2020', '2021', '2022', '2023', '2024'];
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesName.forEach(() => {
this.seriesRow.push([...values]);
});
const dropzones$: Observable<Array<CanopyModelByYear>> = this._canopiesService.getAllBySizeByModelByYear().pipe(takeUntilDestroyed(this.destroyRef));
this._canopyByYear = dropzones$.subscribe((aggregate: Array<CanopyModelByYear>) => {
this._canopiesByYear = aggregate.map((row: CanopyModelByYear) => {
const voile: string = row.voile;
const taille: string = row.taille.toString();
const year: string = row.year.toString();
this.seriesRow[this.seriesName.indexOf(`${taille} - ${voile}`)][this.seriesHeader.indexOf(year)] = row.count;
return row;
});
});
}
}
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { PieChartComponent } from '@components/shared/helpers-chart';
import { HistoryTableComponent } from '@components/shared/helpers-jump';
import { UtilitiesService, CanopiesService } from '@services';
import { CanopyModelBySize, CanopyModelByYear } from '@models';
@Component({
selector: 'app-canopies-models',
imports: [
MatButtonModule,
MatCardModule,
MatDividerModule,
MatExpansionModule,
MatIconModule,
MatMenuModule,
PieChartComponent,
HistoryTableComponent,
],
templateUrl: './canopies-models.component.html',
})
export class CanopiesModelsComponent implements OnInit, OnDestroy {
private _canopyBySize: Subscription = new Subscription();
private _canopyByYear: Subscription = new Subscription();
private _canopiesBySize!: Array<CanopyModelBySize>;
private _canopiesByYear!: Array<CanopyModelByYear>;
public title: string = 'Modèles de voile';
public subtitle: string = 'Nombre total de sauts par modèle';
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all'),
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public destroyRef = inject(DestroyRef);
constructor(
private _canopiesService: CanopiesService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems,
) {}
ngOnInit() {
this._loadCanopyModelBySize();
}
ngOnDestroy() {
this._canopyBySize.unsubscribe();
this._canopyByYear.unsubscribe();
}
private _loadCanopyModelBySize(): void {
const canopies$: Observable<Array<CanopyModelBySize>> = this._canopiesService
.getAllBySizeByModel()
.pipe(takeUntilDestroyed(this.destroyRef));
this._canopyBySize = canopies$.subscribe((aggregate: Array<CanopyModelBySize>) => {
this._canopiesBySize = aggregate.map((row: CanopyModelBySize) => {
this.seriesName.push(`${row.taille.toString()} - ${row.voile}`);
this.seriesValue.push(row.count);
return row;
});
this._loadCanopyModelByYear();
});
}
private _loadCanopyModelByYear(): void {
this.seriesHeader = ['2018', '2019', '2020', '2021', '2022', '2023', '2024'];
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesName.forEach(() => {
this.seriesRow.push([...values]);
});
const dropzones$: Observable<Array<CanopyModelByYear>> = this._canopiesService
.getAllBySizeByModelByYear()
.pipe(takeUntilDestroyed(this.destroyRef));
this._canopyByYear = dropzones$.subscribe((aggregate: Array<CanopyModelByYear>) => {
this._canopiesByYear = aggregate.map((row: CanopyModelByYear) => {
const voile: string = row.voile;
const taille: string = row.taille.toString();
const year: string = row.year.toString();
this.seriesRow[this.seriesName.indexOf(`${taille} - ${voile}`)][this.seriesHeader.indexOf(year)] =
row.count;
return row;
});
});
}
}
src/app/components/shared/dashboard-components/canopies-sizes/canopies-sizes.component.ts
+100 -92
View File
@@ -1,92 +1,100 @@
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { PieChartComponent } from '@components/shared/helpers-chart';
import { HistoryTableComponent } from '@components/shared/helpers-jump';
import { UtilitiesService, CanopiesService } from '@services';
import { CanopyBySize, CanopyByYear } from '@models';
@Component({
selector: 'app-canopies-sizes',
standalone: true,
imports: [
MatButtonModule, MatCardModule, MatDividerModule,
MatExpansionModule, MatIconModule, MatMenuModule,
PieChartComponent, HistoryTableComponent
],
templateUrl: './canopies-sizes.component.html'
})
export class CanopiesSizesComponent implements OnInit, OnDestroy {
private _canopyBySize: Subscription = new Subscription();
private _canopyByYear: Subscription = new Subscription();
private _canopiesBySize!: Array<CanopyBySize>;
private _canopiesByYear!: Array<CanopyByYear>;
public title: string = 'Tailles de voile';
public subtitle: string = 'Nombre total de sauts par taille';
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[],
borderColor: string[]
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all')
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public destroyRef = inject(DestroyRef);
constructor(
private _canopiesService: CanopiesService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems
) { }
ngOnInit() {
this._loadCanopyBySize();
}
ngOnDestroy() {
this._canopyBySize.unsubscribe();
this._canopyByYear.unsubscribe();
}
private _loadCanopyBySize(): void {
const canopies$: Observable<Array<CanopyBySize>> = this._canopiesService.getAllBySize().pipe(takeUntilDestroyed(this.destroyRef));
this._canopyBySize = canopies$.subscribe((aggregate: Array<CanopyBySize>) => {
this._canopiesBySize = aggregate.map((row: CanopyBySize) => {
this.seriesName.push(row.taille.toString());
this.seriesValue.push(row.count);
return row;
});
this._loadCanopyByYear();
});
}
private _loadCanopyByYear(): void {
this.seriesHeader = ['2018', '2019', '2020', '2021', '2022', '2023', '2024'];
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesName.forEach(() => {
this.seriesRow.push([...values]);
});
const dropzones$: Observable<Array<CanopyByYear>> = this._canopiesService.getAllBySizeByYear().pipe(takeUntilDestroyed(this.destroyRef));
this._canopyByYear = dropzones$.subscribe((aggregate: Array<CanopyByYear>) => {
this._canopiesByYear = aggregate.map((row: CanopyByYear) => {
const taille: string = row.taille.toString();
const year: string = row.year.toString();
this.seriesRow[this.seriesName.indexOf(taille)][this.seriesHeader.indexOf(year)] = row.count;
return row;
});
});
}
}
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { PieChartComponent } from '@components/shared/helpers-chart';
import { HistoryTableComponent } from '@components/shared/helpers-jump';
import { UtilitiesService, CanopiesService } from '@services';
import { CanopyBySize, CanopyByYear } from '@models';
@Component({
selector: 'app-canopies-sizes',
imports: [
MatButtonModule,
MatCardModule,
MatDividerModule,
MatExpansionModule,
MatIconModule,
MatMenuModule,
PieChartComponent,
HistoryTableComponent,
],
templateUrl: './canopies-sizes.component.html',
})
export class CanopiesSizesComponent implements OnInit, OnDestroy {
private _canopyBySize: Subscription = new Subscription();
private _canopyByYear: Subscription = new Subscription();
private _canopiesBySize!: Array<CanopyBySize>;
private _canopiesByYear!: Array<CanopyByYear>;
public title: string = 'Tailles de voile';
public subtitle: string = 'Nombre total de sauts par taille';
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all'),
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public destroyRef = inject(DestroyRef);
constructor(
private _canopiesService: CanopiesService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems,
) {}
ngOnInit() {
this._loadCanopyBySize();
}
ngOnDestroy() {
this._canopyBySize.unsubscribe();
this._canopyByYear.unsubscribe();
}
private _loadCanopyBySize(): void {
const canopies$: Observable<Array<CanopyBySize>> = this._canopiesService
.getAllBySize()
.pipe(takeUntilDestroyed(this.destroyRef));
this._canopyBySize = canopies$.subscribe((aggregate: Array<CanopyBySize>) => {
this._canopiesBySize = aggregate.map((row: CanopyBySize) => {
this.seriesName.push(row.taille.toString());
this.seriesValue.push(row.count);
return row;
});
this._loadCanopyByYear();
});
}
private _loadCanopyByYear(): void {
this.seriesHeader = ['2018', '2019', '2020', '2021', '2022', '2023', '2024'];
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesName.forEach(() => {
this.seriesRow.push([...values]);
});
const dropzones$: Observable<Array<CanopyByYear>> = this._canopiesService
.getAllBySizeByYear()
.pipe(takeUntilDestroyed(this.destroyRef));
this._canopyByYear = dropzones$.subscribe((aggregate: Array<CanopyByYear>) => {
this._canopiesByYear = aggregate.map((row: CanopyByYear) => {
const taille: string = row.taille.toString();
const year: string = row.year.toString();
this.seriesRow[this.seriesName.indexOf(taille)][this.seriesHeader.indexOf(year)] = row.count;
return row;
});
});
}
}
src/app/components/shared/dashboard-components/dropzones-bar/dropzones-bar.component.ts
+161 -143
View File
@@ -1,143 +1,161 @@
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { BaseChartDirective } from 'ng2-charts';
import { ChartistModule, Configuration } from 'ng-chartist';
import { AxisOptions, Label } from 'chartist';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { HistoryTableComponent } from '@components/shared/helpers-jump';
import { UtilitiesService, DropZonesService } from '@services';
import { DropZoneByOaci, DropZoneByYear } from '@models';
@Component({
selector: 'app-dropzones-bar',
standalone: true,
imports: [
MatButtonModule, MatCardModule, MatDividerModule,
MatExpansionModule, MatIconModule, MatMenuModule,
BaseChartDirective, ChartistModule,
HistoryTableComponent
],
templateUrl: './dropzones-bar.component.html'
})
export class DropzonesBarComponent implements OnInit, OnDestroy {
private _dropzoneByOaci: Subscription = new Subscription();
private _dropzoneByYear: Subscription = new Subscription();
private _dropzonesByOaci!: Array<DropZoneByOaci>;
private _dropzonesByYear!: Array<DropZoneByYear>;
public title: string = 'Les dropzones';
public subtitle: string = 'Nombre total de sauts par dropzone';
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[],
borderColor: string[]
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all')
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public displayCharts = false;
public barChartDropZones: Configuration = this._utilitiesService.getBarConfig();
public destroyRef = inject(DestroyRef);
constructor(
private _dropzonesService: DropZonesService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems
) { }
ngOnInit() {
this._loadDropZoneByOaci();
}
ngOnDestroy() {
this._dropzoneByOaci.unsubscribe();
this._dropzoneByYear.unsubscribe();
}
private _loadDropZoneByOaci(): void {
const dropzones$: Observable<Array<DropZoneByOaci>> = this._dropzonesService.getAllByOaci().pipe(takeUntilDestroyed(this.destroyRef));
this._dropzoneByOaci = dropzones$.subscribe((aggregate: Array<DropZoneByOaci>) => {
this._dropzonesByOaci = aggregate.map((row: DropZoneByOaci) => {
this.seriesName.push(`${row.oaci} - ${row.lieu}`);
this.seriesValue.push(row.count);
return row;
});
this._loadDropZoneByYear();
});
}
private _loadDropZoneByYear(): void {
this.seriesHeader = ['2018', '2019', '2020', '2021', '2022', '2023', '2024'];
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesName.forEach(() => {
this.seriesRow.push([...values]);
});
const dropzones$: Observable<Array<DropZoneByYear>> = this._dropzonesService.getAllByOaciByYear().pipe(takeUntilDestroyed(this.destroyRef));
this._dropzoneByYear = dropzones$.subscribe((aggregate: Array<DropZoneByYear>) => {
this._dropzonesByYear = aggregate.map((row: DropZoneByYear) => {
const lieu: string = row.lieu;
const oaci: string = row.oaci;
const year: string = row.year.toString();
this.seriesRow[this.seriesName.indexOf(`${oaci} - ${lieu}`)][this.seriesHeader.indexOf(year)] = row.count;
return row;
});
const axisX: AxisOptions = {
labelInterpolationFnc: function(value: Label, index: number): string {
return index % 1 === 0 ? `${value.toString()}` : '';
}
}
this.barChartDropZones = {
type: 'Bar',
data: {
'labels': this.seriesHeader,
'series': this.seriesRow
},
options: {
seriesBarDistance: 15,
horizontalBars: false,
high: 180,
axisX: {
showGrid: false,
offset: 20
},
axisY: {
showGrid: true,
offset: 40
},
height: 300
},
responsiveOptions: [
['screen and (min-width: 1024px)', {
axisX: axisX
}],
['screen and (min-width: 641px) and (max-width: 1024px)', {
seriesBarDistance: 7,
axisY: {
offset: 30
},
axisX: axisX
}],
['screen and (max-width: 640px)', {
seriesBarDistance: 5,
axisY: {
offset: 20
},
axisX: axisX
}]
]
};
this.displayCharts = true;
});
}
}
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { BaseChartDirective } from 'ng2-charts';
import { ChartistModule, Configuration } from 'ng-chartist';
import { AxisOptions, Label } from 'chartist';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { HistoryTableComponent } from '@components/shared/helpers-jump';
import { UtilitiesService, DropZonesService } from '@services';
import { DropZoneByOaci, DropZoneByYear } from '@models';
@Component({
selector: 'app-dropzones-bar',
imports: [
MatButtonModule,
MatCardModule,
MatDividerModule,
MatExpansionModule,
MatIconModule,
MatMenuModule,
BaseChartDirective,
ChartistModule,
HistoryTableComponent,
],
templateUrl: './dropzones-bar.component.html',
})
export class DropzonesBarComponent implements OnInit, OnDestroy {
private _dropzoneByOaci: Subscription = new Subscription();
private _dropzoneByYear: Subscription = new Subscription();
private _dropzonesByOaci!: Array<DropZoneByOaci>;
private _dropzonesByYear!: Array<DropZoneByYear>;
public title: string = 'Les dropzones';
public subtitle: string = 'Nombre total de sauts par dropzone';
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all'),
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public displayCharts = false;
public barChartDropZones: Configuration = this._utilitiesService.getBarConfig();
public destroyRef = inject(DestroyRef);
constructor(
private _dropzonesService: DropZonesService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems,
) {}
ngOnInit() {
this._loadDropZoneByOaci();
}
ngOnDestroy() {
this._dropzoneByOaci.unsubscribe();
this._dropzoneByYear.unsubscribe();
}
private _loadDropZoneByOaci(): void {
const dropzones$: Observable<Array<DropZoneByOaci>> = this._dropzonesService
.getAllByOaci()
.pipe(takeUntilDestroyed(this.destroyRef));
this._dropzoneByOaci = dropzones$.subscribe((aggregate: Array<DropZoneByOaci>) => {
this._dropzonesByOaci = aggregate.map((row: DropZoneByOaci) => {
this.seriesName.push(`${row.oaci} - ${row.lieu}`);
this.seriesValue.push(row.count);
return row;
});
this._loadDropZoneByYear();
});
}
private _loadDropZoneByYear(): void {
this.seriesHeader = ['2018', '2019', '2020', '2021', '2022', '2023', '2024'];
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesName.forEach(() => {
this.seriesRow.push([...values]);
});
const dropzones$: Observable<Array<DropZoneByYear>> = this._dropzonesService
.getAllByOaciByYear()
.pipe(takeUntilDestroyed(this.destroyRef));
this._dropzoneByYear = dropzones$.subscribe((aggregate: Array<DropZoneByYear>) => {
this._dropzonesByYear = aggregate.map((row: DropZoneByYear) => {
const lieu: string = row.lieu;
const oaci: string = row.oaci;
const year: string = row.year.toString();
this.seriesRow[this.seriesName.indexOf(`${oaci} - ${lieu}`)][this.seriesHeader.indexOf(year)] =
row.count;
return row;
});
const axisX: AxisOptions = {
labelInterpolationFnc: function (value: Label, index: number): string {
return index % 1 === 0 ? `${value.toString()}` : '';
},
};
this.barChartDropZones = {
type: 'Bar',
data: {
labels: this.seriesHeader,
series: this.seriesRow,
},
options: {
seriesBarDistance: 15,
horizontalBars: false,
high: 180,
axisX: {
showGrid: false,
offset: 20,
},
axisY: {
showGrid: true,
offset: 40,
},
height: 300,
},
responsiveOptions: [
[
'screen and (min-width: 1024px)',
{
axisX: axisX,
},
],
[
'screen and (min-width: 641px) and (max-width: 1024px)',
{
seriesBarDistance: 7,
axisY: {
offset: 30,
},
axisX: axisX,
},
],
[
'screen and (max-width: 640px)',
{
seriesBarDistance: 5,
axisY: {
offset: 20,
},
axisX: axisX,
},
],
],
};
this.displayCharts = true;
});
}
}
src/app/components/shared/dashboard-components/dropzones-pie/dropzones-pie.component.ts
+102 -93
View File
@@ -1,93 +1,102 @@
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
//import { ChartConfiguration } from 'chart.js';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { PieChartComponent } from '@components/shared/helpers-chart';
import { HistoryTableComponent } from '@components/shared/helpers-jump';
import { UtilitiesService, DropZonesService } from '@services';
import { DropZoneByOaci, DropZoneByYear } from '@models';
@Component({
selector: 'app-dropzones-pie',
standalone: true,
imports: [
MatButtonModule, MatCardModule, MatDividerModule,
MatExpansionModule, MatIconModule, MatMenuModule,
PieChartComponent, HistoryTableComponent
],
templateUrl: './dropzones-pie.component.html'
})
export class DropzonesPieComponent implements OnInit, OnDestroy {
private _dropzoneByOaci: Subscription = new Subscription();
private _dropzoneByYear: Subscription = new Subscription();
private _dropzonesByOaci!: Array<DropZoneByOaci>;
private _dropzonesByYear!: Array<DropZoneByYear>;
public title: string = 'Les dropzones';
public subtitle: string = 'Nombre total de sauts par dropzone';
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[],
borderColor: string[]
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all')
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public destroyRef = inject(DestroyRef);
constructor(
private _dropzonesService: DropZonesService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems
) { }
ngOnInit() {
this._loadDropZoneByOaci();
}
ngOnDestroy() {
this._dropzoneByOaci.unsubscribe();
this._dropzoneByYear.unsubscribe();
}
private _loadDropZoneByOaci(): void {
const dropzones$: Observable<Array<DropZoneByOaci>> = this._dropzonesService.getAllByOaci().pipe(takeUntilDestroyed(this.destroyRef));
this._dropzoneByOaci = dropzones$.subscribe((aggregate: Array<DropZoneByOaci>) => {
this._dropzonesByOaci = aggregate.map((row: DropZoneByOaci) => {
this.seriesName.push(`${row.oaci} - ${row.lieu}`);
this.seriesValue.push(row.count);
return row;
});
this._loadDropZoneByYear();
});
}
private _loadDropZoneByYear(): void {
this.seriesHeader = ['2018', '2019', '2020', '2021', '2022', '2023', '2024'];
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesName.forEach(() => {
this.seriesRow.push([...values]);
});
const dropzones$: Observable<Array<DropZoneByYear>> = this._dropzonesService.getAllByOaciByYear().pipe(takeUntilDestroyed(this.destroyRef));
this._dropzoneByYear = dropzones$.subscribe((aggregate: Array<DropZoneByYear>) => {
this._dropzonesByYear = aggregate.map((row: DropZoneByYear) => {
const lieu: string = row.lieu;
const oaci: string = row.oaci;
const year: string = row.year.toString();
this.seriesRow[this.seriesName.indexOf(`${oaci} - ${lieu}`)][this.seriesHeader.indexOf(year)] = row.count;
return row;
});
});
}
}
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
//import { ChartConfiguration } from 'chart.js';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { PieChartComponent } from '@components/shared/helpers-chart';
import { HistoryTableComponent } from '@components/shared/helpers-jump';
import { UtilitiesService, DropZonesService } from '@services';
import { DropZoneByOaci, DropZoneByYear } from '@models';
@Component({
selector: 'app-dropzones-pie',
imports: [
MatButtonModule,
MatCardModule,
MatDividerModule,
MatExpansionModule,
MatIconModule,
MatMenuModule,
PieChartComponent,
HistoryTableComponent,
],
templateUrl: './dropzones-pie.component.html',
})
export class DropzonesPieComponent implements OnInit, OnDestroy {
private _dropzoneByOaci: Subscription = new Subscription();
private _dropzoneByYear: Subscription = new Subscription();
private _dropzonesByOaci!: Array<DropZoneByOaci>;
private _dropzonesByYear!: Array<DropZoneByYear>;
public title: string = 'Les dropzones';
public subtitle: string = 'Nombre total de sauts par dropzone';
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesValue: number[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all'),
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public destroyRef = inject(DestroyRef);
constructor(
private _dropzonesService: DropZonesService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems,
) {}
ngOnInit() {
this._loadDropZoneByOaci();
}
ngOnDestroy() {
this._dropzoneByOaci.unsubscribe();
this._dropzoneByYear.unsubscribe();
}
private _loadDropZoneByOaci(): void {
const dropzones$: Observable<Array<DropZoneByOaci>> = this._dropzonesService
.getAllByOaci()
.pipe(takeUntilDestroyed(this.destroyRef));
this._dropzoneByOaci = dropzones$.subscribe((aggregate: Array<DropZoneByOaci>) => {
this._dropzonesByOaci = aggregate.map((row: DropZoneByOaci) => {
this.seriesName.push(`${row.oaci} - ${row.lieu}`);
this.seriesValue.push(row.count);
return row;
});
this._loadDropZoneByYear();
});
}
private _loadDropZoneByYear(): void {
this.seriesHeader = ['2018', '2019', '2020', '2021', '2022', '2023', '2024'];
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesName.forEach(() => {
this.seriesRow.push([...values]);
});
const dropzones$: Observable<Array<DropZoneByYear>> = this._dropzonesService
.getAllByOaciByYear()
.pipe(takeUntilDestroyed(this.destroyRef));
this._dropzoneByYear = dropzones$.subscribe((aggregate: Array<DropZoneByYear>) => {
this._dropzonesByYear = aggregate.map((row: DropZoneByYear) => {
const lieu: string = row.lieu;
const oaci: string = row.oaci;
const year: string = row.year.toString();
this.seriesRow[this.seriesName.indexOf(`${oaci} - ${lieu}`)][this.seriesHeader.indexOf(year)] =
row.count;
return row;
});
});
}
}
src/app/components/shared/dashboard-components/jumps-by-month/jumps-by-month.component.ts
+189 -172
View File
@@ -1,172 +1,189 @@
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { CommonModule } from '@angular/common';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { ChartistModule, Configuration } from 'ng-chartist';
import { AxisOptions, Label } from 'chartist';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { UtilitiesService, JumpsService } from '@services';
import { JumpByDate } from '@models';
@Component({
selector: 'app-jumps-by-month',
standalone: true,
imports: [
CommonModule,
MatButtonModule, MatCardModule, MatDividerModule,
MatExpansionModule, MatIconModule, MatMenuModule,
ChartistModule
],
templateUrl: './jumps-by-month.component.html'
})
export class JumpsByMonthComponent implements OnInit, OnDestroy {
private _jumpByDate: Subscription = new Subscription();
private _jumpsByDate!: Array<JumpByDate>;
private _jumpsByDateCount = 0;
public title: string = 'Volume mensuel';
public subtitle: string = 'Nombre total de sauts par mois';
public min = 0;
public max = 0;
public grandAvg = 0;
public grandAvgLastYears = 0;
public grandTotal = 0;
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[],
borderColor: string[]
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all')
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public seriesRowTotal: number[] = [];
public seriesRowAvg: number[] = [];
public seriesRowAvgLastYears: number[] = [];
public seriesColTotal: number[] = [];
public seriesColTotalClosed: number[] = [];
public seriesColTotalLastYears: number[] = [];
public displayCharts = false;
public barChartJumps: Configuration = this._utilitiesService.getBarConfig();
public destroyRef = inject(DestroyRef);
constructor(
private _jumpsService: JumpsService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems
) { }
ngOnInit() {
this._loadJumpByDate();
}
ngOnDestroy() {
this._jumpByDate.unsubscribe();
}
private _loadJumpByDate() {
const minoration = 2; // -2 pour ne pas compter la première année
this.seriesHeader = this._utilitiesService.getMonthsList();
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesColTotal = [...values];
this.seriesColTotalClosed = [...values];
this.seriesColTotalLastYears = [...values];
const jumps$: Observable<Array<JumpByDate>> = this._jumpsService.getAllByDate().pipe(takeUntilDestroyed(this.destroyRef));
this._jumpByDate = jumps$.subscribe((aggregate: Array<JumpByDate>) => {
this._jumpsByDateCount = aggregate.length;
this._jumpsByDate = aggregate.map((row: JumpByDate) => {
const currentYear: number = new Date().getFullYear();
const year = row.year.toString();
const month = row.month;
if (this.seriesName.indexOf(year) < 0) {
this.seriesName.push(year);
if (row.year < this.min || this.min == 0) {
this.min = row.year;
}
if (row.year > this.max) {
this.max = row.year;
}
this.seriesRow.push([...values]);
}
this.seriesRow[(this.seriesRow.length-1)][(month-1)] = row.count;
this.seriesColTotal[(month-1)] += row.count;
if (row.year < currentYear) {
this.seriesColTotalClosed[(month-1)] += row.count;
}
if (row.year >= (currentYear-3) && row.year < currentYear) {
this.seriesColTotalLastYears[(month-1)] += row.count;
}
return row;
});
this.seriesRow.forEach((row: number[]) => {
const total = row.reduce((partialSum, a) => partialSum + a, 0);
this.seriesRowTotal.push(total);
});
this.seriesColTotalClosed.forEach((row: number) => {
const value: number = (row/(this.seriesName.length-minoration));
this.seriesRowAvg.push(parseInt(value.toFixed(0)));
});
this.seriesColTotalLastYears.forEach((row: number) => {
const value: number = (row/3); // Les 3 dernières années
this.seriesRowAvgLastYears.push(parseInt(value.toFixed(0)));
});
this.grandAvg = this.seriesRowAvg.reduce((partialSum, accumulated) => partialSum + accumulated, 0);
this.grandAvgLastYears = this.seriesRowAvgLastYears.reduce((partialSum, accumulated) => partialSum + accumulated, 0);
this.grandTotal = this.seriesColTotal.reduce((partialSum, accumulated) => partialSum + accumulated, 0);
const axisX: AxisOptions = {
labelInterpolationFnc: function(value: Label, index: number): string {
return index % 1 === 0 ? `${value.toString()}` : '';
}
}
this.barChartJumps = {
type: 'Bar',
data: {
'labels': this.seriesHeader,
'series': this.seriesRow
},
options: {
seriesBarDistance: 15,
high: 70,
axisX: {
showGrid: false,
offset: 20
},
axisY: {
showGrid: true,
offset: 40
},
height: 300
},
responsiveOptions: [
['screen and (min-width: 1024px)', {
axisX: axisX
}],
['screen and (min-width: 641px) and (max-width: 1024px)', {
seriesBarDistance: 10,
axisY: {
offset: 30
},
axisX: axisX
}],
['screen and (max-width: 640px)', {
seriesBarDistance: 5,
axisY: {
offset: 20
},
axisX: axisX
}]
]
};
this.displayCharts = true;
});
}
}
import { Component, DestroyRef, inject, OnInit, OnDestroy } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { CommonModule } from '@angular/common';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatDividerModule } from '@angular/material/divider';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { ChartistModule, Configuration } from 'ng-chartist';
import { AxisOptions, Label } from 'chartist';
import { Observable, Subscription } from 'rxjs';
import { MenuItems } from '@components/shared';
import { UtilitiesService, JumpsService } from '@services';
import { JumpByDate } from '@models';
@Component({
selector: 'app-jumps-by-month',
imports: [
CommonModule,
MatButtonModule,
MatCardModule,
MatDividerModule,
MatExpansionModule,
MatIconModule,
MatMenuModule,
ChartistModule,
],
templateUrl: './jumps-by-month.component.html',
})
export class JumpsByMonthComponent implements OnInit, OnDestroy {
private _jumpByDate: Subscription = new Subscription();
private _jumpsByDate!: Array<JumpByDate>;
private _jumpsByDateCount = 0;
public title: string = 'Volume mensuel';
public subtitle: string = 'Nombre total de sauts par mois';
public min = 0;
public max = 0;
public grandAvg = 0;
public grandAvgLastYears = 0;
public grandTotal = 0;
public seriesHeader: string[] = [];
public seriesName: string[] = [];
public seriesRow: Array<Array<number>> = [];
public seriesColor: {
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all'),
};
public seriesColorClass: string[] = this._utilitiesService.getChartColors();
public seriesRowTotal: number[] = [];
public seriesRowAvg: number[] = [];
public seriesRowAvgLastYears: number[] = [];
public seriesColTotal: number[] = [];
public seriesColTotalClosed: number[] = [];
public seriesColTotalLastYears: number[] = [];
public displayCharts = false;
public barChartJumps: Configuration = this._utilitiesService.getBarConfig();
public destroyRef = inject(DestroyRef);
constructor(
private _jumpsService: JumpsService,
private _utilitiesService: UtilitiesService,
public menuItems: MenuItems,
) {}
ngOnInit() {
this._loadJumpByDate();
}
ngOnDestroy() {
this._jumpByDate.unsubscribe();
}
private _loadJumpByDate() {
const minoration = 2; // -2 pour ne pas compter la première année
this.seriesHeader = this._utilitiesService.getMonthsList();
const values: Array<number> = this.seriesHeader.map(() => 0);
this.seriesColTotal = [...values];
this.seriesColTotalClosed = [...values];
this.seriesColTotalLastYears = [...values];
const jumps$: Observable<Array<JumpByDate>> = this._jumpsService
.getAllByDate()
.pipe(takeUntilDestroyed(this.destroyRef));
this._jumpByDate = jumps$.subscribe((aggregate: Array<JumpByDate>) => {
this._jumpsByDateCount = aggregate.length;
this._jumpsByDate = aggregate.map((row: JumpByDate) => {
const currentYear: number = new Date().getFullYear();
const year = row.year.toString();
const month = row.month;
if (this.seriesName.indexOf(year) < 0) {
this.seriesName.push(year);
if (row.year < this.min || this.min == 0) {
this.min = row.year;
}
if (row.year > this.max) {
this.max = row.year;
}
this.seriesRow.push([...values]);
}
this.seriesRow[this.seriesRow.length - 1][month - 1] = row.count;
this.seriesColTotal[month - 1] += row.count;
if (row.year < currentYear) {
this.seriesColTotalClosed[month - 1] += row.count;
}
if (row.year >= currentYear - 3 && row.year < currentYear) {
this.seriesColTotalLastYears[month - 1] += row.count;
}
return row;
});
this.seriesRow.forEach((row: number[]) => {
const total = row.reduce((partialSum, a) => partialSum + a, 0);
this.seriesRowTotal.push(total);
});
this.seriesColTotalClosed.forEach((row: number) => {
const value: number = row / (this.seriesName.length - minoration);
this.seriesRowAvg.push(parseInt(value.toFixed(0)));
});
this.seriesColTotalLastYears.forEach((row: number) => {
const value: number = row / 3; // Les 3 dernières années
this.seriesRowAvgLastYears.push(parseInt(value.toFixed(0)));
});
this.grandAvg = this.seriesRowAvg.reduce((partialSum, accumulated) => partialSum + accumulated, 0);
this.grandAvgLastYears = this.seriesRowAvgLastYears.reduce(
(partialSum, accumulated) => partialSum + accumulated,
0,
);
this.grandTotal = this.seriesColTotal.reduce((partialSum, accumulated) => partialSum + accumulated, 0);
const axisX: AxisOptions = {
labelInterpolationFnc: function (value: Label, index: number): string {
return index % 1 === 0 ? `${value.toString()}` : '';
},
};
this.barChartJumps = {
type: 'Bar',
data: {
labels: this.seriesHeader,
series: this.seriesRow,
},
options: {
seriesBarDistance: 15,
high: 70,
axisX: {
showGrid: false,
offset: 20,
},
axisY: {
showGrid: true,
offset: 40,
},
height: 300,
},
responsiveOptions: [
[
'screen and (min-width: 1024px)',
{
axisX: axisX,
},
],
[
'screen and (min-width: 641px) and (max-width: 1024px)',
{
seriesBarDistance: 10,
axisY: {
offset: 30,
},
axisX: axisX,
},
],
[
'screen and (max-width: 640px)',
{
seriesBarDistance: 5,
axisY: {
offset: 20,
},
axisX: axisX,
},
],
],
};
this.displayCharts = true;
});
}
}
src/app/components/shared/helpers-chart/bar-chart.component.ts
+53 -58
View File
@@ -1,58 +1,53 @@
import { Component, Input, OnChanges } from '@angular/core';
import { ChartDataset } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { BarConfig } from '@models';
@Component({
selector: 'app-bar-chart',
standalone: true,
imports: [
BaseChartDirective
],
templateUrl: './bar-chart.component.html'
})
export class BarChartComponent implements OnChanges {
public displayCharts = false;
public chartConfig: BarConfig = this._utilitiesService.getBarChartConfig();
constructor(
private _utilitiesService: UtilitiesService
) { }
@Input() names: string[] = [];
@Input() values: number[] = [];
@Input() headers: string[] = [];
@Input() colors: {
backgroundColor: string[],
borderColor: string[]
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1)
};
@Input() label: string = 'Nombre total de sauts';
@Input() legend: boolean = false;
ngOnChanges() {
this._loadBarChart();
}
private _loadBarChart(): void {
const dataset: ChartDataset<'bar'> = {
data: [...this.values],
label: this.label,
backgroundColor: this.colors.backgroundColor,
borderColor: this.colors.borderColor,
borderWidth: 1
};
this.chartConfig.barChartData.labels = [...this.names];
this.chartConfig.barChartData.datasets!.push(dataset);
/*this.chartConfig.barChartOptions!.scales = {
x: {display: false},
y: {display: true}
};*/
this.chartConfig.barChartLegend = this.legend;
this.displayCharts = true;
}
}
import { Component, Input, OnChanges } from '@angular/core';
import { ChartDataset } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { BarConfig } from '@models';
@Component({
selector: 'app-bar-chart',
imports: [BaseChartDirective],
templateUrl: './bar-chart.component.html',
})
export class BarChartComponent implements OnChanges {
public displayCharts = false;
public chartConfig: BarConfig = this._utilitiesService.getBarChartConfig();
constructor(private _utilitiesService: UtilitiesService) {}
@Input() names: string[] = [];
@Input() values: number[] = [];
@Input() headers: string[] = [];
@Input() colors: {
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1),
};
@Input() label: string = 'Nombre total de sauts';
@Input() legend: boolean = false;
ngOnChanges() {
this._loadBarChart();
}
private _loadBarChart(): void {
const dataset: ChartDataset<'bar'> = {
data: [...this.values],
label: this.label,
backgroundColor: this.colors.backgroundColor,
borderColor: this.colors.borderColor,
borderWidth: 1,
};
this.chartConfig.barChartData.labels = [...this.names];
this.chartConfig.barChartData.datasets!.push(dataset);
/*this.chartConfig.barChartOptions!.scales = {
x: {display: false},
y: {display: true}
};*/
this.chartConfig.barChartLegend = this.legend;
this.displayCharts = true;
}
}
src/app/components/shared/helpers-chart/bar-horizontal-chart.component.ts
+49 -54
View File
@@ -1,54 +1,49 @@
import { Component, Input, OnChanges } from '@angular/core';
import { ChartDataset } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { BarConfig } from '@models';
@Component({
selector: 'app-bar-horizontal-chart',
standalone: true,
imports: [
BaseChartDirective
],
templateUrl: './bar-horizontal-chart.component.html'
})
export class BarHorizontalChartComponent implements OnChanges {
public displayCharts = false;
public chartConfig: BarConfig = this._utilitiesService.getHorizontalBarChartConfig();
constructor(
private _utilitiesService: UtilitiesService
) { }
@Input() names: string[] = [];
@Input() values: number[] = [];
@Input() headers: string[] = [];
@Input() colors: {
backgroundColor: string[],
borderColor: string[]
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1)
};
@Input() label: string = 'Nombre total de sauts';
@Input() legend: boolean = false;
ngOnChanges() {
this._loadBarChart();
}
private _loadBarChart(): void {
const dataset: ChartDataset<'bar'> = {
data: [...this.values],
label: this.label,
backgroundColor: this.colors.backgroundColor,
borderColor: this.colors.borderColor,
borderWidth: 1
};
this.chartConfig.barChartData.labels = [...this.names];
this.chartConfig.barChartData.datasets!.push(dataset);
this.chartConfig.barChartLegend = this.legend;
this.displayCharts = true;
}
}
import { Component, Input, OnChanges } from '@angular/core';
import { ChartDataset } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { BarConfig } from '@models';
@Component({
selector: 'app-bar-horizontal-chart',
imports: [BaseChartDirective],
templateUrl: './bar-horizontal-chart.component.html',
})
export class BarHorizontalChartComponent implements OnChanges {
public displayCharts = false;
public chartConfig: BarConfig = this._utilitiesService.getHorizontalBarChartConfig();
constructor(private _utilitiesService: UtilitiesService) {}
@Input() names: string[] = [];
@Input() values: number[] = [];
@Input() headers: string[] = [];
@Input() colors: {
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1),
};
@Input() label: string = 'Nombre total de sauts';
@Input() legend: boolean = false;
ngOnChanges() {
this._loadBarChart();
}
private _loadBarChart(): void {
const dataset: ChartDataset<'bar'> = {
data: [...this.values],
label: this.label,
backgroundColor: this.colors.backgroundColor,
borderColor: this.colors.borderColor,
borderWidth: 1,
};
this.chartConfig.barChartData.labels = [...this.names];
this.chartConfig.barChartData.datasets!.push(dataset);
this.chartConfig.barChartLegend = this.legend;
this.displayCharts = true;
}
}
src/app/components/shared/helpers-chart/bars-chart.component.ts
+84 -79
View File
@@ -1,79 +1,84 @@
import { Component, Input, OnChanges, AfterContentChecked } from '@angular/core';
import { ChartDataset } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { BarConfig } from '@models';
@Component({
selector: 'app-bars-chart',
standalone: true,
imports: [
BaseChartDirective
],
templateUrl: './bars-chart.component.html'
})
export class BarsChartComponent implements OnChanges, AfterContentChecked {
public displayCharts = false;
public chartConfig: BarConfig = this._utilitiesService.getBarChartConfig();
constructor(
private _utilitiesService: UtilitiesService
) { }
@Input() names: string[] = [];
@Input() values: Array<Array<number>> = [];
@Input() headers: string[] = [];
@Input() colors: {
backgroundColor: string[],
borderColor: string[]
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1)
};
@Input() legend: boolean = false;
ngOnChanges() {
this._loadBarChart();
}
ngAfterContentChecked() {
this._loadBarChart();
}
private _loadBarChart(): void {
this.chartConfig = this._utilitiesService.getBarChartConfig();
this.chartConfig.barChartData.labels = [...this.headers];
this.chartConfig.barChartOptions!.maintainAspectRatio = false;
//this.chartConfig.barChartOptions!.aspectRatio = 2.4;
this.chartConfig.barChartOptions!.scales = {
x: {
display: true,
//stacked: true,
beginAtZero: true,
ticks: { color: 'rgba(255,255,255,0.3)' },
grid: { color: 'rgba(255,255,255,0.1)', display: true, tickBorderDash: [1,2], tickBorderDashOffset: 2 }
},
y: {
display: true,
//stacked: true,
beginAtZero: true,
ticks: { color: 'rgba(255,255,255,0.3)' },
grid: { color: 'rgba(255,255,255,0.2)', tickBorderDash: [1,2], tickBorderDashOffset: 2, display: true }
}
};
this.names.forEach((label: string, index: number) => {
const dataset: ChartDataset<'bar'> = {
data: [...this.values[index]],
label: label,
backgroundColor: this.colors.backgroundColor[index],
borderColor: this.colors.borderColor[index],
borderWidth: 1,
//stack: 'Stack 0'
};
this.chartConfig.barChartData.datasets!.push(dataset);
});
this.chartConfig.barChartLegend = this.legend;
this.displayCharts = true;
}
}
import { Component, Input, OnChanges, AfterContentChecked } from '@angular/core';
import { ChartDataset } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { BarConfig } from '@models';
@Component({
selector: 'app-bars-chart',
imports: [BaseChartDirective],
templateUrl: './bars-chart.component.html',
})
export class BarsChartComponent implements OnChanges, AfterContentChecked {
public displayCharts = false;
public chartConfig: BarConfig = this._utilitiesService.getBarChartConfig();
constructor(private _utilitiesService: UtilitiesService) {}
@Input() names: string[] = [];
@Input() values: Array<Array<number>> = [];
@Input() headers: string[] = [];
@Input() colors: {
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1),
};
@Input() legend: boolean = false;
ngOnChanges() {
this._loadBarChart();
}
ngAfterContentChecked() {
this._loadBarChart();
}
private _loadBarChart(): void {
this.chartConfig = this._utilitiesService.getBarChartConfig();
this.chartConfig.barChartData.labels = [...this.headers];
this.chartConfig.barChartOptions!.maintainAspectRatio = false;
//this.chartConfig.barChartOptions!.aspectRatio = 2.4;
this.chartConfig.barChartOptions!.scales = {
x: {
display: true,
//stacked: true,
beginAtZero: true,
ticks: { color: 'rgba(255,255,255,0.3)' },
grid: {
color: 'rgba(255,255,255,0.1)',
display: true,
tickBorderDash: [1, 2],
tickBorderDashOffset: 2,
},
},
y: {
display: true,
//stacked: true,
beginAtZero: true,
ticks: { color: 'rgba(255,255,255,0.3)' },
grid: {
color: 'rgba(255,255,255,0.2)',
tickBorderDash: [1, 2],
tickBorderDashOffset: 2,
display: true,
},
},
};
this.names.forEach((label: string, index: number) => {
const dataset: ChartDataset<'bar'> = {
data: [...this.values[index]],
label: label,
backgroundColor: this.colors.backgroundColor[index],
borderColor: this.colors.borderColor[index],
borderWidth: 1,
//stack: 'Stack 0'
};
this.chartConfig.barChartData.datasets!.push(dataset);
});
this.chartConfig.barChartLegend = this.legend;
this.displayCharts = true;
}
}
src/app/components/shared/helpers-chart/circle-chart.component.ts
+59 -64
View File
@@ -1,64 +1,59 @@
import { Component, Input, OnChanges } from '@angular/core';
//import { ChartDataset } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { CircleConfig } from '@models';
@Component({
selector: 'app-circle-chart',
standalone: true,
imports: [
BaseChartDirective
],
templateUrl: './circle-chart.component.html'
})
export class CircleChartComponent implements OnChanges {
public displayCharts = false;
public chartConfig: CircleConfig = this._utilitiesService.getCircleChartConfig();
constructor(
private _utilitiesService: UtilitiesService
) { }
@Input() names: string[] = [];
@Input() values: number[] = [];
@Input() headers: string[] = [];
@Input() color: number = 0;
@Input() label: string = 'Nombre total de sauts';
@Input() legend: boolean = false;
ngOnChanges() {
this._loadCircleChart();
}
private _loadCircleChart(): void {
this.chartConfig.circleChartLabels = [...this.names];
this.chartConfig.circleChartDatasets[0].data = [...this.values];
this.chartConfig.circleChartDatasets[0].label = this.label;
this.chartConfig.circleChartDatasets[0].backgroundColor = [
this._utilitiesService.getSeriesColors(0.9, 'pastels')[this.color],
'rgba(255, 255, 255, 0.05)'
];
this.chartConfig.circleChartDatasets[0].borderColor = [
this._utilitiesService.getSeriesColors(1, 'pastels')[this.color],
'rgba(255, 255, 255, 0.05)'
];
this.chartConfig.circleChartDatasets[0].borderWidth = 0;
this.chartConfig.circleChartLegend = this.legend;
this.displayCharts = true;
}
/*private _loadCircleChart(): void {
const dataset: ChartDataset<'circle'> = {
data: [...this.values],
label: 'Nombre total de sauts',
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1),
borderWidth: 1
};
this.chartConfig.circleChartLabels = [...this.names];
this.chartConfig.circleChartDatasets!.push(dataset);
this.displayCharts = true;
}*/
}
import { Component, Input, OnChanges } from '@angular/core';
//import { ChartDataset } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { CircleConfig } from '@models';
@Component({
selector: 'app-circle-chart',
imports: [BaseChartDirective],
templateUrl: './circle-chart.component.html',
})
export class CircleChartComponent implements OnChanges {
public displayCharts = false;
public chartConfig: CircleConfig = this._utilitiesService.getCircleChartConfig();
constructor(private _utilitiesService: UtilitiesService) {}
@Input() names: string[] = [];
@Input() values: number[] = [];
@Input() headers: string[] = [];
@Input() color: number = 0;
@Input() label: string = 'Nombre total de sauts';
@Input() legend: boolean = false;
ngOnChanges() {
this._loadCircleChart();
}
private _loadCircleChart(): void {
this.chartConfig.circleChartLabels = [...this.names];
this.chartConfig.circleChartDatasets[0].data = [...this.values];
this.chartConfig.circleChartDatasets[0].label = this.label;
this.chartConfig.circleChartDatasets[0].backgroundColor = [
this._utilitiesService.getSeriesColors(0.9, 'pastels')[this.color],
'rgba(255, 255, 255, 0.05)',
];
this.chartConfig.circleChartDatasets[0].borderColor = [
this._utilitiesService.getSeriesColors(1, 'pastels')[this.color],
'rgba(255, 255, 255, 0.05)',
];
this.chartConfig.circleChartDatasets[0].borderWidth = 0;
this.chartConfig.circleChartLegend = this.legend;
this.displayCharts = true;
}
/*private _loadCircleChart(): void {
const dataset: ChartDataset<'circle'> = {
data: [...this.values],
label: 'Nombre total de sauts',
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1),
borderWidth: 1
};
this.chartConfig.circleChartLabels = [...this.names];
this.chartConfig.circleChartDatasets!.push(dataset);
this.displayCharts = true;
}*/
}
src/app/components/shared/helpers-chart/line-chart.component.ts
+59 -64
View File
@@ -1,64 +1,59 @@
import { Component, Input, OnChanges } from '@angular/core';
import { ChartDataset, Point } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { LineConfig } from '@models';
@Component({
selector: 'app-line-chart',
standalone: true,
imports: [
BaseChartDirective
],
templateUrl: './line-chart.component.html'
})
export class LineChartComponent implements OnChanges {
public displayCharts = false;
public chartConfig: LineConfig = this._utilitiesService.getLineChartConfig();
constructor(
private _utilitiesService: UtilitiesService
) { }
@Input() headers: string[] = [];
@Input() names: string[] = [];
@Input() values: Array<Array<number>> = [];
@Input() colors: {
backgroundColor: string[],
borderColor: string[]
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1)
};
@Input() legend: boolean = false;
@Input() hideZero: boolean = false;
ngOnChanges() {
this._loadLineChart();
}
private _loadLineChart(): void {
this.chartConfig.lineChartData.labels = [...this.headers];
this.names.forEach((label: string, index: number) => {
let data: Array<(number | Point | null)> = [];
if (this.hideZero) {
data = [...this.values[index].map(value => value === 0 ? null : value)];
} else {
data = [...this.values[index]];
}
const dataset: ChartDataset<'line'> = {
data: data,
label: label,
backgroundColor: this.colors.backgroundColor[index],
borderColor: this.colors.borderColor[index],
borderWidth: 2,
cubicInterpolationMode: 'monotone',
tension: 0
};
this.chartConfig.lineChartData.datasets!.push(dataset);
});
this.chartConfig.lineChartLegend = this.legend;
this.displayCharts = true;
}
}
import { Component, Input, OnChanges } from '@angular/core';
import { ChartDataset, Point } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { LineConfig } from '@models';
@Component({
selector: 'app-line-chart',
imports: [BaseChartDirective],
templateUrl: './line-chart.component.html',
})
export class LineChartComponent implements OnChanges {
public displayCharts = false;
public chartConfig: LineConfig = this._utilitiesService.getLineChartConfig();
constructor(private _utilitiesService: UtilitiesService) {}
@Input() headers: string[] = [];
@Input() names: string[] = [];
@Input() values: Array<Array<number>> = [];
@Input() colors: {
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1),
};
@Input() legend: boolean = false;
@Input() hideZero: boolean = false;
ngOnChanges() {
this._loadLineChart();
}
private _loadLineChart(): void {
this.chartConfig.lineChartData.labels = [...this.headers];
this.names.forEach((label: string, index: number) => {
let data: Array<number | Point | null> = [];
if (this.hideZero) {
data = [...this.values[index].map((value) => (value === 0 ? null : value))];
} else {
data = [...this.values[index]];
}
const dataset: ChartDataset<'line'> = {
data: data,
label: label,
backgroundColor: this.colors.backgroundColor[index],
borderColor: this.colors.borderColor[index],
borderWidth: 2,
cubicInterpolationMode: 'monotone',
tension: 0,
};
this.chartConfig.lineChartData.datasets!.push(dataset);
});
this.chartConfig.lineChartLegend = this.legend;
this.displayCharts = true;
}
}
src/app/components/shared/helpers-chart/linearea-chart.component.ts
+58 -63
View File
@@ -1,63 +1,58 @@
import { Component, Input, OnChanges } from '@angular/core';
import { ChartDataset } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { LineConfig } from '@models';
@Component({
selector: 'app-linearea-chart',
standalone: true,
imports: [
BaseChartDirective
],
templateUrl: './linearea-chart.component.html'
})
export class LineAreaChartComponent implements OnChanges {
public displayCharts = false;
public chartConfig: LineConfig = this._utilitiesService.getStackedLineAreaChartConfig();
constructor(
private _utilitiesService: UtilitiesService
) { }
@Input() headers: string[] = [];
@Input() names: string[] = [];
@Input() values: Array<Array<number>> = [];
@Input() colors: {
backgroundColor: string[],
borderColor: string[]
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1)
};
@Input() legend: boolean = false;
ngOnChanges() {
this._loadLineChart();
}
private _loadLineChart(): void {
this.chartConfig.lineChartData.labels = [...this.headers];
this.names.forEach((label: string, index: number) => {
let fill: string | number | boolean = '-1';
if (index === 0) {
fill = true;
}
const dataset: ChartDataset<'line'> = {
data: [...this.values[index]],
label: label,
backgroundColor: this.colors.backgroundColor[index],
borderColor: this.colors.borderColor[index],
borderWidth: 1,
fill: fill,
//stepped: true,
cubicInterpolationMode: 'monotone',
tension: 0
};
this.chartConfig.lineChartData.datasets!.push(dataset);
});
this.chartConfig.lineChartLegend = this.legend;
this.displayCharts = true;
}
}
import { Component, Input, OnChanges } from '@angular/core';
import { ChartDataset } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { LineConfig } from '@models';
@Component({
selector: 'app-linearea-chart',
imports: [BaseChartDirective],
templateUrl: './linearea-chart.component.html',
})
export class LineAreaChartComponent implements OnChanges {
public displayCharts = false;
public chartConfig: LineConfig = this._utilitiesService.getStackedLineAreaChartConfig();
constructor(private _utilitiesService: UtilitiesService) {}
@Input() headers: string[] = [];
@Input() names: string[] = [];
@Input() values: Array<Array<number>> = [];
@Input() colors: {
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1),
};
@Input() legend: boolean = false;
ngOnChanges() {
this._loadLineChart();
}
private _loadLineChart(): void {
this.chartConfig.lineChartData.labels = [...this.headers];
this.names.forEach((label: string, index: number) => {
let fill: string | number | boolean = '-1';
if (index === 0) {
fill = true;
}
const dataset: ChartDataset<'line'> = {
data: [...this.values[index]],
label: label,
backgroundColor: this.colors.backgroundColor[index],
borderColor: this.colors.borderColor[index],
borderWidth: 1,
fill: fill,
//stepped: true,
cubicInterpolationMode: 'monotone',
tension: 0,
};
this.chartConfig.lineChartData.datasets!.push(dataset);
});
this.chartConfig.lineChartLegend = this.legend;
this.displayCharts = true;
}
}
src/app/components/shared/helpers-chart/pie-chart.component.ts
+58 -63
View File
@@ -1,63 +1,58 @@
import { Component, Input, OnChanges } from '@angular/core';
//import { ChartDataset } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { DoughnutConfig } from '@models';
@Component({
selector: 'app-pie-chart',
standalone: true,
imports: [
BaseChartDirective
],
templateUrl: './pie-chart.component.html'
})
export class PieChartComponent implements OnChanges {
public displayCharts = false;
public chartConfig: DoughnutConfig = this._utilitiesService.getDoughnutChartConfig();
constructor(
private _utilitiesService: UtilitiesService
) { }
@Input() names: string[] = [];
@Input() values: number[] = [];
@Input() headers: string[] = [];
@Input() colors: {
backgroundColor: string[],
borderColor: string[]
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all')
};
@Input() legend: boolean = false;
ngOnChanges() {
this._loadDoughnutChart();
}
private _loadDoughnutChart(): void {
this.chartConfig.doughnutChartLabels = [...this.names];
this.chartConfig.doughnutChartDatasets[0].data = [...this.values];
this.chartConfig.doughnutChartDatasets[0].label = 'Nombre total de sauts';
this.chartConfig.doughnutChartDatasets[0].backgroundColor = this.colors.backgroundColor;
this.chartConfig.doughnutChartDatasets[0].borderColor = this.colors.borderColor;
this.chartConfig.doughnutChartDatasets[0].borderWidth = 2;
this.chartConfig.doughnutChartLegend = this.legend;
this.displayCharts = true;
}
/*private _loadDoughnutChart(): void {
const dataset: ChartDataset<'doughnut'> = {
data: [...this.values],
label: 'Nombre total de sauts',
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1),
borderWidth: 1
};
this.chartConfig.doughnutChartLabels = [...this.names];
this.chartConfig.doughnutChartDatasets!.push(dataset);
this.displayCharts = true;
}*/
}
import { Component, Input, OnChanges } from '@angular/core';
//import { ChartDataset } from 'chart.js';
import { BaseChartDirective } from 'ng2-charts';
import { UtilitiesService } from '@services';
import { DoughnutConfig } from '@models';
@Component({
selector: 'app-pie-chart',
imports: [BaseChartDirective],
templateUrl: './pie-chart.component.html',
})
export class PieChartComponent implements OnChanges {
public displayCharts = false;
public chartConfig: DoughnutConfig = this._utilitiesService.getDoughnutChartConfig();
constructor(private _utilitiesService: UtilitiesService) {}
@Input() names: string[] = [];
@Input() values: number[] = [];
@Input() headers: string[] = [];
@Input() colors: {
backgroundColor: string[];
borderColor: string[];
} = {
backgroundColor: this._utilitiesService.getSeriesColors(0.8, 'all'),
borderColor: this._utilitiesService.getSeriesColors(1, 'all'),
};
@Input() legend: boolean = false;
ngOnChanges() {
this._loadDoughnutChart();
}
private _loadDoughnutChart(): void {
this.chartConfig.doughnutChartLabels = [...this.names];
this.chartConfig.doughnutChartDatasets[0].data = [...this.values];
this.chartConfig.doughnutChartDatasets[0].label = 'Nombre total de sauts';
this.chartConfig.doughnutChartDatasets[0].backgroundColor = this.colors.backgroundColor;
this.chartConfig.doughnutChartDatasets[0].borderColor = this.colors.borderColor;
this.chartConfig.doughnutChartDatasets[0].borderWidth = 2;
this.chartConfig.doughnutChartLegend = this.legend;
this.displayCharts = true;
}
/*private _loadDoughnutChart(): void {
const dataset: ChartDataset<'doughnut'> = {
data: [...this.values],
label: 'Nombre total de sauts',
backgroundColor: this._utilitiesService.getSeriesColors(0.8),
borderColor: this._utilitiesService.getSeriesColors(1),
borderWidth: 1
};
this.chartConfig.doughnutChartLabels = [...this.names];
this.chartConfig.doughnutChartDatasets!.push(dataset);
this.displayCharts = true;
}*/
}
src/app/components/shared/helpers-jump/history-table.component.ts
+3 -6
View File
@@ -2,13 +2,10 @@ import { Component, Input, AfterContentChecked } from '@angular/core';
import { NgIf, NgFor } from '@angular/common';
@Component({
standalone: true,
imports: [
NgIf, NgFor
],
imports: [NgIf, NgFor],
selector: 'app-history-table',
templateUrl: './history-table.component.html',
styleUrls: []
styleUrls: [],
})
export class HistoryTableComponent implements AfterContentChecked {
public seriesColTotal: number[] = [];
@@ -38,7 +35,7 @@ export class HistoryTableComponent implements AfterContentChecked {
this.seriesColTotal = [...values];
this.rows.forEach((row: number[], rowIndex: number) => {
row.forEach((value: number, index: number) => {
this.seriesColTotal[index] = (this.seriesColTotal[index] + this.rows[rowIndex][index]);
this.seriesColTotal[index] = this.seriesColTotal[index] + this.rows[rowIndex][index];
});
this.grandTotal = this.seriesColTotal.reduce((partialSum, a) => partialSum + a, 0);
});
src/app/components/shared/helpers-jump/jump-list.component.ts
+11 -14
View File
@@ -13,16 +13,15 @@ import { JumpPreviewComponent } from './jump-preview.component';
@Component({
selector: 'app-jump-list',
templateUrl: './jump-list.component.html',
standalone: true,
imports: [
NgClass,
DatePipe,
MatProgressSpinnerModule,
MatButtonModule,
RouterLink,
MatIconModule,
JumpPreviewComponent
]
NgClass,
DatePipe,
MatProgressSpinnerModule,
MatButtonModule,
RouterLink,
MatIconModule,
JumpPreviewComponent,
],
})
export class JumpListComponent implements OnInit, OnDestroy {
private _jumps: Subscription = new Subscription();
@@ -35,9 +34,7 @@ export class JumpListComponent implements OnInit, OnDestroy {
pages: Array<number> = [1];
lastUpdate: Date = new Date();
constructor(
private jumpsService: JumpsService
) { }
constructor(private jumpsService: JumpsService) {}
@Input() limit = 0;
@Input() refresh = 30000;
@@ -70,7 +67,7 @@ export class JumpListComponent implements OnInit, OnDestroy {
runQuery() {
if (this.limit) {
this.query.filters.limit = this.limit;
this.query.filters.offset = (this.limit * (this.currentPage - 1));
this.query.filters.offset = this.limit * (this.currentPage - 1);
}
const jumps$: Observable<JumpList> = this.jumpsService.query(this.query);
@@ -85,7 +82,7 @@ export class JumpListComponent implements OnInit, OnDestroy {
},
error: (err) => {
this.errors = err;
}
},
});
}
src/app/components/shared/helpers-jump/jump-meta.component.ts
+2 -3
View File
@@ -6,10 +6,9 @@ import { Jump } from '@models';
@Component({
selector: 'app-jump-meta',
standalone: true,
imports: [ RouterLink, DatePipe ],
imports: [RouterLink, DatePipe],
styleUrl: './jump-meta.component.scss',
templateUrl: './jump-meta.component.html'
templateUrl: './jump-meta.component.html',
})
export class JumpMetaComponent {
@Input() jump!: Jump;
src/app/components/shared/helpers-jump/jump-preview.component.ts
+5 -10
View File
@@ -12,14 +12,9 @@ import { JumpsService } from '@services';
@Component({
selector: 'app-jump-preview',
standalone: true,
imports: [
DecimalPipe, RouterLink,
MatDividerModule, MatButtonModule, MatCardModule,
JumpMetaComponent
],
imports: [DecimalPipe, RouterLink, MatDividerModule, MatButtonModule, MatCardModule, JumpMetaComponent],
styleUrl: './jump-preview.component.scss',
templateUrl: './jump-preview.component.html'
templateUrl: './jump-preview.component.html',
})
export class JumpPreviewComponent implements OnDestroy {
@Input() jump!: Jump;
@@ -30,8 +25,8 @@ export class JumpPreviewComponent implements OnDestroy {
constructor(
private router: Router,
private jumpsService: JumpsService
) { }
private jumpsService: JumpsService,
) {}
ngOnDestroy() {
this._jump.unsubscribe();
@@ -43,7 +38,7 @@ export class JumpPreviewComponent implements OnDestroy {
this._jump = jump$.subscribe({
next: () => {
this.router.navigateByUrl('/');
}
},
});
}
}
src/app/components/shared/helpers-jump/jump-table.component.ts
+239 -158
View File
@@ -1,4 +1,13 @@
import { AfterContentChecked, Component, EventEmitter, Input, Output, OnChanges, OnDestroy, ViewChild } from '@angular/core';
import {
AfterContentChecked,
Component,
EventEmitter,
Input,
Output,
OnChanges,
OnDestroy,
ViewChild,
} from '@angular/core';
import { CommonModule, DecimalPipe, DatePipe } from '@angular/common';
import { UntypedFormBuilder, UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
import { Router, RouterLink } from '@angular/router';
@@ -15,29 +24,68 @@ import { MatProgressBarModule } from '@angular/material/progress-bar';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MatSort, MatSortModule } from '@angular/material/sort';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { MatSnackBar, MatSnackBarHorizontalPosition, MatSnackBarModule, MatSnackBarVerticalPosition } from '@angular/material/snack-bar';
import {
MatSnackBar,
MatSnackBarHorizontalPosition,
MatSnackBarModule,
MatSnackBarVerticalPosition,
} from '@angular/material/snack-bar';
import { Observable, Subscription } from 'rxjs';
import { take } from 'rxjs/operators';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { FrenchPaginator } from '@components/shared/french-paginator.component';
import { ColumnDefinition, Errors, Jump, JumpByDay, JumpFile, JumpFileType, JumpList, JumpListConfig, jumpColumns } from '@models';
import {
ColumnDefinition,
Errors,
Jump,
JumpByDay,
JumpFile,
JumpFileType,
JumpList,
JumpListConfig,
jumpColumns,
} from '@models';
import { JumpsService, JumpTableService } from '@services';
import { JumpAddDialogComponent, JumpDeleteDialogComponent, JumpEditDialogComponent, JumpViewDialogComponent } from '@components/logbook/dialogs'
import {
JumpAddDialogComponent,
JumpDeleteDialogComponent,
JumpEditDialogComponent,
JumpViewDialogComponent,
} from '@components/logbook/dialogs';
@Component({
standalone: true,
imports: [
CommonModule, DecimalPipe, DatePipe, RouterLink, FormsModule, ReactiveFormsModule, NgxSkeletonLoaderModule,
MatButtonModule, MatCardModule, MatDialogModule,
MatFormFieldModule, MatIconModule, MatInputModule, MatNativeDateModule, MatMenuModule,
MatPaginatorModule, MatProgressBarModule, MatProgressSpinnerModule, MatSnackBarModule, MatSortModule, MatTableModule,
JumpAddDialogComponent, JumpDeleteDialogComponent, JumpEditDialogComponent, JumpViewDialogComponent
CommonModule,
DecimalPipe,
DatePipe,
RouterLink,
FormsModule,
ReactiveFormsModule,
NgxSkeletonLoaderModule,
MatButtonModule,
MatCardModule,
MatDialogModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
MatNativeDateModule,
MatMenuModule,
MatPaginatorModule,
MatProgressBarModule,
MatProgressSpinnerModule,
MatSnackBarModule,
MatSortModule,
MatTableModule,
JumpAddDialogComponent,
JumpDeleteDialogComponent,
JumpEditDialogComponent,
JumpViewDialogComponent,
],
selector: 'app-jump-table',
styleUrl: './jump-table.component.scss',
templateUrl: './jump-table.component.html',
providers: [{provide: MatPaginatorIntl, useClass: FrenchPaginator}]
providers: [{ provide: MatPaginatorIntl, useClass: FrenchPaginator }],
})
export class JumpTableComponent implements OnChanges, OnDestroy, AfterContentChecked {
private _jumps: Subscription = new Subscription();
@@ -57,10 +105,18 @@ export class JumpTableComponent implements OnChanges, OnDestroy, AfterContentChe
'zone', 'files', 'actions'
];*/
public displayedColumns: string[] = [
'numero', 'date', 'lieu', 'aeronef',
'hauteur', 'voile', 'categorie',
'participants', 'zone', 'accessoires',
'files', 'actions'
'numero',
'date',
'lieu',
'aeronef',
'hauteur',
'voile',
'categorie',
'participants',
'zone',
'accessoires',
'files',
'actions',
];
//public displayedColumns: string[] = jumpColumns.map((col) => col.key)
public columnsSchema: Array<ColumnDefinition> = jumpColumns;
@@ -81,12 +137,12 @@ export class JumpTableComponent implements OnChanges, OnDestroy, AfterContentChe
private _jumpTableService: JumpTableService,
private dialog: MatDialog,
private fb: UntypedFormBuilder,
private snackBar: MatSnackBar
private snackBar: MatSnackBar,
) {
this._resetErrors();
this.searchForm = this.fb.group({
//numero: ['', Validators.required]
numero: ''
numero: '',
});
}
@@ -116,7 +172,7 @@ export class JumpTableComponent implements OnChanges, OnDestroy, AfterContentChe
ngOnDestroy() {
this._jumps.unsubscribe();
this._subscriptions.forEach(subscription => {
this._subscriptions.forEach((subscription) => {
subscription.unsubscribe();
});
}
@@ -139,7 +195,7 @@ export class JumpTableComponent implements OnChanges, OnDestroy, AfterContentChe
if (this.limit) {
this._query.filters.limit = this.limit;
this._query.filters.offset = (this.limit * (this._currentPage - 1));
this._query.filters.offset = this.limit * (this._currentPage - 1);
} else {
this._query.filters.limit = 0;
this._query.filters.offset = 0;
@@ -172,7 +228,7 @@ export class JumpTableComponent implements OnChanges, OnDestroy, AfterContentChe
},
error: (err) => {
this.errors = err;
}
},
});
}
@@ -185,97 +241,114 @@ export class JumpTableComponent implements OnChanges, OnDestroy, AfterContentChe
//config.filters.dateRangeEnd = `${year}-12-31 23:59:59`;
config.filters.dateRangeEnd = '2024-12-31 23:59:59';
//console.log(config.filters);
const subscription: Subscription = this._jumpsService.getAllByDay(config)
.pipe(take(1))
.subscribe({
next: (days) => {
this._resetErrors();
//console.log('getAllByDay : ', days);
days.forEach(day => {
this.loadSkydiverIdJumps(day, config);
});
},
error: (err) => {
this.errors = err;
}
});
const subscription: Subscription = this._jumpsService
.getAllByDay(config)
.pipe(take(1))
.subscribe({
next: (days) => {
this._resetErrors();
//console.log('getAllByDay : ', days);
days.forEach((day) => {
this.loadSkydiverIdJumps(day, config);
});
},
error: (err) => {
this.errors = err;
},
});
this._subscriptions.push(subscription);
}
loadSkydiverIdJumps(day: JumpByDay, config: JumpListConfig) {
config.filters.dateRangeStart = `${day.jumps[0].date!.substring(0, 10)} 00:00:00`;
config.filters.dateRangeEnd = `${day.jumps[0].date!.substring(0, 10)} 23:59:59`;
const subscription: Subscription = this._jumpsService.getAllFromSkydiverIdApi(config)
.pipe(take(1))
.subscribe({
next: (data) => {
if (data.items.length) {
const diff = day.count - data.items.length;
if (diff < 0) {
console.error(`${diff} ${diff > 1 ? 'données' : 'donnée'} altimètre de trop le ${day.jumps[0].date!.substring(0, 10)}`);
} else {
if (diff > 0) {
console.error(`${diff}/${day.count} ${diff > 1 ? 'données altimètre manquantes' : 'donnée altimètre manquante'} le ${day.jumps[0].date!.substring(0, 10)}`, day.jumps, data.items);
}
console.log(`${day.count} ${day.count > 1 ? 'sauts' : 'saut'} le ${data.items[0].date!.substring(0, 10)}`, day.jumps.sort((a, b) => b.numero! - a.numero!), data.items);
data.items.map((jump, index) => {
const file: JumpFile = {
name: jump.name,
path: `/Volumes/Storage/Skydive/X2_Logs/${day.jumps[index].date!.substring(0, 4)}/`,
type: JumpFileType.CSV
} as JumpFile;
this._subscriptions.push(
this._jumpsService.saveX2Data(day.jumps[index].slug!, file, jump)
.pipe(take(1))
.subscribe({
next: (jump) => {
this._resetErrors();
console.log(`Le fichier ${file.name} a été ajouté au saut n°${jump.numero} !`, 'OK');
},
error: (err) => {
this.errors = err;
}
})
const subscription: Subscription = this._jumpsService
.getAllFromSkydiverIdApi(config)
.pipe(take(1))
.subscribe({
next: (data) => {
if (data.items.length) {
const diff = day.count - data.items.length;
if (diff < 0) {
console.error(
`${diff} ${diff > 1 ? 'données' : 'donnée'} altimètre de trop le ${day.jumps[0].date!.substring(0, 10)}`,
);
return jump;
});
} else {
if (diff > 0) {
console.error(
`${diff}/${day.count} ${diff > 1 ? 'données altimètre manquantes' : 'donnée altimètre manquante'} le ${day.jumps[0].date!.substring(0, 10)}`,
day.jumps,
data.items,
);
}
console.log(
`${day.count} ${day.count > 1 ? 'sauts' : 'saut'} le ${data.items[0].date!.substring(0, 10)}`,
day.jumps.sort((a, b) => b.numero! - a.numero!),
data.items,
);
data.items.map((jump, index) => {
const file: JumpFile = {
name: jump.name,
path: `/Volumes/Storage/Skydive/X2_Logs/${day.jumps[index].date!.substring(0, 4)}/`,
type: JumpFileType.CSV,
} as JumpFile;
this._subscriptions.push(
this._jumpsService
.saveX2Data(day.jumps[index].slug!, file, jump)
.pipe(take(1))
.subscribe({
next: (jump) => {
this._resetErrors();
console.log(
`Le fichier ${file.name} a été ajouté au saut n°${jump.numero} !`,
'OK',
);
},
error: (err) => {
this.errors = err;
},
}),
);
return jump;
});
}
//console.log(`${day.count} ${day.count > 1 ? 'sauts' : 'saut'} le ${day.jumps[0].date!.substring(0, 10)}`);
//console.log(`${data.items.length} ${data.items.length > 1 ? 'sauts' : 'saut'} le ${data.items[0].date!.substring(0, 10)}`, data);
} else {
console.info('Aucune données altimètre pour le ', day.jumps[0].date!.substring(0, 10));
}
//console.log(`${day.count} ${day.count > 1 ? 'sauts' : 'saut'} le ${day.jumps[0].date!.substring(0, 10)}`);
//console.log(`${data.items.length} ${data.items.length > 1 ? 'sauts' : 'saut'} le ${data.items[0].date!.substring(0, 10)}`, data);
} else {
console.info('Aucune données altimètre pour le ', day.jumps[0].date!.substring(0, 10));
}
},
error: (err) => {
console.error('getAllFromSkydiverIdApi error');
this.errors = err;
}
});
},
error: (err) => {
console.error('getAllFromSkydiverIdApi error');
this.errors = err;
},
});
this._subscriptions.push(subscription);
}
updateJumps(jumps: Array<Jump>) {
jumps.map(jump => {
jumps.map((jump) => {
jump.files = [];
if (jump.dossier !== "" && jump.video !== "") {
if (jump.dossier !== '' && jump.video !== '') {
const file: JumpFile = {
name: jump.video!,
path: jump.dossier!,
type: JumpFileType.VIDEO
type: JumpFileType.VIDEO,
} as JumpFile;
this._subscriptions.push(
this._jumpsService.saveFile(jump.slug, file)
.pipe(take(1))
.subscribe({
next: (file) => {
this._resetErrors();
jump.files.push(file);
//console.log(`Le fichier ${file.name} a été ajouté au saut n°${jump.numero} !`, 'OK');
},
error: (err) => {
this.errors = err;
}
})
this._jumpsService
.saveFile(jump.slug, file)
.pipe(take(1))
.subscribe({
next: (file) => {
this._resetErrors();
jump.files.push(file);
//console.log(`Le fichier ${file.name} a été ajouté au saut n°${jump.numero} !`, 'OK');
},
error: (err) => {
this.errors = err;
},
}),
);
}
return jump;
@@ -283,26 +356,30 @@ export class JumpTableComponent implements OnChanges, OnDestroy, AfterContentChe
}
getKmlJumpFiles(jumps: Array<Jump>) {
jumps.map(jump => {
jumps.map((jump) => {
if (jump.x2data !== null) {
//console.log(`Le fichier ${jump.x2data.name} existe pour le saut n°${jump.numero} !`, `https://skydiver.id/api/jump/${jump.x2data.id}/kml`);
const file: JumpFile = {
name: jump.x2data.name.substring(0, -4) + '.kml',
path: `/X2_Kmls/${jump.date.substring(0, 4)}/`,
type: JumpFileType.KML
type: JumpFileType.KML,
} as JumpFile;
this._subscriptions.push(
this._jumpsService.saveKml(jump.slug, file)
.pipe(take(1))
.subscribe({
next: (file) => {
this._resetErrors();
console.log(`Le fichier ${file.path}${file.name} a été ajouté au saut n°${jump.numero} !`, 'OK');
},
error: (err) => {
this.errors = err;
}
})
this._jumpsService
.saveKml(jump.slug, file)
.pipe(take(1))
.subscribe({
next: (file) => {
this._resetErrors();
console.log(
`Le fichier ${file.path}${file.name} a été ajouté au saut n°${jump.numero} !`,
'OK',
);
},
error: (err) => {
this.errors = err;
},
}),
);
}
return jump;
@@ -312,50 +389,53 @@ export class JumpTableComponent implements OnChanges, OnDestroy, AfterContentChe
deleteJump(slug: string) {
this.isDeleting = true;
this._subscriptions.push(
this._jumpsService.destroy(slug)
.pipe(take(1))
.subscribe(() => {
this.router.navigateByUrl('/');
})
this._jumpsService
.destroy(slug)
.pipe(take(1))
.subscribe(() => {
this.router.navigateByUrl('/');
}),
);
}
openDeleteDialog(jump: Jump): void {
const dialogRef = this.dialog.open(JumpDeleteDialogComponent, {
width: '60vw',
data: jump
data: jump,
});
this._subscriptions.push(
dialogRef.afterClosed()
.pipe(take(1))
.subscribe(result => {
if (result != undefined) {
this._onDelete(result.slug);
}
})
dialogRef
.afterClosed()
.pipe(take(1))
.subscribe((result) => {
if (result != undefined) {
this._onDelete(result.slug);
}
}),
);
}
openEditDialog(jump: Jump): void {
const dialogRef = this.dialog.open(JumpEditDialogComponent, {
width: '70vw',
data: jump
data: jump,
});
this._subscriptions.push(
dialogRef.afterClosed()
.pipe(take(1))
.subscribe(result => {
if (result != undefined) {
this._onEdit(result);
}
})
dialogRef
.afterClosed()
.pipe(take(1))
.subscribe((result) => {
if (result != undefined) {
this._onEdit(result);
}
}),
);
}
openViewDialog(jump: Jump): void {
const dialogRef = this.dialog.open(JumpViewDialogComponent, {
width: '60vw',
data: jump
data: jump,
});
dialogRef.afterClosed();
}
@@ -379,20 +459,21 @@ export class JumpTableComponent implements OnChanges, OnDestroy, AfterContentChe
try {
this.isDeleting = true;
this._subscriptions.push(
this._jumpsService.destroy(slug)
.pipe(take(1))
.subscribe({
next: () => {
this._resetErrors();
this._openSnackBar(`Le saut a été supprimé !`, 'OK');
this.runQuery();
this.tableRefresh = !this.tableRefresh;
this._jumpTableService.updateTableRefresh(this.tableRefresh);
},
error: (err) => {
this.errors = err;
}
})
this._jumpsService
.destroy(slug)
.pipe(take(1))
.subscribe({
next: () => {
this._resetErrors();
this._openSnackBar(`Le saut a été supprimé !`, 'OK');
this.runQuery();
this.tableRefresh = !this.tableRefresh;
this._jumpTableService.updateTableRefresh(this.tableRefresh);
},
error: (err) => {
this.errors = err;
},
}),
);
} catch (error) {
console.error(error);
@@ -403,21 +484,22 @@ export class JumpTableComponent implements OnChanges, OnDestroy, AfterContentChe
try {
this.isSubmitting = true;
this._subscriptions.push(
this._jumpsService.update(jump)
.pipe(take(1))
.subscribe({
next: (jump) => {
this._resetErrors();
this._openSnackBar(`Le saut n°${jump.numero} a été mis à jour !`, 'OK');
this.runQuery();
this.tableRefresh = !this.tableRefresh;
this._jumpTableService.updateTableRefresh(this.tableRefresh);
},
error: (err) => {
this.errors = err;
this.isSubmitting = false;
}
})
this._jumpsService
.update(jump)
.pipe(take(1))
.subscribe({
next: (jump) => {
this._resetErrors();
this._openSnackBar(`Le saut n°${jump.numero} a été mis à jour !`, 'OK');
this.runQuery();
this.tableRefresh = !this.tableRefresh;
this._jumpTableService.updateTableRefresh(this.tableRefresh);
},
error: (err) => {
this.errors = err;
this.isSubmitting = false;
},
}),
);
} catch (error) {
console.error(error);
@@ -468,5 +550,4 @@ export class JumpTableComponent implements OnChanges, OnDestroy, AfterContentChe
}))
}
*/
}
src/app/components/shared/herowars-components/fortification-card-content/fortification-card-content.component.ts
+2 -6
View File
@@ -12,11 +12,7 @@ import { HWGuildWarFortification, HWMember } from '@models';
selector: 'app-fortification-card-content',
templateUrl: './fortification-card-content.component.html',
styleUrl: './fortification-card-content.component.scss',
standalone: true,
imports: [
DecimalPipe,
MatCardModule, MatChipsModule, MatIconModule
]
imports: [DecimalPipe, MatCardModule, MatChipsModule, MatIconModule],
})
export class FortificationCardContentComponent {
public data: HWGuildWarFortification = {} as HWGuildWarFortification;
@@ -80,4 +76,4 @@ export class FortificationCardContentComponent {
: [];
}
*/
}
}
src/app/components/shared/herowars-components/guild-card/guild-card.component.ts
+2 -6
View File
@@ -10,13 +10,9 @@ import guildData from 'src/files-data/hw-guild-data.json'; // page Membres
@Component({
selector: 'app-guild-card',
standalone: true,
imports: [
DatePipe, DecimalPipe,
MatCardModule, MatDividerModule, MatIconModule
],
imports: [DatePipe, DecimalPipe, MatCardModule, MatDividerModule, MatIconModule],
templateUrl: './guild-card.component.html',
styleUrl: './guild-card.component.scss'
styleUrl: './guild-card.component.scss',
})
export class GuildCardComponent implements OnInit {
public guildData: HWGuildData = {} as HWGuildData;
src/app/components/shared/herowars-components/guildraids-log/guildraids-log.component.ts
+49 -36
View File
@@ -23,21 +23,29 @@ export class StepperIntl extends MatStepperIntl {
}
@Component({
selector: 'app-guildraids-log',
standalone: true,
providers: [
{
provide: STEPPER_GLOBAL_OPTIONS,
useValue: {displayDefaultIndicatorType: false},
provide: STEPPER_GLOBAL_OPTIONS,
useValue: { displayDefaultIndicatorType: false },
},
],
imports: [
DatePipe, DecimalPipe, FormsModule, ReactiveFormsModule,
MatButtonModule, MatCardModule, MatDatepickerModule, MatDividerModule,
MatFormFieldModule, MatIconModule, MatInputModule, MatTooltipModule,
MatStepperModule
DatePipe,
DecimalPipe,
FormsModule,
ReactiveFormsModule,
MatButtonModule,
MatCardModule,
MatDatepickerModule,
MatDividerModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
MatTooltipModule,
MatStepperModule,
],
templateUrl: './guildraids-log.component.html',
styleUrl: './guildraids-log.component.scss'
styleUrl: './guildraids-log.component.scss',
})
export class GuildraidsLogComponent implements OnInit {
public now: Date;
@@ -49,18 +57,16 @@ export class GuildraidsLogComponent implements OnInit {
private _matStepperIntl = inject(MatStepperIntl);
private _guildRaids: HWGuildRaid[] = [];
private _raidStages: HWGuildRaidStage[] = [
{num: 1, name: 'Stage 1', maxPower: 350000, duration: 8, startTime: 0, endTime: 0},
{num: 2, name: 'Stage 2', maxPower: 550000, duration: 8, startTime: 0, endTime: 0},
{num: 3, name: 'Stage 3', maxPower: 0, duration: 0, startTime: 0, endTime: 0}
{ num: 1, name: 'Stage 1', maxPower: 350000, duration: 8, startTime: 0, endTime: 0 },
{ num: 2, name: 'Stage 2', maxPower: 550000, duration: 8, startTime: 0, endTime: 0 },
{ num: 3, name: 'Stage 3', maxPower: 0, duration: 0, startTime: 0, endTime: 0 },
];
@Input() set members(value: HWMember[]) {
this.guildMembers = value;
}
constructor(
private fb: FormBuilder
) {
constructor(private fb: FormBuilder) {
this.now = new Date();
const raidsDate = new Date();
const startHour = 4;
@@ -71,7 +77,7 @@ export class GuildraidsLogComponent implements OnInit {
maxPower: 350,
duration: 8,
startTime: [raidsDate.getTime(), Validators.required],
endTime: 0
endTime: 0,
};
this.raidsForm = this.fb.group(controlsConfig);
}
@@ -82,11 +88,11 @@ export class GuildraidsLogComponent implements OnInit {
raidsDate.setHours(startHour, 0, 0, 0);
this._raidStages[0].startTime = raidsDate.getTime();
raidsDate.setHours((startHour + this._raidStages[0].duration), 0, 0, 0);
raidsDate.setHours(startHour + this._raidStages[0].duration, 0, 0, 0);
this._raidStages[0].endTime = raidsDate.getTime();
this._raidStages[1].startTime = raidsDate.getTime();
raidsDate.setHours((startHour + this._raidStages[0].duration + this._raidStages[1].duration), 0, 0, 0);
raidsDate.setHours(startHour + this._raidStages[0].duration + this._raidStages[1].duration, 0, 0, 0);
this._raidStages[1].endTime = raidsDate.getTime();
this._raidStages[2].startTime = raidsDate.getTime();
@@ -101,19 +107,19 @@ export class GuildraidsLogComponent implements OnInit {
data.raids = [];
data.raidsInfo = {
variationAvg: 0,
variationSum: 0
variationSum: 0,
};
return data;
});
for (const member of Object.entries(guildRaids)) {
const index = this.guildMembers.findIndex(item => item.id === member[0]);
const index = this.guildMembers.findIndex((item) => item.id === member[0]);
const memberRaids: HWGuildRaid[] = [];
if (index !== -1) {
for (const data of Object.entries(member[1])) {
const raid: HWGuildRaid = {} as HWGuildRaid;
Object.assign(raid, data[1]);
const startTime: number = (parseInt(raid.startTime) * 1000);
const startTime: number = parseInt(raid.startTime) * 1000;
if (this._guildRaids.length === 0) {
this._setStagesTime(startTime);
}
@@ -139,14 +145,14 @@ export class GuildraidsLogComponent implements OnInit {
const attacker: HWGuildRaidAttacker = {
id: item[1].id,
power: item[1].power,
type: item[1].type
type: item[1].type,
} as HWGuildRaidAttacker;
raid.power += attacker.power;
raid.attackers.push(attacker);
}
let percent = 0;
if (raid.stage.maxPower > 0) {
percent = (((raid.power / raid.stage.maxPower) - 1) * 100);
percent = (raid.power / raid.stage.maxPower - 1) * 100;
}
let color = 'default';
let value = 0;
@@ -158,12 +164,12 @@ export class GuildraidsLogComponent implements OnInit {
} else if (percent > 5) {
color = 'orange';
}
value = (raid.power - raid.stage.maxPower)
value = raid.power - raid.stage.maxPower;
}
raid.variation = {
value: value,
percent: percent,
color: color
color: color,
};
raid.tooltip = Math.floor(raid.variation.value / 1000) + 'k';
//console.log(raid.attackers);
@@ -172,17 +178,24 @@ export class GuildraidsLogComponent implements OnInit {
this._guildRaids.push(raid);
}
this.guildMembers[index].raids = memberRaids;
const varSum = memberRaids.reduce((accumulator, currentValue) => accumulator + currentValue.variation.percent, 0);
const varSum = memberRaids.reduce(
(accumulator, currentValue) => accumulator + currentValue.variation.percent,
0,
);
this.guildMembers[index].raidsInfo = {
variationAvg: (varSum / memberRaids.length),
variationSum: varSum
variationAvg: varSum / memberRaids.length,
variationSum: varSum,
};
}
}
this._guildRaids.sort((a, b) => (a.startTime < b.startTime ? -1 : 1)).map((data) => {
return data;
});
this.guildMembers.sort((a, b) => (a.raidsInfo.variationAvg > b.raidsInfo.variationAvg ? -1 : 1));/*.map((data) => {
this._guildRaids
.sort((a, b) => (a.startTime < b.startTime ? -1 : 1))
.map((data) => {
return data;
});
this.guildMembers.sort((a, b) =>
a.raidsInfo.variationAvg > b.raidsInfo.variationAvg ? -1 : 1,
); /*.map((data) => {
console.log(data.name, data.raidsInfo.variationAvg, data.raids.length);
return data;
});*/
@@ -190,11 +203,13 @@ export class GuildraidsLogComponent implements OnInit {
public getMembers(): HWMember[] {
//return this.guildMembers;
return this.minVarPct ? this.guildMembers.filter(member => (member.raidsInfo.variationAvg >= this.minVarPct) === true) : this.guildMembers;
return this.minVarPct
? this.guildMembers.filter((member) => member.raidsInfo.variationAvg >= this.minVarPct === true)
: this.guildMembers;
}
public getRaidsLog(stageNum: number): HWGuildRaid[] {
return this._guildRaids.filter(raid => (raid.stage.num === stageNum) === true);
return this._guildRaids.filter((raid) => (raid.stage.num === stageNum) === true);
}
public getStagesTime(stageNum: number): HWGuildRaidStage {
@@ -208,7 +223,5 @@ export class GuildraidsLogComponent implements OnInit {
}
}
submitForm(): void {
}
submitForm(): void {}
}
src/app/components/shared/herowars-components/guildwar-attack/guildwar-attack.component.ts
+44 -42
View File
@@ -6,26 +6,26 @@ import { MatIconModule } from '@angular/material/icon';
import { FortificationCardContentComponent } from '../fortification-card-content/fortification-card-content.component';
import {
HWGuildWarEnemySlot, HWGuildWarEnemyTeam, HWGuildWarFortification,
HWGuildWarHeroTeam, HWGuildWarTitanTeam, HWGuildWarSlots, HWMember
HWGuildWarEnemySlot,
HWGuildWarEnemyTeam,
HWGuildWarFortification,
HWGuildWarHeroTeam,
HWGuildWarTitanTeam,
HWGuildWarSlots,
HWMember,
} from '@models';
/* JSON data */
import guildWarData from 'src/files-data/hw-guild-war.json'; // page Overview -> Statistics | page Guild War -> Guild War
import guildWarInfo from 'src/files-data/hw-guild-war-info.json'; // page Guild War -> Guild War
import guildWarData from 'src/files-data/hw-guild-war.json'; // page Overview -> Statistics | page Guild War -> Guild War
import guildWarInfo from 'src/files-data/hw-guild-war-info.json'; // page Guild War -> Guild War
//import guildWarLog from 'src/files-data/hw-guild-war-log.json'; // page Guild War -> Guild War
import guildWarSlots from 'src/files-data/hw-guild-war-slots.json'; // no pages
@Component({
selector: 'app-guildwar-attack',
standalone: true,
imports: [
DatePipe, DecimalPipe,
MatCardModule, MatDividerModule, MatIconModule,
FortificationCardContentComponent
],
imports: [DatePipe, DecimalPipe, MatCardModule, MatDividerModule, MatIconModule, FortificationCardContentComponent],
templateUrl: './guildwar-attack.component.html',
styleUrl: './guildwar-attack.component.scss'
styleUrl: './guildwar-attack.component.scss',
})
export class GuildwarAttackComponent implements OnInit {
private _championsByPower: HWMember[] = [];
@@ -35,13 +35,14 @@ export class GuildwarAttackComponent implements OnInit {
public title = 'Fortifications';
public subtitle = 'Guild War Attack';
public now = new Date();
public warInfo: { day: number, clanEnemyName: string, endTime: number, nextWarTime: number, nextLockTime: number } = {
day: 0,
clanEnemyName: '',
endTime: 0,
nextWarTime: 0,
nextLockTime: 0
};
public warInfo: { day: number; clanEnemyName: string; endTime: number; nextWarTime: number; nextLockTime: number } =
{
day: 0,
clanEnemyName: '',
endTime: 0,
nextWarTime: 0,
nextLockTime: 0,
};
@Input() set members(value: HWMember[]) {
this.guildMembers = value;
@@ -50,9 +51,9 @@ export class GuildwarAttackComponent implements OnInit {
ngOnInit() {
this.warInfo.day = parseInt(guildWarInfo.day);
this.warInfo.clanEnemyName = guildWarInfo.enemyClan.title;
this.warInfo.endTime = (guildWarInfo.endTime * 1000);
this.warInfo.nextWarTime = (guildWarInfo.nextWarTime * 1000);
this.warInfo.nextLockTime = (guildWarInfo.nextLockTime * 1000);
this.warInfo.endTime = guildWarInfo.endTime * 1000;
this.warInfo.nextWarTime = guildWarInfo.nextWarTime * 1000;
this.warInfo.nextLockTime = guildWarInfo.nextLockTime * 1000;
this._setChampionsByPower();
this._setEnemies();
}
@@ -81,7 +82,7 @@ export class GuildwarAttackComponent implements OnInit {
count: count,
teams: teams,
positions: this._enemySlots,
slots: slots[name]
slots: slots[name],
};
}
@@ -89,10 +90,10 @@ export class GuildwarAttackComponent implements OnInit {
const teams: HWMember[] = [];
const slots: HWGuildWarSlots = guildWarSlots.slots;
let count = 0;
slots[name].forEach(slot => {
slots[name].forEach((slot) => {
let enemies: HWMember[] = [];
let team: HWMember = {} as HWMember;
enemies = this.guildEnemies.filter(enemy => parseInt(enemy.id) === this._enemySlots[slot]);
enemies = this.guildEnemies.filter((enemy) => parseInt(enemy.id) === this._enemySlots[slot]);
if (enemies.length) {
team = enemies[0];
teams.push(team);
@@ -115,7 +116,7 @@ export class GuildwarAttackComponent implements OnInit {
count: count,
teams: teams,
positions: this._enemySlots,
slots: slots[name]
slots: slots[name],
};
}
@@ -125,21 +126,21 @@ export class GuildwarAttackComponent implements OnInit {
warriors.push(parseInt(data[0]));
}
for (const data of Object.entries(guildWarInfo.enemyClanMembers)) {
const enemy: HWMember = {} as HWMember;
Object.assign(enemy, data[1]);
if (warriors.indexOf(parseInt(enemy.id)) !== -1) {
enemy.champion = true;
} else {
enemy.champion = false;
}
enemy.heroes = { power: 0, teams: []};
enemy.titans = { power: 0, teams: []};
const enemy: HWMember = {} as HWMember;
Object.assign(enemy, data[1]);
if (warriors.indexOf(parseInt(enemy.id)) !== -1) {
enemy.champion = true;
} else {
enemy.champion = false;
}
enemy.heroes = { power: 0, teams: [] };
enemy.titans = { power: 0, teams: [] };
//console.log(guildWarInfo.enemySlots);
//console.log(guildWarInfo.enemySlots);
this.guildEnemies.push(enemy);
this.guildEnemies.push(enemy);
}
for (const data of Object.entries(guildWarInfo.enemySlots)) {
const ennemySlot: HWGuildWarEnemySlot = {} as HWGuildWarEnemySlot;
Object.assign(ennemySlot, data[1]);
@@ -187,13 +188,15 @@ export class GuildwarAttackComponent implements OnInit {
return false;
});
}
this.guildEnemies.sort((a, b) => ((a.heroes.power + a.titans.power) > (b.heroes.power + b.titans.power) ? -1 : 1)); // Descending
this.guildEnemies.sort((a, b) =>
a.heroes.power + a.titans.power > b.heroes.power + b.titans.power ? -1 : 1,
); // Descending
}
}
private _setChampionsByPower(): void {
for (const [teamId, teamValues] of Object.entries(guildWarData.teams)) {
const index = this.guildMembers.findIndex(member => member.id === teamId);
const index = this.guildMembers.findIndex((member) => member.id === teamId);
if (index === -1) continue;
let totalHeroPower = 0;
let totalTitanPower = 0;
@@ -211,8 +214,8 @@ export class GuildwarAttackComponent implements OnInit {
this.guildMembers[index].heroes = { power: totalHeroPower, teams: heroes };
this.guildMembers[index].titans = { power: totalTitanPower, teams: titans };
}
this.guildMembers.sort((a, b) => ((a.heroes.power + a.titans.power) > (b.heroes.power + b.titans.power) ? -1 : 1)); // Descending
this._championsByPower = this.guildMembers.filter(member => member.champion === true);
this.guildMembers.sort((a, b) => (a.heroes.power + a.titans.power > b.heroes.power + b.titans.power ? -1 : 1)); // Descending
this._championsByPower = this.guildMembers.filter((member) => member.champion === true);
}
getEnemies(): HWMember[] {
@@ -282,5 +285,4 @@ export class GuildwarAttackComponent implements OnInit {
//return this._getFortification(indexes, 'titans', 'Spring Of Elements');
return this._getDefense('titans', 'Spring Of Elements');
}
}
src/app/components/shared/herowars-components/guildwar-champions/guildwar-champions.component.ts
+4 -8
View File
@@ -9,13 +9,9 @@ import { HWMember } from '@models';
@Component({
selector: 'app-guildwar-champions',
standalone: true,
imports: [
DecimalPipe,
MatCardModule, MatDividerModule, MatIconModule
],
imports: [DecimalPipe, MatCardModule, MatDividerModule, MatIconModule],
templateUrl: './guildwar-champions.component.html',
styleUrl: './guildwar-champions.component.scss'
styleUrl: './guildwar-champions.component.scss',
})
export class GuildwarChampionsComponent implements OnInit {
private _championsByPower: HWMember[] = [];
@@ -39,13 +35,13 @@ export class GuildwarChampionsComponent implements OnInit {
this.color = 'navy';
this.subtitle = 'heroes power';
this.guildMembers.sort((a, b) => (a.heroes.power > b.heroes.power ? -1 : 1)); // Descending
this._championsByPower = this.guildMembers.filter(member => member.champion === true);
this._championsByPower = this.guildMembers.filter((member) => member.champion === true);
break;
case 'titans':
this.color = 'purple';
this.subtitle = 'titans power';
this.guildMembers.sort((a, b) => (a.titans.power > b.titans.power ? -1 : 1)); // Descending
this._championsByPower = this.guildMembers.filter(member => member.champion === true);
this._championsByPower = this.guildMembers.filter((member) => member.champion === true);
break;
default:
break;
src/app/components/shared/herowars-components/guildwar-defence/guildwar-defence.component.ts
+6 -10
View File
@@ -9,18 +9,14 @@ import { FortificationCardContentComponent } from '../fortification-card-content
import { HWGuildWarFortification, HWGuildWarHeroTeam, HWGuildWarSlots, HWGuildWarTitanTeam, HWMember } from '@models';
/* JSON data */
import guildWarData from 'src/files-data/hw-guild-war.json'; // page Overview -> Statistics | page Guild War -> Guild War
import guildWarData from 'src/files-data/hw-guild-war.json'; // page Overview -> Statistics | page Guild War -> Guild War
import guildWarSlots from 'src/files-data/hw-guild-war-slots.json'; // no pages
@Component({
selector: 'app-guildwar-defence',
standalone: true,
imports: [
MatCardModule, MatDividerModule, MatIconModule,
FortificationCardContentComponent
],
imports: [MatCardModule, MatDividerModule, MatIconModule, FortificationCardContentComponent],
templateUrl: './guildwar-defence.component.html',
styleUrl: './guildwar-defence.component.scss'
styleUrl: './guildwar-defence.component.scss',
})
export class GuildwarDefenceComponent implements OnInit {
private _championsByPower: HWMember[] = [];
@@ -40,7 +36,7 @@ export class GuildwarDefenceComponent implements OnInit {
ngOnInit() {
for (const [teamId, teamValues] of Object.entries(guildWarData.teams)) {
const index = this.guildMembers.findIndex(member => member.id === teamId);
const index = this.guildMembers.findIndex((member) => member.id === teamId);
if (index === -1) continue;
let totalHeroPower = 0;
let totalTitanPower = 0;
@@ -75,7 +71,7 @@ export class GuildwarDefenceComponent implements OnInit {
default:
break;
}
this._championsByPower = this.guildMembers.filter(member => member.champion === true);
this._championsByPower = this.guildMembers.filter((member) => member.champion === true);
}
private _getFortification(indexes: number[], type: string, name: string): HWGuildWarFortification {
@@ -104,7 +100,7 @@ export class GuildwarDefenceComponent implements OnInit {
count: count,
teams: teams,
positions: this._championSlots,
slots: slots[name]
slots: slots[name],
};
}
src/app/components/shared/herowars-components/guildwar-teams/guildwar-teams.component.ts
+10 -13
View File
@@ -10,13 +10,9 @@ import guildWarData from 'src/files-data/hw-guild-war.json'; // page Overview ->
@Component({
selector: 'app-guildwar-teams',
standalone: true,
imports: [
DecimalPipe,
MatCardModule, MatDividerModule, MatIconModule
],
imports: [DecimalPipe, MatCardModule, MatDividerModule, MatIconModule],
templateUrl: './guildwar-teams.component.html',
styleUrl: './guildwar-teams.component.scss'
styleUrl: './guildwar-teams.component.scss',
})
export class GuildwarTeamsComponent implements OnInit {
private _championsByPower: HWMember[] = [];
@@ -33,8 +29,8 @@ export class GuildwarTeamsComponent implements OnInit {
}
ngOnInit() {
this.guildMembers.sort((a, b) => (((a.heroes.power + a.titans.power) / 2) > ((b.heroes.power + b.titans.power) / 2) ? -1 : 1))
this.guildMembers
.sort((a, b) => ((a.heroes.power + a.titans.power) / 2 > (b.heroes.power + b.titans.power) / 2 ? -1 : 1))
.map((data) => {
/*
this.guildTotalHeroesPower += data.heroes.power;
@@ -47,7 +43,7 @@ export class GuildwarTeamsComponent implements OnInit {
});
for (const [teamId, teamValues] of Object.entries(guildWarData.teams)) {
const index = this._championsByPower.findIndex(member => member.id === teamId);
const index = this._championsByPower.findIndex((member) => member.id === teamId);
if (index === -1) continue;
let totalHeroPower = 0;
let totalTitanPower = 0;
@@ -66,14 +62,15 @@ export class GuildwarTeamsComponent implements OnInit {
this._championsByPower[index].titans = { power: totalTitanPower, teams: titans };
this.guildTotalHeroesPower += totalHeroPower;
this.guildTotalTitansPower += totalTitanPower;
this._championsByPower[index].rewards = Math.floor((this._championsByPower[index].scoreGifts + this._championsByPower[index].warGifts));
this._championsByPower[index].rewards = Math.floor(
this._championsByPower[index].scoreGifts + this._championsByPower[index].warGifts,
);
}
this.guildAverageHeroesPower = Math.floor((this.guildTotalHeroesPower / this._championsByPower.length));
this.guildAverageTitansPower = Math.floor((this.guildTotalTitansPower / this._championsByPower.length));
this.guildAverageHeroesPower = Math.floor(this.guildTotalHeroesPower / this._championsByPower.length);
this.guildAverageTitansPower = Math.floor(this.guildTotalTitansPower / this._championsByPower.length);
}
getChampionsByPower(): HWMember[] {
return this._championsByPower;
}
}
src/app/components/shared/herowars-components/members-statistics/members-statistics.component.ts
+120 -62
View File
@@ -7,76 +7,128 @@ import { MatIconModule } from '@angular/material/icon';
import { HWActivityStat, HWGuildClan, HWGuildData, HWMember, HWMemberStat, HWWeekStat } from '@models/herowars';
import { UtilitiesService } from '@services';
import guildData from 'src/files-data/hw-guild-data.json'; // page Membres
import guildData from 'src/files-data/hw-guild-data.json'; // page Membres
import guildStatistics from 'src/files-data/hw-guild-statistics.json'; // page Overview -> Statistics
@Component({
selector: 'app-members-statistics',
standalone: true,
imports: [
DatePipe, DecimalPipe,
MatCardModule, MatDividerModule, MatIconModule
],
imports: [DatePipe, DecimalPipe, MatCardModule, MatDividerModule, MatIconModule],
templateUrl: './members-statistics.component.html',
styleUrl: './members-statistics.component.scss'
styleUrl: './members-statistics.component.scss',
})
export class MembersStatisticsComponent implements OnInit {
public guildMembers: HWMember[] = [];
public title = 'Members';
public subtitle = 'statistics';
public daysToWarn = 1;
public guildSumAverages: HWActivityStat = { activity: 0, prestige: 0, titanite: 0, war: 0, adventure: 0, gifts: 0, score: 0, scoreGifts: 0, warGifts: 0, rewards: 0 };
public guildTodayAverages: HWActivityStat = { activity: 0, prestige: 0, titanite: 0, war: 0, adventure: 0, gifts: 0, score: 0, scoreGifts: 0, warGifts: 0, rewards: 0 };
public guildSumTotal: HWActivityStat = { activity: 0, prestige: 0, titanite: 0, war: 0, adventure: 0, gifts: 0, score: 0, scoreGifts: 0, warGifts: 0, rewards: 0 };
public guildTodayTotal: HWActivityStat = { activity: 0, prestige: 0, titanite: 0, war: 0, adventure: 0, gifts: 0, score: 0, scoreGifts: 0, warGifts: 0, rewards: 0 };
public guildSumAverages: HWActivityStat = {
activity: 0,
prestige: 0,
titanite: 0,
war: 0,
adventure: 0,
gifts: 0,
score: 0,
scoreGifts: 0,
warGifts: 0,
rewards: 0,
};
public guildTodayAverages: HWActivityStat = {
activity: 0,
prestige: 0,
titanite: 0,
war: 0,
adventure: 0,
gifts: 0,
score: 0,
scoreGifts: 0,
warGifts: 0,
rewards: 0,
};
public guildSumTotal: HWActivityStat = {
activity: 0,
prestige: 0,
titanite: 0,
war: 0,
adventure: 0,
gifts: 0,
score: 0,
scoreGifts: 0,
warGifts: 0,
rewards: 0,
};
public guildTodayTotal: HWActivityStat = {
activity: 0,
prestige: 0,
titanite: 0,
war: 0,
adventure: 0,
gifts: 0,
score: 0,
scoreGifts: 0,
warGifts: 0,
rewards: 0,
};
public guildData: HWGuildData = {} as HWGuildData;
private _guildClan: HWGuildClan = {} as HWGuildClan;
private _membersByName: HWMember[] = [];
private _deviations: { activity: number[], prestige: number[], titanite: number[] } = { activity: [], prestige: [], titanite: [] };
private _deviations: { activity: number[]; prestige: number[]; titanite: number[] } = {
activity: [],
prestige: [],
titanite: [],
};
@Input() set members(value: HWMember[]) {
this.guildMembers = value;
}
constructor(
private _utilitiesService: UtilitiesService
) { }
constructor(private _utilitiesService: UtilitiesService) {}
ngOnInit() {
const oneDayInSec = (24 * 60 * 60);
const oneDayInSec = 24 * 60 * 60;
const today = new Date();
const daysToKick = parseInt(guildData.clan.daysToKick);
this.daysToWarn = (parseInt(guildData.clan.daysToKick) / 2);
this.guildMembers.sort((a, b) => (a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1)).map((data) => {
const last = new Date((parseInt(data.lastLoginTime) * 1000));
const exp = new Date(last.getTime() + ((daysToKick * oneDayInSec) * 1000));
const diff = Math.floor(((exp.getTime() - today.getTime()) / 1000));
const daysLeft = Math.floor((diff / oneDayInSec));
let timeLeft = diff;
if (daysLeft >= 1) {
timeLeft = (diff - (daysLeft * oneDayInSec));
}
data.inactivity = {
daysLeft: daysLeft,
timeLeft: timeLeft,
dropDelay: `${daysLeft}d, ${this._utilitiesService.secondsToDuration(timeLeft)}`,
dropDate: Math.floor((exp.getTime() / 1000))
};
this._membersByName.push(data);
return data;
});
this.daysToWarn = parseInt(guildData.clan.daysToKick) / 2;
this.guildMembers
.sort((a, b) => (a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1))
.map((data) => {
const last = new Date(parseInt(data.lastLoginTime) * 1000);
const exp = new Date(last.getTime() + daysToKick * oneDayInSec * 1000);
const diff = Math.floor((exp.getTime() - today.getTime()) / 1000);
const daysLeft = Math.floor(diff / oneDayInSec);
let timeLeft = diff;
if (daysLeft >= 1) {
timeLeft = diff - daysLeft * oneDayInSec;
}
data.inactivity = {
daysLeft: daysLeft,
timeLeft: timeLeft,
dropDelay: `${daysLeft}d, ${this._utilitiesService.secondsToDuration(timeLeft)}`,
dropDate: Math.floor(exp.getTime() / 1000),
};
this._membersByName.push(data);
return data;
});
Object.assign(this._guildClan, guildData.clan);
this.guildData.clan = this._guildClan;
this.guildData.membersStat = guildData.membersStat;
for (const item of Object.entries(guildStatistics.stat)) {
const index = this._membersByName.findIndex(member => member.id === item[1].id);
const index = this._membersByName.findIndex((member) => member.id === item[1].id);
if (index !== -1) {
this._membersByName[index].adventureSum = item[1].adventureStat.reduce((accumulator, currentValue) => accumulator + currentValue, 0);
this._membersByName[index].clanGiftsSum = item[1].clanGifts.reduce((accumulator, currentValue) => accumulator + currentValue, 0);
this._membersByName[index].clanWarSum = item[1].clanWarStat.reduce((accumulator, currentValue) => accumulator + currentValue, 0);
this._membersByName[index].adventureSum = item[1].adventureStat.reduce(
(accumulator, currentValue) => accumulator + currentValue,
0,
);
this._membersByName[index].clanGiftsSum = item[1].clanGifts.reduce(
(accumulator, currentValue) => accumulator + currentValue,
0,
);
this._membersByName[index].clanWarSum = item[1].clanWarStat.reduce(
(accumulator, currentValue) => accumulator + currentValue,
0,
);
this.guildSumTotal.adventure += this._membersByName[index].adventureSum;
this.guildSumTotal.gifts += this._membersByName[index].clanGiftsSum;
this.guildSumTotal.war += this._membersByName[index].clanWarSum;
@@ -91,19 +143,26 @@ export class MembersStatisticsComponent implements OnInit {
for (const data of Object.entries(guildData.membersStat)) {
const stat: HWMemberStat = {} as HWMemberStat;
Object.assign(stat, data[1]);
const index = this._membersByName.findIndex(member => member.id === data[1].userId);
const index = this._membersByName.findIndex((member) => member.id === data[1].userId);
if (index !== -1) {
this._membersByName[index].stat = stat;
} else {
continue;
}
this._membersByName[index].score = (this._membersByName[index].stat.dungeonActivitySum + this._membersByName[index].stat.activitySum + this._membersByName[index].stat.prestigeSum);
this._membersByName[index].warGifts = (((guildData.clan.giftsCount / 2) * ((this._membersByName[index].clanWarSum * 10) / 100)) / 20);
this._membersByName[index].score =
this._membersByName[index].stat.dungeonActivitySum +
this._membersByName[index].stat.activitySum +
this._membersByName[index].stat.prestigeSum;
this._membersByName[index].warGifts =
((guildData.clan.giftsCount / 2) * ((this._membersByName[index].clanWarSum * 10) / 100)) / 20;
this.guildTodayTotal.activity += stat.todayActivity;
this.guildTodayTotal.prestige += stat.todayPrestige;
this.guildTodayTotal.titanite += stat.todayDungeonActivity;
this.guildTodayTotal.score += (this._membersByName[index].stat.todayDungeonActivity + this._membersByName[index].stat.todayActivity + this._membersByName[index].stat.todayPrestige);
this.guildTodayTotal.score +=
this._membersByName[index].stat.todayDungeonActivity +
this._membersByName[index].stat.todayActivity +
this._membersByName[index].stat.todayPrestige;
this.guildSumTotal.activity += stat.activitySum;
this.guildSumTotal.prestige += stat.prestigeSum;
this.guildSumTotal.titanite += stat.dungeonActivitySum;
@@ -114,26 +173,26 @@ export class MembersStatisticsComponent implements OnInit {
this._deviations.titanite.push(stat.dungeonActivitySum);
//this.guildSumTotal.warGifts += ((this._membersByName[index].score / this.guildSumTotal.score) * (guildData.clan.giftsCount / 2))
}
this.guildSumTotal.scoreGifts = (guildData.clan.giftsCount - Math.floor(this.guildSumTotal.warGifts));
this.guildTodayAverages.activity = (this.guildTodayTotal.activity / this._membersByName.length);
this.guildTodayAverages.prestige = (this.guildTodayTotal.prestige / this._membersByName.length);
this.guildTodayAverages.titanite = (this.guildTodayTotal.titanite / this._membersByName.length);
this.guildTodayAverages.score = (this.guildTodayTotal.score / this._membersByName.length);
this.guildSumAverages.activity = (this.guildSumTotal.activity / this._membersByName.length);
this.guildSumAverages.prestige = (this.guildSumTotal.prestige / this._membersByName.length);
this.guildSumAverages.titanite = (this.guildSumTotal.titanite / this._membersByName.length);
this.guildSumAverages.war = (this.guildSumTotal.war / 20);
this.guildSumAverages.adventure = (this.guildSumTotal.adventure / this._membersByName.length);
this.guildSumAverages.gifts = (this.guildSumTotal.gifts / this._membersByName.length);
this.guildSumAverages.score = (this.guildSumTotal.score / this._membersByName.length);
this.guildSumTotal.scoreGifts = guildData.clan.giftsCount - Math.floor(this.guildSumTotal.warGifts);
this.guildTodayAverages.activity = this.guildTodayTotal.activity / this._membersByName.length;
this.guildTodayAverages.prestige = this.guildTodayTotal.prestige / this._membersByName.length;
this.guildTodayAverages.titanite = this.guildTodayTotal.titanite / this._membersByName.length;
this.guildTodayAverages.score = this.guildTodayTotal.score / this._membersByName.length;
this.guildSumAverages.activity = this.guildSumTotal.activity / this._membersByName.length;
this.guildSumAverages.prestige = this.guildSumTotal.prestige / this._membersByName.length;
this.guildSumAverages.titanite = this.guildSumTotal.titanite / this._membersByName.length;
this.guildSumAverages.war = this.guildSumTotal.war / 20;
this.guildSumAverages.adventure = this.guildSumTotal.adventure / this._membersByName.length;
this.guildSumAverages.gifts = this.guildSumTotal.gifts / this._membersByName.length;
this.guildSumAverages.score = this.guildSumTotal.score / this._membersByName.length;
this._membersByName.map((data) => {
data.scoreGifts = ((data.score / this.guildSumTotal.score) * this.guildSumTotal.scoreGifts);
data.rewards = Math.floor((data.scoreGifts + data.warGifts));
data.scoreGifts = (data.score / this.guildSumTotal.score) * this.guildSumTotal.scoreGifts;
data.rewards = Math.floor(data.scoreGifts + data.warGifts);
this.guildSumTotal.rewards += data.rewards;
return data;
});
this.guildSumAverages.rewards = (this.guildSumTotal.rewards / this._membersByName.length);
this.guildSumAverages.rewards = this.guildSumTotal.rewards / this._membersByName.length;
}
getMembersByName(): HWMember[] {
@@ -143,7 +202,7 @@ export class MembersStatisticsComponent implements OnInit {
private _standardDeviation(array: number[]): number {
const n = array.length;
const mean = array.reduce((a, b) => a + b) / n;
return Math.sqrt(array.map(x => Math.pow(x - mean, 2)).reduce((a, b) => a + b) / n);
return Math.sqrt(array.map((x) => Math.pow(x - mean, 2)).reduce((a, b) => a + b) / n);
}
getStandardDeviationActivity(): number {
@@ -157,5 +216,4 @@ export class MembersStatisticsComponent implements OnInit {
getStandardDeviationTitanite(): number {
return this._standardDeviation(this._deviations.titanite);
}
}
src/app/components/shared/layout/footer.component.ts
+1 -2
View File
@@ -4,8 +4,7 @@ import { DatePipe } from '@angular/common';
@Component({
selector: 'app-layout-footer',
templateUrl: './footer.component.html',
standalone: true,
imports: [ DatePipe ]
imports: [DatePipe],
})
export class FooterComponent {
today: number = Date.now();
src/app/components/shared/layout/full.component.ts
+126 -116
View File
@@ -1,116 +1,126 @@
import { Component, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core';
import { Router, RouterOutlet, RouterModule } from '@angular/router';
import { MediaMatcher } from '@angular/cdk/layout';
import { MatBadgeModule } from '@angular/material/badge';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { MatListModule } from '@angular/material/list';
import { MatSidenavModule } from '@angular/material/sidenav';
import { MatToolbarModule } from '@angular/material/toolbar';
import { MatMenuModule } from '@angular/material/menu';
import { Observable, Subscription } from 'rxjs';
import { Menu, User } from '@models';
import { UserService } from '@services';
import { MenuItems, ShowAuthedDirective, AccordionAnchorDirective, AccordionLinkDirective, AccordionDirective } from '@components/shared';
//import { SpinnerComponent } from '@components/shared';
//import { HeaderComponent, FooterComponent } from '@components/shared/layout';
import { FooterComponent } from '@components/shared/layout';
/** @title Responsive sidenav */
@Component({
selector: 'app-full-layout',
standalone: true,
imports: [
RouterModule, RouterOutlet,
MatBadgeModule, MatButtonModule, MatDividerModule,
MatIconModule, MatListModule, MatMenuModule,
MatSidenavModule, MatToolbarModule,
ShowAuthedDirective, AccordionAnchorDirective,
AccordionLinkDirective, AccordionDirective,
FooterComponent
//HeaderComponent,
//SpinnerComponent
],
providers: [ MenuItems ],
templateUrl: 'full.component.html',
styleUrls: []
})
export class FullComponent implements OnInit, OnDestroy {
private _currentUser: Subscription = new Subscription();
private _mobileQueryListener: () => void;
mobileQuery: MediaQueryList;
currentUser: User = {} as User;
today: number = Date.now();
siteLink = 'https://www.adastra-cbd.com';
author = 'Ad Astra';
links: Menu[] = [];
visibleMenu: string[] = [];
//visibleMenu: string[] = ['products', 'page'];
//visibleMenu: string[] = ['products'];
constructor(
private router: Router,
private userService: UserService,
changeDetectorRef: ChangeDetectorRef,
media: MediaMatcher,
public menuItems: MenuItems
) {
this.mobileQuery = media.matchMedia('(min-width: 768px)');
this._mobileQueryListener = () => changeDetectorRef.detectChanges();
this.mobileQuery.addListener(this._mobileQueryListener);
}
ngOnInit() {
const user$: Observable<User> = this.userService.currentUser;
this._currentUser = user$.subscribe(
(userData) => {
this.currentUser = userData;
if (this.currentUser.role === 'Admin') {
this.links = this.menuItems.getMenuItemsAdmin();
//this.links = this.menuItems.getMenuItems();
} else {
this.links = this.menuItems.getMenuItems();
}
}
);
}
getMenuItems(): Menu[] {
return this.links;
}
isVisibleMenu(state: string): boolean {
const indexOf: number = this.visibleMenu.indexOf(state);
if (indexOf !== -1) {
return true;
} else {
return false;
}
}
ngOnDestroy(): void {
this._currentUser.unsubscribe();
this.mobileQuery.removeListener(this._mobileQueryListener);
}
goToGitHub() {
window.open('https://github.com/rampeur', '_blank');
}
toggleShowMenu(state: string) {
const indexOf: number = this.visibleMenu.indexOf(state);
if (indexOf !== -1) {
this.visibleMenu.splice(indexOf, 1);
} else {
this.visibleMenu.push(state);
}
}
logout() {
this.userService.purgeAuth();
this.router.navigateByUrl('/login');
}
}
import { Component, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core';
import { Router, RouterOutlet, RouterModule } from '@angular/router';
import { MediaMatcher } from '@angular/cdk/layout';
import { MatBadgeModule } from '@angular/material/badge';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { MatListModule } from '@angular/material/list';
import { MatSidenavModule } from '@angular/material/sidenav';
import { MatToolbarModule } from '@angular/material/toolbar';
import { MatMenuModule } from '@angular/material/menu';
import { Observable, Subscription } from 'rxjs';
import { Menu, User } from '@models';
import { UserService } from '@services';
import {
MenuItems,
ShowAuthedDirective,
AccordionAnchorDirective,
AccordionLinkDirective,
AccordionDirective,
} from '@components/shared';
//import { SpinnerComponent } from '@components/shared';
//import { HeaderComponent, FooterComponent } from '@components/shared/layout';
import { FooterComponent } from '@components/shared/layout';
/** @title Responsive sidenav */
@Component({
selector: 'app-full-layout',
imports: [
RouterModule,
RouterOutlet,
MatBadgeModule,
MatButtonModule,
MatDividerModule,
MatIconModule,
MatListModule,
MatMenuModule,
MatSidenavModule,
MatToolbarModule,
ShowAuthedDirective,
AccordionAnchorDirective,
AccordionLinkDirective,
AccordionDirective,
FooterComponent,
//HeaderComponent,
//SpinnerComponent
],
providers: [MenuItems],
templateUrl: 'full.component.html',
styleUrls: [],
})
export class FullComponent implements OnInit, OnDestroy {
private _currentUser: Subscription = new Subscription();
private _mobileQueryListener: () => void;
mobileQuery: MediaQueryList;
currentUser: User = {} as User;
today: number = Date.now();
siteLink = 'https://www.adastra-cbd.com';
author = 'Ad Astra';
links: Menu[] = [];
visibleMenu: string[] = [];
//visibleMenu: string[] = ['products', 'page'];
//visibleMenu: string[] = ['products'];
constructor(
private router: Router,
private userService: UserService,
changeDetectorRef: ChangeDetectorRef,
media: MediaMatcher,
public menuItems: MenuItems,
) {
this.mobileQuery = media.matchMedia('(min-width: 768px)');
this._mobileQueryListener = () => changeDetectorRef.detectChanges();
this.mobileQuery.addListener(this._mobileQueryListener);
}
ngOnInit() {
const user$: Observable<User> = this.userService.currentUser;
this._currentUser = user$.subscribe((userData) => {
this.currentUser = userData;
if (this.currentUser.role === 'Admin') {
this.links = this.menuItems.getMenuItemsAdmin();
//this.links = this.menuItems.getMenuItems();
} else {
this.links = this.menuItems.getMenuItems();
}
});
}
getMenuItems(): Menu[] {
return this.links;
}
isVisibleMenu(state: string): boolean {
const indexOf: number = this.visibleMenu.indexOf(state);
if (indexOf !== -1) {
return true;
} else {
return false;
}
}
ngOnDestroy(): void {
this._currentUser.unsubscribe();
this.mobileQuery.removeListener(this._mobileQueryListener);
}
goToGitHub() {
window.open('https://github.com/rampeur', '_blank');
}
toggleShowMenu(state: string) {
const indexOf: number = this.visibleMenu.indexOf(state);
if (indexOf !== -1) {
this.visibleMenu.splice(indexOf, 1);
} else {
this.visibleMenu.push(state);
}
}
logout() {
this.userService.purgeAuth();
this.router.navigateByUrl('/login');
}
}
src/app/components/shared/layout/header.component.ts
+17 -19
View File
@@ -6,7 +6,7 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { MatToolbarModule } from '@angular/material/toolbar';
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { Observable, Subscription } from 'rxjs';
import { User } from '@models';
@@ -15,15 +15,17 @@ import { UserService } from '@services';
@Component({
selector: 'app-layout-header',
templateUrl: './header.component.html',
standalone: true,
imports: [
RouterLink, RouterLinkActive,
MatToolbarModule, MatButtonModule, MatDividerModule,
MatIconModule, MatMenuModule
]
RouterLink,
RouterLinkActive,
MatToolbarModule,
MatButtonModule,
MatDividerModule,
MatIconModule,
MatMenuModule,
],
})
export class HeaderComponent implements OnInit {
private _currentUser: Subscription = new Subscription();
private _isAuthenticated: Subscription = new Subscription();
private isAuthenticated = false;
@@ -32,22 +34,18 @@ export class HeaderComponent implements OnInit {
constructor(
private router: Router,
private userService: UserService
) { }
private userService: UserService,
) {}
ngOnInit() {
const user$: Observable<User> = this.userService.currentUser.pipe(takeUntilDestroyed(this.destroyRef));
this._currentUser = user$.subscribe(
(userData) => {
this.currentUser = userData;
}
);
this._currentUser = user$.subscribe((userData) => {
this.currentUser = userData;
});
const auth$: Observable<boolean> = this.userService.isAuthenticated.pipe(takeUntilDestroyed(this.destroyRef));
this._isAuthenticated = auth$.subscribe(
(value) => {
this.isAuthenticated = value;
}
);
this._isAuthenticated = auth$.subscribe((value) => {
this.isAuthenticated = value;
});
}
goToGitHub() {
src/app/components/shared/list-errors/list-errors.component.ts
+4 -7
View File
@@ -1,5 +1,5 @@
import { Component, Input } from '@angular/core';
import { NgForOf, NgIf } from "@angular/common";
import { NgForOf, NgIf } from '@angular/common';
import { MatCardModule } from '@angular/material/card';
import { Errors } from 'src/app/core';
@@ -7,17 +7,14 @@ import { Errors } from 'src/app/core';
@Component({
selector: 'app-list-errors',
templateUrl: './list-errors.component.html',
standalone: true,
imports: [NgIf, NgForOf, MatCardModule]
imports: [NgIf, NgForOf, MatCardModule],
})
export class ListErrorsComponent {
errorList: string[] = [];
@Input() set errors(errorList: Errors | null) {
this.errorList = errorList
? Object.keys(errorList.errors || {}).map(
(key) => `${key} ${errorList.errors[key]}`,
)
? Object.keys(errorList.errors || {}).map((key) => `${key} ${errorList.errors[key]}`)
: [];
}
}
}
src/app/components/shared/spinner/spinner.component.ts
+43 -44
View File
@@ -1,44 +1,43 @@
import { Component, Input, OnDestroy, Inject, ViewEncapsulation } from '@angular/core';
import { Router, NavigationStart, NavigationEnd, NavigationCancel, NavigationError } from '@angular/router';
import { DOCUMENT } from '@angular/common';
@Component({
selector: 'app-spinner',
standalone: true,
imports: [],
templateUrl: './spinner.component.html',
encapsulation: ViewEncapsulation.None
})
export class SpinnerComponent implements OnDestroy {
public isSpinnerVisible = true;
@Input()
public backgroundColor = 'rgba(0, 115, 170, 0.69)';
constructor(
private router: Router,
@Inject(DOCUMENT) private document: Document
) {
this.router.events.subscribe(
event => {
if (event instanceof NavigationStart) {
this.isSpinnerVisible = true;
} else if (
event instanceof NavigationEnd ||
event instanceof NavigationCancel ||
event instanceof NavigationError
) {
this.isSpinnerVisible = false;
}
},
() => {
this.isSpinnerVisible = false;
}
);
}
ngOnDestroy(): void {
this.isSpinnerVisible = false;
}
}
import { Component, Input, OnDestroy, Inject, ViewEncapsulation } from '@angular/core';
import { Router, NavigationStart, NavigationEnd, NavigationCancel, NavigationError } from '@angular/router';
import { DOCUMENT } from '@angular/common';
@Component({
selector: 'app-spinner',
imports: [],
templateUrl: './spinner.component.html',
encapsulation: ViewEncapsulation.None,
})
export class SpinnerComponent implements OnDestroy {
public isSpinnerVisible = true;
@Input()
public backgroundColor = 'rgba(0, 115, 170, 0.69)';
constructor(
private router: Router,
@Inject(DOCUMENT) private document: Document,
) {
this.router.events.subscribe(
(event) => {
if (event instanceof NavigationStart) {
this.isSpinnerVisible = true;
} else if (
event instanceof NavigationEnd ||
event instanceof NavigationCancel ||
event instanceof NavigationError
) {
this.isSpinnerVisible = false;
}
},
() => {
this.isSpinnerVisible = false;
},
);
}
ngOnDestroy(): void {
this.isSpinnerVisible = false;
}
}
src/styles/styles.scss
+47 -39
View File
@@ -4,18 +4,18 @@ Author: UnEspace
Email: rampeur@gmail.com
File: scss
*/
@use 'sass:color';
@use 'sass:map';
@use './components';
@use '@angular/material' as mat;
@use "sass:color";
@use "sass:map";
@use "./components";
@use "@angular/material" as mat;
/* Bootstrap */
// Functions first
@import "bootstrap/scss/functions";
// Variable overrides second
@import 'variable';
@import 'palettes';
@import "variable";
@import "palettes";
// Required Bootstrap imports
@import "bootstrap/scss/variables";
@@ -42,7 +42,8 @@ File: scss
// Utilities
@import "bootstrap/scss/utilities/api";
@include mat.core();
@include mat.elevation-classes();
@include mat.app-background();
// Define the palettes for your theme using the Material Design palettes available in palette.scss
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
@@ -82,35 +83,37 @@ $adastra_app-grey: mat.m2-define-palette(mat.$m2-grey-palette, 400);
$adastra_app-muted: mat.m2-define-palette(mat.$m2-grey-palette, 300);
$custom-typography: mat.m2-define-typography-config(
$font-family: 'Barlow, sans-serif',
$font-family: "Barlow, sans-serif",
$body-1: mat.m2-define-typography-level(
$font-family: 'Barlow, sans-serif',
$font-weight: 400,
$font-size: 14px,
$line-height: 1.42857143,
$letter-spacing: normal,
),
$font-family: "Barlow, sans-serif",
$font-weight: 400,
$font-size: 14px,
$line-height: 1.42857143,
$letter-spacing: normal,
),
$body-2: mat.m2-define-typography-level(
$font-family: 'Barlow, sans-serif',
$font-weight: 500,
$font-size: 14px,
$line-height: 22px,
$letter-spacing: normal,
)
$font-family: "Barlow, sans-serif",
$font-weight: 500,
$font-size: 14px,
$line-height: 22px,
$letter-spacing: normal,
),
);
// Create the theme object. A theme consists of configurations for individual
// theming systems such as "color" or "typography".
//$adastra_app-theme: mat.m2-define-dark-theme((
$adastra_app-theme: mat.m2-define-light-theme((
color: (
primary: $adastra_app-primary,
accent: $adastra_app-accent,
warn: $adastra_app-warn,
),
typography: $custom-typography,
density: 0
));
$adastra_app-theme: mat.m2-define-light-theme(
(
color: (
primary: $adastra_app-primary,
accent: $adastra_app-accent,
warn: $adastra_app-warn,
),
typography: $custom-typography,
density: 0,
)
);
$adastra_app-variants: (
secondary: $adastra_app-secondary,
@@ -135,7 +138,7 @@ $adastra_app-variants: (
magenta: $adastra_app-magenta,
pink: $adastra_app-pink,
grey: $adastra_app-grey,
muted: $adastra_app-muted
muted: $adastra_app-muted,
);
/*
$config: mat.m2-get-color-config($adastra_app-theme);
@@ -176,7 +179,12 @@ $background: map.get($adastra_app-theme, background);
@each $variant, $var-color in $grays {
.bg-gray-#{"" + $variant} {
--#{$prefix}-bg-opacity: 1;
background-color: RGBA(color.red($var-color), color.green($var-color), color.blue($var-color), var(--#{$prefix}bg-opacity, 1)) !important;
background-color: RGBA(
color.red($var-color),
color.green($var-color),
color.blue($var-color),
var(--#{$prefix}bg-opacity, 1)
) !important;
/* background-color: RGBA(color.channel($var-color, "red"), color.channel($var-color, "green"), color.channel($var-color, "blue"), var(--#{$prefix}bg-opacity, 1)) !important; */
}
}
@@ -187,13 +195,13 @@ $background: map.get($adastra_app-theme, background);
}
}
@import 'spinner';
@import 'icomoon';
@import 'header';
@import 'sidebar';
@import 'tables';
@import 'charts';
@import 'responsive';
@import 'app';
@import "spinner";
@import "icomoon";
@import "header";
@import "sidebar";
@import "tables";
@import "charts";
@import "responsive";
@import "app";
//@import "../styles/icons/material-design-iconic-font/css/materialdesignicons.min.css";