From fe9dcacc7c6b8cfaed3b983740913eb5717281a7 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Wed, 6 Jan 2021 16:39:34 -0500 Subject: [PATCH] =?UTF-8?q?Renommer=20inventaire=20vers=20catalogue=20pour?= =?UTF-8?q?=20une=20meilleure=20repr=C3=A9sentation.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/frontend/src/app/app-routing.module.ts | 6 +++--- src/main/frontend/src/app/app.module.ts | 4 ++-- .../modules/company/pages/add/add.component.html | 2 +- .../modules/company/pages/add/add.component.ts | 2 +- .../company/pages/edit/edit.component.html | 2 +- .../modules/company/pages/edit/edit.component.ts | 6 +++--- .../company/pages/list/list.component.html | 2 +- .../modules/company/pages/list/list.component.ts | 2 +- .../material-type/pages/add/add.component.html | 2 +- .../material-type/pages/add/add.component.ts | 2 +- .../material-type/pages/edit/edit.component.html | 2 +- .../material-type/pages/edit/edit.component.ts | 4 ++-- .../material-type/pages/list/list.component.html | 2 +- .../material-type/pages/list/list.component.ts | 2 +- .../material/pages/add/add.component.html | 2 +- .../modules/material/pages/add/add.component.ts | 2 +- .../material/pages/edit/edit.component.html | 2 +- .../material/pages/edit/edit.component.ts | 6 +++--- .../material/pages/list/list.component.html | 2 +- .../material/pages/list/list.component.ts | 2 +- .../shared/components/header/header.component.ts | 6 ++---- .../catalog.component.html} | 0 .../src/app/pages/catalog/catalog.component.sass | 0 .../src/app/pages/catalog/catalog.component.ts | 16 ++++++++++++++++ .../inventory-page/inventory-page.component.ts | 16 ---------------- 25 files changed, 46 insertions(+), 48 deletions(-) rename src/main/frontend/src/app/pages/{inventory-page/inventory-page.component.html => catalog/catalog.component.html} (100%) create mode 100644 src/main/frontend/src/app/pages/catalog/catalog.component.sass create mode 100644 src/main/frontend/src/app/pages/catalog/catalog.component.ts delete mode 100644 src/main/frontend/src/app/pages/inventory-page/inventory-page.component.ts diff --git a/src/main/frontend/src/app/app-routing.module.ts b/src/main/frontend/src/app/app-routing.module.ts index 0f119ac..6292afe 100644 --- a/src/main/frontend/src/app/app-routing.module.ts +++ b/src/main/frontend/src/app/app-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {Routes, RouterModule} from '@angular/router'; -import {InventoryPageComponent} from "./pages/inventory-page/inventory-page.component"; +import {CatalogComponent} from "./pages/catalog/catalog.component"; const routes: Routes = [{ @@ -16,8 +16,8 @@ const routes: Routes = [{ path: 'group', loadChildren: () => import('./modules/groups/groups.module').then(m => m.GroupsModule) }, { - path: 'inventory', - component: InventoryPageComponent, + path: 'catalog', + component: CatalogComponent, children: [ { path: 'materialtype', diff --git a/src/main/frontend/src/app/app.module.ts b/src/main/frontend/src/app/app.module.ts index 7c914a4..eb260be 100644 --- a/src/main/frontend/src/app/app.module.ts +++ b/src/main/frontend/src/app/app.module.ts @@ -6,13 +6,13 @@ import {AppComponent} from './app.component'; import {MatIconRegistry} from "@angular/material/icon"; import {SharedModule} from "./modules/shared/shared.module"; import {BrowserAnimationsModule} from "@angular/platform-browser/animations"; -import { InventoryPageComponent } from './pages/inventory-page/inventory-page.component'; +import { CatalogComponent } from './pages/catalog/catalog.component'; import { CompanyModule } from './modules/company/company.module'; @NgModule({ declarations: [ AppComponent, - InventoryPageComponent + CatalogComponent ], imports: [ AppRoutingModule, diff --git a/src/main/frontend/src/app/modules/company/pages/add/add.component.html b/src/main/frontend/src/app/modules/company/pages/add/add.component.html index 32402ee..75daec8 100644 --- a/src/main/frontend/src/app/modules/company/pages/add/add.component.html +++ b/src/main/frontend/src/app/modules/company/pages/add/add.component.html @@ -1,6 +1,6 @@ this.router.navigate(['/inventory/company/list']), + next: () => this.router.navigate(['/catalog/company/list']), error: err => { if (err.status == 409) { this.errorMessage = `Une bannière avec le nom '${values.name}' existe déjà` diff --git a/src/main/frontend/src/app/modules/company/pages/edit/edit.component.html b/src/main/frontend/src/app/modules/company/pages/edit/edit.component.html index 5312c74..d3211cd 100644 --- a/src/main/frontend/src/app/modules/company/pages/edit/edit.component.html +++ b/src/main/frontend/src/app/modules/company/pages/edit/edit.component.html @@ -2,7 +2,7 @@ *ngIf="company" title="Modifier la bannière {{company.name}}" deleteConfirmMessage="Voulez-vous vraiment supprimer la bannière {{company.name}}?" - backButtonLink="/inventory/company/list" + backButtonLink="/catalog/company/list" deletePermission="REMOVE_COMPANY" [entity]="company" [formFields]="formFields" diff --git a/src/main/frontend/src/app/modules/company/pages/edit/edit.component.ts b/src/main/frontend/src/app/modules/company/pages/edit/edit.component.ts index 2ff244c..33bdec1 100644 --- a/src/main/frontend/src/app/modules/company/pages/edit/edit.component.ts +++ b/src/main/frontend/src/app/modules/company/pages/edit/edit.component.ts @@ -46,7 +46,7 @@ export class EditComponent extends SubscribingComponent { next: company => this.company = company, error: err => { if (err.status == 404) { - this.router.navigate(['/inventory/company/list']) + this.router.navigate(['/catalog/company/list']) } else { this.unknownError = true } @@ -60,7 +60,7 @@ export class EditComponent extends SubscribingComponent { this.subscribe( this.companyService.update(this.company.id, values.name), { - next: () => this.router.navigate(['/inventory/company/list']), + next: () => this.router.navigate(['/catalog/company/list']), error: err => { if (err.status == 409) { this.errorMessage = `Une bannière avec le nom '${values.name}' existe déjà` @@ -77,7 +77,7 @@ export class EditComponent extends SubscribingComponent { this.subscribe( this.companyService.delete(this.company.id), { - next: () => this.router.navigate(['/inventory/company/list']), + next: () => this.router.navigate(['/catalog/company/list']), error: err => { this.unknownError = true console.log(err) diff --git a/src/main/frontend/src/app/modules/company/pages/list/list.component.html b/src/main/frontend/src/app/modules/company/pages/list/list.component.html index 54eaea6..b528bb3 100644 --- a/src/main/frontend/src/app/modules/company/pages/list/list.component.html +++ b/src/main/frontend/src/app/modules/company/pages/list/list.component.html @@ -2,5 +2,5 @@ [entities$]="companies$" [columns]="columns" [buttons]="buttons" - addLink="/inventory/company/add"> + addLink="/catalog/company/add"> diff --git a/src/main/frontend/src/app/modules/company/pages/list/list.component.ts b/src/main/frontend/src/app/modules/company/pages/list/list.component.ts index d77a958..4f0d118 100644 --- a/src/main/frontend/src/app/modules/company/pages/list/list.component.ts +++ b/src/main/frontend/src/app/modules/company/pages/list/list.component.ts @@ -15,7 +15,7 @@ export class ListComponent extends SubscribingComponent { ] buttons = [{ text: 'Modifier', - linkFn: t => `/inventory/company/edit/${t.id}`, + linkFn: t => `/catalog/company/edit/${t.id}`, permission: EmployeePermission.EDIT_COMPANY }] diff --git a/src/main/frontend/src/app/modules/material-type/pages/add/add.component.html b/src/main/frontend/src/app/modules/material-type/pages/add/add.component.html index 5a022c5..7e087c8 100644 --- a/src/main/frontend/src/app/modules/material-type/pages/add/add.component.html +++ b/src/main/frontend/src/app/modules/material-type/pages/add/add.component.html @@ -1,6 +1,6 @@ this.router.navigate(['/inventory/materialtype/list']), + next: () => this.router.navigate(['/catalog/materialtype/list']), error: err => { if (err.status == 409 && err.error.id === values.name) { this.errorMessage = `Un type de produit avec le nom '${values.name}' existe déjà` diff --git a/src/main/frontend/src/app/modules/material-type/pages/edit/edit.component.html b/src/main/frontend/src/app/modules/material-type/pages/edit/edit.component.html index b8db91c..e54412d 100644 --- a/src/main/frontend/src/app/modules/material-type/pages/edit/edit.component.html +++ b/src/main/frontend/src/app/modules/material-type/pages/edit/edit.component.html @@ -2,7 +2,7 @@ *ngIf="materialType" title="Modifier le group {{materialType.name}}" deleteConfirmMessage="Voulez-vous vraiment supprimer le type de produit {{materialType.name}}?" - backButtonLink="/inventory/materialtype/list" + backButtonLink="/catalog/materialtype/list" deletePermission="REMOVE_MATERIAL_TYPE" [entity]="materialType" [formFields]="formFields" diff --git a/src/main/frontend/src/app/modules/material-type/pages/edit/edit.component.ts b/src/main/frontend/src/app/modules/material-type/pages/edit/edit.component.ts index 0ece7b3..7f28964 100644 --- a/src/main/frontend/src/app/modules/material-type/pages/edit/edit.component.ts +++ b/src/main/frontend/src/app/modules/material-type/pages/edit/edit.component.ts @@ -74,7 +74,7 @@ export class EditComponent extends SubscribingComponent { this.subscribe( this.materialTypeService.update(this.materialType.id, values.name, values.prefix), { - next: () => this.router.navigate(['/inventory/materialtype/list']), + next: () => this.router.navigate(['/catalog/materialtype/list']), error: err => { if (err.status == 409 && err.error.id === values.name) { this.errorMessage = `Un type de produit avec le nom '${values.name}' existe déjà` @@ -93,7 +93,7 @@ export class EditComponent extends SubscribingComponent { this.subscribe( this.materialTypeService.delete(this.materialType.id), { - next: () => this.router.navigate(['/inventory/materialtype/list']), + next: () => this.router.navigate(['/catalog/materialtype/list']), error: err => { this.unknownError = true console.log(err) diff --git a/src/main/frontend/src/app/modules/material-type/pages/list/list.component.html b/src/main/frontend/src/app/modules/material-type/pages/list/list.component.html index 5663df0..075efa2 100644 --- a/src/main/frontend/src/app/modules/material-type/pages/list/list.component.html +++ b/src/main/frontend/src/app/modules/material-type/pages/list/list.component.html @@ -2,5 +2,5 @@ [entities$]="materialTypes$" [columns]="columns" [buttons]="buttons" - addLink="/inventory/materialtype/add"> + addLink="/catalog/materialtype/add"> diff --git a/src/main/frontend/src/app/modules/material-type/pages/list/list.component.ts b/src/main/frontend/src/app/modules/material-type/pages/list/list.component.ts index 6e24b28..0b16d66 100644 --- a/src/main/frontend/src/app/modules/material-type/pages/list/list.component.ts +++ b/src/main/frontend/src/app/modules/material-type/pages/list/list.component.ts @@ -18,7 +18,7 @@ export class ListComponent extends SubscribingComponent { buttons = [ { text: 'Modifier', - linkFn: t => `/inventory/materialtype/edit/${t.id}`, + linkFn: t => `/catalog/materialtype/edit/${t.id}`, permission: EmployeePermission.EDIT_MATERIAL_TYPE, disabledFn: t => t.systemType } diff --git a/src/main/frontend/src/app/modules/material/pages/add/add.component.html b/src/main/frontend/src/app/modules/material/pages/add/add.component.html index 99b06f1..01034b6 100644 --- a/src/main/frontend/src/app/modules/material/pages/add/add.component.html +++ b/src/main/frontend/src/app/modules/material/pages/add/add.component.html @@ -1,6 +1,6 @@ this.router.navigate(['/inventory/material/list']), + next: () => this.router.navigate(['/catalog/material/list']), error: err => { if (err.status == 409) { this.errorMessage = `Un produit avec le nom '${values.name}' existe déjà` diff --git a/src/main/frontend/src/app/modules/material/pages/edit/edit.component.html b/src/main/frontend/src/app/modules/material/pages/edit/edit.component.html index a872990..5fee3dc 100644 --- a/src/main/frontend/src/app/modules/material/pages/edit/edit.component.html +++ b/src/main/frontend/src/app/modules/material/pages/edit/edit.component.html @@ -2,7 +2,7 @@ *ngIf="material" title="Modifier le produit {{material.name}}" deleteConfirmMessage="Voulez-vous vraiment supprimer le produit {{material.name}}?" - backButtonLink="/inventory/material/list" + backButtonLink="/catalog/material/list" deletePermission="REMOVE_MATERIAL" [entity]="material" [formFields]="formFields" diff --git a/src/main/frontend/src/app/modules/material/pages/edit/edit.component.ts b/src/main/frontend/src/app/modules/material/pages/edit/edit.component.ts index 5cb779f..a1165a3 100644 --- a/src/main/frontend/src/app/modules/material/pages/edit/edit.component.ts +++ b/src/main/frontend/src/app/modules/material/pages/edit/edit.component.ts @@ -89,7 +89,7 @@ export class EditComponent extends SubscribingComponent { next: material => this.material = material, error: err => { if (err.status === 404) { - this.router.navigate(['/inventory/material/list']) + this.router.navigate(['/catalog/material/list']) } else { this.unknownError = true } @@ -108,7 +108,7 @@ export class EditComponent extends SubscribingComponent { this.subscribe( this.materialService.update(this.material.id, values.name, values.inventoryQuantity, values.materialType, values.simdutFile), { - next: () => this.router.navigate(['/inventory/material/list']), + next: () => this.router.navigate(['/catalog/material/list']), error: err => { if (err.status == 409) { this.errorMessage = `Un produit avec le nom '${values.name}' existe déjà` @@ -125,7 +125,7 @@ export class EditComponent extends SubscribingComponent { this.subscribe( this.materialService.delete(this.material.id), { - next: () => this.router.navigate(['/inventory/material/list']), + next: () => this.router.navigate(['/catalog/material/list']), error: err => { this.unknownError = true console.log(err) diff --git a/src/main/frontend/src/app/modules/material/pages/list/list.component.html b/src/main/frontend/src/app/modules/material/pages/list/list.component.html index 3aa2bae..d46acc6 100644 --- a/src/main/frontend/src/app/modules/material/pages/list/list.component.html +++ b/src/main/frontend/src/app/modules/material/pages/list/list.component.html @@ -3,5 +3,5 @@ [columns]="columns" [icons]="icons" [buttons]="buttons" - addLink="/inventory/material/add"> + addLink="/catalog/material/add"> diff --git a/src/main/frontend/src/app/modules/material/pages/list/list.component.ts b/src/main/frontend/src/app/modules/material/pages/list/list.component.ts index 1772e1a..2d8b608 100644 --- a/src/main/frontend/src/app/modules/material/pages/list/list.component.ts +++ b/src/main/frontend/src/app/modules/material/pages/list/list.component.ts @@ -24,7 +24,7 @@ export class ListComponent extends SubscribingComponent { }] buttons = [{ text: 'Modifier', - linkFn: t => `/inventory/material/edit/${t.id}`, + linkFn: t => `/catalog/material/edit/${t.id}`, permission: EmployeePermission.EDIT_MATERIAL }, { text: 'Fiche signalitique', diff --git a/src/main/frontend/src/app/modules/shared/components/header/header.component.ts b/src/main/frontend/src/app/modules/shared/components/header/header.component.ts index e161ea8..cd40f17 100644 --- a/src/main/frontend/src/app/modules/shared/components/header/header.component.ts +++ b/src/main/frontend/src/app/modules/shared/components/header/header.component.ts @@ -1,10 +1,8 @@ -import {Component, OnDestroy, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {ResolveEnd, Router} from "@angular/router"; import {AppState} from "../../app-state"; import {Employee, EmployeePermission} from "../../model/employee"; import {AccountService} from "../../../accounts/services/account.service"; -import {Subject} from "rxjs"; -import {takeUntil} from "rxjs/operators"; import {SubscribingComponent} from "../subscribing.component"; @Component({ @@ -14,7 +12,7 @@ import {SubscribingComponent} from "../subscribing.component"; }) export class HeaderComponent extends SubscribingComponent { links: HeaderLink[] = [ - {route: '/inventory', title: 'Inventaire', enabled: true}, + {route: '/catalog', title: 'Catalogue', enabled: true}, new HeaderLink('/employee', 'Employés', EmployeePermission.VIEW_EMPLOYEE), new HeaderLink('/group', 'Groupes', EmployeePermission.VIEW_EMPLOYEE_GROUP), {route: '/account/login', title: 'Connexion', enabled: true}, diff --git a/src/main/frontend/src/app/pages/inventory-page/inventory-page.component.html b/src/main/frontend/src/app/pages/catalog/catalog.component.html similarity index 100% rename from src/main/frontend/src/app/pages/inventory-page/inventory-page.component.html rename to src/main/frontend/src/app/pages/catalog/catalog.component.html diff --git a/src/main/frontend/src/app/pages/catalog/catalog.component.sass b/src/main/frontend/src/app/pages/catalog/catalog.component.sass new file mode 100644 index 0000000..e69de29 diff --git a/src/main/frontend/src/app/pages/catalog/catalog.component.ts b/src/main/frontend/src/app/pages/catalog/catalog.component.ts new file mode 100644 index 0000000..d7c49db --- /dev/null +++ b/src/main/frontend/src/app/pages/catalog/catalog.component.ts @@ -0,0 +1,16 @@ +import {Component} from '@angular/core'; +import {NavLink} from "../../modules/shared/components/nav/nav.component"; +import {EmployeePermission} from "../../modules/shared/model/employee"; + +@Component({ + selector: 'cre-inventory-page', + templateUrl: './catalog.component.html', + styleUrls: ['./catalog.component.sass'] +}) +export class CatalogComponent { + links: NavLink[] = [ + {route: '/catalog/materialtype', title: 'Types de produit', permission: EmployeePermission.VIEW_MATERIAL_TYPE}, + {route: '/catalog/material', title: 'Produits', permission: EmployeePermission.VIEW_MATERIAL}, + {route: '/catalog/company', title: 'Bannières', permission: EmployeePermission.VIEW_COMPANY} + ] +} diff --git a/src/main/frontend/src/app/pages/inventory-page/inventory-page.component.ts b/src/main/frontend/src/app/pages/inventory-page/inventory-page.component.ts deleted file mode 100644 index 5769b6f..0000000 --- a/src/main/frontend/src/app/pages/inventory-page/inventory-page.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {Component} from '@angular/core'; -import {NavLink} from "../../modules/shared/components/nav/nav.component"; -import {EmployeePermission} from "../../modules/shared/model/employee"; - -@Component({ - selector: 'cre-inventory-page', - templateUrl: './inventory-page.component.html', - styleUrls: ['./inventory-page.component.sass'] -}) -export class InventoryPageComponent { - links: NavLink[] = [ - {route: '/inventory/materialtype', title: 'Types de produit', permission: EmployeePermission.VIEW_MATERIAL_TYPE}, - {route: '/inventory/material', title: 'Produits', permission: EmployeePermission.VIEW_MATERIAL}, - {route: '/inventory/company', title: 'Bannières', permission: EmployeePermission.VIEW_COMPANY} - ] -}