diff --git a/angular.json b/angular.json index ade7b98..c95cbff 100644 --- a/angular.json +++ b/angular.json @@ -100,7 +100,12 @@ "browserTarget": "angularTest:build:development" } }, - "defaultConfiguration": "development" + "defaultConfiguration": "development", + "options": { + "port": 9002 + } + + }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 370fb6e..be17048 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -13,6 +13,7 @@ import { EmployeeService } from './service/employee.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { MatStepperModule } from '@angular/material/stepper'; import { MatToolbarModule } from '@angular/material/toolbar'; +import {MatDialogModule} from '@angular/material/dialog'; import { MatIconModule } from "@angular/material/icon"; import { Custom_Ng2SearchPipe } from './../Custom_Ng2SearchPipe'; import { FormsModule } from '@angular/forms'; @@ -21,6 +22,7 @@ import { CreateJoinsPageComponent } from './create-joins-page/create-joins-page. import { JoinsTableComponent } from './joins-table/joins-table.component'; import { WhereCardComponent } from './where-card/where-card.component'; import { ColumnsCardComponent } from './columns-card/columns-card.component'; +import {MatProgressSpinnerModule} from '@angular/material/progress-spinner' @NgModule({ declarations: [ @@ -44,7 +46,9 @@ import { ColumnsCardComponent } from './columns-card/columns-card.component'; MatStepperModule, MatToolbarModule, MatIconModule, - FormsModule + FormsModule, + MatDialogModule, + MatProgressSpinnerModule ], providers: [EmployeeService], diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html index 431a271..1748a31 100644 --- a/src/app/navbar/navbar.component.html +++ b/src/app/navbar/navbar.component.html @@ -26,6 +26,7 @@ + @@ -52,6 +53,10 @@ Jointures Calendar + + + + diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts index 5352b8c..d8e6de8 100644 --- a/src/app/navbar/navbar.component.ts +++ b/src/app/navbar/navbar.component.ts @@ -3,6 +3,7 @@ import { Component } from '@angular/core'; import { ResetDataService } from '../service/reset_data.service'; import { Router, RouterModule } from '@angular/router'; import { AppRoutingModule } from '../app-routing.module'; +import { MatDialog, MatDialogModule } from '@angular/material/dialog'; @Component({ selector: 'app-navbar', @@ -11,6 +12,7 @@ import { AppRoutingModule } from '../app-routing.module'; }) export class NavbarComponent { public mobileOpen: boolean = false; + public isLoading: boolean = false; constructor(private resetDataService: ResetDataService, private router: Router){} @@ -19,7 +21,18 @@ export class NavbarComponent { } public applyResetDatabase():void { - this.resetDataService.resetDatabase().subscribe(); - this.router.navigateByUrl(''); + if(window.confirm('Êtes-vous sûr de vouloir recharger le BDD ? Cela peut prendre du temps !')){ + this.isLoading = true; + this.resetDataService.resetDatabase().subscribe( + () => { + //this.router.navigateByUrl(''); + this.isLoading = false; + }, + (error: HttpErrorResponse) => { + alert(error.message) + } + ); + } } + }