-
Aucune image n'est associée à cette couleur
+
Aucune image n'est associée à cette couleur
-
+
-
+
-
-
+
+
diff --git a/src/app/modules/recipes/components/images-editor/images-editor.component.ts b/src/app/modules/recipes/components/images-editor/images-editor.component.ts
index 4b00c2d..eb56138 100644
--- a/src/app/modules/recipes/components/images-editor/images-editor.component.ts
+++ b/src/app/modules/recipes/components/images-editor/images-editor.component.ts
@@ -4,7 +4,8 @@ import {SubscribingComponent} from '../../../shared/components/subscribing.compo
import {ActivatedRoute, Router} from '@angular/router'
import {RecipeImageService} from '../../services/recipe-image.service'
import {ErrorService} from '../../../shared/service/error.service'
-import {openJpg} from '../../../shared/utils/utils'
+import {getImageUrl, openJpg} from '../../../shared/utils/utils'
+import {RecipeService} from "../../services/recipe.service";
@Component({
selector: 'cre-images-editor',
@@ -15,10 +16,11 @@ export class ImagesEditorComponent extends SubscribingComponent {
@Input() recipe: Recipe
@Input() editionMode = false
- imagesUrls: string[]
+ imagesIds: string[] = []
constructor(
private recipeImageService: RecipeImageService,
+ private recipeService: RecipeService,
errorService: ErrorService,
router: Router,
activatedRoute: ActivatedRoute
@@ -29,19 +31,26 @@ export class ImagesEditorComponent extends SubscribingComponent {
ngOnInit() {
super.ngOnInit()
- this.imagesUrls = this.recipe.imagesUrls
+ this.subscribe(
+ this.recipeService.getImagesIds(this.recipe.id),
+ imagesIds => this.imagesIds = imagesIds ?? []
+ )
}
submit(event) {
const image = event.target.files[0]
this.subscribe(
this.recipeImageService.save(image, this.recipe.id),
- r => this.imagesUrls = r.imagesUrls
+ imageId => this.imagesIds.push(imageId)
)
}
- openImage(url: string) {
- openJpg(url)
+ getImageUrl(id: string): string {
+ return getImageUrl(this.getImagePath(id))
+ }
+
+ openImage(id: string) {
+ openJpg(this.getImagePath(id))
}
delete(url: string) {
@@ -52,6 +61,10 @@ export class ImagesEditorComponent extends SubscribingComponent {
}
private removeUrl(url: string) {
- this.imagesUrls = this.imagesUrls.filter(u => u !== url)
+ this.imagesIds = this.imagesIds.filter(u => u !== url)
+ }
+
+ private getImagePath(id: string): string {
+ return `recipes/${this.recipe.id}/${id}`
}
}
diff --git a/src/app/modules/recipes/components/mix-table/mix-table.component.html b/src/app/modules/recipes/components/mix-table/mix-table.component.html
index 7f8a28a..9a94211 100644
--- a/src/app/modules/recipes/components/mix-table/mix-table.component.html
+++ b/src/app/modules/recipes/components/mix-table/mix-table.component.html
@@ -126,7 +126,7 @@
diff --git a/src/app/modules/recipes/components/mix-table/mix-table.component.ts b/src/app/modules/recipes/components/mix-table/mix-table.component.ts
index bd430a6..e50128f 100644
--- a/src/app/modules/recipes/components/mix-table/mix-table.component.ts
+++ b/src/app/modules/recipes/components/mix-table/mix-table.component.ts
@@ -1,5 +1,11 @@
import {Component, EventEmitter, Input, Output, ViewChild} from '@angular/core'
-import {Mix, MixMaterial, MixMaterialDto, mixMaterialsToMixMaterialsDto, Recipe} from '../../../shared/model/recipe.model'
+import {
+ Mix,
+ MixQuantity,
+ MixMaterialDto,
+ mixMaterialsToMixMaterialsDto,
+ Recipe
+} from '../../../shared/model/recipe.model'
import {Subject} from 'rxjs'
import {SubscribingComponent} from '../../../shared/components/subscribing.component'
import {convertMixMaterialQuantity, UNIT_MILLILITER} from '../../../shared/units'
@@ -37,7 +43,7 @@ export class MixTableComponent extends SubscribingComponent {
mixColumns = this.COLUMNS
units = UNIT_MILLILITER
mixMaterials: MixMaterialDto[] = []
- hoveredMixMaterial: MixMaterial | null
+ hoveredMixMaterial: MixQuantity | null
// BPac printer
printer: PtouchPrinter | null
@@ -68,11 +74,7 @@ export class MixTableComponent extends SubscribingComponent {
)
}
- hasSimdut(material: Material): boolean {
- return material.simdutUrl != null
- }
-
- openSimdut(mixMaterial: MixMaterial) {
+ openSimdut(mixMaterial: MixQuantity) {
openSimdut(mixMaterial.material)
}
@@ -102,8 +104,8 @@ export class MixTableComponent extends SubscribingComponent {
})
}
- getMixMaterialFromDto(mixMaterialDto: MixMaterialDto): MixMaterial {
- return this.mix.mixMaterials.find(m => m.material.id === mixMaterialDto.materialId)
+ getMixMaterialFromDto(mixMaterialDto: MixMaterialDto): MixQuantity {
+ return this.mix.mixQuantities.find(m => m.material.id === mixMaterialDto.materialId)
}
getMixMaterialQuantityRounded(mixMaterial: MixMaterialDto): number {
@@ -121,7 +123,7 @@ export class MixTableComponent extends SubscribingComponent {
return totalQuantity
}
- getCalculatedQuantityHtml(mixMaterial: MixMaterial, index: number): string {
+ getCalculatedQuantityHtml(mixMaterial: MixQuantity, index: number): string {
const totalQuantity = this.round(this.getTotalQuantity(index))
const addedQuantity = this.round(this.calculateQuantity(index))
return `
+${addedQuantity} (${totalQuantity})`
@@ -137,7 +139,7 @@ export class MixTableComponent extends SubscribingComponent {
}
async print() {
- const base = this.mix.mixMaterials
+ const base = this.mix.mixQuantities
.map(ma => ma.material)
.filter(m => m.materialType.name === 'Base')[0]
if (!base) {
@@ -192,7 +194,8 @@ export class MixTableComponent extends SubscribingComponent {
quantity: this.calculateQuantity(index),
isPercents: quantity.isPercents,
position: quantity.position,
- units: UNIT_MILLILITER
+ units: UNIT_MILLILITER,
+ isMixType: false // TODO
})
}
diff --git a/src/app/modules/recipes/explore.html b/src/app/modules/recipes/explore.html
index 8d8f714..623858a 100644
--- a/src/app/modules/recipes/explore.html
+++ b/src/app/modules/recipes/explore.html
@@ -39,7 +39,7 @@
-
diff --git a/src/app/modules/recipes/explore.ts b/src/app/modules/recipes/explore.ts
index 084693e..dd59d1e 100644
--- a/src/app/modules/recipes/explore.ts
+++ b/src/app/modules/recipes/explore.ts
@@ -143,7 +143,7 @@ export class CreRecipeExplore extends ErrorHandlingComponent {
}
deductMix() {
- const firstMixMaterial = this.recipe.mixes.filter(m => m.id === this.deductedMixId)[0].mixMaterials[0]
+ const firstMixMaterial = this.recipe.mixes.filter(m => m.id === this.deductedMixId)[0].mixQuantities[0]
if (this.quantitiesChanges.has(this.deductedMixId) && this.quantitiesChanges.get(this.deductedMixId).has(firstMixMaterial.material.id)) {
const originalQuantity = firstMixMaterial.quantity
const currentQuantity = this.quantitiesChanges.get(this.deductedMixId).get(firstMixMaterial.material.id)
diff --git a/src/app/modules/recipes/mix/edit.html b/src/app/modules/recipes/mix/edit.html
index 14267ca..3888e4c 100644
--- a/src/app/modules/recipes/mix/edit.html
+++ b/src/app/modules/recipes/mix/edit.html
@@ -4,11 +4,8 @@
Retour
-
- Enregistrer
-
+ Supprimer
+ Enregistrer
@@ -22,4 +19,10 @@
Modification du mélange {{mix.mixType.name}} de la recette {{recipe.company.name}} - {{recipe.name}}
+
+
+
diff --git a/src/app/modules/recipes/mix/materials-form.html b/src/app/modules/recipes/mix/materials-form.html
index 5c7742c..56d2dc3 100644
--- a/src/app/modules/recipes/mix/materials-form.html
+++ b/src/app/modules/recipes/mix/materials-form.html
@@ -33,7 +33,7 @@
[mix]="mix"
[mixMaterials]="mixMaterials"
[control]="getControls(mixMaterial.position).materialId"
- [materials]="allMaterials"
+ [materials]="allMaterialsValues"
[position]="mixMaterial.position">