From 440b21d3dc1c9066357fb707246d5931e4b9f7ed Mon Sep 17 00:00:00 2001 From: FyloZ Date: Fri, 5 Feb 2021 19:35:01 -0500 Subject: [PATCH] =?UTF-8?q?Correction=20de=20la=20suppression=20de=20m?= =?UTF-8?q?=C3=A9langes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mix-editor/mix-editor.component.html | 17 +++++++++++---- .../mix-editor/mix-editor.component.sass | 3 ++- .../mix-editor/mix-editor.component.ts | 17 ++++++++++++--- .../modules/colors/services/mix.service.ts | 4 ++++ .../components/subscribing.component.ts | 10 +++++++++ .../colorrecipesexplorer/model/Recipe.kt | 2 +- .../service/MixService.kt | 6 ++++++ .../service/RecipeService.kt | 6 ++++++ .../service/RecipeServiceTest.kt | 21 ++++++++++++++++++- 9 files changed, 76 insertions(+), 10 deletions(-) diff --git a/src/main/frontend/src/app/modules/colors/components/mix-editor/mix-editor.component.html b/src/main/frontend/src/app/modules/colors/components/mix-editor/mix-editor.component.html index 59bfaad..82d8c55 100644 --- a/src/main/frontend/src/app/modules/colors/components/mix-editor/mix-editor.component.html +++ b/src/main/frontend/src/app/modules/colors/components/mix-editor/mix-editor.component.html @@ -1,4 +1,4 @@ - + Création d'un mélange pour la recette {{recipe.company.name}} - {{recipe.name}} @@ -22,11 +22,13 @@ - +
+ +
- + @@ -65,7 +67,9 @@ Unités - % + +

%

+ {{units}} @@ -94,3 +98,8 @@ + + diff --git a/src/main/frontend/src/app/modules/colors/components/mix-editor/mix-editor.component.sass b/src/main/frontend/src/app/modules/colors/components/mix-editor/mix-editor.component.sass index 3d15487..ee4dba4 100644 --- a/src/main/frontend/src/app/modules/colors/components/mix-editor/mix-editor.component.sass +++ b/src/main/frontend/src/app/modules/colors/components/mix-editor/mix-editor.component.sass @@ -1,2 +1,3 @@ -td.units-wrapper +td.units-wrapper p width: 3rem + margin-bottom: 0 diff --git a/src/main/frontend/src/app/modules/colors/components/mix-editor/mix-editor.component.ts b/src/main/frontend/src/app/modules/colors/components/mix-editor/mix-editor.component.ts index 8839e3b..5572641 100644 --- a/src/main/frontend/src/app/modules/colors/components/mix-editor/mix-editor.component.ts +++ b/src/main/frontend/src/app/modules/colors/components/mix-editor/mix-editor.component.ts @@ -12,6 +12,9 @@ import {FormBuilder, FormControl, FormGroup, Validators} from "@angular/forms"; import {UNIT_MILLILITER} from "../../../shared/units"; import {MatTable} from "@angular/material/table"; import {ActivatedRoute, Router} from "@angular/router"; +import {ConfirmBoxComponent} from "../../../shared/components/confirm-box/confirm-box.component"; +import {AccountService} from "../../../accounts/services/account.service"; +import {EmployeePermission} from "../../../shared/model/employee"; @Component({ selector: 'cre-mix-editor', @@ -20,6 +23,7 @@ import {ActivatedRoute, Router} from "@angular/router"; }) export class MixEditorComponent extends SubscribingComponent { @ViewChild('mixTable') mixTable: MatTable + @ViewChild('deleteConfirmBox') deleteConfirmBox: ConfirmBoxComponent @Input() mixId: number | null @Input() recipeId: number | null @@ -46,6 +50,7 @@ export class MixEditorComponent extends SubscribingComponent { private recipeService: RecipeService, private materialService: MaterialService, private materialTypeService: MaterialTypeService, + private accountService: AccountService, private formBuilder: FormBuilder, router: Router, activatedRoute: ActivatedRoute @@ -57,14 +62,16 @@ export class MixEditorComponent extends SubscribingComponent { super.ngOnInit(); this.mixId = this.urlUtils.parseIntUrlParam('id') + if (this.mixId) { + this.editionMode = true + } this.subscribe( this.recipeService.getById(this.recipeId), { next: r => { this.recipe = r - if (this.mixId) { - this.editionMode = true + if (this.editionMode) { this.subscribe( this.mixService.getById(this.mixId), { @@ -107,7 +114,7 @@ export class MixEditorComponent extends SubscribingComponent { } delete() { - + this.subscribeAndNavigate(this.mixService.delete(this.mixId), `/color/edit/${this.recipeId}`) } materialUsePercentages(mixMaterial: any) { @@ -121,6 +128,10 @@ export class MixEditorComponent extends SubscribingComponent { return id ? this.materials.filter(m => m.id === id)[0] : null } + get canDeleteMix() { + return this.accountService.hasPermission(EmployeePermission.REMOVE_RECIPE) + } + private generateForm() { this.nameControl = new FormControl(this.mix ? this.mix.mixType.name : null, Validators.required) this.materialTypeControl = new FormControl(this.mix ? this.mix.mixType.material.materialType.id : null, Validators.required) diff --git a/src/main/frontend/src/app/modules/colors/services/mix.service.ts b/src/main/frontend/src/app/modules/colors/services/mix.service.ts index e33db7e..a27b0cd 100644 --- a/src/main/frontend/src/app/modules/colors/services/mix.service.ts +++ b/src/main/frontend/src/app/modules/colors/services/mix.service.ts @@ -51,6 +51,10 @@ export class MixService { return this.api.put('/recipe/mix', body) } + delete(id: number): Observable { + return this.api.delete(`/recipe/mix/${id}`) + } + extractMixMaterials(mix: Mix): { materialId: number, quantity: number, percents: boolean }[] { return mix.mixMaterials.map(m => { return {materialId: m.material.id, quantity: m.quantity, percents: m.material.materialType.usePercentages} diff --git a/src/main/frontend/src/app/modules/shared/components/subscribing.component.ts b/src/main/frontend/src/app/modules/shared/components/subscribing.component.ts index 7e9e805..16d9a99 100644 --- a/src/main/frontend/src/app/modules/shared/components/subscribing.component.ts +++ b/src/main/frontend/src/app/modules/shared/components/subscribing.component.ts @@ -29,6 +29,16 @@ export abstract class SubscribingComponent implements OnInit, OnDestroy { this.subscribers$.push(observable.subscribe(observer)) } + subscribeAndNavigate(observable: Observable, route: string) { + this.subscribe( + observable, + { + next: () => this.urlUtils.navigateTo(route) + }, + 1 + ) + } + subscribeEntityByIdFromRoute(service: any, entitySubject: Subject, notFoundRoute: string, paramName: string = 'id') { const id = this.urlUtils.parseIntUrlParam(paramName) this.subscribe( diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Recipe.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Recipe.kt index 3c79c62..7348862 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Recipe.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Recipe.kt @@ -42,7 +42,7 @@ data class Recipe( @ManyToOne val company: Company, - @OneToMany + @OneToMany(cascade = [CascadeType.ALL]) val mixes: MutableCollection, @OneToMany(cascade = [CascadeType.ALL]) diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/service/MixService.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/service/MixService.kt index 2ba3fa7..f4717f7 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/service/MixService.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/service/MixService.kt @@ -78,4 +78,10 @@ class MixServiceImpl( override fun updateLocation(mix: Mix, location: String) { update(mix.apply { this.location = location }) } + + @Transactional + override fun delete(entity: Mix) { + recipeService.removeMix(entity) + super.delete(entity) + } } diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/service/RecipeService.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/service/RecipeService.kt index 0628a3c..4c74ada 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/service/RecipeService.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/service/RecipeService.kt @@ -19,6 +19,9 @@ interface RecipeService : ExternalModelService()) + + val found = service.removeMix(mix) + + verify(service).update(any()) + + assertEquals(recipe.id, found.id) + assertFalse(found.mixes.contains(mix)) + } + } }